diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-12-12 15:58:23 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-12-12 15:58:23 +0000 |
| commit | 360718de2aad23f18abc53a9c6fc8a41b37d66fd (patch) | |
| tree | 339c1065837fc01bfdbcb5fefe3cbfb136e23e1b | |
| parent | Apply Kevin Pyle's patch for bug 239921 to fix parallel build make issue. Tha... (diff) | |
| download | historical-360718de2aad23f18abc53a9c6fc8a41b37d66fd.tar.gz historical-360718de2aad23f18abc53a9c6fc8a41b37d66fd.tar.bz2 historical-360718de2aad23f18abc53a9c6fc8a41b37d66fd.zip | |
Link pnmtopng directly to zlib #291987 Marcin Marszalek.
| -rw-r--r-- | media-libs/netpbm/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch | 12 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch | 12 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.46.00-r1.ebuild | 3 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.48.00.ebuild | 3 |
5 files changed, 34 insertions, 3 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index c1034e835eae..39839cd37b0e 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.228 2009/11/06 17:57:16 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.229 2009/12/12 15:58:23 vapier Exp $ + + 12 Dec 2009; Mike Frysinger <vapier@gentoo.org> + +files/netpbm-10.35.0-pnmtopng-zlib.patch, netpbm-10.46.00-r1.ebuild, + netpbm-10.48.00.ebuild, +files/netpbm-10.48.00-pnmtopng-zlib.patch: + Link pnmtopng directly to zlib #291987 Marcin Marszalek. 06 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org> netpbm-10.48.00.ebuild: diff --git a/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch b/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch new file mode 100644 index 000000000000..ff66768744cc --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch @@ -0,0 +1,12 @@ +http://bugs.gentoo.org/291987 + +--- netpbm/converter/other/Makefile ++++ netbpm/converter/other/Makefile +@@ -159,6 +156,7 @@ + $(shell $(LIBOPT) $(NETPBMLIB)) \ + $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) + ++pnmtopng: LADD += -lz # pnmtopng calls zlib_version itself + pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT) + $(LD) -o $@ $@.o pngtxt.o \ + $(shell $(LIBOPT) $(NETPBMLIB)) \ diff --git a/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch b/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch new file mode 100644 index 000000000000..100c33f9ea34 --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch @@ -0,0 +1,12 @@ +http://bugs.gentoo.org/291987 + +--- netpbm/converter/other/Makefile ++++ netbpm/converter/other/Makefile +@@ -159,6 +156,7 @@ + $(shell $(LIBOPT) $(NETPBMLIB)) \ + $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) + ++pnmtopng: LADD += -lz # pnmtopng calls zlib_version itself + pnmtopng: %: %.o pngx.o pngtxt.o $(NETPBMLIB) $(LIBOPT) + $(LD) -o $@ $@.o pngtxt.o \ + $(shell $(LIBOPT) $(NETPBMLIB)) \ diff --git a/media-libs/netpbm/netpbm-10.46.00-r1.ebuild b/media-libs/netpbm/netpbm-10.46.00-r1.ebuild index 3a49a122fd0e..abce1ba18458 100644 --- a/media-libs/netpbm/netpbm-10.46.00-r1.ebuild +++ b/media-libs/netpbm/netpbm-10.46.00-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00-r1.ebuild,v 1.7 2009/09/29 19:54:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00-r1.ebuild,v 1.8 2009/12/12 15:58:23 vapier Exp $ inherit toolchain-funcs eutils multilib @@ -81,6 +81,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-min_DCT_v_scaled_size.patch + epatch "${FILESDIR}"/netpbm-10.35.0-pnmtopng-zlib.patch #291987 # glibc2.10 compat (bug 270351) sed "s:getline:getline_nonlibc:" -i converter/ppm/xvminitoppm.c || die diff --git a/media-libs/netpbm/netpbm-10.48.00.ebuild b/media-libs/netpbm/netpbm-10.48.00.ebuild index 5cc6a4fc3fee..8898ebea8749 100644 --- a/media-libs/netpbm/netpbm-10.48.00.ebuild +++ b/media-libs/netpbm/netpbm-10.48.00.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.48.00.ebuild,v 1.4 2009/11/17 15:54:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.48.00.ebuild,v 1.5 2009/12/12 15:58:23 vapier Exp $ inherit toolchain-funcs eutils multilib @@ -82,6 +82,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/netpbm-10.31-build.patch + epatch "${FILESDIR}"/netpbm-10.48.00-pnmtopng-zlib.patch #291987 # avoid ugly depend.mk warnings touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) |