Add patch to fix compilation with gcc-4.1, by Kristiaan Lenaerts <kristiaan.lenaerts AT gmail DOT com>; bug #116019

(Portage version: 2.1_pre3-r1)

4 files changed, 35 insertions, 22 deletions

diff --git a/dev-util/glademm/ChangeLog b/dev-util/glademm/ChangeLog
index 83c3b416e886..28cee52fbaa9 100644
--- a/dev-util/glademm/ChangeLog
+++ b/dev-util/glademm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/glademm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/ChangeLog,v 1.23 2005/04/24 12:51:38 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/ChangeLog,v 1.24 2006/01/11 05:34:25 halcy0n Exp $
+
+  11 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/glademm-2.6.0-gcc41.patch, glademm-2.6.0.ebuild:
+  Add patch to fix compilation with gcc-4.1, by Kristiaan Lenaerts
+  <kristiaan.lenaerts AT gmail DOT com>; bug #116019
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   glademm-2.0.0.1.ebuild:
diff --git a/dev-util/glademm/Manifest b/dev-util/glademm/Manifest
index d2dab7722ed2..c0962bdc2771 100644
--- a/dev-util/glademm/Manifest
+++ b/dev-util/glademm/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5c9e298b3f16893f52b6bb9790ffb650 glademm-2.0.0.ebuild 641
-MD5 0fd9ab9faf9b687341e75a3625b20897 glademm-2.0.0.1.ebuild 654
-MD5 46268ba2c38598db07492f373e5f4509 glademm-2.6.0.ebuild 653
-MD5 b1251262591666c17939c95273095409 glademm-0.6.4.ebuild 1249
 MD5 35b601b280e120b8f59bd92e4624e564 ChangeLog 2989
-MD5 d55015f2e0ee69e92ab287320c27c5b2 metadata.xml 161
 MD5 bcefbe9c96d7d7044dfdd9e430156786 files/digest-glademm-0.6.4 67
 MD5 34d6c3ac9817acb1763ff8020a18e0e4 files/digest-glademm-2.0.0 65
+MD5 d6f8579f06790af592daea9ee569e9cd files/digest-glademm-2.0.0.1 67
 MD5 8ef7cb22eceef0cc001fd387c32960b6 files/digest-glademm-2.6.0 65
+MD5 b44f3d090964634741b1e40328f8e5e5 files/glademm-0.6.4-gcc33_assert_fixes.patch 7586
 MD5 87fa6f6465eb8bdb5edf9df08c675ba6 files/glademm-0.6.4b-gcc3.patch 4533
 MD5 6a25f4328b81baaf6fac0eb0931a88a2 files/glademm-2.0.0-gcc33-missing-includes-fix.patch 1399
-MD5 d6f8579f06790af592daea9ee569e9cd files/digest-glademm-2.0.0.1 67
-MD5 b44f3d090964634741b1e40328f8e5e5 files/glademm-0.6.4-gcc33_assert_fixes.patch 7586
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3xDuEZCkKN40op4RAtL8AJ9eET6sMO0v6ONaXzEgGMpWrTJqFQCeL61H
-JsjKwzvuJO1f/GufSNagz24=
-=wvip
------END PGP SIGNATURE-----
+MD5 8e502221ba17acd20729cc6e2e8aae93 files/glademm-2.6.0-gcc41.patch 800
+MD5 b1251262591666c17939c95273095409 glademm-0.6.4.ebuild 1249
+MD5 0fd9ab9faf9b687341e75a3625b20897 glademm-2.0.0.1.ebuild 654
+MD5 5c9e298b3f16893f52b6bb9790ffb650 glademm-2.0.0.ebuild 641
+MD5 a266bd7857c04492ece82c7abdaf986a glademm-2.6.0.ebuild 731
+MD5 d55015f2e0ee69e92ab287320c27c5b2 metadata.xml 161
diff --git a/dev-util/glademm/files/glademm-2.6.0-gcc41.patch b/dev-util/glademm/files/glademm-2.6.0-gcc41.patch
new file mode 100644
index 000000000000..06414ab73e7f
--- /dev/null
+++ b/dev-util/glademm/files/glademm-2.6.0-gcc41.patch
@@ -0,0 +1,11 @@
+--- glademm-2.6.0/src/writers/gnome_app.hh.old	2005-12-19 11:33:35.000000000 +0100
++++ glademm-2.6.0/src/writers/gnome_app.hh	2005-12-19 11:33:45.000000000 +0100
+@@ -28,7 +28,7 @@
+ 	virtual bool NeedExplicitCtor(const Widget &w) const;
+ 	virtual void ConstructionArgs(const Widget &w, CxxFile &f) const;
+ 	virtual void Configure(const Widget &w, CxxFile &f,const std::string &instance) const;
+-	virtual Subwidget Gnome_App::IsSubwidget(const Widget &w,const Widget &ch) const;
++	virtual Subwidget IsSubwidget(const Widget &w,const Widget &ch) const;
+ 	virtual const std::string InternalInstance(const Widget &parent,const Widget &w2) const;
+ 	virtual void AddChildren(const Widget &w,CxxFile &f,const std::string &instance,const WriterBase &writer_for_subw, const Widget &widget_for_subw) const;
+ };
diff --git a/dev-util/glademm/glademm-2.6.0.ebuild b/dev-util/glademm/glademm-2.6.0.ebuild
index c9d0ece0ac09..5d103f94c65b 100644
--- a/dev-util/glademm/glademm-2.6.0.ebuild
+++ b/dev-util/glademm/glademm-2.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-2.6.0.ebuild,v 1.1 2004/12/15 05:17:09 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-2.6.0.ebuild,v 1.2 2006/01/11 05:34:25 halcy0n Exp $
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="A C++ code generating backend for glade"
 SRC_URI="http://home.wtal.de/petig/Gtk/${P}.tar.gz"
@@ -17,6 +17,12 @@ DEPEND="virtual/libc"
 
 DOCS="AUTHORS BUGS COPYING ChangeLog NEWS README TODO docs/*"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+}
+
 pkg_postinst() {
 
 	einfo "glademm generated sources have dependencies on packages not required by this ebuild."