summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/glademm/ChangeLog7
-rw-r--r--dev-util/glademm/Manifest4
-rw-r--r--dev-util/glademm/files/glademm-2.0.0-gcc33-missing-includes-fix.patch37
-rw-r--r--dev-util/glademm/glademm-2.0.0.ebuild10
4 files changed, 54 insertions, 4 deletions
diff --git a/dev-util/glademm/ChangeLog b/dev-util/glademm/ChangeLog
index f762c911dcf3..caa23a9ffa7e 100644
--- a/dev-util/glademm/ChangeLog
+++ b/dev-util/glademm/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/glademm
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/ChangeLog,v 1.13 2003/07/13 12:26:37 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/ChangeLog,v 1.14 2003/10/02 15:46:39 kumba Exp $
+
+ 02 Oct 2003; Joshua Kinard <kumba@gentoo.org> glademm-2.0.0.ebuild:
+ Added a patch that fixes a missing <cassert> include that allows glademm to
+ compile with gcc-3.3.x.
+ Closes Bug #29654
13 Jul 2003; Martin Holzer <mholzer@gentoo.org> glademm-0.6.4.ebuild:
update x11-libs/gtkmm to dev-cpp/gtkmm
diff --git a/dev-util/glademm/Manifest b/dev-util/glademm/Manifest
index 61b3453128ac..702ddfa191f1 100644
--- a/dev-util/glademm/Manifest
+++ b/dev-util/glademm/Manifest
@@ -1,6 +1,6 @@
-MD5 4ea692dbab3ae0c75ebe776589717dc8 ChangeLog 2144
+MD5 9b8e3134c400a56441b1de2c97d1fc3a ChangeLog 2142
MD5 b603e673a79b473bce9ac4cb883bdac5 glademm-0.6.4.ebuild 1187
-MD5 5995874aa0e71dd1420d2b11992b83d2 glademm-2.0.0.ebuild 840
+MD5 28a2fd3b1d13f48e4aff94554ad466d6 glademm-2.0.0.ebuild 841
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
MD5 bcefbe9c96d7d7044dfdd9e430156786 files/digest-glademm-0.6.4 67
MD5 34d6c3ac9817acb1763ff8020a18e0e4 files/digest-glademm-2.0.0 65
diff --git a/dev-util/glademm/files/glademm-2.0.0-gcc33-missing-includes-fix.patch b/dev-util/glademm/files/glademm-2.0.0-gcc33-missing-includes-fix.patch
new file mode 100644
index 000000000000..d13fb56f6653
--- /dev/null
+++ b/dev-util/glademm/files/glademm-2.0.0-gcc33-missing-includes-fix.patch
@@ -0,0 +1,37 @@
+diff -ur glademm-2.0.0/src/ChildParamList.hh glademm-2.0.0-gentoo/src/ChildParamList.hh
+--- glademm-2.0.0/src/ChildParamList.hh 2003-09-27 01:38:27.000000000 +1200
++++ glademm-2.0.0-gentoo/src/ChildParamList.hh 2003-09-27 01:54:22.000000000 +1200
+@@ -22,6 +22,7 @@
+ #define CHILDPARAMLIST_HH
+ #include <config.h>
+ #include "Tag.hh"
++#include <cassert>
+
+ class ChildParamList
+ { const Tag *tag;
+diff -ur glademm-2.0.0/src/SourceWriter/CxxFile.cc glademm-2.0.0-gentoo/src/SourceWriter/CxxFile.cc
+--- glademm-2.0.0/src/SourceWriter/CxxFile.cc 2003-09-27 01:38:31.000000000 +1200
++++ glademm-2.0.0-gentoo/src/SourceWriter/CxxFile.cc 2003-09-27 01:44:40.000000000 +1200
+@@ -23,7 +23,9 @@
+
+ #include "CxxFile.hh"
+ #include <cstdio>
+-#include <algo.h>
++#include <algorithm>
++#include <cassert>
++#include <iostream>
+
+ CxxFile &CxxFile::GlobalContext(Global_Context new_gc,bool stay_inside)
+ // insert blank line if necessary
+diff -ur glademm-2.0.0/src/Widget.hh glademm-2.0.0-gentoo/src/Widget.hh
+--- glademm-2.0.0/src/Widget.hh 2003-09-27 01:38:27.000000000 +1200
++++ glademm-2.0.0-gentoo/src/Widget.hh 2003-09-27 01:50:18.000000000 +1200
+@@ -28,6 +28,7 @@
+ #include "ChildParamList.hh"
+ #include <iostream>
+ #include <stdexcept>
++#include <cassert>
+
+ // Widget is a Tag handle class with convenience additions for widget
+ // handling. Constructing a Widget from an Tag is very fast, so remembering
+
diff --git a/dev-util/glademm/glademm-2.0.0.ebuild b/dev-util/glademm/glademm-2.0.0.ebuild
index c39b8b328508..c3e1ac5ccbdf 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-2003 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.3 2003/07/12 14:28:13 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-2.0.0.ebuild,v 1.4 2003/10/02 15:46:39 kumba Exp $
inherit gnome2
@@ -19,6 +19,14 @@ 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."
}