Add segfaults patch from Debian for bug #180427

Package-Manager: portage-2.1.2.9

5 files changed, 145 insertions, 9 deletions

diff --git a/games-board/pouetchess/ChangeLog b/games-board/pouetchess/ChangeLog
index 915904c682ba..35375f5b2712 100644
--- a/games-board/pouetchess/ChangeLog
+++ b/games-board/pouetchess/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/pouetchess
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/ChangeLog,v 1.6 2007/04/29 22:17:57 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/ChangeLog,v 1.7 2007/06/05 05:01:29 nyhm Exp $
+
+*pouetchess-0.2.0-r1 (05 Jun 2007)
+
+  05 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/pouetchess-0.2.0-segfaults.patch, +pouetchess-0.2.0-r1.ebuild:
+  Add segfaults patch from Debian for bug #180427
 
   29 Apr 2007; Tristan Heaven <nyhm@gentoo.org>
   files/pouetchess-0.2.0-sconstruct-sandbox.patch:
diff --git a/games-board/pouetchess/Manifest b/games-board/pouetchess/Manifest
index 7b41ce003b14..f69e24a248cc 100644
--- a/games-board/pouetchess/Manifest
+++ b/games-board/pouetchess/Manifest
@@ -9,15 +9,23 @@ AUX pouetchess-0.2.0-sconstruct-sandbox.patch 754 RMD160 cd2b425d782fa1da12bd6a6
 MD5 3dc8152a95846a77ea06a0f88512cf40 files/pouetchess-0.2.0-sconstruct-sandbox.patch 754
 RMD160 cd2b425d782fa1da12bd6a68c77f54d8b577c16b files/pouetchess-0.2.0-sconstruct-sandbox.patch 754
 SHA256 0d0c7471bc5de6157f5d8c44dde061dbbf9215fc6b00bd4be590d41dabbdd70a files/pouetchess-0.2.0-sconstruct-sandbox.patch 754
+AUX pouetchess-0.2.0-segfaults.patch 1195 RMD160 698eeb1561ec984fafa2ec398a467151b5a74642 SHA1 5d79a39c2b8a98c619f3f285d321cab5bc4b4796 SHA256 a0796702fdc434a337afa7579d8fee7076bfab06eb99171b6802ecf85a0ae4c2
+MD5 fa5c2687e2eb55fa7728071e10975605 files/pouetchess-0.2.0-segfaults.patch 1195
+RMD160 698eeb1561ec984fafa2ec398a467151b5a74642 files/pouetchess-0.2.0-segfaults.patch 1195
+SHA256 a0796702fdc434a337afa7579d8fee7076bfab06eb99171b6802ecf85a0ae4c2 files/pouetchess-0.2.0-segfaults.patch 1195
 DIST pouetchess_src_0.2.0.tar.gz 1055338 RMD160 29611b78ef75b3707ad98752055da775335c0490 SHA1 023bea8043b5dcf8a134531b920497c7efb89adb SHA256 fe966ff1b0aa2dd6d0ca2b62692f5b788e3a286050a6a374e58ca0612f68b2ef
+EBUILD pouetchess-0.2.0-r1.ebuild 1739 RMD160 4f901a7ec50ba02ad08e2bf83b63d309c8486cf3 SHA1 71ce9bdd4139b2622a7a98ebd22ba013ed6b01e3 SHA256 0953ce3132d114504bb039ba7caf4d89451f1df1bd3eda6e15d123daf80dd3b4
+MD5 59055833f2781d0369fe34b26f380125 pouetchess-0.2.0-r1.ebuild 1739
+RMD160 4f901a7ec50ba02ad08e2bf83b63d309c8486cf3 pouetchess-0.2.0-r1.ebuild 1739
+SHA256 0953ce3132d114504bb039ba7caf4d89451f1df1bd3eda6e15d123daf80dd3b4 pouetchess-0.2.0-r1.ebuild 1739
 EBUILD pouetchess-0.2.0.ebuild 1694 RMD160 5d547ca824e3f30148f94f8b1fdec3fd5cd2ac36 SHA1 ca4ded8addf4a945afe966831e25c867d9516e42 SHA256 bb595709bc85ba2e745e567ce1a004953cc7c1a75108f633069b4845f17550c4
 MD5 e5dd86fadfc1be0ee9c57aaa584e7108 pouetchess-0.2.0.ebuild 1694
 RMD160 5d547ca824e3f30148f94f8b1fdec3fd5cd2ac36 pouetchess-0.2.0.ebuild 1694
 SHA256 bb595709bc85ba2e745e567ce1a004953cc7c1a75108f633069b4845f17550c4 pouetchess-0.2.0.ebuild 1694
