Fix by Holger Ackermann for building with gcc-4.3 #218297.

Package-Manager: portage-2.2_pre5

4 files changed, 39 insertions, 7 deletions

diff --git a/games-puzzle/ksudoku/ChangeLog b/games-puzzle/ksudoku/ChangeLog
index 20dbfbf24af1..9aae060a038c 100644
--- a/games-puzzle/ksudoku/ChangeLog
+++ b/games-puzzle/ksudoku/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/ksudoku
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ksudoku/ChangeLog,v 1.12 2007/10/22 22:04:03 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ksudoku/ChangeLog,v 1.13 2008/04/20 09:01:33 vapier Exp $
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/ksudoku-0.4-gcc43.patch, ksudoku-0.4.ebuild:
+  Fix by Holger Ackermann for building with gcc-4.3 #218297.
 
   22 Oct 2007; Markus Ullmann <jokey@gentoo.org> ksudoku-0.4.ebuild:
   Add opengl use flag dep check for bug #195817
diff --git a/games-puzzle/ksudoku/Manifest b/games-puzzle/ksudoku/Manifest
index d7d1394d7d0f..18ad140f5ca4 100644
--- a/games-puzzle/ksudoku/Manifest
+++ b/games-puzzle/ksudoku/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ksudoku-0.4-gcc43.patch 299 RMD160 848c1de6e5068aea7541e88b2f8102beabc0d44d SHA1 fd6401c4800041507b03401cb68a25348b2ff12b SHA256 14b041e287714c20fd2acea87418fd82aaa23c627baeb3aacea4950e4a9caf4d
 DIST ksudoku-0.4.tar.gz 316486 RMD160 9b5a1c20ff2afb75d7c7380029103c71da5dba8a SHA1 f98a32f7f15ef73505ec89e4a7e79c7f53f856af SHA256 6dc1b247fba46ccd08a79f7f9b711143f4cce837484bf5230221a2225ab9922b
-EBUILD ksudoku-0.4.ebuild 1445 RMD160 d4bb2acb82e988db515cdd289ef3d80af8339e41 SHA1 6da5667ef8888c39fe9ede3fceb7e23a3161558c SHA256 057c675f28029b16ef459e4ffcb863542044621853c715bbff6ff91849391cd1
-MISC ChangeLog 1586 RMD160 91e3b3f3d215d19f58ec15dcac4e74f2919fb68d SHA1 24e3f0187b8ca651b05db06162e3e98dcae9e199 SHA256 dfe18e08a5e5a8a5ef945f6b7a47e5f4ae093171e446c5dd8905390bbc708f11
+EBUILD ksudoku-0.4.ebuild 1537 RMD160 7e01b3c32dcb749e2c54e102e33a43d0794b7a73 SHA1 fd841206c9b7c44cb244b4840b75c1631efcb445 SHA256 f3718ebee2b57cfc9fc8f9c7810a122cbafd518de1d856e95f638314d8379f16
+MISC ChangeLog 1753 RMD160 b55d0f67ef7612af1512fb06e30bfc6d4f28739c SHA1 6be36f799a1f06bdacbd391f7c5a7af9b9c7ef47 SHA256 eff0f4bb0d7afbfec9af51e3ae01c8f5150018effb8fd02235fbfce595e2ffcd
 MISC metadata.xml 252 RMD160 913f8ab144abda854c9c69ccb3d67888aa8eca4e SHA1 55cf4431a6564918f5e857dd7489a80efc662bc3 SHA256 8603ad8c688a1d0c2f3f988ad90c0650e5b63beb3cb40790d5f7682ede2e1f35
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFICwZ3j9hvisErhMIRAnCTAJ0YVpMzgZ8NdwOOAOiGcN63HfwOLwCeJjqi
+9SoOHAYM1efELlbcehipfWg=
+=gD1Y
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/ksudoku/files/ksudoku-0.4-gcc43.patch b/games-puzzle/ksudoku/files/ksudoku-0.4-gcc43.patch
new file mode 100644
index 000000000000..adf9b8b54058
--- /dev/null
+++ b/games-puzzle/ksudoku/files/ksudoku-0.4-gcc43.patch
@@ -0,0 +1,15 @@
+fix by Holger Ackermann for building with gcc-4.3
+
+http://bugs.gentoo.org/218297
+
+--- ksudoku-0.4/work/ksudoku-0.4/src/logic/skgraph.h
++++ ksudoku-0.4/work/ksudoku-0.4/src/logic/skgraph.h
+@@ -28,6 +28,8 @@
+ #include <vector>
+ #include "skbase.h"
+ 
++typedef unsigned int  uint;
++
+ /**
+ 	@author 
+ */
diff --git a/games-puzzle/ksudoku/ksudoku-0.4.ebuild b/games-puzzle/ksudoku/ksudoku-0.4.ebuild
index 88c2e6d6996f..963d3f4fd994 100644
--- a/games-puzzle/ksudoku/ksudoku-0.4.ebuild
+++ b/games-puzzle/ksudoku/ksudoku-0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ksudoku/ksudoku-0.4.ebuild,v 1.10 2007/10/22 22:04:03 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ksudoku/ksudoku-0.4.ebuild,v 1.11 2008/04/20 09:01:33 vapier Exp $
 
-inherit flag-o-matic multilib kde
+inherit flag-o-matic multilib kde eutils
 
 DESCRIPTION="Sudoku Puzzle Generator and Solver for KDE"
 HOMEPAGE="http://ksudoku.sourceforge.net/"
@@ -27,6 +27,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch #218297
 
 	sed -i \
 		-e 's:LINK_FLAGS "${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} ${LINK_NO_UNDEFINED} ${_BASE_LDADD}"):LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} ${LINK_NO_UNDEFINED}"):' \
@@ -51,4 +52,5 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README TODO
 }