From 72d39ddfd5940f820941fbc0c6dd8ed196031ffa Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 16 Oct 2011 13:07:03 +0000 Subject: [PATCH] Upgrade libpng version sed. Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64 --- media-libs/gd/ChangeLog | 5 ++++- media-libs/gd/Manifest | 18 +++++++++++------- media-libs/gd/gd-2.0.35-r3.ebuild | 6 +++--- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog index 6af8e50a9f47..1407299c52b4 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.68 2011/04/15 08:51:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.69 2011/10/16 13:07:03 ssuominen Exp $ + + 16 Oct 2011; Samuli Suominen gd-2.0.35-r3.ebuild: + Upgrade libpng version sed. 15 Apr 2011; Mike Frysinger gd-2.0.35-r3.ebuild: Disable png/zlib related programs when support is disabled #363491 by Albert diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest index a23efd2fadb4..0b07e2b2e505 100644 --- a/media-libs/gd/Manifest +++ b/media-libs/gd/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX gd-2.0.35-fontconfig.patch 606 RMD160 35cf7028df42e913999a8e8cee3fd20a849fd12b SHA1 e8191c2cc26874144a6f929c3aa002c476d896b1 SHA256 3c318c2b140092c69357bba69b8cf873459581c162e16ac79d20a29bfb30bfdf AUX gd-2.0.35-libpng14.patch 347 RMD160 2d845e72cfe88a0b32d61efc8377b0d5aa438709 SHA1 cba6b3a13c9d35bbe3446dcf7130250e1b3958fa SHA256 b9f5e121ae652e211c866e1982bc6c37303d43b2a3df420be7069ca5fbb04bc4 @@ -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 2068 RMD160 10b22d119fdeafcb27eae1b866ae0e5f243256d0 SHA1 37df97a2c2d769c4992af362489da3ff3e913743 SHA256 0887648f4fa93a385f779649a48b6310f17c9aa96883180fa97b345d9ae4330a -MISC ChangeLog 14618 RMD160 9b414c99ad35f7054281cf5ccf0d91f8d65d6feb SHA1 62b2919019578d4cff39d87c1becd4e27a817260 SHA256 0430559e27c72764c09ca38020cf7d6f6722fbdade9022449b474cb7b4498e97 +EBUILD gd-2.0.35-r3.ebuild 2071 RMD160 67d71f80d7a6f1ac4a4f60d6e436fbb4a16706ec SHA1 cdf6b99c600454822103d50b022ceb16973434b4 SHA256 54230404cc6f87064004e2d78b6487c18e89b00de627b108a87e33611142313a +MISC ChangeLog 14727 RMD160 cc8613eb08f3659bdc8a01673c4524acefad2128 SHA1 4ac8bbea0785546532bdb2d57eec81bd482dfaf1 SHA256 cb0134fe7d7f7f2e48cb82a418354bcec2bd5de588a4567976ff2c9be40c8fa0 MISC metadata.xml 1199 RMD160 d34c8a08b02ececd35c66c0c3594f326639ef8a5 SHA1 e52d9e8500558488eee80333fe2e112a23a519a5 SHA256 a670f3b0950512e392f25f290fc70b953c941cecdc6919cb38048bef2d46c843 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk2oBw8ACgkQaC/OocHi7JaGzAEAkPak5crMiVLqlTmh7xn/ckyU -VpDYBTnisicH8ubvCKAA/3eOVL4ApR3DLRbfmr0sJw4lBC4iDYM1ch0U5Qu10Aww -=JtYF +iQEcBAEBAgAGBQJOmtbtAAoJEEdUh39IaPFNWzwH/3wFUAv1waBaB+HTDL4OPAR0 +JodkLbz2N5ox1JujjqJPdKShXrfUv0YM5P7Jxp0cbU3ZPW6aJJ++WcpI355SZUjc ++3rHOmN2dx93UdQDs1F6ppLadb6XsbTJTvITo8Ad97lOSAPKn64o8GcW+S7XB6Er +Qsyemyc6qmRkz7LQp/H3EWPnIfhZv9wSRy/Mun51KaCs/KGMAyj81nD7SOcsFZxG +QdLZuaD1+glO/rXzn609AJcsu0+f67ApiOa0CZBg9PPL53pZP7Dd54xYCwsQR4z6 +3sFBn73v6Ou1apA6lqrLjrMUOHgVN6uulIi4+kZFNNzzIB6HFhd7Vrstypb5i1Y= +=5pRw -----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 b153d1e31900..e8837bcfa8a0 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.2 2011/04/15 08:51:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.3 2011/10/16 13:07:03 ssuominen Exp $ EAPI="2" @@ -28,8 +28,8 @@ src_prepare() { epatch "${FILESDIR}"/${P}-maxcolors.patch #292130 epatch "${FILESDIR}"/${P}-fontconfig.patch #363367 - # Try libpng14 first, then fallback to plain libpng - sed -i -e 's:png12:png14:' configure.ac || die + # Try libpng15 first, then fallback to plain libpng + sed -i -e 's:png12:png15:' configure.ac || die # Avoid programs we never install sed -i '/^noinst_PROGRAMS/s:=:=\n___fooooo =:' Makefile.in || die -- 2.26.2