diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-10-30 18:41:51 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-10-30 18:41:51 +0000 |
| commit | bcfe55312acb506a12dd5a7237384aec5ea1ee23 (patch) | |
| tree | 38d3a3f991fb53b430a35ed2b6cbd071431d7a73 /media-libs | |
| parent | old (diff) | |
| download | historical-bcfe55312acb506a12dd5a7237384aec5ea1ee23.tar.gz historical-bcfe55312acb506a12dd5a7237384aec5ea1ee23.tar.bz2 historical-bcfe55312acb506a12dd5a7237384aec5ea1ee23.zip | |
Fix building with USE="png -zlib" wrt #381729 by Brennan Shacklett
Package-Manager: portage-2.2.0_alpha71_p73/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/gd/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/gd/Manifest | 14 | ||||
| -rw-r--r-- | media-libs/gd/gd-2.0.35-r3.ebuild | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog index 72e178d4b7ba..440cf6ce207c 100644 --- a/media-libs/gd/ChangeLog +++ b/media-libs/gd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/gd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.74 2011/10/29 19:29:40 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.75 2011/10/30 18:41:51 ssuominen Exp $ + + 30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r3.ebuild: + Fix building with USE="png -zlib" wrt #381729 by Brennan Shacklett 29 Oct 2011; Markus Meier <maekke@gentoo.org> gd-2.0.35-r3.ebuild: arm stable, bug #387291 diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest index bd473787de35..e9ab89acce0e 100644 --- a/media-libs/gd/Manifest +++ b/media-libs/gd/Manifest @@ -7,13 +7,17 @@ AUX gd-2.0.35-maxcolors.patch 348 RMD160 14ef5425229c5406c90beb4a8fade801cd1013b DIST gd-2.0.35.tar.bz2 1212730 RMD160 f452a2c333b2ba9b7b4c143983ec2af18a335516 SHA1 ccf34a610abff2dbf133a20c4d2a4aa94939018a SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9 EBUILD gd-2.0.35-r1.ebuild 1238 RMD160 47424c23f20db301c026d45a649793b270757722 SHA1 ca814a7bc69cc2c8804f812ae7d1386f2e08fbd0 SHA256 bba6e84fc0e5d7b2e9e287773c9397d5d0d6e00bd8ef619273e9e4a4f4077e5b EBUILD gd-2.0.35-r2.ebuild 1416 RMD160 3e048f308cc881702f2dea4bde0a6c5d45b96b82 SHA1 91fc8e4954cb0c3ad52cefb3c5c919331c90ea38 SHA256 832cd51c0c0cf61a2321811cc0186fc5c4d152adc970bf6c510f65597a69dd04 -EBUILD gd-2.0.35-r3.ebuild 2064 RMD160 53bdec761989a3768351f436ee6c915fb673f558 SHA1 c5bd49849c95e976a49489ac0ace9fd808228c9c SHA256 adc900715f9c5073b06e1e6127216b90da08f617a11dd3c3dd7ae2936742bd52 -MISC ChangeLog 15297 RMD160 126b9879e2280d932d0428ae39062238c62f19f5 SHA1 14b7fcaed6744709e3ba235487ceabfec7bae0ec SHA256 472fbb4dd6f6a561d86390ad79f301de982e8c9726879021432a92db1fe33839 +EBUILD gd-2.0.35-r3.ebuild 2076 RMD160 e59292c5cccfca643c3ea42ae838d481d65c7101 SHA1 69a8f6f3ad80f2d0ae09e195276b50a557cfd2b4 SHA256 457ae0745e126f519d87abb50417bee506d25acb1dff49b82c2ea0ed9183bd86 +MISC ChangeLog 15445 RMD160 97c7e7306538859af13ac5c72d4de41bd73bee3c SHA1 37ce4e662509a09762476c660e9687d0b594af40 SHA256 512e1dd831a57cf88f10e9150addc01f6e921b743a92aeb310933b26f790411f MISC metadata.xml 1199 RMD160 d34c8a08b02ececd35c66c0c3594f326639ef8a5 SHA1 e52d9e8500558488eee80333fe2e112a23a519a5 SHA256 a670f3b0950512e392f25f290fc70b953c941cecdc6919cb38048bef2d46c843 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6sVKwACgkQkKaRLQcq0GLbbgCfUqy3NDSBG0Nass8FiG+RJVta -fwMAmwYDm4n02wSTVTiNsLppvgBm9lR4 -=5B9M +iQEcBAEBAgAGBQJOrZpwAAoJEEdUh39IaPFNHZEIAJLDV5z7ahgLoXDFmR1rol1Q +ouBAQzsn/mcHLvZp4ffY7r8wwVbY5lDbHQ647WVP5tyeEXw8jO5P9A/uNhsqh5gB +5UGwIQXzCTsUw3k7WMN1rU68RHlL2i8z0dU2clXMZHdQY/9NFXMaD2JfCA3V08YN +D0oEsZuxfl5tmJMGoUKstueV/L18INbDamJZk/By4Qz6oXL4Cgl8jBKRS4LmjdQJ +n0Yq/gVoAB8IEkDkSNeKX3zcGqjyxwtTL8AE1Jzwpjr9gwhJa1FqMZUnSWOO5ZbV +8N8+t7PeHeZZ7r4TSLzAPS6GC9yGEeWcs8w8r0GGsj89EzlOheh+s5oXHlACBFc= +=dFN/ -----END PGP SIGNATURE----- diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild index b95ea8d1552b..cdd641c5d65e 100644 --- a/media-libs/gd/gd-2.0.35-r3.ebuild +++ b/media-libs/gd/gd-2.0.35-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.8 2011/10/29 19:29:40 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.9 2011/10/30 18:41:51 ssuominen Exp $ EAPI="2" @@ -41,7 +41,7 @@ src_prepare() { fi if ! use zlib ; then sed -i -r \ - -e '/^bin_PROGRAMS/,/^noinst_PROGRAMS/s:(gd2topng|gd2copypal|gd2togif|giftogd2|gdparttopng)..EXEEXT.::g' \ + -e '/^bin_PROGRAMS/,/^noinst_PROGRAMS/s:(gd2topng|gd2copypal|gd2togif|giftogd2|gdparttopng|pngtogd2)..EXEEXT.::g' \ Makefile.in || die fi |