fix build with gcc 4.3 with tse3 useflag on, by Markus Rathgeb <maggu2810@web.de>, bug #229291

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

4 files changed, 49 insertions, 5 deletions

diff --git a/media-sound/noteedit/ChangeLog b/media-sound/noteedit/ChangeLog
index 164ee3d946d3..17ecae9bbdf3 100644
--- a/media-sound/noteedit/ChangeLog
+++ b/media-sound/noteedit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/noteedit
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/ChangeLog,v 1.33 2008/05/02 16:08:16 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/ChangeLog,v 1.34 2008/06/25 17:24:22 aballier Exp $
+
+  25 Jun 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/noteedit-2.8.1+gcc-4.3.1.patch, noteedit-2.8.1-r1.ebuild:
+  fix build with gcc 4.3 with tse3 useflag on, by Markus Rathgeb
+  <maggu2810@web.de>, bug #229291
 
   02 May 2008; Samuli Suominen <drac@gentoo.org> noteedit-2.8.1-r1.ebuild:
   Use berlios mirrors://
diff --git a/media-sound/noteedit/Manifest b/media-sound/noteedit/Manifest
index f772cc53431f..8cf20a29e897 100644
--- a/media-sound/noteedit/Manifest
+++ b/media-sound/noteedit/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX noteedit-2.8.1+gcc-4.3.1.patch 918 RMD160 1140634a599e3e9e2ab0b91d45d7404debfb4c73 SHA1 5cb2ad9f5a4ea5306d0e83f659280169889d8337 SHA256 ea0eee24d7622edde64863ba1a8bd0b828cf86d955363d7837469bc17c02a526
 AUX noteedit-2.8.1+gcc-4.3.patch 5004 RMD160 616345cb71dd1908a153f233d8d52c943f4d6031 SHA1 5a843152c41fdce10783b60a13216c17054ed05f SHA256 a87fda2750984e9903bb633b3ecb13f1e6b7485dbd8ebc880faa74a899c7e2d7
 AUX noteedit-2.8.1-desktop-file.patch 2428 RMD160 62bffb3d7a5cb20ded0fe71705a30aafbe43943b SHA1 86e6e2648dcafbb07cd827e557309644e62a866a SHA256 5922e3c0036ad368f863a3041e636cf9107be89f7350a7504a4cd3380d7a104d
 DIST noteedit-2.8.1.tar.gz 2842962 RMD160 38dc0c27e819c7a201d26176da2b54b16bbc7bbe SHA1 84f3f20acfb37042131df94435ad391a04ca73ba SHA256 781706eb2926925923817dc9b63f586f3e43c9c74f20a98f95e2ab7197d2a730
-EBUILD noteedit-2.8.1-r1.ebuild 1084 RMD160 3122628c7747cba8d6e0c5012a51419714785bfc SHA1 d30ed9b2f45e5d02c96c533ff9d39607ef0ec6ca SHA256 4d189b6475470c41ca15580b6146fa99d79c6461f3d156f555a347c38fd7f7fd
-MISC ChangeLog 4824 RMD160 245cec55a08d12a94aab59da6650effeb6ef5856 SHA1 6a9f15332ee621ac46071a9d152d682ac35a7840 SHA256 e62baedd8030a279d5f3e9591aa5e89992e63c1c1579771d4ca4926a0aac972d
+EBUILD noteedit-2.8.1-r1.ebuild 1123 RMD160 0661e34b751ae86a4cceba5665e921e1995849d6 SHA1 885852460db7a21779549d9bf5c652eeb7238d52 SHA256 b052af29dc87eca1a72969adbfe14dd3cc7ba899f4c12a440fdb53b190121fdf
+MISC ChangeLog 5047 RMD160 3f352f8d62b5edc24762c6a55ea568cdacaa5ca4 SHA1 21cf108eadeabea62a6f3fda4df9d130a0f6762a SHA256 d6b25ac532850a02b7167cb19b839b5ef814d2ff3a473f9ede3bf572dc6533ca
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhif1EACgkQvFcC4BYPU0ofVgCeNXTX/Gd2fHOeXQrwPPJFTUjA
+EHIAoKzhq/TroyYBwCPSjcemP8xkteJd
+=8emM
+-----END PGP SIGNATURE-----
diff --git a/media-sound/noteedit/files/noteedit-2.8.1+gcc-4.3.1.patch b/media-sound/noteedit/files/noteedit-2.8.1+gcc-4.3.1.patch
new file mode 100644
index 000000000000..d5a2238b8834
--- /dev/null
+++ b/media-sound/noteedit/files/noteedit-2.8.1+gcc-4.3.1.patch
@@ -0,0 +1,28 @@
+diff -Naur noteedit-2.8.1.orig/configure.in.in noteedit-2.8.1/configure.in.in
+--- noteedit-2.8.1.orig/configure.in.in	2006-03-27 08:07:18.000000000 +0200
++++ noteedit-2.8.1/configure.in.in	2008-06-24 23:04:48.000000000 +0200
+@@ -275,10 +275,10 @@
+ 
+ 	fi
+ 	cat >tse3vtest.cc << EOF
+-#include <istream.h>
++#include <iostream>
+ #include <tse3/TSE3.h>
+ int main() {
+-	cout << TSE3::TSE3_Version() << endl;
++	std::cout << TSE3::TSE3_Version() << std::endl;
+ 	return 0;
+ }
+ EOF
+diff -Naur noteedit-2.8.1.orig/kguitar_excerpt/fingerlist.cpp noteedit-2.8.1/kguitar_excerpt/fingerlist.cpp
+--- noteedit-2.8.1.orig/kguitar_excerpt/fingerlist.cpp	2006-03-26 22:54:31.000000000 +0200
++++ noteedit-2.8.1/kguitar_excerpt/fingerlist.cpp	2008-06-24 23:04:24.000000000 +0200
+@@ -21,7 +21,7 @@
+ #if GCC_MAJ_VERS > 2
+ #include <istream>
+ #else
+-#include <istream.h>
++#include <istream>
+ #endif
+ #include <qpainter.h>
+ #include <qcolor.h>
diff --git a/media-sound/noteedit/noteedit-2.8.1-r1.ebuild b/media-sound/noteedit/noteedit-2.8.1-r1.ebuild
index 7d918577bdbd..79bf76e38a7b 100644
--- a/media-sound/noteedit/noteedit-2.8.1-r1.ebuild
+++ b/media-sound/noteedit/noteedit-2.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/noteedit-2.8.1-r1.ebuild,v 1.6 2008/05/02 16:08:16 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/noteedit-2.8.1-r1.ebuild,v 1.7 2008/06/25 17:24:22 aballier Exp $
 
 IUSE="kmid tse3"
 
@@ -23,7 +23,7 @@ DEPEND="kmid? ( || ( kde-base/kmid kde-base/kdemultimedia )  )
 
 need-kde 3
 
-PATCHES=( "${FILESDIR}/${P}-desktop-file.patch" "${FILESDIR}/${P}+gcc-4.3.patch" )
+PATCHES=( "${FILESDIR}/${P}-desktop-file.patch" "${FILESDIR}/${P}+gcc-4.3.patch" "${FILESDIR}/${P}+gcc-4.3.1.patch" )
 
 src_compile() {
 	use tse3 || use kmid || myconf="--without-libs"