gcc-4.1 fix, bug #126595

Package-Manager: portage-2.1_pre7-r4

5 files changed, 47 insertions, 5 deletions

diff --git a/games-util/qjoypad/ChangeLog b/games-util/qjoypad/ChangeLog
index 4694d3120e17..ff92ff897100 100644
--- a/games-util/qjoypad/ChangeLog
+++ b/games-util/qjoypad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-util/qjoypad
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/ChangeLog,v 1.3 2006/01/26 22:16:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/ChangeLog,v 1.4 2006/04/04 17:37:18 tupone Exp $
+
+  04 Apr 2006; <Tupone@gentoo.org> +files/qjoypad-3.4-gcc41.patch,
+  qjoypad-3.4.ebuild:
+  gcc-4.1 fix, bug #126595 by Matteo Azzali
 
   26 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> qjoypad-3.4.ebuild:
   Added modular X dependencies and closing bug #120463.
diff --git a/games-util/qjoypad/Manifest b/games-util/qjoypad/Manifest
index 9c4ed8915bf2..020a64bbfe52 100644
--- a/games-util/qjoypad/Manifest
+++ b/games-util/qjoypad/Manifest
@@ -1,4 +1,25 @@
-MD5 43e91a44ba3cc970995979a6917e5a86 ChangeLog 548
-MD5 8235ab81791feb29ee2ed26ca07d1b96 files/digest-qjoypad-3.4 59
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 47e924aa02281400efac065107593005 ChangeLog 680
+RMD160 9e0820b5095146e52eee114570e2c062c8364f95 ChangeLog 680
+SHA256 9d1ec242bd093ccbbfd2a0d357317bea6f61ed6a8b2127dd2618dad0ecd29962 ChangeLog 680
+MD5 4fe509fb0ac917665206c1e9f623fd33 files/digest-qjoypad-3.4 223
+RMD160 486507e14b42f11c8fef77fcad24d2dd1da0e7db files/digest-qjoypad-3.4 223
+SHA256 aaea871b94877f70fc65a61859e9a3d5dd7067ddae232c139ef4c5f39daefe24 files/digest-qjoypad-3.4 223
+MD5 1fa2b982a83d8dc984c2009438c83401 files/qjoypad-3.4-gcc41.patch 506
+RMD160 687e14148dfa397910937d596e62f14519e860e3 files/qjoypad-3.4-gcc41.patch 506
+SHA256 cfe7452859aa9d4b1dd2b56db21206be08b4b025184d0e8231ec27811926ec5a files/qjoypad-3.4-gcc41.patch 506
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 dc49f7186ccbf2de63624b72e2f472a8 qjoypad-3.4.ebuild 1315
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 e4065e56fe88dd00635d141edcbd4aec qjoypad-3.4.ebuild 1352
+RMD160 fd973e73a587c5e3cfb86c550232ee81ca84c5ad qjoypad-3.4.ebuild 1352
+SHA256 f78344c7b2883ea1b5de8a4cfb00b40020ced547006d746d7aeb1e66c3c5e232 qjoypad-3.4.ebuild 1352
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEMq7f2CTtIKiFlQIRArewAJ0dwsj4SZmv7SQ5Fl5B9exGQtwZyQCghEYo
+JZ2ZfTcuUBbsnyb75Y1FiaE=
+=o9nA
+-----END PGP SIGNATURE-----
diff --git a/games-util/qjoypad/files/digest-qjoypad-3.4 b/games-util/qjoypad/files/digest-qjoypad-3.4
index 810caf9ba92c..11722876e200 100644
--- a/games-util/qjoypad/files/digest-qjoypad-3.4
+++ b/games-util/qjoypad/files/digest-qjoypad-3.4
@@ -1 +1,3 @@
 MD5 f103086cc7e2571a218f1acea36d533f qjoypad-3.4.tgz 92298
+RMD160 1c623383b11ffe9e58224e7304eb588d42816ed9 qjoypad-3.4.tgz 92298
+SHA256 b2af48bfc36e919a6e87fbb0bcfe59166e4777aee820416c66e5a02bef3aad24 qjoypad-3.4.tgz 92298
diff --git a/games-util/qjoypad/files/qjoypad-3.4-gcc41.patch b/games-util/qjoypad/files/qjoypad-3.4-gcc41.patch
new file mode 100644
index 000000000000..2b6dc040f3a5
--- /dev/null
+++ b/games-util/qjoypad/files/qjoypad-3.4-gcc41.patch
@@ -0,0 +1,14 @@
+diff -ur qjoypad-3.4-orig/src/layout.h qjoypad-3.4/src/layout.h
+--- qjoypad-3.4-orig/src/layout.h	2006-03-17 23:23:24.000000000 -0500
++++ qjoypad-3.4/src/layout.h	2006-03-17 23:26:44.000000000 -0500
+@@ -40,6 +40,9 @@
+ //for recognizing when the special empty layout is in use
+ #define NL "[NO LAYOUT]"
+ 
++//Circular dependency in the headers, so adding a forward declaration here
++class LayoutEdit;
++
+ //where QJoyPad saves its settings!
+ const QString settingsDir(QDir::homeDirPath() + "/.qjoypad3/");
+ 
+
diff --git a/games-util/qjoypad/qjoypad-3.4.ebuild b/games-util/qjoypad/qjoypad-3.4.ebuild
index 575675f0092b..fabc3b804726 100644
--- a/games-util/qjoypad/qjoypad-3.4.ebuild
+++ b/games-util/qjoypad/qjoypad-3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/qjoypad-3.4.ebuild,v 1.5 2006/01/26 22:16:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/qjoypad-3.4.ebuild,v 1.6 2006/04/04 17:37:18 tupone Exp $
 
 inherit eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 		-e "/^CXXFLAGS/s:-pipe -Wall -W -O2:${CXXFLAGS}:" \
 		-e '/^Makefile:/s|:.*||' \
 		Makefile || die "sed make depends failed"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 }
 
 src_compile() {