gcc-4 patch, bug #120866

(Portage version: 2.1_pre7-r3)

5 files changed, 34 insertions, 11 deletions

diff --git a/games-misc/yadex/ChangeLog b/games-misc/yadex/ChangeLog
index 7eb0a78d8161..d34bc9a35042 100644
--- a/games-misc/yadex/ChangeLog
+++ b/games-misc/yadex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-misc/yadex
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/ChangeLog,v 1.4 2006/01/29 22:17:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/ChangeLog,v 1.5 2006/04/03 17:34:09 tupone Exp $
+
+  03 Apr 2006; <Tupone@gentoo.org>
+  +files/yadex-1.7.0-NULL-is-not-zero.patch, yadex-1.7.0.ebuild:
+  gcc-4 patch, bug #120866 by Joshua Baergen
 
   29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> yadex-1.7.0.ebuild:
   Add modular X dependencies.
diff --git a/games-misc/yadex/Manifest b/games-misc/yadex/Manifest
index 5ca8fc5fee77..5652e17777b1 100644
--- a/games-misc/yadex/Manifest
+++ b/games-misc/yadex/Manifest
@@ -1,12 +1,15 @@
-MD5 50e2d93833800f56e074fa77e05e1b97 ChangeLog 608
-RMD160 a99183923bc80a231c7df60da41090ed26e56423 ChangeLog 608
-SHA256 d3c3790a1457327b14c130ead61d4f8c1e4cb793c152bd3e9a5cf8bc4cc109fd ChangeLog 608
-MD5 50612161cf860343d7754117df23606e files/digest-yadex-1.7.0 63
-RMD160 29924b3ced07be1b77813ab721ef3e9779afc01d files/digest-yadex-1.7.0 63
-SHA256 f2d12f5f8efcca978901c9fb330c0479e9c2b7cc383b8a1df08d99a2fd37e146 files/digest-yadex-1.7.0 63
+MD5 685f2ff5b1023175e552d95e188a1d36 ChangeLog 754
+RMD160 f4334aabdd3f386a00ec16fefe1fa6bfd0532278 ChangeLog 754
+SHA256 54ac2ac7fb981d8aea148ec4561287944db1ef96329419ad33ca2bef9580f1e4 ChangeLog 754
+MD5 899065e4e0b2e62903d1a79cd1936325 files/digest-yadex-1.7.0 235
+RMD160 02d97f37de8d722133404768671d202b9208f966 files/digest-yadex-1.7.0 235
+SHA256 abc3ef125fe30d0ae08575cd4cd2eaf4944ea1fd74f881f67ca82aaa14b773c0 files/digest-yadex-1.7.0 235
+MD5 37d61c81a7658a393a3eec9537b7a376 files/yadex-1.7.0-NULL-is-not-zero.patch 406
+RMD160 9ee842efd8b00fb1c8170b050da0aff4a8030339 files/yadex-1.7.0-NULL-is-not-zero.patch 406
+SHA256 08d881eef844a7a7417feffdab473b557b43c6c240905cf05ea917504213c2dc files/yadex-1.7.0-NULL-is-not-zero.patch 406
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 788a79c5706c7536d5cfdb2f7d45164d yadex-1.7.0.ebuild 1112
-RMD160 e23069b23ac140a45873f9daff4b884fa1a8ba0e yadex-1.7.0.ebuild 1112
-SHA256 49026b8222520ebff792759704b436ef09a30fb2bce3a6f8bbd527605e710a6c yadex-1.7.0.ebuild 1112
+MD5 3a63ddf9a0cf78469a3125b5592f1932 yadex-1.7.0.ebuild 1270
+RMD160 a6f5ecdda7954f9066a7e6d544b67652f0d75d8a yadex-1.7.0.ebuild 1270
+SHA256 8d2ba9a7d9857968dcfc68f6d4d5b7aea48764c3ced386f3ca20325f7d0d9a2b yadex-1.7.0.ebuild 1270
diff --git a/games-misc/yadex/files/digest-yadex-1.7.0 b/games-misc/yadex/files/digest-yadex-1.7.0
index 402f0738fc72..55d5abe1c59c 100644
--- a/games-misc/yadex/files/digest-yadex-1.7.0
+++ b/games-misc/yadex/files/digest-yadex-1.7.0
@@ -1 +1,3 @@
 MD5 d341abe066525394082edfd520af86ae yadex-1.7.0.tar.gz 551318
+RMD160 6f86e6aa1fd9c9241a883f03fd9567eac8d83887 yadex-1.7.0.tar.gz 551318
+SHA256 316aca295b647b45d6d0d359fd7bba0448e7e114d295347add7ac0e87aa0f446 yadex-1.7.0.tar.gz 551318
diff --git a/games-misc/yadex/files/yadex-1.7.0-NULL-is-not-zero.patch b/games-misc/yadex/files/yadex-1.7.0-NULL-is-not-zero.patch
new file mode 100644
index 000000000000..7ceb7a558873
--- /dev/null
+++ b/games-misc/yadex/files/yadex-1.7.0-NULL-is-not-zero.patch
@@ -0,0 +1,11 @@
+--- yadex-1.7.0/src/wadlist.cc.old	2003-01-29 14:45:19.000000000 -0700
++++ yadex-1.7.0/src/wadlist.cc	2003-01-29 14:45:56.000000000 -0700
+@@ -175,7 +175,7 @@
+   priv->iter = priv->list.erase (i);
+   if (priv->iter == priv->list.begin ())
+   {
+-    priv->iter = 0;			// Catch bugs
++    priv->iter = (std::_List_iterator<boost::shared_ptr<Wad_file> >)NULL;			// Catch bugs
+     priv->rewound = true;
+   }
+ }
diff --git a/games-misc/yadex/yadex-1.7.0.ebuild b/games-misc/yadex/yadex-1.7.0.ebuild
index 8b980c9af3e8..d011450de037 100644
--- a/games-misc/yadex/yadex-1.7.0.ebuild
+++ b/games-misc/yadex/yadex-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/yadex-1.7.0.ebuild,v 1.5 2006/01/29 22:17:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/yadex/yadex-1.7.0.ebuild,v 1.6 2006/04/03 17:34:09 tupone Exp $
 
 inherit games
 
@@ -21,6 +21,9 @@ src_unpack() {
 		-e '/iwad/s/local\///' \
 		${S}/yadex.cfg \
 		|| die "sed yadex.cfg failed"
+	epatch "${FILESDIR}/${P}"-NULL-is-not-zero.patch
+	# Force the patched file to be old, otherwise the compile fails
+	touch -t 196910101010 ${S}/src/wadlist.cc
 }
 
 src_compile() {