Compile fixes for gcc4.2. Submitted by Gene Seto in bug #188069

Package-Manager: portage-2.1.2.11

4 files changed, 83 insertions, 21 deletions

diff --git a/games-board/slibo/ChangeLog b/games-board/slibo/ChangeLog
index 107a3ed237ec..fa49c2dcb76b 100644
--- a/games-board/slibo/ChangeLog
+++ b/games-board/slibo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/slibo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/ChangeLog,v 1.10 2007/03/12 13:53:42 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/ChangeLog,v 1.11 2007/08/09 23:15:39 mr_bones_ Exp $
+
+  09 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/slibo-0.4.4-gcc42.patch, slibo-0.4.4.ebuild:
+  Compile fixes for gcc4.2. Submitted by Gene Seto in bug #188069
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org> slibo-0.4.4.ebuild:
   Replacing einfo with elog
diff --git a/games-board/slibo/Manifest b/games-board/slibo/Manifest
index c5c7b753280d..063ac81b0997 100644
--- a/games-board/slibo/Manifest
+++ b/games-board/slibo/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.4.4-gcc34.patch 2638 RMD160 1fcf2af07e493d583159010520f242bcbe0deb60 SHA1 a6a1fbd57b34e6c4bd820884dafa2ff0a8d58ee9 SHA256 095c5e6055b2a1fd0efd696b172e960c1b4426523294c2a413ce041b95052ab9
 MD5 2956467632bec1b5ec193090cccbdca9 files/0.4.4-gcc34.patch 2638
 RMD160 1fcf2af07e493d583159010520f242bcbe0deb60 files/0.4.4-gcc34.patch 2638
@@ -9,15 +6,19 @@ AUX slibo-0.4.4-gcc41.patch 441 RMD160 4e8b82e67d06ce08d50af72830f34665a6d6322c
 MD5 12c86df41d9ec9d6a0011ca814c00c6d files/slibo-0.4.4-gcc41.patch 441
 RMD160 4e8b82e67d06ce08d50af72830f34665a6d6322c files/slibo-0.4.4-gcc41.patch 441
 SHA256 372dd6ea94c35f157ba633dc3ba6f18f4d84710495091b3a88ff4a1ae036a30f files/slibo-0.4.4-gcc41.patch 441
+AUX slibo-0.4.4-gcc42.patch 2257 RMD160 70893daf538f319e583147736986061f7f3c9d02 SHA1 b306deca29a773247ce7ab99ea0a5bf1b8272dca SHA256 2a6189253bd4c89a79562eaecc8b0d93b505ec936b5cd44ada9603e3e252e8cb
+MD5 cdf941ed97cd5dae49d01ea8bf87afdf files/slibo-0.4.4-gcc42.patch 2257
+RMD160 70893daf538f319e583147736986061f7f3c9d02 files/slibo-0.4.4-gcc42.patch 2257
+SHA256 2a6189253bd4c89a79562eaecc8b0d93b505ec936b5cd44ada9603e3e252e8cb files/slibo-0.4.4-gcc42.patch 2257
 DIST slibo-0.4.4.tar.bz2 897532 RMD160 b8b3d000b6124b548cd310b5981cdd846b81a953 SHA1 82cd98e34e732084f279bc239727b280e74d3f74 SHA256 83aef936812f9499be0c12a9f9ed76041679e6991bc860572a2e4dd0083ce853
-EBUILD slibo-0.4.4.ebuild 918 RMD160 f91a701c133975a171da8c6cd9588a59de3942ec SHA1 240314dc3c3cc99081cb9f30669ee19845cc39ec SHA256 da4c1c986553010222f79a19812253aecebdbbd28d4fc53c0fadafbfc885425f
-MD5 f700d740d9f8b817df00a588a6d8e489 slibo-0.4.4.ebuild 918
-RMD160 f91a701c133975a171da8c6cd9588a59de3942ec slibo-0.4.4.ebuild 918
-SHA256 da4c1c986553010222f79a19812253aecebdbbd28d4fc53c0fadafbfc885425f slibo-0.4.4.ebuild 918
-MISC ChangeLog 1142 RMD160 4f69577833f94777c33da7cf566cc8b9f06fff27 SHA1 1e0468b0a014fdd2c4faec08c58646b8260b34fe SHA256 310ed43dbb867f9118c40722fe73f3d00d2e1d8a31e37470f53b43e3aa30da91
-MD5 87549222175f2d5179d4d0a4038affd1 ChangeLog 1142
-RMD160 4f69577833f94777c33da7cf566cc8b9f06fff27 ChangeLog 1142
-SHA256 310ed43dbb867f9118c40722fe73f3d00d2e1d8a31e37470f53b43e3aa30da91 ChangeLog 1142
+EBUILD slibo-0.4.4.ebuild 950 RMD160 ba663ab4ea1539d41d8ed0f1008fa720621baed7 SHA1 bc2bcde79cae41b0acca217ce4bdf1fd77f8c498 SHA256 5c994201bf52ec9d1a2b045c166a51f77ae98682566c7c65658f66d3d7b4e337
+MD5 a1d983f746ee9b05befd30929bc70641 slibo-0.4.4.ebuild 950
+RMD160 ba663ab4ea1539d41d8ed0f1008fa720621baed7 slibo-0.4.4.ebuild 950
+SHA256 5c994201bf52ec9d1a2b045c166a51f77ae98682566c7c65658f66d3d7b4e337 slibo-0.4.4.ebuild 950
+MISC ChangeLog 1321 RMD160 01a5e58bc63fdf631eab6e67577a6460824fda0c SHA1 968fe5ca67ff71c18d781a5bedba498f36449432 SHA256 430922da7015c7417d2923b0cb3c405e4869dab0845a29c9ea4f99d9d459f359
+MD5 9e45fc7cfd21decb9e3e364f9b525ba9 ChangeLog 1321
+RMD160 01a5e58bc63fdf631eab6e67577a6460824fda0c ChangeLog 1321
+SHA256 430922da7015c7417d2923b0cb3c405e4869dab0845a29c9ea4f99d9d459f359 ChangeLog 1321
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -25,10 +26,3 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 6970051922eb3912c40cd57748c3db1d files/digest-slibo-0.4.4 238
 RMD160 06014581562f5353732e364bfd7d2642fc4b6e2a files/digest-slibo-0.4.4 238
 SHA256 d6bdf4ac35c824ead93ef98a4fae063a6ffe1d8d9102cef83305a1bc6bc6d989 files/digest-slibo-0.4.4 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF9Vxs6J2i8a8J4okRAnoyAJ9oOqCLUnz2y9kbXGVcgD020vhk1gCdEi8J
