fix gcc-4.x issues; thanks to Pascal Martineau on #131831

Package-Manager: portage-2.1.1

5 files changed, 116 insertions, 8 deletions

diff --git a/media-video/gephex/ChangeLog b/media-video/gephex/ChangeLog
index 06bd1ef10b5e..61ee3264dde3 100644
--- a/media-video/gephex/ChangeLog
+++ b/media-video/gephex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gephex
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/ChangeLog,v 1.14 2005/12/17 14:36:39 lu_zero Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/ChangeLog,v 1.15 2006/10/16 19:50:24 hd_brummy Exp $
+
+  16 Oct 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/gephex-0.4.3-gcc4.patch, gephex-0.4.3.ebuild:
+  fix gcc-4.x issues; thanks to Pascal Martineau on #131831
 
   17 Dec 2005; Luca Barbato <lu_zero@gentoo.org> -gephex-0.4.1.ebuild:
   Cleanup
diff --git a/media-video/gephex/Manifest b/media-video/gephex/Manifest
index d88898514cc1..ba00ebe12330 100644
--- a/media-video/gephex/Manifest
+++ b/media-video/gephex/Manifest
@@ -1,7 +1,43 @@
-MD5 88b62e87018687dd682582711e69fdf7 ChangeLog 1550
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.0.4-alsa-api-fix.patch 832 RMD160 57fd3605663262fd45c8a2a80be18afe711ee572 SHA1 b99c44399f8c65c7e0dc65ccde977283b2dd931a SHA256 de8ca07f8a932e6ecd95a71ed1018467075336fd5ea200bce93f925a47ab3792
 MD5 0e6024af9a9dd49daca8977ba601c8f5 files/0.0.4-alsa-api-fix.patch 832
+RMD160 57fd3605663262fd45c8a2a80be18afe711ee572 files/0.0.4-alsa-api-fix.patch 832
+SHA256 de8ca07f8a932e6ecd95a71ed1018467075336fd5ea200bce93f925a47ab3792 files/0.0.4-alsa-api-fix.patch 832
+AUX 0.0.4-disable-glx.patch 159 RMD160 cb323f18a88976af896fb32653dfea17d3d1bc3a SHA1 81678d143ed41268f322b074d722d2d0c079bee4 SHA256 c3202bc9a77dd28c68347f50aee053ec1f2a624444d5a7719ef4c985e1e3a5a3
 MD5 060f2d352bb4bee71e647beb2b8135a1 files/0.0.4-disable-glx.patch 159
+RMD160 cb323f18a88976af896fb32653dfea17d3d1bc3a files/0.0.4-disable-glx.patch 159
+SHA256 c3202bc9a77dd28c68347f50aee053ec1f2a624444d5a7719ef4c985e1e3a5a3 files/0.0.4-disable-glx.patch 159
+AUX 0.0.4-makefile.in.patch 873 RMD160 5f6b2cbd495bf5d37ad8e2e3ab4c1c5a697bd8ff SHA1 f0d6bf9c1fb08e97d3baeac396a02f5c807fca06 SHA256 6474e53a7f7d9e6af3d010bf1246d8398de791bd33039dcaed588e463b493ede
 MD5 d0c894eccb6239538b954cb1d6680c5d files/0.0.4-makefile.in.patch 873
