fix build with gcc 4.3, bug #257516

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 53 insertions, 6 deletions

diff --git a/media-sound/gigedit/ChangeLog b/media-sound/gigedit/ChangeLog
index 9ce80052967c..3eb7e7bbe69b 100644
--- a/media-sound/gigedit/ChangeLog
+++ b/media-sound/gigedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gigedit
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gigedit/ChangeLog,v 1.1 2008/01/27 10:15:26 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gigedit/ChangeLog,v 1.2 2009/02/08 10:04:55 aballier Exp $
+
+  08 Feb 2009; Alexis Ballier <aballier@gentoo.org>
+  +files/gigedit-0.1.1-gcc43.patch, gigedit-0.1.1.ebuild:
+  fix build with gcc 4.3, bug #257516
 
 *gigedit-0.1.1 (27 Jan 2008)
 
diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index be04bda208a4..9d5c387f113a 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gigedit-0.1.1-gcc43.patch 691 RMD160 f84b0943c06e25419792aa166c649124895037f9 SHA1 9a6417bbccc7d3437dd958308d1af468f9275b87 SHA256 4ab56a3609883e454db5f43bb8e1c92ed7e0634e9b9cf64a0d38dd06d3601927
 DIST gigedit-0.1.1.tar.gz 829456 RMD160 e9ccfc623125b4b54947647a652f64758db25cce SHA1 0691dcc646e241fa2ddf4e0606a998a777e68286 SHA256 7ffea08f6e406ef1ab1f0d123fee63d053daa3b8488d4c5e3e3b7c4882fb3bf8
-EBUILD gigedit-0.1.1.ebuild 747 RMD160 5dadf671f7e5a65a14aa335d645af1a0d49b21b6 SHA1 1563ea23248bab8554d118294298e489bc59b18b SHA256 1c21f8cc6b85031041396e998f1dc51c34ec20fe8d4cd8862ba6f537f5d0d083
-MISC ChangeLog 367 RMD160 0df7054f7fbd72e734ad01aafa6ce04523796f12 SHA1 473ee82344ca7d20a670a6c515c9470f11879d2d SHA256 116ac7127511fa24cc1bc99ddb9d369e39ce40d3edc9d7e0e2cab624b29ba75f
+EBUILD gigedit-0.1.1.ebuild 844 RMD160 a0d5d84591ebd4817afc72efa1959b29fbdb3011 SHA1 76190ceb4634e38428a6cdaa201a31047676550b SHA256 dae5af8cd30753a1281a9c3d897206f174f48b818d08e31c8080f3a9baa79f31
+MISC ChangeLog 516 RMD160 423f44803967c9604efc09e6ed5f15f220fcdd27 SHA1 668602b417882799ae0f7bfee5bc1088f4ef01f0 SHA256 0dfb50731ff278210a939c20463cab93d56da46872aaf240e505098e2c15f04a
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmOrk0ACgkQvFcC4BYPU0oMJwCdFj+LPoPCZFEputbEeqfW7MiW
+0mEAoIHL4ZZzccjBsqACvuSyJ/f3xmvI
+=86Sh
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gigedit/files/gigedit-0.1.1-gcc43.patch b/media-sound/gigedit/files/gigedit-0.1.1-gcc43.patch
new file mode 100644
index 000000000000..d5fbf2c23a1f
--- /dev/null
+++ b/media-sound/gigedit/files/gigedit-0.1.1-gcc43.patch
@@ -0,0 +1,24 @@
+Index: gigedit-0.1.1/src/gigedit/mainwindow.cpp
+===================================================================
+--- gigedit-0.1.1.orig/src/gigedit/mainwindow.cpp
++++ gigedit-0.1.1/src/gigedit/mainwindow.cpp
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <iostream>
++#include <cstring>
+ 
+ #include <gtkmm/filechooserdialog.h>
+ #include <gtkmm/messagedialog.h>
+Index: gigedit-0.1.1/src/gigedit/paramedit.cpp
+===================================================================
+--- gigedit-0.1.1.orig/src/gigedit/paramedit.cpp
++++ gigedit-0.1.1/src/gigedit/paramedit.cpp
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include "paramedit.h"
++#include <cstring>
+ 
+ namespace {
+     const char* const controlChangeTexts[] = {
diff --git a/media-sound/gigedit/gigedit-0.1.1.ebuild b/media-sound/gigedit/gigedit-0.1.1.ebuild
index 2bf74bb8f87b..b3cb93a8ea70 100644
--- a/media-sound/gigedit/gigedit-0.1.1.ebuild
+++ b/media-sound/gigedit/gigedit-0.1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gigedit/gigedit-0.1.1.ebuild,v 1.1 2008/01/27 10:15:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gigedit/gigedit-0.1.1.ebuild,v 1.2 2009/02/08 10:04:55 aballier Exp $
+
+inherit eutils
 
 DESCRIPTION="An instrument editor for gig files"
 HOMEPAGE="http://www.linuxsampler.org/"
@@ -18,6 +20,12 @@ DEPEND=">=media-sound/linuxsampler-0.5
 
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
 src_compile() {
 	econf
 	emake -j1 || die "make failed"