From: Samuli Suominen Date: Wed, 14 Sep 2011 13:34:50 +0000 (+0000) Subject: Fix building with libpng15 (missing zlib.h include) wrt #378389 by Diego Elio Pettenò X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a47007cd3078753762e0d8f3775ed3d1348a9c7b;p=gentoo.git Fix building with libpng15 (missing zlib.h include) wrt #378389 by Diego Elio Pettenò Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64 --- diff --git a/media-gfx/flphoto/ChangeLog b/media-gfx/flphoto/ChangeLog index 37cf4c572d0e..4111953d3d28 100644 --- a/media-gfx/flphoto/ChangeLog +++ b/media-gfx/flphoto/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/flphoto # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.25 2011/03/20 20:14:56 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.26 2011/09/14 13:34:50 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen flphoto-1.3.1-r2.ebuild, + +files/flphoto-1.3.1-libpng15.patch: + Fix building with libpng15 (missing zlib.h include) wrt #378389 by Diego Elio + Pettenò 20 Mar 2011; Justin Lecher flphoto-1.3.1-r1.ebuild, flphoto-1.3.1-r2.ebuild: diff --git a/media-gfx/flphoto/Manifest b/media-gfx/flphoto/Manifest index 54dfc39e82a4..f7542091de96 100644 --- a/media-gfx/flphoto/Manifest +++ b/media-gfx/flphoto/Manifest @@ -1,19 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX album.xml 288 RMD160 052add01b8967c9a564da488ec082f23974545f0 SHA1 62ea904cb231bba911fa7807a234a754b431b0b7 SHA256 6718e126eeeecf0b2f0225dc6c86f280d956384859605a65dbc9d53c5b30c236 AUX espmsg.patch 966 RMD160 745348f6366fc6159255c4b69c42368ecb952172 SHA1 57564b8571edc56a8e357436483370880d637ef8 SHA256 12aadda040f205edfae4bdf3c536de03898b88bf2aa30d492d3b4c03e251625b AUX flphoto-1.3.1-glibc28.patch 394 RMD160 bfe4f8d82c2990b4ecc4be6138fd0b4206960956 SHA1 02c4640a56da12207c4adb97c45e41523fc336c3 SHA256 8452038decbd3a81c73e42e0cb07781de48a1268b92741c02eff8c298454172f +AUX flphoto-1.3.1-libpng15.patch 198 RMD160 ce7c96c2bf71ebf1fcd6b13b7dcc4f5bec8b4663 SHA1 8843ffd3b196a5eb7123ac90930209cdf5f90f91 SHA256 daae0e1981ba245281772272bde8d33664749582a04fb0e48c07dcf9342728c0 AUX flphoto-1.3.1-linking.patch 4918 RMD160 698793987fa8ceb2e8854cbde6128d4a9280c1a1 SHA1 bf6b9bf23dbe9559a0d0fafa74b32bbb2d98e59e SHA256 d737c5a31ad3b886bfb2cb9dd16032885c4a2021dcf9d8b9dc17998f921225bb DIST flphoto-1.3.1-source.tar.gz 797714 RMD160 d8c99e6dbaa448f3590de3f961ba28a1cc3d706e SHA1 3486233c94a74d7f2ec9d325590c1d0191c91952 SHA256 c9e41fd45c584923bd749e6ff52ef39ceb3800f3122d8fd48904a980f6e2b9b3 EBUILD flphoto-1.3.1-r1.ebuild 1267 RMD160 edb00dafd218652202b05e7081d8c00dd650c686 SHA1 3fe223c1666f78ebf0800373319c6e025f0430db SHA256 65b8bca68cc4f882ff9fb01474faef4b2cb05f0d3bbb5b01337f79af146d936f -EBUILD flphoto-1.3.1-r2.ebuild 1454 RMD160 f2084fb7bc2a91f5379708fdaac912e7d0a5d329 SHA1 053fa3325e210bf9dd4b63e6d6162a5bf444ee3b SHA256 218103392127acd7b925ba3765c9df6797441854b0eea33f2db6c382417719aa -MISC ChangeLog 3389 RMD160 7b206bddbb69611b60876abd89aa65e5ebcba2f1 SHA1 1ae299f1316bf3dfaf5afd62f5db99c578772d49 SHA256 26b2f6e93bb60f8157293011d560d6149c183320bc53991160e412ebafd8ad2a +EBUILD flphoto-1.3.1-r2.ebuild 1426 RMD160 3441984e1095af3db2eab6b5d8440fe18722b4a9 SHA1 a8382c4cbae7eaa5e50c6cca0880c24b4dbc5e48 SHA256 b0978e7a20f58ab30abbcf62b933c2f804a3a4bdc32966091591c58812f45fe8 +MISC ChangeLog 3604 RMD160 aeaac377b45c8e4c1dba035ec11161cc76db8e29 SHA1 6eb8f6558be853c33baf64229ce8b17aab9db890 SHA256 2e48992883fbdfe8be50e7af397ae55980b546603c28fc5adc086fb10d416804 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEUEARECAAYFAk2GYEYACgkQgAnW8HDreRatBACY0GGhfblF52Ja8V+cnSN+8SBl -lACfeLTquW7S6z/R9Jxx5+llARkuZMg= -=u2cJ +iF4EAREIAAYFAk5wrbAACgkQXkR9YqOcLPFbwQEAkZaKm6TJJ9CAiefV7lZ3iY5t +BWIni0NLS5UxYOVL4PUA/RVweA+e8MFHYIccXVT00t83iZcvnxklXc+6BXKebq+w +=Inlb -----END PGP SIGNATURE----- diff --git a/media-gfx/flphoto/files/flphoto-1.3.1-libpng15.patch b/media-gfx/flphoto/files/flphoto-1.3.1-libpng15.patch new file mode 100644 index 000000000000..c523a4536380 --- /dev/null +++ b/media-gfx/flphoto/files/flphoto-1.3.1-libpng15.patch @@ -0,0 +1,12 @@ +Missing include for Z_BEST_COMPRESSION + +--- image.cxx ++++ image.cxx +@@ -91,6 +91,7 @@ + #endif // HAVE_LIBJPEG + + #ifdef HAVE_LIBPNG ++# include + # include + #endif // HAVE_LIBPNG + diff --git a/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild b/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild index 97d1299ed78d..65ad3b18801e 100644 --- a/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild +++ b/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild,v 1.6 2011/03/20 20:14:56 jlec Exp $ - -EAPI=3 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild,v 1.7 2011/09/14 13:34:50 ssuominen Exp $ +EAPI=4 inherit autotools eutils fdo-mime DESCRIPTION="Basic image management and display program based on the FLTK toolkit" @@ -15,23 +14,24 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="cups debug gphoto2 nls" -DEPEND=" - dev-libs/openssl +RDEPEND="dev-libs/openssl virtual/jpeg - media-libs/libpng + >=media-libs/libpng-1.4 sys-libs/zlib x11-libs/fltk:1 x11-libs/libX11 x11-misc/shared-mime-info cups? ( net-print/cups ) gphoto2? ( media-gfx/gphoto2 )" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_prepare() { epatch \ - "${FILESDIR}"/flphoto-1.3.1-glibc28.patch \ - "${FILESDIR}"/flphoto-1.3.1-linking.patch \ - "${FILESDIR}"/espmsg.patch + "${FILESDIR}"/${P}-glibc28.patch \ + "${FILESDIR}"/${P}-linking.patch \ + "${FILESDIR}"/espmsg.patch \ + "${FILESDIR}"/${P}-libpng15.patch + eautoreconf } @@ -42,19 +42,16 @@ src_configure() { } src_compile() { - emake || die - if use nls; then - emake translations || die - fi + emake + use nls && emake translations } src_install() { - emake DESTDIR="${D}" install || die - if use nls; then - emake DESTDIR="${D}" install-translations || die - fi + emake DESTDIR="${D}" install + use nls && emake DESTDIR="${D}" install-translations + insinto /usr/share/mime/packages - doins "${FILESDIR}"/album.xml || die + doins "${FILESDIR}"/album.xml } pkg_postinst() {