summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-25 20:09:00 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-25 20:09:00 +0000
commit01e80176be2bb377f4dff7fa1bca9b9f6ed3fbe5 (patch)
treed2859ce33a9a06e085e2911ae14b3b9d353c5bac /www-client/w3mmee
parentFixed typo in ebuild (diff)
downloadhistorical-01e80176be2bb377f4dff7fa1bca9b9f6ed3fbe5.tar.gz
historical-01e80176be2bb377f4dff7fa1bca9b9f6ed3fbe5.tar.bz2
historical-01e80176be2bb377f4dff7fa1bca9b9f6ed3fbe5.zip
Fix building with GCC 4.4 wrt #278079.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'www-client/w3mmee')
-rw-r--r--www-client/w3mmee/ChangeLog8
-rw-r--r--www-client/w3mmee/Manifest5
-rw-r--r--www-client/w3mmee/files/w3mmee-gcc44.patch12
-rw-r--r--www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild11
4 files changed, 27 insertions, 9 deletions
diff --git a/www-client/w3mmee/ChangeLog b/www-client/w3mmee/ChangeLog
index 50152d15ec97..4301a0b1bec8 100644
--- a/www-client/w3mmee/ChangeLog
+++ b/www-client/w3mmee/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/w3mmee
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.9 2007/02/22 00:26:37 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.10 2009/07/25 20:09:00 ssuominen Exp $
+
+ 25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+ +files/w3mmee-gcc44.patch, w3mmee-0.3.2_p24-r6.ebuild:
+ Fix building with GCC 4.4 wrt #278079.
22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
Redigest for Manifest2
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
index 4213399b5e90..7f1348a587f5 100644
--- a/www-client/w3mmee/Manifest
+++ b/www-client/w3mmee/Manifest
@@ -1,3 +1,4 @@
+AUX w3mmee-gcc44.patch 377 RMD160 aea8f3af554e899a4e14c4b00bf866e987ce407a SHA1 f5994a483c24a7ea136d4f78d9f4d26859218d26 SHA256 0673e512ab07b8cd2d2034a73cea48f440ab3b92423432d9684b9a5167b581fd
AUX w3mmee-w3mman-gentoo.diff 1037 RMD160 4393faa68061e1aace2472e3930c0e9fafdd5684 SHA1 8ff4f4eee818428198a27970c232763173d4b678 SHA256 fbba900cebcca79a7f7e2323e104a1d411bdc19cab80c273b98c3906a1053295
DIST gc6.2.tar.gz 750883 RMD160 849969021e41697dc7cfd6773607ac73f0b525be SHA1 ef17f8f56e9853ef41808fdf5c4c7bf2f78f1fec SHA256 344d1bf1125e08f0c1d207b0f7de5fa06275b167333b5acc97ac155d0c58d9f7
DIST gc6.4.tar.gz 778553 RMD160 818a4d6116f304795b2bed115f075a2a1eb1738b SHA1 f857013d6af72979996ff994e740cad035c48e86 SHA256 6507af822e1730d828f72bd4f48a4960ace2ed9fb5d934f424f64b6023acfdae
@@ -5,6 +6,6 @@ DIST w3mmee-p24-20.tar.gz 686907 RMD160 5ef9fb771a2066a3bd91d121311f2ff1f235bdcc
DIST w3mmee-p24-22.tar.gz 690094 RMD160 a93c2e5a8f55a4defadc5ea669e584e4a8a16b98 SHA1 98efee2d4b18293873723f10b84eb5cd7f9d1086 SHA256 1a905a30786568a2c607fd296ea7c13a03c6930d4b9fcb3d0e084c71e30aa665
EBUILD w3mmee-0.3.2_p24-r4.ebuild 3672 RMD160 9c8beb7a756cf2962b2097e6ad8c4d435c52b5fb SHA1 ba295d302ccfbdf6e8e4e9ee10a96a259ec3aff2 SHA256 72e7f996213ddda63b85520953a202a1c64959036b11864ecff77ac04951a057
EBUILD w3mmee-0.3.2_p24-r5.ebuild 3675 RMD160 9cc901a6048a995cc08395e0ee223a32f7d5c2bb SHA1 8b9f20bd36b7338482b51fa43ac37fb91b2b353b SHA256 e0118b0604338ebb8e4d85ec94c5197ab93b0851aa640adacf59b807a5e90a7d
-EBUILD w3mmee-0.3.2_p24-r6.ebuild 3558 RMD160 c896e847d64edef823d8638def8b7caa72ed936e SHA1 03dd270a7c1397e34ed4bb2b4724e47c96fd30cc SHA256 d01f1a24ad2bd1058fcd4c2de5c099c602c5dd1d4aac392dab9e00f8d2a97c69
-MISC ChangeLog 3656 RMD160 ee5e8d35b0260f5b3150f7b3c582ed84f6eda8b9 SHA1 696499d7396d862f4e69a3dd37a14a6ab301a5a2 SHA256 75650eb1d540d86d0aae62c119223b0d1e1eb4d289ae9e5616e37b7e229f596a
+EBUILD w3mmee-0.3.2_p24-r6.ebuild 3596 RMD160 930c296b2582b2f7ded8402fa9b0db97e2007303 SHA1 c4b17be836fa7a723bfe0c338cf436ad68917ca3 SHA256 87049f92c24d1026699ca34f78d87f81111a605cf5c218f936e2eb4efd29e603
+MISC ChangeLog 3814 RMD160 8f6528092a6e33fbfbed9eb52a02b67ff9c01ae2 SHA1 cc5441df96217ec61c62018a85e36449ea34250f SHA256 37269b988341f019572f7c4973fd4707f50904262e859cdd0015354a09f5248e
MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/www-client/w3mmee/files/w3mmee-gcc44.patch b/www-client/w3mmee/files/w3mmee-gcc44.patch
new file mode 100644
index 000000000000..092adb5ba40c
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur w3mmee-p24-22.orig/indep.c w3mmee-p24-22/indep.c
+--- w3mmee-p24-22.orig/indep.c 2002-11-27 16:35:37.000000000 +0200
++++ w3mmee-p24-22/indep.c 2009-07-25 23:06:52.000000000 +0300
+@@ -14,7 +14,7 @@
+ {
+ #ifdef HAVE_STRTOLL
+ return strtoll(s, NULL, base);
+-#elif HAVE_STRTOQ
++#elif defined(HAVE_STRTOQ)
+ return strtoq(s, NULL, base);
+ #else
+ int minus, digit;
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild
index fdb60c4558d1..9b8c876eeb2c 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild,v 1.6 2006/04/21 17:33:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild,v 1.7 2009/07/25 20:09:00 ssuominen Exp $
inherit alternatives eutils
@@ -30,12 +30,13 @@ DEPEND=">=sys-libs/ncurses-5.2-r3
PROVIDE="virtual/w3m"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
src_unpack() {
unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
+ cd "${S}"
+ epatch "${FILESDIR}"/${PN}-w3mman-gentoo.diff \
+ "${FILESDIR}"/${PN}-gcc44.patch
}
src_compile() {