Fix building with gcc-4.1, thanks to Ian S. <rhican@gmail.com> in bug #147984.

Package-Manager: portage-2.1.2_pre1

5 files changed, 54 insertions, 11 deletions

diff --git a/x11-misc/3dfb/3dfb-0.6.1.ebuild b/x11-misc/3dfb/3dfb-0.6.1.ebuild
index e947c0c442ed..090603e2b554 100644
--- a/x11-misc/3dfb/3dfb-0.6.1.ebuild
+++ b/x11-misc/3dfb/3dfb-0.6.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/3dfb/3dfb-0.6.1.ebuild,v 1.5 2005/10/06 21:53:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3dfb/3dfb-0.6.1.ebuild,v 1.6 2006/09/18 21:37:47 swegener Exp $
+
+inherit eutils
 
 DESCRIPTION="3D File Browser"
 HOMEPAGE="http://sourceforge.net/projects/dz3d/"
@@ -17,6 +19,13 @@ RDEPEND=">=dev-libs/glib-2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/0.6.1-gcc41.patch
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
diff --git a/x11-misc/3dfb/ChangeLog b/x11-misc/3dfb/ChangeLog
index 57c10d92a7b5..7020aff02bcf 100644
--- a/x11-misc/3dfb/ChangeLog
+++ b/x11-misc/3dfb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/3dfb
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/3dfb/ChangeLog,v 1.6 2004/09/07 23:12:51 swegener Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3dfb/ChangeLog,v 1.7 2006/09/18 21:37:47 swegener Exp $
+
+  18 Sep 2006; Sven Wegener <swegener@gentoo.org> +files/0.6.1-gcc41.patch,
+  3dfb-0.6.1.ebuild:
+  Fix building with gcc-4.1, thanks to Ian S. <rhican@gmail.com> in bug #147984.
 
   08 Sep 2004; Sven Wegener <swegener@gentoo.org> -3dfb-0.5.5.ebuild,
   3dfb-0.6.1.ebuild:
diff --git a/x11-misc/3dfb/Manifest b/x11-misc/3dfb/Manifest
index d762094b6c5b..fb978c1ec9c3 100644
--- a/x11-misc/3dfb/Manifest
+++ b/x11-misc/3dfb/Manifest
@@ -1,14 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d572ab0b46205ebaa4ddd585a36e34d8 3dfb-0.6.1.ebuild 638
-MD5 4a39076ad464005657ad53d03d1653ba ChangeLog 1099
-MD5 50ee00e8e1db1ba6ff4162abafb01a31 files/digest-3dfb-0.6.1 62
+AUX 0.6.1-gcc41.patch 330 RMD160 d29f9d08993d0551a51b30f302177be878d91e67 SHA1 79859447c2010765760047ec5ccbd9c282eb680c SHA256 5f94be8d79e92ac241a86ae5c3c2cadded16a1489b4a16cc6376474348f4192d
+MD5 2dbbb7f41fbf506cbdec08da142accd7 files/0.6.1-gcc41.patch 330
+RMD160 d29f9d08993d0551a51b30f302177be878d91e67 files/0.6.1-gcc41.patch 330
+SHA256 5f94be8d79e92ac241a86ae5c3c2cadded16a1489b4a16cc6376474348f4192d files/0.6.1-gcc41.patch 330
+DIST 3dfb-0.6.1.tar.gz 102343 RMD160 2782d3984367aad07e3c53bcdb240e53b6ffa1c6 SHA1 fd54a4e4f976142a6f8c4f18658dc3fb0760490e SHA256 94321725651711a7f7e61f8c479e519985f980e788dfa6a840300d8a41dacf3f
+EBUILD 3dfb-0.6.1.ebuild 737 RMD160 034d8dd4e78f70e316d7c45f129d54369d5f6d05 SHA1 291c746b6d8fff6a178655cdbcec957b651b433f SHA256 934589e36387cdc64057dbc3f923f34b99075872e2adbafa10d772192f768394
+MD5 d96ec7897bc3f1d918058958b71975c1 3dfb-0.6.1.ebuild 737
+RMD160 034d8dd4e78f70e316d7c45f129d54369d5f6d05 3dfb-0.6.1.ebuild 737
+SHA256 934589e36387cdc64057dbc3f923f34b99075872e2adbafa10d772192f768394 3dfb-0.6.1.ebuild 737
+MISC ChangeLog 1278 RMD160 a9330bcec72c35ed2eeccfcb2e3b67142aa0085b SHA1 79e6114eb36d53dfda75a7327286032de4037082 SHA256 02ff7c7dd090ce0c380414dac846dda54906343f2097ba2d376d67f68059a052
+MD5 b5f274c11ab6e181e9430618b15dd676 ChangeLog 1278
+RMD160 a9330bcec72c35ed2eeccfcb2e3b67142aa0085b ChangeLog 1278
+SHA256 02ff7c7dd090ce0c380414dac846dda54906343f2097ba2d376d67f68059a052 ChangeLog 1278
+MISC metadata.xml 385 RMD160 da8a93b1c95e09321026b2c8688aa3dc312ddf10 SHA1 a82c86501ebe9e24404563e06473e279e0c38885 SHA256 16c73fd31d9417f22bd795d6c954a495ebbcadd43a811eb28829d6f6cd0ce75f
 MD5 809fdbb24c1177ba34d056255c235003 metadata.xml 385
