Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #278101.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 34 insertions, 22 deletions

diff --git a/x11-misc/xfe/ChangeLog b/x11-misc/xfe/ChangeLog
index a76b911886b9..d15d82373914 100644
--- a/x11-misc/xfe/ChangeLog
+++ b/x11-misc/xfe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xfe
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.49 2008/10/04 12:01:45 mabi Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.50 2009/08/05 12:53:13 ssuominen Exp $
+
+  05 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> xfe-1.19.2.ebuild,
+  +files/xfe-1.19.2-gcc44.patch:
+  Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #278101.
 
 *xfe-1.19.2 (04 Oct 2008)
 
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 3c0ed5f47fe5..9c9ae8ecff9d 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xfe-1.19.2-gcc44.patch 465 RMD160 f85128bfb6fd3384e2adcfac42108bf3dda6162c SHA1 d78a69a00704e70b7211f2c023d2da6ad6617030 SHA256 8b8b8109732ce6df40e17b8b6835901c5f69f2a1690a2fd4c0e1734b7f5ce123
 DIST xfe-1.04.tar.gz 1663117 RMD160 beb1226548152406ac5b7031597590926886ef4c SHA1 0a81c0a98312f48ba7c1fd208edf53516e743511 SHA256 9cacd18f4071becda343db02b779f6c36273d6f3bd34749271ef0eae3c179c2b
 DIST xfe-1.19.2.tar.gz 2084775 RMD160 adc7bbf79ca07f18e8448b3671f25e59b6c22e9a SHA1 34c0833769613efb15bdefcde18198952cd8dc99 SHA256 8a30b992931b1b1cadd469c6bf0174919fd06e562f8c08962ef26ce4c091ea42
 EBUILD xfe-1.04.ebuild 1383 RMD160 5d51c5285f05cefaa5b88a367e39db5372213d5b SHA1 6d144eac4416d04ce96e5d7d43e5a61229a4c9f1 SHA256 e2d6457028ff05b2c944562fd5d209867ec94bd07be0d75ebe075e828d67853c
-EBUILD xfe-1.19.2.ebuild 1088 RMD160 a282b323341867ae18e56e786b6804405d90a438 SHA1 b7077f6287cf1f0393b36584bbc7561af53f44ac SHA256 68dc87dc216d1a79c9408ed440395b5f4f052c663e940382ac32a1ee9b5f18bc
-MISC ChangeLog 5805 RMD160 169c4b1dc96a5763944cc776a1231beb509f7f1d SHA1 a27aa5974e936c88b825c91249b5256346ede6e6 SHA256 bc6ebe2fa951311a8e2e80b8c6bc9aaadde4226c488dc5c42d9c07bd0124be2f
+EBUILD xfe-1.19.2.ebuild 1150 RMD160 efe6a3c2c31e622f0b866d699136cc355962cc72 SHA1 a08269e51cdce5b5532042d3b653af5ef49cb523 SHA256 4a08d3ffea34d210b8343408df34a1dc61df41f1cdfab4ef13fb8f55064429ba
+MISC ChangeLog 5975 RMD160 84768011d4e353f5ca2d4b6a0f471af26d57404d SHA1 5015f786d6fec04dbef8ec16f47cbc445785ea6b SHA256 59c486179f614a73507e0a335daa8f38662b4d9f0cef591552c75eefdaa825c0
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjnXlIACgkQfNMcoUhJ7GyZOQCeI4bNMH03CrAD1F7qS/YH4COK
-KHsAn3GYa9VdXkB1jkMwT7Fw7X5rQbWr
-=XIC3
------END PGP SIGNATURE-----
diff --git a/x11-misc/xfe/files/xfe-1.19.2-gcc44.patch b/x11-misc/xfe/files/xfe-1.19.2-gcc44.patch
new file mode 100644
index 000000000000..36165810b310
--- /dev/null
+++ b/x11-misc/xfe/files/xfe-1.19.2-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur xfe-1.19.2.orig/src/ViewWindow.cpp xfe-1.19.2/src/ViewWindow.cpp
+--- xfe-1.19.2.orig/src/ViewWindow.cpp	2008-07-17 16:13:18.000000000 +0300
++++ xfe-1.19.2/src/ViewWindow.cpp	2009-08-05 15:51:36.000000000 +0300
+@@ -655,7 +655,7 @@
+ {
+     FXString buf=viewer->getText();
+     const char* text=buf.text();
+-    char *p = strstr(&text[pos],str.text());
++    const char *p = strstr(&text[pos],str.text());
+     if(!p)
+         return -1;
+     return (p-text);
diff --git a/x11-misc/xfe/xfe-1.19.2.ebuild b/x11-misc/xfe/xfe-1.19.2.ebuild
index 6db225229ff5..b082d95ff520 100644
--- a/x11-misc/xfe/xfe-1.19.2.ebuild
+++ b/x11-misc/xfe/xfe-1.19.2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.19.2.ebuild,v 1.1 2008/10/04 12:01:45 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.19.2.ebuild,v 1.2 2009/08/05 12:53:13 ssuominen Exp $
 
 EAPI=2
-
 inherit eutils
 
 DESCRIPTION="MS-Explorer-like minimalist file manager for X"
@@ -15,16 +14,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug nls +png"
 
-DEPEND="=x11-libs/fox-1.6*[truetype,png?]
+RDEPEND="=x11-libs/fox-1.6*[truetype,png?]"
+DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_compile() {
-	econf $(use_enable nls) $(use_enable debug)
-	emake || die "emake failed."
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS BUGS ChangeLog README TODO
 	make_desktop_entry xfe "X File Explorer" xfe "System;FileTools;FileManager"
 	make_desktop_entry xfi "X File Image" xfi "System;FileTools"