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

(Portage version: 2.1.1)

4 files changed, 77 insertions, 5 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/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"