+RMD160 da8a93b1c95e09321026b2c8688aa3dc312ddf10 metadata.xml 385
+SHA256 16c73fd31d9417f22bd795d6c954a495ebbcadd43a811eb28829d6f6cd0ce75f metadata.xml 385
+MD5 37f9315f6a320ab60fd14a24315d6df9 files/digest-3dfb-0.6.1 232
+RMD160 7caf53910043f0707817ef216bcfe65e732d12c3 files/digest-3dfb-0.6.1 232
+SHA256 ae8d200d24ea749b458b956c98cf3c3e783faa6c269527c8d1f8e6ff6bbff76c files/digest-3dfb-0.6.1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFDRZzZI1lqEGTUzyQRAvEQAJ91pP6BQF0Zke7XfQqmnwx7QQ2gUACfUZhU
-btk9IGs9Yexb0jLsFUSfhe8=
-=dDZu
+iD8DBQFFDxGyI1lqEGTUzyQRAi5oAKCE7fK+GuhjO2kzMiVV+/DqGZ96+QCg3KNv
+/j8fN96/RkSlYcR4Bc087qA=
+=Qaaw
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/3dfb/files/0.6.1-gcc41.patch b/x11-misc/3dfb/files/0.6.1-gcc41.patch
new file mode 100644
index 000000000000..2a964f66c21d
--- /dev/null
+++ b/x11-misc/3dfb/files/0.6.1-gcc41.patch
@@ -0,0 +1,12 @@
+diff -Nur 3dfb-0.6.1.orig/src/gui.cpp 3dfb-0.6.1/src/gui.cpp
+--- 3dfb-0.6.1.orig/src/gui.cpp	2004-07-28 22:32:21.000000000 +0000
++++ 3dfb-0.6.1/src/gui.cpp	2006-09-18 21:35:01.271923722 +0000
+@@ -70,7 +70,7 @@
+ 
+ 
+ static fileMap fileMap;
+-static levelLocation levels[fileMap.maxLevels];
++static levelLocation levels[1024];
+ 
+ 
+ 
diff --git a/x11-misc/3dfb/files/digest-3dfb-0.6.1 b/x11-misc/3dfb/files/digest-3dfb-0.6.1
index 60f26f59e88b..ce695e2b3244 100644
--- a/x11-misc/3dfb/files/digest-3dfb-0.6.1
+++ b/x11-misc/3dfb/files/digest-3dfb-0.6.1
@@ -1 +1,3 @@
 MD5 90f42a25f5fa4572faedcb00c20a8eb4 3dfb-0.6.1.tar.gz 102343
+RMD160 2782d3984367aad07e3c53bcdb240e53b6ffa1c6 3dfb-0.6.1.tar.gz 102343
+SHA256 94321725651711a7f7e61f8c479e519985f980e788dfa6a840300d8a41dacf3f 3dfb-0.6.1.tar.gz 102343