Patched for gcc-4.1

(Portage version: 2.1_pre7-r4)

4 files changed, 41 insertions, 9 deletions

diff --git a/games-strategy/xarchon/ChangeLog b/games-strategy/xarchon/ChangeLog
index 3779fc7a390f..11553bd407fa 100644
--- a/games-strategy/xarchon/ChangeLog
+++ b/games-strategy/xarchon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/xarchon
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xarchon/ChangeLog,v 1.9 2006/03/15 18:42:06 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xarchon/ChangeLog,v 1.10 2006/04/09 10:44:43 tupone Exp $
+
+  09 Apr 2006; <Tupone@gentoo.org> +files/xarchon-0.60-gcc41.patch,
+  xarchon-0.60-r1.ebuild:
+  Fixes for gcc-4.1
 
 *xarchon-0.60-r1 (15 Mar 2006)
 
diff --git a/games-strategy/xarchon/Manifest b/games-strategy/xarchon/Manifest
index a0ff2769d04c..bfd6a222948a 100644
--- a/games-strategy/xarchon/Manifest
+++ b/games-strategy/xarchon/Manifest
@@ -1,6 +1,6 @@
-MD5 5a956b95681dca01aa4da8877b2ab3f7 ChangeLog 1306
-RMD160 80beb2de3dd1d76c368ce186ae0063095db41fbe ChangeLog 1306
-SHA256 32e4cc2b4387b861b570035a4edf6253b70ab5fc5cf2aa675694533278e37224 ChangeLog 1306
+MD5 002bdffbd4b8d2dcddd103fe982ccebf ChangeLog 1421
+RMD160 3d0ac229392a07891eb1561bfb6aea61bf71e1c9 ChangeLog 1421
+SHA256 5a2b0702c179f22769c011adb6510cb41afc3bcab3d746e0946f8ca680e4e57d ChangeLog 1421
 MD5 4388c8ee38d49ac90ccbedbb8b810eaa files/01_all_gcc34_font.patch 5384
 RMD160 174d5ef891870bc58434ce40677269a689d816ad files/01_all_gcc34_font.patch 5384
 SHA256 abbb20e50413f4b812bcade3eb80647b819886f34f10d4897c3535f1d7e2b37a files/01_all_gcc34_font.patch 5384
@@ -13,15 +13,18 @@ SHA256 4c6888f1fff8638cfa755c1ae5945d69e7a46b910849ba811170ac4aa26609d9 files/di
 MD5 596bf4b259ff3ca51a4940ec8a232362 files/digest-xarchon-0.60-r1 491
 RMD160 d0ee7551a6dae2c98e4d6a1b0bacd953f3fde879 files/digest-xarchon-0.60-r1 491
 SHA256 fa2179e4dd10dbfecae8ca1dad0c8eeea8cb9b6c1775337f71e247809408bd0e files/digest-xarchon-0.60-r1 491
+MD5 7f877a9fa7ee1e6df4ee4316c3c1a6a0 files/xarchon-0.60-gcc41.patch 1092
+RMD160 737f0427b78cd33b73f0f8f9a9fec8adf5c5ecff files/xarchon-0.60-gcc41.patch 1092
+SHA256 6c626625a1a6c97464c16ca23d8d7940eacf5ef6bc98af52b879b894ffe91d90 files/xarchon-0.60-gcc41.patch 1092
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
 MD5 e9926061f428b56d0e8006581cf86805 xarchon-0.50.ebuild 866
 RMD160 9810a6995b5c828bf946f4ed0fc57455d10c954c xarchon-0.50.ebuild 866
 SHA256 94ee3655ac53b5954740ed73c6fcde2ba146fedad9f05c40531145208d3fcd6a xarchon-0.50.ebuild 866
