From 9e8cf2104150717a2c899e31fe62b8a7dbdc43d1 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 11 Oct 2011 22:00:27 +0000 Subject: [PATCH] =?utf8?q?Don't=20execute=20symbols=20check=20with=20apng?= =?utf8?q?=20patch=20wrt=20#378111=20by=20Diego=20Elio=20Petten=C3=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.0_alpha64/cvs/Linux x86_64 --- media-libs/libpng/ChangeLog | 6 +++++- media-libs/libpng/Manifest | 18 +++++++++--------- media-libs/libpng/libpng-1.5.5.ebuild | 8 ++++++-- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog index 1989d770f82c..6c118ce2580f 100644 --- a/media-libs/libpng/ChangeLog +++ b/media-libs/libpng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libpng # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.312 2011/10/08 11:05:03 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.313 2011/10/11 22:00:27 ssuominen Exp $ + + 11 Oct 2011; Samuli Suominen libpng-1.5.5.ebuild: + Don't execute symbols check with apng patch wrt #378111 by Diego Elio + Pettenò 08 Oct 2011; Markus Meier libpng-1.4.8-r1.ebuild: arm stable, bug #384285 diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest index 9b226b3d44f7..fe79b4ffa1c1 100644 --- a/media-libs/libpng/Manifest +++ b/media-libs/libpng/Manifest @@ -19,17 +19,17 @@ EBUILD libpng-1.4.8-r1.ebuild 1419 RMD160 174f84969499fe78ac1024093370ec121981a2 EBUILD libpng-1.4.8-r2.ebuild 1369 RMD160 531f587ba91f30eb15135f613068aed99545600f SHA1 bc4b9405b9d7533dd7ece78f7e39542b61d2d6b0 SHA256 ec52f045d997fc9bfb1fa2fe3686489956395c6f079b9a815e2cec32fbf497d2 EBUILD libpng-1.4.8.ebuild 1467 RMD160 023570d161ac3f93c09893c2292a605ec079418b SHA1 6e2808c79a8c2cebdafa56611c7236d9aa2c195c SHA256 8447d796a9d51d3ed14b91aad3b39d82c4ea1ce0b0d35f8b3fcb6ce2a7abf5c1 EBUILD libpng-1.5.4-r1.ebuild 1463 RMD160 27b6c8dd18f3169fb359c3bec9b433693d67b5de SHA1 faa68726cc46b698db204b4120fe2e0d1ce37af9 SHA256 40a8a4cd20697bcc2fb08fb1248db7515841039d9bfdfd9307fbd34c2cb21be6 -EBUILD libpng-1.5.5.ebuild 1585 RMD160 a5b47cc871b5f1280fdd2bde160cb70cf5855335 SHA1 a46244a5a4c19e6e8749aa11eb4bd5db57bc1407 SHA256 0ef166be2f75da906ffb5ea8df917189804c8c287c90ad41c6bb98f11ea34e38 -MISC ChangeLog 41931 RMD160 124a92a4031252e7a865b7e2029d42619e8ac3ac SHA1 99b0b7109f13fec159df93214fbb472b5241000d SHA256 ef531574c86e6d75dd885e4aca0e253ea18cbff5099ed14a5d2d2e44058b3185 +EBUILD libpng-1.5.5.ebuild 1722 RMD160 19d33854d5b589baf668337411ab327d056efb4f SHA1 f5ab42227e3bbac97324d5e9abaf278391b33795 SHA256 02cbc97efa21e38689c7093260684eb09bda9e801296d6926b6c53ce329c6463 +MISC ChangeLog 42093 RMD160 d26edaabacfdb2814b978351fc276db24d51dce2 SHA1 ac8b14b33131eaf7094404f9f401680ae3fff8ba SHA256 71d185e91aa39cbf843abf68249ebd0988a71f60b50556ad1b65e54ba15c0db5 MISC metadata.xml 247 RMD160 61ce1843d85a1ab05dc7838ac15375b0fb4f35bd SHA1 0a4b634f99126e9ebc485ad949b41df5a11f2fb0 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOkKmpAAoJEEdUh39IaPFNYE4H/0SapghnJTr6/K/6ys6xexHj -Hkf/klqmlfGJ3CIHsyuZoGww0KV+FPS6Zk+GEuzxUw9Rf0CYv0dASpgwUM1DRu/3 -d5bp7KzjfFkkfkMjpJirYKF+FWxiEiWzvP3b+cjKsZ9JiBsahDuwjzpP1EXA0WpC -pnfJPBgqBrg62kf5FdKoW2DpotFw/v3eFit5ytq+7+edR4a1ZR1Dof2JKYqTjZQk -FdSQCPc90JGM1HL5grmW8wZ7Rzn8poV3Vrk4pRw1cYVkavEiMLLT9QRMuwMA4n7D -xOXyxGdNu55ZduVlZZG1UoFmgjcVboUMhyZKVxQpKueix2mv6ZLoTJ2N0oHKVi4= -=Xmg3 +iQEcBAEBAgAGBQJOlLyJAAoJEEdUh39IaPFNb5kIAKBJ7ei64pTv1mq/nd/hSBcn +6wLRJmdePjkkqGttaMLpnhdLUdexfb+PHvyRNjVP2j3SvKZMs3Yngo58QL9Eg2Dk +dGQpNMrCoDZySIhD4VuLnuB7ZEl4BVJ75k8JTWcWUFO/HyQ4k4A7a4mwJQm35O5S +0kKnPr9V+jRji7e3HlCGNZ3mgIxi1mED/FhMTd2OzyadSypTdoiWWKR8qdaWaOyR +uk1yaOwwUswr4oP7Eo2iv9uxFfg3sZp47oRyVau8W2VRIm/ZOc2utAZKdZOSiysq +nddmKYJT6DZXtTPHhIzm0JMGGZfJUT7lONvEG7rcG7U08qRD1C0uSKACMqY4CWg= +=L+7L -----END PGP SIGNATURE----- diff --git a/media-libs/libpng/libpng-1.5.5.ebuild b/media-libs/libpng/libpng-1.5.5.ebuild index e09567a08144..7ad78fc90d5d 100644 --- a/media-libs/libpng/libpng-1.5.5.ebuild +++ b/media-libs/libpng/libpng-1.5.5.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/libpng/libpng-1.5.5.ebuild,v 1.3 2011/10/08 19:50:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.5.ebuild,v 1.4 2011/10/11 22:00:27 ssuominen Exp $ # NOTE: Both optipng and pngcrush are using bundled libpng14. If and when libpng # gets bumped for security, they need to be checked out. @@ -27,7 +27,11 @@ DEPEND="${RDEPEND} DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO ) src_prepare() { - use apng && epatch "${WORKDIR}"/${P}-apng.patch + if use apng; then + epatch "${WORKDIR}"/${P}-apng.patch + # Don't execute symbols check with apng patch wrt #378111 + sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die + fi elibtoolize } -- 2.26.2