-81Vc/C+7lM+vP10ZT5SkBR4=
-=pzBd
------END PGP SIGNATURE-----
diff --git a/games-board/slibo/files/slibo-0.4.4-gcc42.patch b/games-board/slibo/files/slibo-0.4.4-gcc42.patch
new file mode 100644
index 000000000000..f8b4d1b5860c
--- /dev/null
+++ b/games-board/slibo/files/slibo-0.4.4-gcc42.patch
@@ -0,0 +1,64 @@
+Compile fixes for gcc4.2.
+Submitted by Gene Seto at
+http://bugs.gentoo.org/show_bug.cgi?id=188069
+
+--- slibo-0.4.4/src/flatview.old	2007-08-09 16:48:34.000000000 +0000
++++ slibo-0.4.4/src/flatview.cpp	2007-08-09 16:54:53.000000000 +0000
+@@ -43,14 +43,14 @@
+ //convert board to screen coordinates
+ 
+ QPoint FlatView::board2screen(CoorFloat q) {
+-    int squaresize = (width() <? height())/8;
++    int squaresize = (width() < height() ? width() : height())/8;
+     return QPoint((int)(q.x*squaresize), (int)((8.0-q.y)*squaresize));
+ }
+ 
+ //convert screen to board coordinates.
+ 
+ CoorFloat FlatView::screen2board(QPoint p1) {
+-    float squaresize = (width() <? height())/8.0;
++    float squaresize = (width() < height() ? width() : height())/8.0;
+     return CoorFloat(p1.x() / squaresize, p1.y() / squaresize);
+ }
+ 
+@@ -65,7 +65,7 @@
+ }
+ 
+ void FlatView::resizeEvent(QResizeEvent *e) {
+-    int squaresize = (e->size().width() <? e->size().height())/8;
++    int squaresize = (e->size().width() < e->size().height() ? e->size().width():  e->size().height())/8;
+     int nsize = squaresize * 8;
+     if (nsize != width() || nsize != height()) {
+         resize(nsize, nsize);
+@@ -92,7 +92,7 @@
+ }
+ 
+ void FlatView::paintEvent(QPaintEvent*) {
+-    int squaresize = (width() <? height())/8;
++    int squaresize = (width() < height() ? width() : height())/8;
+     QTime t = QTime::currentTime();
+ 
+     QValueList<ViewPiece>::iterator i;
+--- slibo-0.4.4/src/glview.old	2007-08-09 16:48:39.000000000 +0000
++++ slibo-0.4.4/src/glview.cpp	2007-08-09 16:56:30.000000000 +0000
+@@ -288,8 +288,8 @@
+ 	q = q + CoorFloat((p2x*vy - p2y*vx), (ux*p2y - uy*p2x)) * (1.0/det);
+ //        q.x += (p2x*vy - p2y*vx) / det;
+ //        q.y += (ux*p2y - uy*p2x) / det;
+-        q.x = 0.0 >? q.x <? 7.0;
+-        q.y = 0.0 >? q.y <? 7.0;
++	q.x = std::min(std::max(0.0, (double)q.x), 7.0);
++	q.y = std::min(std::max(0.0, (double)q.y), 7.0);
+         lastq = q;
+         d *= 0.5;
+     }
+--- slibo-0.4.4/src/sliboengine/main.old	2007-08-09 16:33:22.000000000 +0000
++++ slibo-0.4.4/src/sliboengine/main.c	2007-08-09 16:33:32.000000000 +0000
+@@ -22,6 +22,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <signal.h>
+ #include <unistd.h>
+ #include <getopt.h>
diff --git a/games-board/slibo/slibo-0.4.4.ebuild b/games-board/slibo/slibo-0.4.4.ebuild
index 6c9d3d040207..cc51727dc9c1 100644
--- a/games-board/slibo/slibo-0.4.4.ebuild
+++ b/games-board/slibo/slibo-0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.12 2007/03/12 13:53:42 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/slibo-0.4.4.ebuild,v 1.13 2007/08/09 23:15:39 mr_bones_ Exp $
 
 inherit eutils kde
 
@@ -16,7 +16,7 @@ IUSE=""
 DEPEND="=dev-db/sqlite-2*"
 need-kde 3
 
-PATCHES="${FILESDIR}/${PV}-gcc34.patch ${FILESDIR}/${P}-gcc41.patch"
+PATCHES="${FILESDIR}/${PV}-gcc34.patch ${FILESDIR}/${P}-gcc41.patch ${FILESDIR}/${P}-gcc42.patch"
 
 src_install() {
 	kde_src_install