gcc4 fix thanks to Markus Gothe <nietzsche@lysator.liu.se>, nyhm <tristanheaven@gmail.com> and Jose daLuz <jdaluz@gmail.com> in bug 122147

Package-Manager: portage-2.1_pre9-r5

5 files changed, 66 insertions, 17 deletions

diff --git a/games-board/gtkboard/ChangeLog b/games-board/gtkboard/ChangeLog
index 869bfaf7db3e..3d6f43efcee7 100644
--- a/games-board/gtkboard/ChangeLog
+++ b/games-board/gtkboard/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-board/gtkboard
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gtkboard/ChangeLog,v 1.7 2004/11/11 00:50:52 josejx Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gtkboard/ChangeLog,v 1.8 2006/04/29 20:37:22 genstef Exp $
+
+  29 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/gtkboard-0.11_pre0-gcc41.patch, gtkboard-0.11_pre0.ebuild:
+  gcc4 fix thanks to Markus Gothe <nietzsche@lysator.liu.se>, nyhm
+  <tristanheaven@gmail.com> and Jose daLuz <jdaluz@gmail.com> in bug 122147
 
   11 Nov 2004; Joseph Jezak <josejx@gentoo.org> gtkboard-0.11_pre0.ebuild:
   Marked ppc stable.
diff --git a/games-board/gtkboard/Manifest b/games-board/gtkboard/Manifest
index 1f066a7c290b..e73c4fd7d010 100644
--- a/games-board/gtkboard/Manifest
+++ b/games-board/gtkboard/Manifest
@@ -1,17 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gtkboard-0.11_pre0-gcc41.patch 583 RMD160 a96cdfcd1805ac4b56f12eaf48e9c10afcda9bc0 SHA1 ae184df64745e77dd647e6ea16d8ffe85f1bfc87 SHA256 3af90808f928e689729e3a88f01bd2681e6a92a4279afc008422f72599385e90 size 583
+MD5 bfb1dddfb72973089855ddeccae165fc files/gtkboard-0.11_pre0-gcc41.patch 583
+RMD160 a96cdfcd1805ac4b56f12eaf48e9c10afcda9bc0 files/gtkboard-0.11_pre0-gcc41.patch 583
+SHA256 3af90808f928e689729e3a88f01bd2681e6a92a4279afc008422f72599385e90 files/gtkboard-0.11_pre0-gcc41.patch 583
 DIST gtkboard-0.10.4.tar.gz 217324 size 217324
-DIST gtkboard-0.11pre0.tar.gz 459581 size 459581
+DIST gtkboard-0.11pre0.tar.gz 459581 RMD160 1381f11a5a83a1de60c5ce1c7f672bafde840920 SHA256 e67ffbec822ce989c9b480b9ef0429bcc75fb2dcdf349940d7d5f9f85da902c5 size 459581
 EBUILD gtkboard-0.10.4.ebuild 550 RMD160 0a3c4124258730d9b1ddf3736f7937a34ce9ce23 SHA1 a7a8560eaa9d77a3e16e3f9c2c824212909a25ed SHA256 c6b892f9575095013c0e9e57f36df49f219ba970bd7b9563bcb68caf83aded62 size 550
 MD5 8ca1686e1cc5b79dea1ae0e57c9ee7d0 gtkboard-0.10.4.ebuild 550
 RMD160 0a3c4124258730d9b1ddf3736f7937a34ce9ce23 gtkboard-0.10.4.ebuild 550
 SHA256 c6b892f9575095013c0e9e57f36df49f219ba970bd7b9563bcb68caf83aded62 gtkboard-0.10.4.ebuild 550
-EBUILD gtkboard-0.11_pre0.ebuild 832 RMD160 8350e191ee7fc2c962efdd286874b07b6eb08768 SHA1 bbd11fca4d731a7d24b75e54cd07841443f6b8af SHA256 796e119c346b199f235bad1f04a846686ffac98a234d1b3cb65ba1a951e09061 size 832
-MD5 d796c4ce99f2f817f96e1214468454dd gtkboard-0.11_pre0.ebuild 832
-RMD160 8350e191ee7fc2c962efdd286874b07b6eb08768 gtkboard-0.11_pre0.ebuild 832
-SHA256 796e119c346b199f235bad1f04a846686ffac98a234d1b3cb65ba1a951e09061 gtkboard-0.11_pre0.ebuild 832
-MISC ChangeLog 848 RMD160 14833d361b716e725193b9b98698d58c03dab0b4 SHA1 500384f95bcd507314c9c43bc8e65b36bf099717 SHA256 0dff9672091139ba04139fa8a30d889588abf423a958f1b38c2e36e57b01bab4 size 848
-MD5 f212c713c59925d6e59c0d173b81ffd2 ChangeLog 848
-RMD160 14833d361b716e725193b9b98698d58c03dab0b4 ChangeLog 848
-SHA256 0dff9672091139ba04139fa8a30d889588abf423a958f1b38c2e36e57b01bab4 ChangeLog 848
+EBUILD gtkboard-0.11_pre0.ebuild 912 RMD160 7315c200e630136a907a1d6a6fcb813420ed21fb SHA1 1e154977b47c4e996a148b5d5998c16609b41b21 SHA256 66122f340d9cd422953c5fb3508e6ea36bcb8ef114c82be113a28dfdf0de252d size 912
+MD5 781821e6ad904f9eb4a54cbd416f0358 gtkboard-0.11_pre0.ebuild 912
+RMD160 7315c200e630136a907a1d6a6fcb813420ed21fb gtkboard-0.11_pre0.ebuild 912
+SHA256 66122f340d9cd422953c5fb3508e6ea36bcb8ef114c82be113a28dfdf0de252d gtkboard-0.11_pre0.ebuild 912
+MISC ChangeLog 1114 RMD160 30e0b7fc4beceb3138167c355099a87109a6445a SHA1 892eb22b493dfdc1aaff04a5e30040aacd9892ff SHA256 d5707e8b84c672d19e1326501f7875a1a1ca6984b23df94545bea23acbf941dc size 1114
+MD5 f51a238849d09523df133e5a97fcff19 ChangeLog 1114
+RMD160 30e0b7fc4beceb3138167c355099a87109a6445a ChangeLog 1114
+SHA256 d5707e8b84c672d19e1326501f7875a1a1ca6984b23df94545bea23acbf941dc ChangeLog 1114
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -19,8 +26,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 b0b4520ca5dd494b20ee91bd9ca78b32 files/digest-gtkboard-0.10.4 67
 RMD160 a10e3e4a1d852b200fd5366c60bfbd9211faf12b files/digest-gtkboard-0.10.4 67
 SHA256 5d28965742da2105f1e0a28db60bff8acea6506162f2c4bdf0b40a8093e3d31f files/digest-gtkboard-0.10.4 67
