Adding gcc4 patch to allow compilation

Package-Manager: portage-2.0.53_rc7

4 files changed, 50 insertions, 7 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index dbbac8ce3e9c..ab8beb38b6d9 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.80 2005/10/21 17:21:21 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.81 2005/11/30 07:23:19 morfic Exp $
+
+  30 Nov 2005; Daniel Goller <morfic@gentoo.org>
+  +files/gtkmm-1.2.9-gcc4.patch, gtkmm-1.2.9-r2.ebuild:
+  Adding gcc4 patch to allow compilation with gcc4
 
 *gtkmm-2.8.1 (21 Oct 2005)
 *gtkmm-2.6.5 (21 Oct 2005)
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 1fbaa7475f98..d212b1c3af30 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ad72c9c977a1e2f67327878c79a99971 ChangeLog 11898
+MD5 de67c9d2019fef7577678b771d3d5b06 ChangeLog 12054
 MD5 cd03ba8b48e5e090cb055a176291475a files/digest-gtkmm-1.2.9-r2 63
 MD5 f824eb6aaffd23a260a89d01e9c0a4e6 files/digest-gtkmm-2.2.10 66
 MD5 70de761424783ad1859efffddb40b848 files/digest-gtkmm-2.2.11 66
@@ -17,7 +17,8 @@ MD5 e2a911429512f8f176b4cef20ee63a48 files/digest-gtkmm-2.8.0 65
 MD5 46dbaa5bb642172ee163cbccf0854930 files/digest-gtkmm-2.8.1 65
 MD5 53f860d6754e3cb516cc67a11c36fc7f files/gtkmm-1.2.9-gcc3.1-gentoo.patch 518
 MD5 e94dace49157531976d52e48b24e620d files/gtkmm-1.2.9-gcc3.4-gentoo.patch 2197
-MD5 286b665f00ff46b5b7309d4754a063e9 gtkmm-1.2.9-r2.ebuild 1288
+MD5 ec017b1d591242271632f34bef93d36a files/gtkmm-1.2.9-gcc4.patch 1382
+MD5 c5a8443258bb9b044c58abcba7391925 gtkmm-1.2.9-r2.ebuild 1327
 MD5 7da18e5d2b0e2cd0d521b0eb3a521f9e gtkmm-2.2.10.ebuild 764
 MD5 61130fde8f9beb2e2ab4b9da8fb150d6 gtkmm-2.2.11.ebuild 764
 MD5 b67ef7a83e720dc14b9135c387d91444 gtkmm-2.2.12.ebuild 766
@@ -34,7 +35,7 @@ MD5 d55015f2e0ee69e92ab287320c27c5b2 metadata.xml 161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDWSOwEZCkKN40op4RAraOAJwJYZQjoe2ehIy17TAaaljPfOnEaQCffWL5
-GKlPx6MxGw93BZrqzQyhNiw=
-=3bUH
+iD8DBQFDjVN2/aM9DdBw91cRAjhHAKChObI1IjrEhaZkCH5JWvkt2GBj3QCfaKfx
+BvjjDmZOfTLr8VAbApnxBcQ=
+=D2Ys
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.patch b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.patch
new file mode 100644
index 000000000000..a5b52edaa818
--- /dev/null
+++ b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.patch
@@ -0,0 +1,37 @@
+diff -ur gtkmm-1.2.9-orig/src/clist.gen_h gtkmm-1.2.9/src/clist.gen_h
+--- gtkmm-1.2.9-orig/src/clist.gen_h	2005-11-29 19:02:52.000000000 +0000
++++ gtkmm-1.2.9/src/clist.gen_h	2005-11-29 19:03:43.000000000 +0000
+@@ -60,8 +60,8 @@
+ class Cell 
+   {
+     protected:
+-      friend class CList;
++      friend class Gtk::CList;
+       friend class Row;
+ 
+       GtkCList    *parent_;
+       GtkCListRow *row__;
+diff -ur gtkmm-1.2.9-orig/src/radiobutton.gen_h gtkmm-1.2.9/src/radiobutton.gen_h
+--- gtkmm-1.2.9-orig/src/radiobutton.gen_h	2005-11-29 19:02:52.000000000 +0000
++++ gtkmm-1.2.9/src/radiobutton.gen_h	2005-11-29 19:04:10.000000000 +0000
+@@ -36,7 +36,7 @@
+   //- It should not be called with new.
+   class Group
+     {
+-      friend class RadioButton;
++      friend class Gtk::RadioButton;
+       GSList *group_;
+       void* operator new(size_t);
+       void add(RadioButton& item);
+diff -ur gtkmm-1.2.9-orig/src/radiomenuitem.gen_h gtkmm-1.2.9/src/radiomenuitem.gen_h
+--- gtkmm-1.2.9-orig/src/radiomenuitem.gen_h	2005-11-29 19:02:52.000000000 +0000
++++ gtkmm-1.2.9/src/radiomenuitem.gen_h	2005-11-29 19:04:22.000000000 +0000
+@@ -34,7 +34,7 @@
+   //- It should not be called with new.
+   class Group 
+     {
+-      friend class RadioMenuItem;
++      friend class Gtk::RadioMenuItem;
+       GSList *group_;
+       void* operator new(size_t);
+       void add(RadioMenuItem& item);
diff --git a/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild b/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
index f64774ef529e..7621eab8f878 100644
--- a/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild,v 1.12 2005/01/01 17:27:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild,v 1.13 2005/11/30 07:23:19 morfic Exp $
 
 inherit eutils
 
@@ -26,6 +26,7 @@ src_unpack() {
 	# (http://marc.theaimsgroup.com/?l=gtkmm&m=101879848701486&w=2)
 	epatch ${FILESDIR}/gtkmm-1.2.9-gcc3.1-gentoo.patch
 	epatch ${FILESDIR}/gtkmm-1.2.9-gcc3.4-gentoo.patch
+	epatch ${FILESDIR}/gtkmm-1.2.9-gcc4.patch
 }
 
 src_compile() {