summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2008-07-11 09:00:23 +0000
committerRémi Cardona <remi@gentoo.org>2008-07-11 09:00:23 +0000
commite6a41c15c19c69126e02695c3f451bb0ebf0d25e (patch)
treeb1c59cf242980a219250b37f5c398ac037943e69 /dev-cpp
parentversion bump, add warning wrt bug #196834 (diff)
downloadgentoo-2-e6a41c15c19c69126e02695c3f451bb0ebf0d25e.tar.gz
gentoo-2-e6a41c15c19c69126e02695c3f451bb0ebf0d25e.tar.bz2
gentoo-2-e6a41c15c19c69126e02695c3f451bb0ebf0d25e.zip
dev-cpp/gtkmm: patch for gcc 4.3 build error, fixes bug #218403
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64)
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/gtkmm/ChangeLog6
-rw-r--r--dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.3.patch17
-rw-r--r--dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild4
3 files changed, 25 insertions, 2 deletions
diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index 09a47edc5eed..f3481c88f818 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-cpp/gtkmm
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.143 2008/07/10 15:16:28 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.144 2008/07/11 09:00:23 remi Exp $
+
+ 11 Jul 2008; Rémi Cardona <remi@gentoo.org>
+ +files/gtkmm-1.2.9-gcc4.3.patch, gtkmm-1.2.9-r2.ebuild:
+ patch for gcc 4.3 build error, fixes bug #218403
10 Jul 2008; Rémi Cardona <remi@gentoo.org> gtkmm-1.2.9-r2.ebuild,
gtkmm-2.2.12.ebuild, gtkmm-2.10.10.ebuild, gtkmm-2.12.1.ebuild,
diff --git a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.3.patch b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.3.patch
new file mode 100644
index 000000000000..4b9777bfb329
--- /dev/null
+++ b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.3.patch
@@ -0,0 +1,17 @@
+--- src/gtkmmproc/gtkmmproc.cc~ 2007-04-01 20:46:07.000000000 +0000
++++ src/gtkmmproc/gtkmmproc.cc 2007-04-01 20:46:11.000000000 +0000
+@@ -1,5 +1,6 @@
+ // $Id: gtkmm-1.2.9-gcc4.3.patch,v 1.1 2008/07/11 09:00:23 remi Exp $
+
++#include <cstdlib>
+ #include <stdio.h>
+ #include <iostream>
+ #include <string>
+--- src/gtkmmproc/fixate.cc~ 2007-04-01 20:46:21.000000000 +0000
++++ src/gtkmmproc/fixate.cc 2007-04-01 20:46:26.000000000 +0000
+@@ -1,3 +1,4 @@
++#include <cstdlib>
+ #include <stdio.h>
+ #include <string>
+ #include <string.h>
+
diff --git a/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild b/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
index 42c63b76e310..ae802c1c89d6 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-2008 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.15 2008/07/10 15:16:28 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild,v 1.16 2008/07/11 09:00:23 remi Exp $
inherit eutils
@@ -20,6 +20,7 @@ DEPEND="=x11-libs/gtk+-1.2*
src_unpack() {
unpack ${A}
+ cd "${S}"
# this patch applies only to gtkmm-1.2.9. gtkmm has been fixed
# in CVS. It fixes a build problem with gcc3.1.
@@ -27,6 +28,7 @@ src_unpack() {
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
+ epatch "${FILESDIR}/gtkmm-1.2.9-gcc4.3.patch"
}
src_compile() {