add gcc33 patch to 0.6.4, mark 2.0.0.1 x86

6 files changed, 223 insertions, 22 deletions

diff --git a/dev-util/glademm/ChangeLog b/dev-util/glademm/ChangeLog
index c1f751d66199..d6eb84d3b326 100644
--- a/dev-util/glademm/ChangeLog
+++ b/dev-util/glademm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/glademm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/ChangeLog,v 1.17 2004/01/23 13:52:35 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/ChangeLog,v 1.18 2004/02/20 17:19:56 foser Exp $
+
+  20 Feb 2004; foser <foser@gentoo.org> glademm-0.6.4.ebuild :
+  Fix gcc33 introduced include errors #40283
 
   23 Jan 2004; <gustavoz@gentoo.org> glademm-2.0.0.ebuild:
   stable on sparc
diff --git a/dev-util/glademm/Manifest b/dev-util/glademm/Manifest
index 53a02203ac0a..8cc70a852fa0 100644
--- a/dev-util/glademm/Manifest
+++ b/dev-util/glademm/Manifest
@@ -1,10 +1,11 @@
-MD5 0bfd222723db6c9a06ebb0469d681dcd glademm-2.0.0.ebuild 848
-MD5 7dd522aae1233b520a06008974eb4fce glademm-2.0.0.1.ebuild 838
-MD5 b603e673a79b473bce9ac4cb883bdac5 glademm-0.6.4.ebuild 1187
-MD5 922592feee6e94b7fced227a50bebc09 ChangeLog 2430
+MD5 5d038283cd59cf2e85d2e773f601138a glademm-2.0.0.ebuild 846
+MD5 26699ecfdf7f0ada1bab9ee804594e2c glademm-2.0.0.1.ebuild 665
+MD5 09a665b64681f27e9eb4d0767f1965ca glademm-0.6.4.ebuild 1284
+MD5 f112d68b92ea0eb127254bb6edd82cee ChangeLog 2536
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 bcefbe9c96d7d7044dfdd9e430156786 files/digest-glademm-0.6.4 67
 MD5 34d6c3ac9817acb1763ff8020a18e0e4 files/digest-glademm-2.0.0 65
 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
diff --git a/dev-util/glademm/files/glademm-0.6.4-gcc33_assert_fixes.patch b/dev-util/glademm/files/glademm-0.6.4-gcc33_assert_fixes.patch
new file mode 100644
index 000000000000..72a8832ed659
--- /dev/null
+++ b/dev-util/glademm/files/glademm-0.6.4-gcc33_assert_fixes.patch
@@ -0,0 +1,198 @@
+diff -uNr glademm-0.6.4b/src/ChildParamList.hh glademm-0.6.4b.patched/src/ChildParamList.hh
+--- glademm-0.6.4b/src/ChildParamList.hh	2001-10-11 16:07:22.000000000 +0200
++++ glademm-0.6.4b.patched/src/ChildParamList.hh	2004-02-20 17:52:45.819512408 +0100
+@@ -22,6 +22,7 @@
+ #define CHILDPARAMLIST_HH
+ #include <config.h>
+ #include "Tag.hh"
++#include <cassert>
+ 
+ class ChildParamList
+ {  	const Tag *tag;
+diff -uNr glademm-0.6.4b/src/Cxx.cc glademm-0.6.4b.patched/src/Cxx.cc
+--- glademm-0.6.4b/src/Cxx.cc	2002-04-03 10:22:41.000000000 +0200
++++ glademm-0.6.4b.patched/src/Cxx.cc	2004-02-20 17:50:37.684991816 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include "Cxx.hh"
+ #include <strstream>
++#include <cassert>
+ #include "Configuration.hh"
+ #include "Widget_type.hh"
+ #include "WidgetMap.hh"
+diff -uNr glademm-0.6.4b/src/Cxx_Fileset.cc glademm-0.6.4b.patched/src/Cxx_Fileset.cc
+--- glademm-0.6.4b/src/Cxx_Fileset.cc	2002-04-03 10:22:41.000000000 +0200
++++ glademm-0.6.4b.patched/src/Cxx_Fileset.cc	2004-02-20 17:52:08.283218792 +0100
+@@ -22,6 +22,7 @@
+ #include "Configuration.hh"
+ #include "writers/WriterBase.hh"
+ #include "WidgetMap.hh"
++#include <cassert>
+ 
+ Cxx_Fileset::Cxx_Fileset(const Tag &t, Cxx &_toplevel)
+ 	: top(t), toplevel(_toplevel)
+diff -uNr glademm-0.6.4b/src/Cxx_Fs_Signal.cc glademm-0.6.4b.patched/src/Cxx_Fs_Signal.cc
+--- glademm-0.6.4b/src/Cxx_Fs_Signal.cc	2001-11-22 10:44:00.000000000 +0100
++++ glademm-0.6.4b.patched/src/Cxx_Fs_Signal.cc	2004-02-20 17:51:31.756771656 +0100
+@@ -22,6 +22,7 @@
+ #include "Configuration.hh"
+ #include "writers/WriterBase.hh"
+ #include "WidgetMap.hh"
++#include <cassert>
+ 
+ static bool WidgetIsContained(const Widget &parent,const Widget &w)
+ {  if (w==parent) return true;
+diff -uNr glademm-0.6.4b/src/Naming.cc glademm-0.6.4b.patched/src/Naming.cc
+--- glademm-0.6.4b/src/Naming.cc	2001-10-11 16:07:23.000000000 +0200
++++ glademm-0.6.4b.patched/src/Naming.cc	2004-02-20 17:52:29.432003688 +0100
+@@ -24,6 +24,7 @@
+ #include "Configuration.hh"
+ #include <cctype>
+ #include <unistd.h>
++#include <cassert>
+ // kind of macro misuse, but everything else is non-portable
+ #define __FILELINE__ __FILE__ << ':' << __LINE__ <<
+ 
+diff -uNr glademm-0.6.4b/src/SourceWriter/CxxFile.cc glademm-0.6.4b.patched/src/SourceWriter/CxxFile.cc
+--- glademm-0.6.4b/src/SourceWriter/CxxFile.cc	2002-03-01 22:50:24.000000000 +0100
++++ glademm-0.6.4b.patched/src/SourceWriter/CxxFile.cc	2004-02-20 17:51:51.652747008 +0100
+@@ -24,6 +24,7 @@
+ #include "CxxFile.hh"
+ #include <cstdio>
+ #include <algo.h>
++#include <cassert>
+ 
+ CxxFile &CxxFile::GlobalContext(Global_Context new_gc,bool stay_inside)
+ // insert blank line if necessary
+diff -uNr glademm-0.6.4b/src/Widget.hh glademm-0.6.4b.patched/src/Widget.hh
+--- glademm-0.6.4b/src/Widget.hh	2001-10-11 16:07:23.000000000 +0200
++++ glademm-0.6.4b.patched/src/Widget.hh	2004-02-20 17:51:13.601531672 +0100
+@@ -24,6 +24,7 @@
+ #include "Tag.hh"
+ #include <iterator>
+ #include <list>
++#include <cassert>
+ #include "Widget_type.hh"
+ #include "ChildParamList.hh"
+ 
+diff -uNr glademm-0.6.4b/src/const_contained_iterator.cc glademm-0.6.4b.patched/src/const_contained_iterator.cc
+--- glademm-0.6.4b/src/const_contained_iterator.cc	2001-10-12 09:11:08.000000000 +0200
++++ glademm-0.6.4b.patched/src/const_contained_iterator.cc	2004-02-20 17:50:51.214934952 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include "Widget.hh"
+ #include <cstring>
++#include <cassert>
+ #include "writers/WriterBase.hh"
+ #include "Widget_type.hh"
+ 
+diff -uNr glademm-0.6.4b/src/writers/Class.cc glademm-0.6.4b.patched/src/writers/Class.cc
+--- glademm-0.6.4b/src/writers/Class.cc	2002-01-21 18:19:32.000000000 +0100
++++ glademm-0.6.4b.patched/src/writers/Class.cc	2004-02-20 17:54:16.879669160 +0100
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include "WriterBase.hh"
++#include <cassert>
+ 
+ // XXX: Compound and Class are the same???
+ 
+diff -uNr glademm-0.6.4b/src/writers/WriterBase.cc glademm-0.6.4b.patched/src/writers/WriterBase.cc
+--- glademm-0.6.4b/src/writers/WriterBase.cc	2002-01-21 18:21:29.000000000 +0100
++++ glademm-0.6.4b.patched/src/writers/WriterBase.cc	2004-02-20 17:54:58.308371040 +0100
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include "WriterBase.hh"
++#include <cassert>
+ 
+ safemap<std::string,const WriterBase *> Writer;
+ 
+diff -uNr glademm-0.6.4b/src/writers/button.cc glademm-0.6.4b.patched/src/writers/button.cc
+--- glademm-0.6.4b/src/writers/button.cc	2002-03-04 15:31:44.000000000 +0100
++++ glademm-0.6.4b.patched/src/writers/button.cc	2004-02-20 17:53:55.421931232 +0100
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include "button.hh"
++#include <cassert>
+ 
+ void Gtk_Button::ApplyPreferences(Tag &t) const
+ {  Parent::ApplyPreferences(t);
+diff -uNr glademm-0.6.4b/src/writers/gnome_dialog.cc glademm-0.6.4b.patched/src/writers/gnome_dialog.cc
+--- glademm-0.6.4b/src/writers/gnome_dialog.cc	2002-04-02 17:14:58.000000000 +0200
++++ glademm-0.6.4b.patched/src/writers/gnome_dialog.cc	2004-02-20 17:54:07.333120456 +0100
+@@ -24,6 +24,7 @@
+ 
+ #include <cstdio>
+ #include "gnome_dialog.hh"
++#include <cassert>
+ 
+ static Gnome_Dialog Gnome_Dialog(false);
+ 
+diff -uNr glademm-0.6.4b/src/writers/gnome_druidpagestd.cc glademm-0.6.4b.patched/src/writers/gnome_druidpagestd.cc
+--- glademm-0.6.4b/src/writers/gnome_druidpagestd.cc	2002-04-02 17:14:58.000000000 +0200
++++ glademm-0.6.4b.patched/src/writers/gnome_druidpagestd.cc	2004-02-20 17:54:48.425873408 +0100
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include "gnome_druidpage.hh"
++#include <cassert>
+ 
+ class Gnome_DruidPageStandard : public Gnome_DruidPage
+ {public:
+diff -uNr glademm-0.6.4b/src/writers/gnome_propertybox.cc glademm-0.6.4b.patched/src/writers/gnome_propertybox.cc
+--- glademm-0.6.4b/src/writers/gnome_propertybox.cc	2002-04-02 17:14:58.000000000 +0200
++++ glademm-0.6.4b.patched/src/writers/gnome_propertybox.cc	2004-02-20 17:54:27.710022696 +0100
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include "gnome_dialog.hh"
++#include <cassert>
+ 
+ class Gnome_PropertyBox : public Gnome_Dialog
+ {public:
+diff -uNr glademm-0.6.4b/src/writers/menubar.cc glademm-0.6.4b.patched/src/writers/menubar.cc
+--- glademm-0.6.4b/src/writers/menubar.cc	2002-01-21 18:19:39.000000000 +0100
++++ glademm-0.6.4b.patched/src/writers/menubar.cc	2004-02-20 17:53:42.633875312 +0100
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include "container.hh"
++#include <cassert>
+ 
+ class Gtk_MenuBar : public Gtk_Container
+ {public:
+diff -uNr glademm-0.6.4b/src/writers/pixmapmenuitem.cc glademm-0.6.4b.patched/src/writers/pixmapmenuitem.cc
+--- glademm-0.6.4b/src/writers/pixmapmenuitem.cc	2002-01-21 18:19:41.000000000 +0100
++++ glademm-0.6.4b.patched/src/writers/pixmapmenuitem.cc	2004-02-20 17:53:02.219019304 +0100
+@@ -21,6 +21,7 @@
+ // strange wrapper - uses Gnome Widget, wrapped via Gtk_MenuItem
+ 
+ #include "menuitem.hh"
++#include <cassert>
+ 
+ class Gtk_PixmapMenuItem : public Gtk_MenuItem
+ {public:
+diff -uNr glademm-0.6.4b/src/writers/toolbar.cc glademm-0.6.4b.patched/src/writers/toolbar.cc
+--- glademm-0.6.4b/src/writers/toolbar.cc	2002-04-02 17:35:13.000000000 +0200
++++ glademm-0.6.4b.patched/src/writers/toolbar.cc	2004-02-20 17:53:32.038486056 +0100
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include "container.hh"
++#include <cassert>
+ 
+ class Gtk_Toolbar : public Gtk_Container
+ {	bool isXPM(const std::string &file) const;
+diff -uNr glademm-0.6.4b/src/writers/window.cc glademm-0.6.4b.patched/src/writers/window.cc
+--- glademm-0.6.4b/src/writers/window.cc	2002-01-21 18:22:47.000000000 +0100
++++ glademm-0.6.4b.patched/src/writers/window.cc	2004-02-20 17:53:20.428251080 +0100
+@@ -21,6 +21,7 @@
+ // AccelGroups really made it ugly
+ 
+ #include "window.hh"
++#include <cassert>
+ 
+ static Gtk_Window Gtk_Window(false);
+ 
diff --git a/dev-util/glademm/glademm-0.6.4.ebuild b/dev-util/glademm/glademm-0.6.4.ebuild
index b708a0634c66..891bdb1a78e0 100644
--- a/dev-util/glademm/glademm-0.6.4.ebuild
+++ b/dev-util/glademm/glademm-0.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.8 2003/07/13 12:26:37 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-0.6.4.ebuild,v 1.9 2004/02/20 17:19:56 foser Exp $
 
 DESCRIPTION="A C++ backend for glade, the GUI designer for Gtk."
 HOMEPAGE="http://home.wtal.de/petig/Gtk/"
@@ -8,7 +8,7 @@ SRC_URI="http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/${P}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
 
 DEPEND="=dev-util/glade-0.6*
 	=x11-libs/gtk+-1.2*
@@ -18,6 +18,7 @@ DEPEND="=dev-util/glade-0.6*
 S=${WORKDIR}/${P}b
 
 src_unpack() {
+
 	unpack ${A}
 
 	#Fix to compile with gcc-3's C++ ABI
@@ -29,6 +30,11 @@ src_unpack() {
 		# Fix supplied by "Nicholas Wourms" <nwourms@netscape.net> 
 		patch -p0 < ${FILESDIR}/glademm-0.6.4b-gcc3.patch || die
 	fi
+
+	# fixes gcc3 missing includes #40283
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc33_assert_fixes.patch
+
 }
 
 src_compile() {
diff --git a/dev-util/glademm/glademm-2.0.0.1.ebuild b/dev-util/glademm/glademm-2.0.0.1.ebuild
index 362c4db9ba89..294917561edb 100644
--- a/dev-util/glademm/glademm-2.0.0.1.ebuild
+++ b/dev-util/glademm/glademm-2.0.0.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-2.0.0.1.ebuild,v 1.2 2003/12/12 15:46:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-2.0.0.1.ebuild,v 1.3 2004/02/20 17:19:56 foser Exp $
 
 inherit gnome2
 
-
 DESCRIPTION="A C++ code generating backend for glade"
 SRC_URI="http://home.wtal.de/petig/Gtk/${P}.tar.gz"
 HOMEPAGE="http://home.wtal.de/petig/Gtk/"
@@ -12,20 +11,14 @@ HOMEPAGE="http://home.wtal.de/petig/Gtk/"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="x86 ~sparc ~ppc ~amd64"
 
 DEPEND="virtual/glibc"
 
 DOCS="AUTHORS BUGS COPYING ChangeLog NEWS README TODO docs/*"
 
-src_unpack() {
-	unpack ${A}
-
-	# Patch that fixes a missing <cassert> include in the source
-	# Closes Bug #29654
-	#epatch ${FILESDIR}/${P}-gcc33-missing-includes-fix.patch
-}
-
 pkg_postinst() {
+
 	einfo "glademm generated sources have dependencies on packages not required by this ebuild."
+
 }
diff --git a/dev-util/glademm/glademm-2.0.0.ebuild b/dev-util/glademm/glademm-2.0.0.ebuild
index e3e2c2f30862..45c30cc12ef9 100644
--- a/dev-util/glademm/glademm-2.0.0.ebuild
+++ b/dev-util/glademm/glademm-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-2.0.0.ebuild,v 1.6 2004/01/23 13:52:35 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-2.0.0.ebuild,v 1.7 2004/02/20 17:19:56 foser Exp $
 
 inherit gnome2
 
@@ -24,7 +24,7 @@ src_unpack() {
 
 	# Patch that fixes a missing <cassert> include in the source
 	# Closes Bug #29654
-	epatch ${FILESDIR}/${P}-gcc33-missing-includes-fix.patch
+#	epatch ${FILESDIR}/${P}-gcc33-missing-includes-fix.patch
 }
 
 pkg_postinst() {