-MD5 08f09f22d845ff4cf6fc2820599f49b4 xarchon-0.60-r1.ebuild 1297
-RMD160 c67cb684734d9ed55717c6f7d7f1cbe26f6158fe xarchon-0.60-r1.ebuild 1297
-SHA256 e879e4972715a1e8ca6c6c0cb2782e0ec1b6eb7307e77121aed7eb81b3971472 xarchon-0.60-r1.ebuild 1297
+MD5 920f4a8252c03745181892fe79b6c169 xarchon-0.60-r1.ebuild 1360
+RMD160 24648dd50bb4facb0a882e6a5938437cedcaf982 xarchon-0.60-r1.ebuild 1360
+SHA256 c588cc7c7472758a5f02b03baedd909cac78737bb5c08ffad103bdce74784ad0 xarchon-0.60-r1.ebuild 1360
 MD5 e925e1555906a05144224079efa976f4 xarchon-0.60.ebuild 1170
 RMD160 26e653e5eab0c54b14bc2a8d5e3b975f04ab7986 xarchon-0.60.ebuild 1170
 SHA256 b866fdbe8482b665d20e2f6c8b33d90105bfa1e426543e3d4c28c084623299e0 xarchon-0.60.ebuild 1170
diff --git a/games-strategy/xarchon/files/xarchon-0.60-gcc41.patch b/games-strategy/xarchon/files/xarchon-0.60-gcc41.patch
new file mode 100644
index 000000000000..a29275bb1fed
--- /dev/null
+++ b/games-strategy/xarchon/files/xarchon-0.60-gcc41.patch
@@ -0,0 +1,23 @@
+--- src/board.h.old	2006-04-09 11:27:54.000000000 +0200
++++ src/board.h	2006-04-09 11:28:08.000000000 +0200
+@@ -98,7 +98,6 @@
+ /*--------------------------------------------------------------------------*/
+ 
+ extern int board_turn;
+-extern int board_frame_time;
+ extern CELL board_cells[BOARD_YCELLS][BOARD_XCELLS];
+ extern int spell_avails[3][SPELL_COUNT_2]; /* row 0 is light, row 1 is dark */
+ extern int init_board_cells[NUM_GAMES][BOARD_YCELLS][BOARD_XCELLS];
+--- src/Xarchon_Genetic.hpp.old	2006-04-09 11:29:36.000000000 +0200
++++ src/Xarchon_Genetic.hpp	2006-04-09 12:20:38.000000000 +0200
+@@ -82,8 +82,8 @@
+   Xarchon_Genetic_Generation *gg;
+ public:
+   Xarchon_Evolution(char *test,char *pop,int num);
+-  Genetic_Population<Xarchon_Goal_Test> *Xarchon_Evolution::Operate(Genetic_Population<Xarchon_Goal_Test> *p);
+-  Genetic_Population<Xarchon_Goal_Test> *Xarchon_Evolution::Operate(void);
++  Genetic_Population<Xarchon_Goal_Test> *Operate(Genetic_Population<Xarchon_Goal_Test> *p);
++  Genetic_Population<Xarchon_Goal_Test> *Operate(void);
+   virtual ~Xarchon_Evolution(void);
+ };
+ 
diff --git a/games-strategy/xarchon/xarchon-0.60-r1.ebuild b/games-strategy/xarchon/xarchon-0.60-r1.ebuild
index 8b6657e9c61c..3d175ba26d84 100644
--- a/games-strategy/xarchon/xarchon-0.60-r1.ebuild
+++ b/games-strategy/xarchon/xarchon-0.60-r1.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-strategy/xarchon/xarchon-0.60-r1.ebuild,v 1.1 2006/03/15 18:42:06 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xarchon/xarchon-0.60-r1.ebuild,v 1.2 2006/04/09 10:44:43 tupone Exp $
 
 inherit eutils games
 
@@ -24,9 +24,11 @@ src_unpack() {
 	cd "${S}"
 	# Applying gtk patch
 	# Fixing gcc-3.4 compiling
+	# Fixing gcc-4.1 compiling
 	# Fixing font missing in gentoo
 	epatch "${WORKDIR}/${P}-gtk.patch" \
-		"${FILESDIR}"/01_all_gcc34_font.patch
+		"${FILESDIR}"/01_all_gcc34_font.patch \
+		"${FILESDIR}"/${P}-gcc41.patch
 	sed -i \
 		-e 's:gtk12-config:gtk-config:' configure \
 		|| die "sed configure failed"