diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-10-03 09:31:36 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-10-03 09:31:36 +0000 |
| commit | b5b798d43700bb1a3319dc87c6001e6a2a23c545 (patch) | |
| tree | 9dc1a6c733f2814441a56e6e78031d511775c236 | |
| parent | Do not bother with binfilter if the useflag is not enabled. (diff) | |
| download | historical-b5b798d43700bb1a3319dc87c6001e6a2a23c545.tar.gz historical-b5b798d43700bb1a3319dc87c6001e6a2a23c545.tar.bz2 historical-b5b798d43700bb1a3319dc87c6001e6a2a23c545.zip | |
The libpng15 patch imported from NetBSD is not compatible with libpng14 wrt #376407 by Pacho Ramos
Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64
| -rw-r--r-- | net-im/amsn/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/amsn/Manifest | 16 | ||||
| -rw-r--r-- | net-im/amsn/amsn-0.98.4-r1.ebuild | 9 |
3 files changed, 21 insertions, 10 deletions
diff --git a/net-im/amsn/ChangeLog b/net-im/amsn/ChangeLog index e2cb6eafb7f8..aa7c09daa92b 100644 --- a/net-im/amsn/ChangeLog +++ b/net-im/amsn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/amsn # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.105 2011/09/17 19:03:45 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.106 2011/10/03 09:31:36 ssuominen Exp $ + + 03 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> amsn-0.98.4-r1.ebuild: + The libpng15 patch imported from NetBSD is not compatible with libpng14 wrt + #376407 by Pacho Ramos 17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> amsn-0.98.4-r1.ebuild, +files/amsn-0.98.4-libpng15.patch: diff --git a/net-im/amsn/Manifest b/net-im/amsn/Manifest index 1624d01f95cc..c867445c2d21 100644 --- a/net-im/amsn/Manifest +++ b/net-im/amsn/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX amsn-0.97.2-TkCximage.patch 3451 RMD160 ecb50e3e98e8c0142c12a11be2345069286fbbba SHA1 be3c392d856ff7150f437c6419a6dd63f40e92dc SHA256 51b02012d51ad981d307f8b816aa783214a9b7811198136ef0fc1bd68ed5a8fc AUX amsn-0.97.2-http-fix.patch 771 RMD160 10eb6467d140e84ae8bc1726013b1630b1af78ff SHA1 12793ccdcfcaab341c515dbee991e5d4d5ce246b SHA256 9caa3e9b439f690114e4dc7609221dba3d662e857233208cc9e44009209d6b1c @@ -11,14 +11,18 @@ AUX amsn-0.98.4-v4l2.patch 850 RMD160 8657bd6e05cb42ebc702e9863274a4755878bb57 S DIST amsn-0.98.3-src.tar.bz2 13275477 RMD160 20f707062da4a5ab1eb6beec49d01dfd2ba90a99 SHA1 aa8383a11ce66352aceee27f9c291c1410b3403d SHA256 43b76da9d886fd2cdcf8a7e21c9872141228a2ad1defaca8ad537722a32e0d88 DIST amsn-0.98.4-src.tar.bz2 13513233 RMD160 8e0c3bdde902540fe759b01978447cc60d8fbeb3 SHA1 e00761c945ad47e0b715c69f1f9f18f5a4bf287c SHA256 7aa11a7199b4cda5e814493dd160915ab4c4f96c04de2c1fe7c2fe23eeaba871 EBUILD amsn-0.98.3.ebuild 1879 RMD160 740fc499d88e512c1a4256b349e455f0bab3c376 SHA1 16ab6050e4f31a396d0e6b67904e07745555352b SHA256 a84fa8b1a7fca24448ced62a3af7cb504221c1d0975a8b3244497bed2ffd959a -EBUILD amsn-0.98.4-r1.ebuild 2187 RMD160 c710ac25e012c85c602c19dc31def29deb9cbc43 SHA1 b4f11b0d16c33828e57b7553a88b1b52567e683e SHA256 b708b2eaf92e27669a484ffd0abb7165c0485c0ea54c6087ff89deb75aadace5 +EBUILD amsn-0.98.4-r1.ebuild 2319 RMD160 3db093740aab1653b4ba67bc6bc212e753234212 SHA1 17784135f3b33205e8665a30dd4d412cd7138dca SHA256 3312499727f3bfb76ce6590a0123bfe2c12a858f3c89728012b77b093e9a2f8b EBUILD amsn-0.98.4.ebuild 1878 RMD160 7fe60ce2b5fe1f6851fcaf9cf75820e1327f6868 SHA1 251b1397d1a7512c28fb303eec46506472acd2de SHA256 d66257d76d87cde3d1e2ace8b313bdc226d7de2a3bca8f930b9e07bfb3c6d87b -MISC ChangeLog 13485 RMD160 bfc7585fc10e526183ef7f1b0e0713679e02cb42 SHA1 b9c249f06b3cd9425502fdfc0707073039f17af7 SHA256 97e39a4aa245a3972e2872e2c3f8c23b5447f5930b21998f5c0330a3d974fd52 +MISC ChangeLog 13666 RMD160 54fb22cb2cb90d7e4a6b70ad1990d6d2ab14985b SHA1 dd63780040acbc6cb358b2b9d3495ed033d78ce4 SHA256 ba42a0e2335e7eed422ce538e76d26dde27fe3b4c7a298a51ec6884075b1a72a MISC metadata.xml 228 RMD160 d75298dd38147e4c60991454366d6d9cc14985bb SHA1 9f2cadd0fee8f845e833c429f3e6d3a4e2a207b4 SHA256 0ca6e1352c0e4284a99ed8f0267b6835a5e33e2d8b94a08f1af6ad58fd72d942 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk50700ACgkQXkR9YqOcLPHn0gD9H/+N3rkvxZk0K0TWQlPrO444 -fRkOSxnxUWP5c+mlqY8A/ii5t49C3aBpga4aqkhReDgqQSgT9foFkKfouW2rkudO -=v7QA +iQEcBAEBAgAGBQJOiYEeAAoJEEdUh39IaPFNCX0IAJfZjlztgFhcLSbAmV/HdwLZ +RgTEgbyuKC+Ly37G4nLwlpeiYcJHtpGl2TsPmY6tuFSfgYWNBri8mspR5ph4w4Vf +bg8Kgr1enNXxPG6Wh5q5NNzzRM4iYStOL3pZLk//1rd8ky1usA5ksYiGE8WF7GtY +ha0ajw+XThH3DPyVKxWH8qrR/2Ukh/DCe15Nt1cHz70tKj9KdkIKkEJQyCWxrwJp +YvYaeMQM0716j4JbtSwyzJ5WfdDQp3HXMotqOk4AyDzgfIEk8B/sxitFGb1pSKPY +ISTJ5rY63QiKMKCFWq+q13sWHzNh1M4osYDrCFBuSRGOalMyZnGk4woiFKYVY0I= +=HGs6 -----END PGP SIGNATURE----- diff --git a/net-im/amsn/amsn-0.98.4-r1.ebuild b/net-im/amsn/amsn-0.98.4-r1.ebuild index 2d46ec7103ef..1500dbcf92e0 100644 --- a/net-im/amsn/amsn-0.98.4-r1.ebuild +++ b/net-im/amsn/amsn-0.98.4-r1.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/net-im/amsn/amsn-0.98.4-r1.ebuild,v 1.2 2011/09/17 19:03:45 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.4-r1.ebuild,v 1.3 2011/10/03 09:31:36 ssuominen Exp $ EAPI=2 @@ -44,8 +44,11 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-0.98-noautoupdate.patch \ "${FILESDIR}"/${PN}-0.98.4-v4l2.patch \ - "${FILESDIR}"/${PN}-0.98.4-amsnplus-ldflags.patch \ - "${FILESDIR}"/${PN}-0.98.4-libpng15.patch + "${FILESDIR}"/${PN}-0.98.4-amsnplus-ldflags.patch + + # The NetBSD patch kills backwards compability, see http://bugs.gentoo.org/376407 + has_version '>=media-libs/libpng-1.5:0' && epatch "${FILESDIR}"/${PN}-0.98.4-libpng15.patch + # only portage should strip files, bug 285682 sed -i -e "s/LDFLAGS += -s/LDFLAGS += /" Makefile.in || die "sed failed" # Ships with a 32-bit binary, we want to rebuild it |