gcc-34 patch from upstream (bug #69492)

3 files changed, 71 insertions, 3 deletions

diff --git a/games-board/slibo/ChangeLog b/games-board/slibo/ChangeLog
index ee9ca62bd845..46df7bf1abed 100644
--- a/games-board/slibo/ChangeLog
+++ b/games-board/slibo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/slibo
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/ChangeLog,v 1.6 2004/08/05 23:33:47 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/ChangeLog,v 1.7 2004/12/30 00:41:23 mr_bones_ Exp $
+
+  29 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.4.4-gcc34.patch, slibo-0.4.4.ebuild:
+  gcc-34 patch from upstream (bug #69492)
 
   05 Aug 2004; Anders Rune Jensen <arj@gentoo.org> slibo-0.4.4.ebuild:
   Depend on version 2 of sqlite.
diff --git a/games-board/slibo/files/0.4.4-gcc34.patch b/games-board/slibo/files/0.4.4-gcc34.patch
new file mode 100644
index 000000000000..8b4bab4487d2
--- /dev/null
+++ b/games-board/slibo/files/0.4.4-gcc34.patch
@@ -0,0 +1,51 @@
+diff -r -U 2 /tmp/slibo-0.4.4/src/engine.cpp /var/tmp/portage/slibo-0.4.4/work/slibo-0.4.4/src/engine.cpp
+--- /tmp/slibo-0.4.4/src/engine.cpp	2003-08-31 18:23:45.000000000 +0200
++++ /var/tmp/portage/slibo-0.4.4/work/slibo-0.4.4/src/engine.cpp	2004-12-29 19:09:26.941957930 +0100
+@@ -18,4 +18,5 @@
+ #include <sys/types.h>
+ #include <signal.h>
++#include <errno.h>
+ 
+ #include <qmessagebox.h>
+@@ -80,5 +81,5 @@
+     //build argument list
+     int argc = (args.isEmpty()) ? 0 : args.contains(' ')+1;
+-    argv = new (char *)[argc+1];
++    argv = new char *[argc+1];
+     int i;
+     argv[0] = strdup(fname.latin1());
+diff -r -U 2 /tmp/slibo-0.4.4/src/sliboengine/search.c /var/tmp/portage/slibo-0.4.4/work/slibo-0.4.4/src/sliboengine/search.c
+--- /tmp/slibo-0.4.4/src/sliboengine/search.c	2003-08-30 01:45:00.000000000 +0200
++++ /var/tmp/portage/slibo-0.4.4/work/slibo-0.4.4/src/sliboengine/search.c	2004-12-29 19:07:47.439235741 +0100
+@@ -68,7 +68,7 @@
+ FILE *logfile = 0;
+ 
+-static float searchq1(Board *, float beta, float alpha, int) __attribute__ ((regparm(1)));
+-static float searchq(Board *, float beta, float alpha, int) __attribute__ ((regparm(1)));
+-float search(Board *, int nullMove, int verifyNull, float beta, float alpha, int) __attribute__ ((regparm(1)));
++__attribute__ ((regparm(1))) static float searchq1(Board *, float beta, float alpha, int);
++__attribute__ ((regparm(1))) static float searchq(Board *, float beta, float alpha, int);
++__attribute__ ((regparm(1))) float search(Board *, int nullMove, int verifyNull, float beta, float alpha, int);
+ 
+ //main search function.
+@@ -78,5 +78,5 @@
+ //returns the score of the position and the best line.
+ 
+-float search(Board *b, int nullMove, int verifyNull, float alpha, float beta, int ply) {
++__attribute__((regparm(1))) float search(Board *b, int nullMove, int verifyNull, float alpha, float beta, int ply) {
+     static unsigned int clockCounter = 0;
+ 
+@@ -648,5 +648,5 @@
+ //of a caller of opposite color it always returns a value less or equal
+ //the current postion, which allows some optimizations.
+-float searchq(Board * b, float alpha, float beta, int ply) {
++__attribute__ ((regparm(1))) float searchq(Board * b, float alpha, float beta, int ply) {
+     BEGIN_PROFILE(TIME_SEARCHQ);
+     float bestEval;
+@@ -816,5 +816,5 @@
+ //of a caller of opposite color it always returns a value less or equal
+ //the current postion, which allows some optimizations.
+-float searchq1(Board * b, float alpha, float beta, int ply) {
++__attribute__ ((regparm(1))) float searchq1(Board * b, float alpha, float beta, int ply) {
+     BEGIN_PROFILE(TIME_SEARCHQ);
+     float bestEval;
diff --git a/games-board/slibo/slibo-0.4.4.ebuild b/games-board/slibo/slibo-0.4.4.ebuild
index 6a50f35e754f..adcb8ecb1a3f 100644
--- a/games-board/slibo/slibo-0.4.4.ebuild
+++ b/games-board/slibo/slibo-0.4.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/slibo-0.4.4.ebuild,v 1.8 2004/12/11 06:55:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/slibo-0.4.4.ebuild,v 1.9 2004/12/30 00:41:23 mr_bones_ Exp $
 
-inherit kde
+inherit eutils kde
 
 DESCRIPTION="A comfortable replacement for the xboard chess interface"
 HOMEPAGE="http://slibo.sourceforge.net/"
@@ -15,3 +15,16 @@ IUSE=""
 
 DEPEND="=dev-db/sqlite-2*"
 need-kde 3
+
+src_unpack() {
+	kde_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-gcc34.patch"
+}
+
+pkg_postinst() {
+	einfo "If you updated from an older version, please do a"
+	einfo "    rm ~/.kde/share/apps/slibo/sliboui.rc"
+	einfo "to get rid of old configuration files, otherwise"
+	einfo "new menu items etc. will not appear"
+}