-MISC ChangeLog 1348 RMD160 1fa56880698572a07ff173cf4aaa9ad5fbef041c SHA1 424a0ffb3faf80b7a9c1493416a457ca1003b4fc SHA256 307e804b3a7f2927f8d12a55d00f6c98a81488a8f753fa3f17e85afbdc54dfc1
-MD5 7a9cefdee6c6cf0b85dd236ebea5db19 ChangeLog 1348
-RMD160 1fa56880698572a07ff173cf4aaa9ad5fbef041c ChangeLog 1348
-SHA256 307e804b3a7f2927f8d12a55d00f6c98a81488a8f753fa3f17e85afbdc54dfc1 ChangeLog 1348
+MISC ChangeLog 1555 RMD160 d6a83281cd8db53cff1cc76680647d43bd82ea8b SHA1 1b9f62d70f97a41fb89b8309fa96134255440d06 SHA256 f11e9965ccedde3d57d38ec817e1fe2f38ab98ac1977f20837220fd0f7881216
+MD5 d8ce6a639971ebf13e50a5f49511d2da ChangeLog 1555
+RMD160 d6a83281cd8db53cff1cc76680647d43bd82ea8b ChangeLog 1555
+SHA256 f11e9965ccedde3d57d38ec817e1fe2f38ab98ac1977f20837220fd0f7881216 ChangeLog 1555
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -25,10 +33,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 7eadcc6fa4e9f41e6368827f20cef2e6 files/digest-pouetchess-0.2.0 265
 RMD160 e825bbeb7f491e368fabe13571d8fe089b9834f3 files/digest-pouetchess-0.2.0 265
 SHA256 702f567d5b88e40b6fa2a4769319aaad242f3eb11283dfd03c094de78d64c110 files/digest-pouetchess-0.2.0 265
+MD5 7eadcc6fa4e9f41e6368827f20cef2e6 files/digest-pouetchess-0.2.0-r1 265
+RMD160 e825bbeb7f491e368fabe13571d8fe089b9834f3 files/digest-pouetchess-0.2.0-r1 265
+SHA256 702f567d5b88e40b6fa2a4769319aaad242f3eb11283dfd03c094de78d64c110 files/digest-pouetchess-0.2.0-r1 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGNRmbdz7hIScOURERAvdBAKDeIoyybgm6ps2u18SmxUWU9Pe+kACghcmD
-0+beXBNXlQL6DNpbA7h3VeQ=
-=6Gyy
+iD8DBQFGZO4vdz7hIScOURERAoPhAKCMvp6miL1sFczsLStrnYZNugurLACfSzFe
+kI10aukh+Xg8taLBdbDrp8s=
+=0tEk
 -----END PGP SIGNATURE-----