-MD5 fc047dc0d3d92510ae3f30e10856ad7c files/digest-gephex-0.4.3 67
-MD5 c7408e6244319aecb0525d64d3481f9a gephex-0.4.3.ebuild 1478
+RMD160 5f6b2cbd495bf5d37ad8e2e3ab4c1c5a697bd8ff files/0.0.4-makefile.in.patch 873
+SHA256 6474e53a7f7d9e6af3d010bf1246d8398de791bd33039dcaed588e463b493ede files/0.0.4-makefile.in.patch 873
+AUX gephex-0.4.3-gcc4.patch 2214 RMD160 4213942be36f78216100187b7547005156b43cd8 SHA1 0f909f37e002c2413f0609bad8eab91d408d8a6e SHA256 a313383d0625f3df76bab3ee351e3ac6cddabdd20de967e3dba61362915660d8
+MD5 763d65f47abdb016cb6dc87b47e86d49 files/gephex-0.4.3-gcc4.patch 2214
+RMD160 4213942be36f78216100187b7547005156b43cd8 files/gephex-0.4.3-gcc4.patch 2214
+SHA256 a313383d0625f3df76bab3ee351e3ac6cddabdd20de967e3dba61362915660d8 files/gephex-0.4.3-gcc4.patch 2214
+DIST gephex-0.4.3b.tar.bz2 6123279 RMD160 e150ce5855120b7a3a8f8eea011f6f59375218ad SHA1 77936c608555f0068a639ac1c6a9bec2bb2d5e8d SHA256 c6958df62506b3bcb25801d76e0e583652b2a32c86c0f7da73eca29b0366e5df
+EBUILD gephex-0.4.3.ebuild 1572 RMD160 bbb118e0d0c23c85f1226c56526ff80b0259fb7c SHA1 3044db5cc0146bff49acaa16eecd5b27f1a017b9 SHA256 f55c9f294d028b145ad0a538006e1c3cf5a0c72e68e4e5fa3ec1fe938358d755
+MD5 28464459396ac88bed31182b92132147 gephex-0.4.3.ebuild 1572
+RMD160 bbb118e0d0c23c85f1226c56526ff80b0259fb7c gephex-0.4.3.ebuild 1572
+SHA256 f55c9f294d028b145ad0a538006e1c3cf5a0c72e68e4e5fa3ec1fe938358d755 gephex-0.4.3.ebuild 1572
+MISC ChangeLog 1723 RMD160 e86aae5b1ece059477860015d919bf0d57927c04 SHA1 ad7161e884c5ae5a2a4a0fa6d97599ae74501a2a SHA256 d36e518750e66f8f16e68bcadd10911ddc3ac24e782624cef7ed89766df5486b
+MD5 c52236d97273761cae87b72366da7118 ChangeLog 1723
+RMD160 e86aae5b1ece059477860015d919bf0d57927c04 ChangeLog 1723
+SHA256 d36e518750e66f8f16e68bcadd10911ddc3ac24e782624cef7ed89766df5486b ChangeLog 1723
+MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
+RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
+SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f metadata.xml 251
+MD5 2e4d7b3ae8e326b2ff20e23d2011a669 files/digest-gephex-0.4.3 247
+RMD160 71b8fb4f8265e7342cbfccc8e277d5889d41b725 files/digest-gephex-0.4.3 247
+SHA256 37d464714d2d8ad3a0d6692f31a41a4e2ff7b32ec2c0373175ca410221672958 files/digest-gephex-0.4.3 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: no further Information
+
+iD8DBQFFM+Nedn07HTTCgIoRAm3aAJ4lM1l6rosqld0GKpkx8INnPfSnwgCfanw8
+lB4f/8AaUTbTE3vNjPRhv5U=
+=qaRM
+-----END PGP SIGNATURE-----
diff --git a/media-video/gephex/files/digest-gephex-0.4.3 b/media-video/gephex/files/digest-gephex-0.4.3
index 1a785886f76f..251a9f40fe88 100644
--- a/media-video/gephex/files/digest-gephex-0.4.3
+++ b/media-video/gephex/files/digest-gephex-0.4.3
@@ -1 +1,3 @@
 MD5 d4e1343fcca8314e773d6daacb8af841 gephex-0.4.3b.tar.bz2 6123279
