diff options
| -rw-r--r-- | www-client/w3m/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/w3m/Manifest | 33 | ||||
| -rw-r--r-- | www-client/w3m/files/w3m-0.5.3-underlinking.patch | 15 | ||||
| -rw-r--r-- | www-client/w3m/w3m-0.5.3-r1.ebuild | 5 | ||||
| -rw-r--r-- | www-client/w3m/w3m-0.5.3-r2.ebuild | 5 |
5 files changed, 43 insertions, 21 deletions
diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog index e7beaf65387e..20753eedc26b 100644 --- a/www-client/w3m/ChangeLog +++ b/www-client/w3m/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/w3m # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.70 2012/05/15 04:20:28 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.71 2012/05/20 00:25:23 naota Exp $ + + 20 May 2012; Naohiro Aota <naota@gentoo.org> + +files/w3m-0.5.3-underlinking.patch, w3m-0.5.3-r1.ebuild, w3m-0.5.3-r2.ebuild: + Add patch to link missing libX11. #416539 *w3m-0.5.3-r2 (15 May 2012) diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest index 815b6417d373..dc61d735bcc9 100644 --- a/www-client/w3m/Manifest +++ b/www-client/w3m/Manifest @@ -7,30 +7,31 @@ AUX w3m-0.5.2-gc72.patch 769 RMD160 475b22c156c6be49729e9a563d5d5493ba249c4d SHA AUX w3m-0.5.3-button.patch 14325 RMD160 06cf86a847065ab0527a015a4eee5151f41470ed SHA1 1ffab809894da7d504afd694d2808a2b0065c561 SHA256 acdc0032e213b610d5f6cf0ca15d7370572f736918c165e962badb5c73ac5982 AUX w3m-0.5.3-glibc214.patch 1673 RMD160 ab4f6e18287a960e15350f0d90c3e564eda1c86b SHA1 c0270149250c180cbfc88eacb917cbe5f0ed5fa9 SHA256 9cad0a1ba6a15d28a705d43d7d82621d18e298d771c750b01809eed935b0370d AUX w3m-0.5.3-parallel-make.patch 351 RMD160 d253ca9e1e47e67c31ad1320573d034447022d42 SHA1 11fb11ba105cfbbf695eb9fa299a7ea0ea84c01c SHA256 606ecdf4b41a49f71efd76a24e6f69fb9aa2ef69d0d27f2e1a7ad42e3a1e47db +AUX w3m-0.5.3-underlinking.patch 790 RMD160 10196f9f6c504786ff656a4cab9a812083af42d1 SHA1 8bc0324aa332b9318be30e8ef544509fb9d5cb0f SHA256 ce289ecf767af2a286e16e7ca03fc47cf2f68eaeab015cbbe48926b18dcb76a6 AUX w3m-CVE-2010-2074.patch 1597 RMD160 2a0f198a18ddec42ac070a9433d39177a41860f1 SHA1 e7e9502af2e749fff7e173c5eb6e27158591f5b8 SHA256 3ceb88f635f2b26509acf99c4817d746f4bd50f2cb6ff3152e919fdfb234d0e2 AUX w3m.mailcap 44 RMD160 86f571fda5a25bc7ffe2a2094c2bc590c0395ce0 SHA1 dccd475e42a34e132adfc2aa13c3c789cd2e6fff SHA256 5f3c243df65c4d2e5ceeb1fae285e0f9f6660c7b0fc66bb7e46803c1de1890b5 DIST w3m-0.5.2.tar.gz 1906812 RMD160 09ce72d8ef5e621a2e49496b63e22f2773edbe79 SHA1 484522547ae6dbb342d3858a2a53a65451e273f9 SHA256 5ff3e5a1f50a4a8e6ddbfdeefbe13d3a7f63538595a8e29f5da504ea46eda646 DIST w3m-0.5.3.tar.gz 2202328 RMD160 6a0153bc53f7c107c700404262ce1b4d02e6dd91 SHA1 444b6c8cf7094ee95f8e9de96b37f814b9d83237 SHA256 e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3 EBUILD w3m-0.5.2-r4.ebuild 3333 RMD160 8953d6e3673bd3407e213c2fc48100a4172d7838 SHA1 44878214cf86bcb665881f4c8ea1e36000ff0671 SHA256 ac6e7acb0a51dc91f394bbdadbcf72bc66328a02911a529487e3bd957d6f0b26 -EBUILD w3m-0.5.3-r1.ebuild 3347 RMD160 dffca9fe68126c4244e5f0ead317ec695e787d0a SHA1 7757fab1460581c9c596bc033c96c02475f73c12 SHA256 e9430f95347ec9f732787aa8dfc5b4166713e99829759687e76945e853c1996d -EBUILD w3m-0.5.3-r2.ebuild 3424 RMD160 5e47a9d6349d9880add81a78f246cadf994949cc SHA1 646c7407a18e736c78744b0da1515fb45da852b6 SHA256 74831d1153fd0bcb0ab4a90ca5925e2b81259f204f33621f272f7caaf022c945 +EBUILD w3m-0.5.3-r1.ebuild 3398 RMD160 e64f238c7f843b042bade954fc21de2f51f5609c SHA1 a6f842fdf1c469a7dab29ff863bcab09e8eeee98 SHA256 4ed94aa84cb70afdb9e583f06a5f8b010b8f95bd4a0c0794bf9eb05591d364d4 +EBUILD w3m-0.5.3-r2.ebuild 3473 RMD160 d085d1d73ce8504a003c323536938a894d85450b SHA1 dbb961111c1f54497579d83b8b5646e30eae4b17 SHA256 4ba5543b4569807729d99bece7e44feb100937aa0606e5d1ecf2a822de3887a4 EBUILD w3m-0.5.3.ebuild 3206 RMD160 340e06493c4f73a476bab19d3289da1dfcdd41c8 SHA1 cf3bd6d1d5223ddd80ce13496eb38fa696e343cd SHA256 d480a07179bb6b5c609d203cd6aa5f839ea2e7409965f6bb0026d883b3dd4d6c -MISC ChangeLog 19885 RMD160 bf11a3e2fe5a6850884871d3141411a21d2ed6ce SHA1 16b336e60849dac22f8a71ab126a554d7391341e SHA256 155728ad00646a1235f352f1de3a21b99bf5408042fad1900de35459ae2df067 +MISC ChangeLog 20058 RMD160 9050d8272acba33d7f1079a2d235be4630980c6d SHA1 b69278ab6b47df66bd23df40d099b3edbcdf537c SHA256 19816004d98e52f195cc72d8b199a31279b5146f5db322d7d261c6ae50cd7d90 MISC metadata.xml 237 RMD160 795d70d06b61c12bd15a97e596afed87747e7553 SHA1 a1a1f21305275c396fb2784bb261595fbf510a6f SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJPsdl9AAoJEDYO1FT4VRUUXnAP/3x/AT4IuliLim4yVp6q1cu5 -4ROvVSDtAuyAA4TzU/RibCotVLU+2XgucBj2Co+pVtJamYPnnzK/FlqbSIQYOCnl -CP9fA0uJPsvjopJuKpPsx4FGj2O+cUGDN0CrG/gEImTWwPs6S3Ffziz7Q2YrGmAO -fNW4Vm+ZM6u5bNRyTI/3Y11e8sryfrjX6yIUCTex/n0UDPLaTXPwyQGo3Qg7myQy -9WkXRURkJooBRAe9gIX7LkDPRRvxkX44XukCYo/P3TxlEFcDV3SKgHQS06zox3bE -wQVvLzl7EgSmWQL5cWLeOCDufe8IpGgnxH8NTpntW7+b2dChSn/jUDWAe3JcwGJg -3/x0Bch310j2xEY4RvflwU3UprhRYEL182Yx1b2tdC/AmqoSMFy3HyKe3MH3jTki -15rP45oFhfMbC3V7p3sOjJGC34s/vucrVZBGKU43ws+dlK9a9+GcXOYCQdazvzbq -rlOHNwS+jMEnaiAV/+DuOdNoxgLZifaUgbSW7WzyBsJsT8IzGBzzCIUpjgdt7+S5 -x768g8at5NxErYZ/Wr+kXPjmgDLYu+0id7x58v7izx4NskZ4uL+XBWxxVuzf0JTG -8K9qVPImEzR+C2HW5h84q3rzt1isKCZI0Ig3AekDu5f02w4MoaS4rDrh/22OR1Tg -mSrjTerW1MdNA35hwRnh -=EtlU +iQIcBAEBCAAGBQJPuDoEAAoJEDYO1FT4VRUUxWUP/3YLBhRYlJ1QF/ity54ng/KI +2MTLl2L1luQvTuUJllHJ95+T8G+vSpVOmrYftQzyNiD/PUszkpITuLnXXWj1UirA +pYp8On+G6kOy07FMjkMMlrqCDjVKmfktFL8tTYLNgWoAcVMJnC5Y5zmGjLQ8MNx6 +AV7qpvLNu6rKFxu1I7JYVuKpBY36kRwnBqXiJV/7sdxJhy/8YW4Z4fPgulm+jgzS +7jqwHD64K1t5yD5rnhDRj23hppZpz4BjFgkt1U6Kb/FpQj9kTDKg/fRCfXBygzym +OHyMStstX6dlmgrLyUhSKjqUqapDjyNl12sOk1peQyYvEMpm7wAQLOV6mScylj0D +BGhb85kateLJt6fnMFL+UJp+wABga8ZvzoklHCyjcA1+VFJApiHzQFjdL8CieLwb +IsFEIKFfi7WIBbI1GfauG+/CouJiVg7iT/qC9cuWSnufAgItoZ2wczHFhfBWDWZi +9ax9iMgYfoovXxo3Z/nNB7YnoYv/uGUwl4P5K1Lpie8vr916HkRm3smTySgYVHU8 +6nrsXP/OW1cn/zFT4S3oaETS8XEAsGmr+cLdy13GFgT2Fon/01K+j8RVPQPghK7A +53W7lrkiN9k7ZguE3zJeOjqcuVdlM3SzI7dsK7z0JaYt94jsYmX/AWhVjOoUYneA +imwcK8EVY3tziOTf/SPK +=i5C9 -----END PGP SIGNATURE----- diff --git a/www-client/w3m/files/w3m-0.5.3-underlinking.patch b/www-client/w3m/files/w3m-0.5.3-underlinking.patch new file mode 100644 index 000000000000..1b034b46cb13 --- /dev/null +++ b/www-client/w3m/files/w3m-0.5.3-underlinking.patch @@ -0,0 +1,15 @@ +Description: Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5 +Author: Martin Pitt <martin.pitt@ubuntu.com> +Bug: https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441 + +--- w3m-0.5.3.orig/Makefile.in 2011-01-04 18:22:18.000000000 +0900 ++++ w3m-0.5.3/Makefile.in 2011-02-06 12:05:40.000000000 +0900 +@@ -199,7 +199,7 @@ + $(CC) $(CFLAGS) -DDUMMY -c -o $@ $? + + $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a +- $(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS) ++ $(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) -lX11 $(IMGLDFLAGS) + + w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h + $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c diff --git a/www-client/w3m/w3m-0.5.3-r1.ebuild b/www-client/w3m/w3m-0.5.3-r1.ebuild index 10ad3e7c703b..182a64c4fbaf 100644 --- a/www-client/w3m/w3m-0.5.3-r1.ebuild +++ b/www-client/w3m/w3m-0.5.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r1.ebuild,v 1.6 2012/05/13 11:41:18 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r1.ebuild,v 1.7 2012/05/20 00:25:23 naota Exp $ EAPI="3" inherit eutils @@ -32,7 +32,8 @@ src_prepare() { epatch \ "${FILESDIR}/${PN}-0.5.2-gc72.patch" \ "${FILESDIR}/${PN}-0.5.3-parallel-make.patch" \ - "${FILESDIR}/${PN}-0.5.3-glibc214.patch" + "${FILESDIR}/${PN}-0.5.3-glibc214.patch" \ + "${FILESDIR}/${PN}-0.5.3-underlinking.patch" find . -name CVS -type d | xargs rm -r } diff --git a/www-client/w3m/w3m-0.5.3-r2.ebuild b/www-client/w3m/w3m-0.5.3-r2.ebuild index 0bcec32fcf4d..b6ea19f11297 100644 --- a/www-client/w3m/w3m-0.5.3-r2.ebuild +++ b/www-client/w3m/w3m-0.5.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r2.ebuild,v 1.1 2012/05/15 04:20:28 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r2.ebuild,v 1.2 2012/05/20 00:25:23 naota Exp $ EAPI="3" inherit eutils @@ -32,7 +32,8 @@ src_prepare() { epatch \ "${FILESDIR}/${PN}-0.5.2-gc72.patch" \ "${FILESDIR}/${PN}-0.5.3-parallel-make.patch" \ - "${FILESDIR}/${PN}-0.5.3-glibc214.patch" + "${FILESDIR}/${PN}-0.5.3-glibc214.patch" \ + "${FILESDIR}/${PN}-0.5.3-underlinking.patch" use vanilla || \ epatch "${FILESDIR}"/${PN}-0.5.3-button.patch find . -name CVS -type d | xargs rm -r |