-size 67 files/digest-gtkboard-0.10.4 67
-MD5 325dd313ba175b2684829aefd7cab5a0 files/digest-gtkboard-0.11_pre0 69
-RMD160 7627653f65f3b6deb6bc148a8fecbc198c8d9971 files/digest-gtkboard-0.11_pre0 69
-SHA256 258e110cd870ee52a898b69d0537a19f1bf1f5fbd1922d49197e3ff7c98f8ab6 files/digest-gtkboard-0.11_pre0 69
-size 69 files/digest-gtkboard-0.11_pre0 69
+MD5 cc6e508cd6a4908902ca8f3b2b3b2bdf files/digest-gtkboard-0.11_pre0 253
+RMD160 8aa2696f1334c4f64eacdc8008f2d01eb837f70d files/digest-gtkboard-0.11_pre0 253
+SHA256 9f483eb6580bfef6d52fc6410e67609da87d8518913ce1318d3b02528216da11 files/digest-gtkboard-0.11_pre0 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEU86QNJowsmZ/PzARAkJ7AJoC0BcwTZoyX0HnMRF4ZPygfhYZSgCdFqHd
+6rxWA+RQdEHlIlCyung2UjU=
+=yzi2
+-----END PGP SIGNATURE-----
diff --git a/games-board/gtkboard/files/digest-gtkboard-0.11_pre0 b/games-board/gtkboard/files/digest-gtkboard-0.11_pre0
index 80d6f4c6130c..f4293edbc219 100644
--- a/games-board/gtkboard/files/digest-gtkboard-0.11_pre0
+++ b/games-board/gtkboard/files/digest-gtkboard-0.11_pre0
@@ -1 +1,3 @@
 MD5 f9fa95b617b9f0006387ed2abcb822b7 gtkboard-0.11pre0.tar.gz 459581
+RMD160 1381f11a5a83a1de60c5ce1c7f672bafde840920 gtkboard-0.11pre0.tar.gz 459581
+SHA256 e67ffbec822ce989c9b480b9ef0429bcc75fb2dcdf349940d7d5f9f85da902c5 gtkboard-0.11pre0.tar.gz 459581
diff --git a/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc41.patch b/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc41.patch
new file mode 100644
index 000000000000..2e6a4c6f83ce
--- /dev/null
+++ b/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc41.patch
@@ -0,0 +1,24 @@
+gcc-4.1 patch from debian.
+
+--- src/board.c
++++ src/board.c
+@@ -74,7 +74,7 @@
+ //! default background
+ char board_default_colors [9] = {215, 215, 215, 215, 215, 215, 0, 0, 0};
+ 
+-static int cell_size, num_pieces;
++int cell_size, num_pieces;
+ 
+ extern void ui_make_human_move (byte *move, int *rmove);
+ 
+--- src/menu.c
++++ src/menu.c
+@@ -829,7 +829,7 @@
+ 	
+ 	{
+ 	int i;
+-	GtkItemFactoryEntry help_items [3];
++	GtkItemFactoryEntry help_items [4];
+ 	help_items[0].path = g_strdup_printf ("/Help/%s", opt_game->name);
+ 	help_items[0].accelerator = NULL;
+ 	help_items[0].callback = NULL;
diff --git a/games-board/gtkboard/gtkboard-0.11_pre0.ebuild b/games-board/gtkboard/gtkboard-0.11_pre0.ebuild
index dd9149a93fcf..98dda1bd7a1c 100644
--- a/games-board/gtkboard/gtkboard-0.11_pre0.ebuild
+++ b/games-board/gtkboard/gtkboard-0.11_pre0.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-board/gtkboard/gtkboard-0.11_pre0.ebuild,v 1.9 2006/04/23 04:47:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gtkboard/gtkboard-0.11_pre0.ebuild,v 1.10 2006/04/29 20:37:22 genstef Exp $
 
 inherit games
 
@@ -20,6 +20,12 @@ DEPEND=">=x11-libs/gtk+-2
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+}
+
 src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \