updated with a gcc3 fix

4 files changed, 138 insertions, 1 deletions

diff --git a/dev-util/glademm/ChangeLog b/dev-util/glademm/ChangeLog
index b1d3a3269436..4b74c152e5e8 100644
--- a/dev-util/glademm/ChangeLog
+++ b/dev-util/glademm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/glademm
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/ChangeLog,v 1.3 2002/08/04 10:31:31 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/ChangeLog,v 1.4 2002/10/04 11:21:28 spider Exp $
+
+
+*glademm-0.6.4 (4 Oct 2002)
+  04 Oct 2002; Spider <spider@gentoo.org> glademm-0.6.4.ebuild :
+  updated to last stable, applied a gcc3 patch from Nicholas Worums
 
 *glademm-1.1.1b (4 Aug 2002)
   04 Aug 2002; spider <spider@gentoo.org> glademm-1.1.1b.ebuild :
diff --git a/dev-util/glademm/files/digest-glademm-0.6.4 b/dev-util/glademm/files/digest-glademm-0.6.4
new file mode 100644
index 000000000000..ca88f54367f2
--- /dev/null
+++ b/dev-util/glademm/files/digest-glademm-0.6.4
@@ -0,0 +1 @@
+MD5 2f322d68e9472904823e23f2705c47d9 glademm-0.6.4b.tar.bz2 289097
diff --git a/dev-util/glademm/files/glademm-0.6.4b-gcc3.patch b/dev-util/glademm/files/glademm-0.6.4b-gcc3.patch
new file mode 100644
index 000000000000..3f4be463b5fb
--- /dev/null
+++ b/dev-util/glademm/files/glademm-0.6.4b-gcc3.patch
@@ -0,0 +1,85 @@
+Only in glademm-0.6.4b/: glademm.spec
+diff -ru glademm-0.6.4b/src/Cxx_Fs_Signal.cc /usr/src/glademm-0.6.4b/src/Cxx_Fs_Signal.cc
+--- glademm-0.6.4b/src/Cxx_Fs_Signal.cc	2001-11-22 10:44:00.000000000 +0100
++++ /usr/src/glademm-0.6.4b/src/Cxx_Fs_Signal.cc	2002-06-25 02:22:33.000000000 +0200
+@@ -99,7 +99,7 @@
+  * in the Widget it is derived from, we should make this more explicit
+  */
+ 
+-void Cxx_Fileset::DeclareSignalHandler(const WriterBase &wr, const Widget &w, const Widget &top, bool container=false)
++void Cxx_Fileset::DeclareSignalHandler(const WriterBase &wr, const Widget &w, const Widget &top, bool container)
+ {  // signals are part of the widget declaration
+    if (w.getBool(CXX_SEPERATE_CLASS) && !container) return;
+    
+diff -ru glademm-0.6.4b/src/SourceWriter/CxxFile.cc /usr/src/glademm-0.6.4b/src/SourceWriter/CxxFile.cc
+--- glademm-0.6.4b/src/SourceWriter/CxxFile.cc	2002-03-01 22:50:24.000000000 +0100
++++ /usr/src/glademm-0.6.4b/src/SourceWriter/CxxFile.cc	2002-06-25 01:57:34.000000000 +0200
+@@ -503,7 +503,7 @@
+    }
+ }
+ 
+-void CxxFile::push(CxxFile_Context c,int indent_delta=0)
++void CxxFile::push(CxxFile_Context c,int indent_delta)
+ {  pushed.push_back(state);
+ #ifdef DEBUG_STATE_MACHINE
+    std::cout << '+' << state.context << "->" << c << " | " << state.global << '\n';
+diff -ru glademm-0.6.4b/src/SourceWriter/SystemFile.cc /usr/src/glademm-0.6.4b/src/SourceWriter/SystemFile.cc
+--- glademm-0.6.4b/src/SourceWriter/SystemFile.cc	2002-01-21 18:22:13.000000000 +0100
++++ /usr/src/glademm-0.6.4b/src/SourceWriter/SystemFile.cc	2002-06-25 01:58:50.000000000 +0200
+@@ -106,7 +106,7 @@
+    }
+ }
+ 
+-SystemFile::SystemFile(const std::string &name,std::ios::openmode mode=std::ios::out, int prot=0664)
++SystemFile::SystemFile(const std::string &name,std::ios::openmode mode, int prot)
+    : filename(name), is_stringstream(false), deallocate(true), 
+    	remembered(0), mystage(0)
+ {  streamptr.of=new std::ofstream(name.c_str(),mode/*,prot*/);
+diff -ru glademm-0.6.4b/src/writers/menubar.cc /usr/src/glademm-0.6.4b/src/writers/menubar.cc
+--- glademm-0.6.4b/src/writers/menubar.cc	2002-01-21 18:19:39.000000000 +0100
++++ /usr/src/glademm-0.6.4b/src/writers/menubar.cc	2002-06-25 02:09:32.000000000 +0200
+@@ -82,7 +82,7 @@
+    return true;
+ }
+ 
+-void Gtk_MenuBar::AdditionalMemberVars(const Widget &w,CxxFile &f,bool container=false) const
++void Gtk_MenuBar::AdditionalMemberVars(const Widget &w,CxxFile &f,bool container) const
+ {  Parent::AdditionalMemberVars(w,f,container);
+    if (!Configuration.gnome_support) return;
+    // all are internal!
+diff -ru glademm-0.6.4b/src/writers/optionmenu.cc /usr/src/glademm-0.6.4b/src/writers/optionmenu.cc
+--- glademm-0.6.4b/src/writers/optionmenu.cc	2002-01-21 18:19:40.000000000 +0100
++++ /usr/src/glademm-0.6.4b/src/writers/optionmenu.cc	2002-06-25 02:13:26.000000000 +0200
+@@ -63,7 +63,7 @@
+    Parent::GCInclude(w,f);
+ }
+ 
+-void Gtk_OptionMenu::AdditionalMemberVars(const Widget &w,CxxFile &f,bool container=false) const
++void Gtk_OptionMenu::AdditionalMemberVars(const Widget &w,CxxFile &f,bool container) const
+ {  Parent::AdditionalMemberVars(w,f,container);
+    if (w.hasTag("items") && Configuration.optionmenu_create_enum)
+    {  const std::string name(Configuration.InstanceName(w.Name()));
+diff -ru glademm-0.6.4b/src/writers/toolbar.cc /usr/src/glademm-0.6.4b/src/writers/toolbar.cc
+--- glademm-0.6.4b/src/writers/toolbar.cc	2002-04-02 17:35:13.000000000 +0200
++++ /usr/src/glademm-0.6.4b/src/writers/toolbar.cc	2002-06-25 02:17:42.000000000 +0200
+@@ -181,7 +181,7 @@
+       f.Statement() << instance << "set_space_style(" << space_style << ')';
+ }
+ 
+-void Gtk_Toolbar::AdditionalMemberVars(const Widget &w,CxxFile &f,bool container=false) const
++void Gtk_Toolbar::AdditionalMemberVars(const Widget &w,CxxFile &f,bool container) const
+ {  Parent::AdditionalMemberVars(w,f,container);
+                      
+    for (Widget::const_iterator i=w.begin();i!=w.end();++i)
+diff -ru glademm-0.6.4b/src/writers/window.cc /usr/src/glademm-0.6.4b/src/writers/window.cc
+--- glademm-0.6.4b/src/writers/window.cc	2002-01-21 18:22:47.000000000 +0100
++++ /usr/src/glademm-0.6.4b/src/writers/window.cc	2002-06-25 02:19:43.000000000 +0200
+@@ -124,7 +124,7 @@
+    assert(never_reached);
+ }
+ 
+-void Gtk_Window::AdditionalMemberVars(const Widget &w,CxxFile &f,bool container=false) const
++void Gtk_Window::AdditionalMemberVars(const Widget &w,CxxFile &f,bool container) const
+ {  if (Configuration.has_accelerators)
+    {  Widget w2(get_accelgroup(w));
+       f.Private();
diff --git a/dev-util/glademm/glademm-0.6.4.ebuild b/dev-util/glademm/glademm-0.6.4.ebuild
new file mode 100644
index 000000000000..c3d4f4cb22a9
--- /dev/null
+++ b/dev-util/glademm/glademm-0.6.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-0.6.4.ebuild,v 1.1 2002/10/04 11:21:28 spider Exp $
+
+S=${WORKDIR}/${P}b
+DESCRIPTION="A C++ backend for glade, the GUI designer for Gtk."
+HOMEPAGE="http://home.wtal.de/petig/Gtk/"
+SRC_URI="http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/${P}b.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc sparc64"
+
+DEPEND=">=dev-util/glade-0.6.4
+	=x11-libs/gtk+-1.2*
+	>=x11-libs/gtkmm-1.2.5-r1
+	>=gnome-extra/gnomemm-1.2.0-r1"
+
+RDEPEND=${DEPEND}
+
+src_unpack() {
+	unpack ${A}
+
+	#Fix to compile with gcc-3's C++ ABI
+	if [ "`gcc --version | cut -f1 -d.`" == "3" ] ||
+		([ -n "${CXX}" ] && [ "`${CXX} --version | cut -f1 -d.`" == "3" ]) ||
+		[ "`gcc --version|grep gcc|cut -f1 -d.|cut -f3 -d\ `" == "3" ]
+	then
+		cd ${WORKDIR}
+		# Fix supplied by "Nicholas Wourms" <nwourms@netscape.net> 
+		patch -p0 < ${FILESDIR}/glademm-0.6.4b-gcc3.patch || die
+	fi
+	cd ${S}
+}
+src_compile() {
+	econf || die
+	emake || die
+}
+
+src_install () {
+
+	einstall || die
+	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc docs/*.txt docs/glade.wishlist
+	dohtml -r docs
+}