Fixing gcc-4.1 compilation, bug #133816

Package-Manager: portage-2.1_rc1-r2

5 files changed, 58 insertions, 7 deletions

diff --git a/games-puzzle/quadros/ChangeLog b/games-puzzle/quadros/ChangeLog
index dd3599ca155d..a565e4dc69e7 100644
--- a/games-puzzle/quadros/ChangeLog
+++ b/games-puzzle/quadros/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/quadros
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadros/ChangeLog,v 1.3 2005/07/01 15:04:16 caleb Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadros/ChangeLog,v 1.4 2006/05/19 22:23:33 tupone Exp $
+
+  19 May 2006; <Tupone@gentoo.org> +files/quadros-0.1-gcc41.patch,
+  quadros-0.1.ebuild:
+  Fixing build with gcc-4.1, bug #133816
 
   01 Jul 2005; Caleb Tennis <caleb@gentoo.org> quadros-0.1.ebuild:
   Fix qmake dir per bug #97535
diff --git a/games-puzzle/quadros/Manifest b/games-puzzle/quadros/Manifest
index 0258310054c0..d58aabe7fa6f 100644
--- a/games-puzzle/quadros/Manifest
+++ b/games-puzzle/quadros/Manifest
@@ -1,4 +1,30 @@
-MD5 c97e79d3b8d15910a853c1448fae8ed1 ChangeLog 578
-MD5 8c154e3710cf2c6c9d8a9b52dee98a25 quadros-0.1.ebuild 1137
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX quadros-0.1-gcc41.patch 439 RMD160 4867943e6861291e8927e463fb64515700c837a3 SHA1 de27fc1f76cc737ba8c1e389d22ed965018d533e SHA256 dd53c4e72c4420221139cf152c25fc25a3334746abf3db945624fd9334484b26 size 439
+MD5 f3381cac289520546b0e29844b8b6b36 files/quadros-0.1-gcc41.patch 439
+RMD160 4867943e6861291e8927e463fb64515700c837a3 files/quadros-0.1-gcc41.patch 439
+SHA256 dd53c4e72c4420221139cf152c25fc25a3334746abf3db945624fd9334484b26 files/quadros-0.1-gcc41.patch 439
+DIST quadros-0.1.tar.gz 730745 RMD160 266eeba8edbfefc188c263cf2d62012a62fcf8ff SHA256 dfb811a5ce1df07733bf6bb2d099f983b8dc6d3d1cb21df57bef3f00810ce35e size 730745
+EBUILD quadros-0.1.ebuild 1177 RMD160 4ba35cf4bf6c8c58d347965cd96fd10a9965895a SHA1 3cb879bfaefd017b972dc89670134f2b333a58e8 SHA256 244cf85a30654c70f1fecdcf58cacfed661a4730c2177fe87aa93069e07eff80 size 1177
+MD5 12cda020c6dd56173004aefc1abe5b7d quadros-0.1.ebuild 1177
+RMD160 4ba35cf4bf6c8c58d347965cd96fd10a9965895a quadros-0.1.ebuild 1177
+SHA256 244cf85a30654c70f1fecdcf58cacfed661a4730c2177fe87aa93069e07eff80 quadros-0.1.ebuild 1177
+MISC ChangeLog 710 RMD160 4190cf8ee6a0e2f5f34035a700b9317ea6fe630b SHA1 13dec659e24485a07bd6fb4f54b7941c51219c9e SHA256 27e5b5e71c4d1e538598b08033dd5be3ece6876ba2b8300043f31ca172e0ba15 size 710
+MD5 63a1dd1e32629add42a6da6972e789f6 ChangeLog 710
+RMD160 4190cf8ee6a0e2f5f34035a700b9317ea6fe630b ChangeLog 710
+SHA256 27e5b5e71c4d1e538598b08033dd5be3ece6876ba2b8300043f31ca172e0ba15 ChangeLog 710
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 d5a99be8987096fcc2141f77237f4113 files/digest-quadros-0.1 63
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 899ceda3885c335fb22e27b81ea44c2f files/digest-quadros-0.1 235
+RMD160 705205bd23965c1001d6909bce33c2e07c5a36a8 files/digest-quadros-0.1 235
+SHA256 36c0ee5b5fa78c687a189d9d331579ee5b80cdcb5ebad251f619f0f61063f45b files/digest-quadros-0.1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEbkVx2CTtIKiFlQIRAsvnAJ91zB6+hPWvi2Hr0BRdpOgREudxwgCggG73
+v1xAthh+qnBSdC57JRUFZjg=
+=H4qp
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/quadros/files/digest-quadros-0.1 b/games-puzzle/quadros/files/digest-quadros-0.1
index d93c8691b90e..3d9b3ff29035 100644
--- a/games-puzzle/quadros/files/digest-quadros-0.1
+++ b/games-puzzle/quadros/files/digest-quadros-0.1
@@ -1 +1,3 @@
 MD5 57aef740147839bf1266a53d35042d8c quadros-0.1.tar.gz 730745
+RMD160 266eeba8edbfefc188c263cf2d62012a62fcf8ff quadros-0.1.tar.gz 730745
+SHA256 dfb811a5ce1df07733bf6bb2d099f983b8dc6d3d1cb21df57bef3f00810ce35e quadros-0.1.tar.gz 730745
diff --git a/games-puzzle/quadros/files/quadros-0.1-gcc41.patch b/games-puzzle/quadros/files/quadros-0.1-gcc41.patch
new file mode 100644
index 000000000000..50608739ec39
--- /dev/null
+++ b/games-puzzle/quadros/files/quadros-0.1-gcc41.patch
@@ -0,0 +1,18 @@
+--- src/quadros.cpp.old	2006-05-20 00:00:05.000000000 +0200
++++ src/quadros.cpp	2006-05-20 00:01:45.000000000 +0200
+@@ -336,6 +336,7 @@
+   {
+   case SinglePlayer:
+   case Arcade:
++	  {
+     SkillOptions opt = FOptions;
+     opt.RandomSeed = time(NULL)%0xFFFFl;
+     if (FGameMode == Arcade)
+@@ -350,6 +351,7 @@
+     setFocus();
+     doc1->run();
+     break;
++	  }
+   case HumanVsHuman:
+   case HumanVsComputer:
+     if (doc1->isPlaying())
diff --git a/games-puzzle/quadros/quadros-0.1.ebuild b/games-puzzle/quadros/quadros-0.1.ebuild
index 9e4c6d5299e6..c38a6dcc9039 100644
--- a/games-puzzle/quadros/quadros-0.1.ebuild
+++ b/games-puzzle/quadros/quadros-0.1.ebuild
@@ -1,6 +1,6 @@
-# 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/games-puzzle/quadros/quadros-0.1.ebuild,v 1.3 2005/07/01 15:04:16 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadros/quadros-0.1.ebuild,v 1.4 2006/05/19 22:23:33 tupone Exp $
 
 inherit kde games
 need-qt 3
@@ -16,6 +16,7 @@ IUSE=""
 
 src_unpack() {
 	kde_src_unpack
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 }
 
 src_compile() {