+RMD160 e150ce5855120b7a3a8f8eea011f6f59375218ad gephex-0.4.3b.tar.bz2 6123279
+SHA256 c6958df62506b3bcb25801d76e0e583652b2a32c86c0f7da73eca29b0366e5df gephex-0.4.3b.tar.bz2 6123279
diff --git a/media-video/gephex/files/gephex-0.4.3-gcc4.patch b/media-video/gephex/files/gephex-0.4.3-gcc4.patch
new file mode 100644
index 000000000000..053610011fa9
--- /dev/null
+++ b/media-video/gephex/files/gephex-0.4.3-gcc4.patch
@@ -0,0 +1,58 @@
+fix problems on gcc-4.x
+https://bugs.gentoo.org/attachment.cgi?id=85864
+https://bugs.gentoo.org/show_bug.cgi?id=131831
+
+Joerg Bornkessel <hd_brummy@gentoo.org> 16 Oct 2006
+
+diff -Naur gephex-0.4.3.old/base/src/utils/structscanner.h gephex-0.4.3/base/src/utils/structscanner.h
+--- gephex-0.4.3.old/base/src/utils/structscanner.h	2006-04-30 18:05:29.000000000 -0400
++++ gephex-0.4.3/base/src/utils/structscanner.h	2006-04-30 18:06:08.000000000 -0400
+@@ -40,11 +40,11 @@
+ {
+  IStructTokenListener& m_listener;
+   
+-  void StructScanner::divideNameFromContent(const std::string& text,
++  void divideNameFromContent(const std::string& text,
+ 					    std::string& name,
+ 					    std::string& content) const;
+-  void StructScanner::processName(const std::string& name) const;
+-  void StructScanner::processContent(const std::string& content) const;
++  void processName(const std::string& name) const;
++  void processContent(const std::string& content) const;
+   std::string::size_type
+   findNextClosingBracket(const std::string& content,
+ 			 std::string::size_type n) const;
+diff -Naur gephex-0.4.3.old/engine/src/model/model.h gephex-0.4.3/engine/src/model/model.h
+--- gephex-0.4.3.old/engine/src/model/model.h	2006-04-30 18:05:29.000000000 -0400
++++ gephex-0.4.3/engine/src/model/model.h	2006-04-30 18:06:22.000000000 -0400
+@@ -235,7 +235,7 @@
+       void deleteModule(utils::AutoPtr<Graph>, int moduleID);
+ 
+ #ifndef NDEBUG
+-      void Model::checkGraphSerialisation();
++      void checkGraphSerialisation();
+ #endif
+ 
+     };
+diff -Naur gephex-0.4.3.old/qtgui/src/gui/graphnameview.cpp gephex-0.4.3/qtgui/src/gui/graphnameview.cpp
+--- gephex-0.4.3.old/qtgui/src/gui/graphnameview.cpp	2006-04-30 18:05:29.000000000 -0400
++++ gephex-0.4.3/qtgui/src/gui/graphnameview.cpp	2006-04-30 18:07:38.000000000 -0400
+@@ -266,7 +266,7 @@
+       m_textListener->textChanged(1,newStatus.c_str());
+     }
+ 
+-    virtual void GraphItem::propertySelected(int id)
++    virtual void propertySelected(int id)
+     {
+       switch(id)
+ 	{
+@@ -428,7 +428,7 @@
+       m_textListener->textChanged(1,newStatus.c_str());
+     }
+ 
+-    void SnapItem::propertySelected(int id)
++    void propertySelected(int id)
+     {
+       switch(id)
+ 	{
+
diff --git a/media-video/gephex/gephex-0.4.3.ebuild b/media-video/gephex/gephex-0.4.3.ebuild
index ff659c3fe888..d43b5c915c82 100644
--- a/media-video/gephex/gephex-0.4.3.ebuild
+++ b/media-video/gephex/gephex-0.4.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/gephex-0.4.3.ebuild,v 1.8 2005/12/28 20:53:58 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/gephex-0.4.3.ebuild,v 1.9 2006/10/16 19:50:24 hd_brummy Exp $
+
+inherit eutils
 
 DESCRIPTION="GePhex is a modular video effect framework."
 HOMEPAGE="http://www.gephex.org"
@@ -24,8 +26,14 @@ DEPEND="virtual/x11
 
 RDEPEND=${DEPEND}
 
-src_compile() {
+src_unpack() {
+	unpack ${A} || die
 	cd ${S}
+	
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
+src_compile() {
 
 	# qt wants to create lock files etc. in that directory
 	addwrite "${QTDIR}/etc/settings"