diff --git a/games-board/pouetchess/files/digest-pouetchess-0.2.0-r1 b/games-board/pouetchess/files/digest-pouetchess-0.2.0-r1
new file mode 100644
index 000000000000..d5dc5c702be3
--- /dev/null
+++ b/games-board/pouetchess/files/digest-pouetchess-0.2.0-r1
@@ -0,0 +1,3 @@
+MD5 c0454aca11ead9be724d769c521120b1 pouetchess_src_0.2.0.tar.gz 1055338
+RMD160 29611b78ef75b3707ad98752055da775335c0490 pouetchess_src_0.2.0.tar.gz 1055338
+SHA256 fe966ff1b0aa2dd6d0ca2b62692f5b788e3a286050a6a374e58ca0612f68b2ef pouetchess_src_0.2.0.tar.gz 1055338
diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-segfaults.patch b/games-board/pouetchess/files/pouetchess-0.2.0-segfaults.patch
new file mode 100644
index 000000000000..46b27b71d47e
--- /dev/null
+++ b/games-board/pouetchess/files/pouetchess-0.2.0-segfaults.patch
@@ -0,0 +1,44 @@
+--- src/faile/search.c
++++ src/faile/search.c
+@@ -805,6 +805,7 @@
+       for (j = 0; j < indent; j++) {
+ 	fputc (' ', output);
+       }
++      void print_move (move_s moves[], int m, FILE *stream);
+       print_move (&moves[0], i, output);
+       fprintf (output, "\n");
+ 
+--- src/faile/utils.c
++++ src/faile/utils.c
+@@ -125,7 +125,7 @@
+       rank (target) < 1 || rank (target) > 8 ||
+       file (target) < 1 || file (target) > 8) 
+   {
+-	sprintf (str, "*** FAILE INTERNAL ERROR ***");
++	sprintf (str, "xxxx");
+     return;
+   }
+   
+--- src/main.cpp
++++ src/main.cpp
+@@ -184,6 +184,9 @@
+ 	// first scene is SCENE_INIT.
+ 	pGlobalInfos->SetCurrentScene(GAME_SCENE_INIT);
+ 
++    /* @FB 02/08/06 */
++    pGlobalInfos->ReleaseKeys();
++
+ 	// main game loop
+ 	while( pGlobalInfos->IsGameRunning() )
+ 	{
+--- src/scene_main_game.cpp
++++ src/scene_main_game.cpp
+@@ -245,7 +245,7 @@
+ 	
+ 	if (pGlobalInfos->OnLeftMouseButtonDown())
+ 	{	
+-		if (chessboard->clickOnChessBoard(mouseX,mouseY,&sqX,&sqY));
++		if (chessboard->clickOnChessBoard(mouseX,mouseY,&sqX,&sqY))
+ 		{
+ 			// if a piece was already selected, this means the player want to move this piece
+ 			if (SquareXSelected>-1 && SquareZSelected>-1)
diff --git a/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild b/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..6d3afabc0bf0
--- /dev/null
+++ b/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild,v 1.1 2007/06/05 05:01:29 nyhm Exp $
+
+inherit eutils toolchain-funcs games
+
+MY_PN=${PN/c/C}
+DESCRIPTION="3D and open source chess game"
+HOMEPAGE="http://pouetchess.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_src_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="debug"
+
+RDEPEND="media-libs/libsdl
+	media-libs/sdl-image
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	dev-util/scons"
+
+S=${WORKDIR}/${PN}_src_${PV}
+
+pkg_setup() {
+	games_pkg_setup
+	einfo "If you experience problems building pouetchess with nvidia drivers,"
+	einfo "you can try:"
+	einfo "eselect opengl set xorg-x11"
+	einfo "emerge pouetchess"
+	einfo "eselect opengl set nvidia"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-sconstruct-sandbox.patch \
+		"${FILESDIR}"/${P}-nvidia_glext.patch \
+		"${FILESDIR}"/${P}-segfaults.patch
+
+	# Fix for LibSDL >= 1.2.10 detection
+	sed -i \
+		-e "s:sdlver.split('.') >= \['1','2','8'\]:sdlver.split('.') >= [1,2,8]:" \
+		pouetChess.py \
+		|| die "sed failed"
+}
+
+src_compile() {
+	tc-export CC CXX
+	scons configure \
+		strip=false \
+		prefix="${GAMES_PREFIX}" \
+		datadir="${GAMES_DATADIR}"/${PN} \
+		$(use debug && echo debug=1) \
+		|| die "scons configure failed"
+	scons || die "scons failed"
+}
+
+src_install() {
+	dogamesbin bin/${MY_PN} || die "dogamesbin failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r data/* || die "doins failed"
+
+	dodoc ChangeLog README
+
+	doicon data/icons/${MY_PN}.png
+	make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}.png "KDE;Qt;Game;BoardGame"
+
+	prepgamesdirs
+}