Fix gcc-4.3 build bug #251125

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r3 i686

5 files changed, 57 insertions, 10 deletions

diff --git a/games-board/ascal/ChangeLog b/games-board/ascal/ChangeLog
index 46de56abd7f6..573b922ea563 100644
--- a/games-board/ascal/ChangeLog
+++ b/games-board/ascal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-board/ascal
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ascal/ChangeLog,v 1.2 2007/06/12 14:57:42 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/ascal/ChangeLog,v 1.3 2009/01/18 20:38:56 tupone Exp $
+
+  18 Jan 2009; Tupone Alfredo <tupone@gentoo.org>
+  +files/ascal-0.1.1-gcc43.patch, files/ascal-0.1.1-install.patch,
+  ascal-0.1.1.ebuild:
+  Fix gcc-4.3 build bug #251125 by flameeyes@gentoo.org
 
   12 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
   +files/ascal-0.1.1-install.patch, ascal-0.1.1.ebuild:
diff --git a/games-board/ascal/Manifest b/games-board/ascal/Manifest
index 487a34239c61..0dc2c61a8673 100644
--- a/games-board/ascal/Manifest
+++ b/games-board/ascal/Manifest
@@ -1,5 +1,16 @@
-AUX ascal-0.1.1-install.patch 1718 RMD160 5f492dcf0e5afdd8a79a398e36b4803cc59abe30 SHA1 605b73609265901c0f4f2882e3f78299f487f83e SHA256 76755d6bd2a9b6f90edad02923939bfda15025a17b6c26cab488cdc8a9974cca
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ascal-0.1.1-gcc43.patch 859 RMD160 27b9542b0bc75ca863faf25f869e6b4fdd3bd3fa SHA1 be05d14cb0ce5b75a3f9dbd06ab73fae9557dc6e SHA256 fb7c73db81baf804747417a120012f2921c1391ccf82f1e0663fcd64f8cdc57d
+AUX ascal-0.1.1-install.patch 1718 RMD160 a5bb03e112f50dabe0c4175cc9984018ef47b0fe SHA1 d7014c6db3a07fc461db8bcbb601cf1e8192b566 SHA256 bc41d61593602b635753e9aae69932493113cde8476cd8f7aad2f765a1128a6e
 DIST ascal-0.1.1.tar.bz2 960688 RMD160 b719f9506059b85cfc9537fc3e77c2f9ab5b0ed9 SHA1 4969d74eeba33ffcf121abcaf2ea357bc6bd351c SHA256 43a5e19d5b2e33ffcaa11b2b2d4dcd62f975f87617505fd3356190c694476ac9
-EBUILD ascal-0.1.1.ebuild 823 RMD160 e7eff2bb4c4de699593df8b613d2fb34d7b15b94 SHA1 648ae3c9f970c03ffdafd65726d35100a1d64997 SHA256 abae79972c35ff373077e7b0ca9d805279baf5a4e557472bc1dcfc7ec8ab1fe4
-MISC ChangeLog 492 RMD160 637b31a103d678d4261706e630119f58d6222eb7 SHA1 83508964b82cbe2b697d985b4f60e41a5d641c6d SHA256 47c3149219cfa96be7840a6327ec1a9b45ead3583624d853d6e6df2c78f557ee
+EBUILD ascal-0.1.1.ebuild 860 RMD160 4327385719c3947c797bb92aadf96a3b4a706b8c SHA1 8c931bf73bbf7eef59a26ce17d6ad1b55f30dde4 SHA256 9a67cb3ff36c5d14b6ac641ed874e8b71f7fcfaa37a6ef1113fcb3dd64fc1a88
+MISC ChangeLog 690 RMD160 69d7e17b8c45d8dd5e2cf3030355c6efcd5b2f79 SHA1 218c89e8be5aa574e32c6b14f28697acc9554118 SHA256 9c39e870f98689289c6bc07bd3fab97e21c3b13e2c060be19c82edd03cff2f62
 MISC metadata.xml 645 RMD160 371fd49009457a94f97706b6b5b1f75ec8bdd72f SHA1 d50b26fd188678bb6e6e2bcfcc88b25e44d34499 SHA256 418f0bcc7720dba9b63708a579ce0c4cfe4416bcc3ed9bcb735945d2e0e9068c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklzk2sACgkQSYz9rjec82b1+gCeMuEdMRpJSZ41UldXrKsFhu+B
++twAoKB9mb1dvGjETkqb86VecS8hmsmq
+=nQjw
+-----END PGP SIGNATURE-----
diff --git a/games-board/ascal/ascal-0.1.1.ebuild b/games-board/ascal/ascal-0.1.1.ebuild
index 18dc9e6b95e2..281457155b5a 100644
--- a/games-board/ascal/ascal-0.1.1.ebuild
+++ b/games-board/ascal/ascal-0.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ascal/ascal-0.1.1.ebuild,v 1.3 2007/06/12 14:57:42 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ascal/ascal-0.1.1.ebuild,v 1.4 2009/01/18 20:38:56 tupone Exp $
 
 inherit autotools eutils games
 
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-install.patch
+	epatch "${FILESDIR}"/${P}-install.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	eautoreconf
 }
 
diff --git a/games-board/ascal/files/ascal-0.1.1-gcc43.patch b/games-board/ascal/files/ascal-0.1.1-gcc43.patch
new file mode 100644
index 000000000000..4b3829ec46a5
--- /dev/null
+++ b/games-board/ascal/files/ascal-0.1.1-gcc43.patch
@@ -0,0 +1,30 @@
+--- src/gui.cpp.old	2009-01-18 21:11:58.000000000 +0100
++++ src/gui.cpp	2009-01-18 21:12:33.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include "shareddata.hpp"
+ #include "config.h"
+ #include <string>
++#include <libintl.h>
+ 
+ gui::gui(shareddata *newData): GuiBoard() {
+ 	//clean, cleaner - pointer ;)
+--- src/gui_board.cpp.old	2009-01-18 21:13:30.000000000 +0100
++++ src/gui_board.cpp	2009-01-18 21:13:50.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <math.h>
+ #include "helper.h"
+ #include <stack>
++#include <libintl.h>
+ 
+ 
+ gui_board::gui_board()   {
+--- src/board.cpp.old	2009-01-18 21:14:27.000000000 +0100
++++ src/board.cpp	2009-01-18 21:14:58.000000000 +0100
+@@ -15,6 +15,7 @@
+ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 
+ #include "board.hpp"
++#include <cstdlib>
+ //#define DEBUG
+ #include "ourmove.hpp"
+ #include "helper.h"
diff --git a/games-board/ascal/files/ascal-0.1.1-install.patch b/games-board/ascal/files/ascal-0.1.1-install.patch
index 86c7659feeb1..b4902998f65f 100644
--- a/games-board/ascal/files/ascal-0.1.1-install.patch
+++ b/games-board/ascal/files/ascal-0.1.1-install.patch
@@ -30,7 +30,7 @@
  
 --- Makefile.am
 +++ Makefile.am
-@@ -17,13 +17,13 @@
+@@ -17,13 +17,12 @@
  
  ACLOCAL_AMFLAGS = -I m4
  
@@ -41,7 +41,7 @@
 -desktopdir = $(datadir)/applications
 +desktopdir = /usr/share/applications
  desktop_in_files = ascal.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
  
  @INTLTOOL_DESKTOP_RULE@