Fix build with gcc-4.5. Bug #318601

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/games-board/openyahtzee/ChangeLog b/games-board/openyahtzee/ChangeLog
index 3770ff761ad5bc8ed6ab765ff350ac4992189100..4fd4896248715b6196200bd5827dce1975c21dbe 100644 (file)
--- a/games-board/openyahtzee/ChangeLog
+++ b/games-board/openyahtzee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/openyahtzee
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/openyahtzee/ChangeLog,v 1.11 2010/01/24 23:08:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/openyahtzee/ChangeLog,v 1.12 2010/05/18 07:57:34 tupone Exp $
+
+  18 May 2010; Tupone Alfredo <tupone@gentoo.org> openyahtzee-1.9.ebuild,
+  +files/openyahtzee-1.9-gcc45.patch:
+  Fix build with gcc-4.5. Bug #318601 by flameeyes@gentoo.org
 
   24 Jan 2010; Brent Baude <ranger@gentoo.org> openyahtzee-1.9.ebuild:
   keyworded ~arch for ppc, bug 296287

diff --git a/games-board/openyahtzee/Manifest b/games-board/openyahtzee/Manifest
index 03d01bddd1c50c9b45a699b2d40ee5de66f042f9..0ee956ee054661b751c4ff5b741ba239a6b6b8b0 100644 (file)
--- a/games-board/openyahtzee/Manifest
+++ b/games-board/openyahtzee/Manifest
@@ -1,4 +1,5 @@
+AUX openyahtzee-1.9-gcc45.patch 633 RMD160 98879124fa67e842f1c735c6f4d8ee967d525d8f SHA1 c8090b9a942488d76623b87777a91349596b433b SHA256 7eea9a893c388b16f43a0970ff1e0ac9de60a681db5fe372bc7bb511d0edace6
 DIST openyahtzee-1.9.tar.bz2 850969 RMD160 992ca4559a0cc7ed925f0b44bd989514a8410405 SHA1 6c9ff016f8f91550a879ec25409b119ef93b82dd SHA256 9d923dc14906aed39d9fa9d9c40eaa2d977d2d8aadae85836e7412712c93d8e1
-EBUILD openyahtzee-1.9.ebuild 860 RMD160 3b40c1668f4061e0acfea405408b914764938e7c SHA1 efbd9a8434d3337751046ae55dfa1d2c30710ec0 SHA256 d5e8466a5d4f41a5f3afc639fb1fd772ae563cbb72dad18ca630eea2e2168b13
-MISC ChangeLog 1659 RMD160 c562017aea279067e6b7557afe61fd3c0974b559 SHA1 3c57f95be59cb5f6d3951dde8dbaff5cdb9e4dee SHA256 e0be81fe0888665f77c1c458167f48072723eff370bf1e2665569a1efba78846
+EBUILD openyahtzee-1.9.ebuild 906 RMD160 30d02a179b268a6db463121aec09ec7e8a916d4c SHA1 0ec22f51a1d69161b0816dc39a7e8353aeb28119 SHA256 4ddef940b470158a5835cd1018310861126ae545199bd00a99a8bad2203d9ecd
+MISC ChangeLog 1834 RMD160 81f1d2203fbc0eced61085565aa630d7cc569b72 SHA1 59633cbe17d33a8ceffd21d53dd5313984053840 SHA256 51edc0cf22c35cdaebaeb0e0790f5d0feeedbe29d4706aa8df61a3560ec6876a
 MISC metadata.xml 285 RMD160 bb74e92f3f2b84bb31c384d629772059ea95cd9d SHA1 8cf455f78e5b2ce0afa67b3d41eed1a8c4b84564 SHA256 b91d53b74f4f7cba24004810d60dce73807300ed0e933001d44ee7896426f5c1

diff --git a/games-board/openyahtzee/files/openyahtzee-1.9-gcc45.patch b/games-board/openyahtzee/files/openyahtzee-1.9-gcc45.patch
new file mode 100644 (file)
index 0000000..4aa411b
--- /dev/null
+++ b/games-board/openyahtzee/files/openyahtzee-1.9-gcc45.patch
@@ -0,0 +1,20 @@
+--- src/DBwrapper.cpp.old      2010-05-18 09:47:25.000000000 +0200
++++ src/DBwrapper.cpp  2010-05-18 09:47:50.000000000 +0200
+@@ -96,7 +96,7 @@
+               cerr << "sqlite3_compile error:" <<endl;
+               cerr << sqlite3_errmsg( m_db ) <<endl;
+               cerr << "on insert: " << query <<endl;
+-              values = list<string>::list();
++              values = list<string>();
+       } else {
+               int busyCnt = 0;
+               int number = sqlite3_column_count( stmt );
+@@ -138,7 +138,7 @@
+                       cerr <<  "sqlite_step error.\n";
+                       cerr << sqlite3_errmsg( m_db ) << endl;
+                       cerr << "on query: " << query << endl;
+-                      values = list<string>::list();
++                      values = list<string>();
+         }
+     }
+ 

diff --git a/games-board/openyahtzee/openyahtzee-1.9.ebuild b/games-board/openyahtzee/openyahtzee-1.9.ebuild
index c38659835eca6007aacf3ca0dc618e59f22f0a93..ceaa38d00b79055efc0ed57bf7e6bffa28ce97b3 100644 (file)
--- a/games-board/openyahtzee/openyahtzee-1.9.ebuild
+++ b/games-board/openyahtzee/openyahtzee-1.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/openyahtzee/openyahtzee-1.9.ebuild,v 1.5 2010/01/24 23:08:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/openyahtzee/openyahtzee-1.9.ebuild,v 1.6 2010/05/18 07:57:34 tupone Exp $
 
 EAPI=2
 WX_GTK_VER="2.8"
-inherit autotools wxwidgets games
+inherit eutils autotools wxwidgets games
 
 DESCRIPTION="A full-featured wxWidgets version of the classic dice game Yahtzee"
 HOMEPAGE="http://openyahtzee.sourceforge.net/"
@@ -18,6 +18,7 @@ IUSE=""
 DEPEND="x11-libs/wxGTK:2.8[X]"
 
 src_prepare() {
+       epatch "${FILESDIR}"/${P}-gcc45.patch
        sed -i \
                -e 's:openyahtzee_LDFLAGS:openyahtzee_LDADD:' \
                src/Makefile.am || die