summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2008-09-28 10:36:40 +0000
committerMart Raudsepp <leio@gentoo.org>2008-09-28 10:36:40 +0000
commit5db22fbf3b53480fc5a17d6c2dbe4e632d8df38c (patch)
tree54624793c0a0bb3d0f8b7d1b7e3cf31828dcde39 /x11-libs/gtk+
parentBump (diff)
downloadgentoo-2-5db22fbf3b53480fc5a17d6c2dbe4e632d8df38c.tar.gz
gentoo-2-5db22fbf3b53480fc5a17d6c2dbe4e632d8df38c.tar.bz2
gentoo-2-5db22fbf3b53480fc5a17d6c2dbe4e632d8df38c.zip
Adjust a header so that packages using GtkCList will remain buildable
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'x11-libs/gtk+')
-rw-r--r--x11-libs/gtk+/ChangeLog6
-rw-r--r--x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch17
-rw-r--r--x11-libs/gtk+/gtk+-2.14.3.ebuild5
3 files changed, 26 insertions, 2 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index ee9735748f82..7b295b4cd7cb 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/gtk+
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.398 2008/09/25 13:59:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.399 2008/09/28 10:36:40 leio Exp $
+
+ 28 Sep 2008; Mart Raudsepp <leio@gentoo.org>
+ +files/gtk+-2.14.3-limit-gtksignal-includes.patch, gtk+-2.14.3.ebuild:
+ Adjust a header so that packages using GtkCList will remain buildable
25 Sep 2008; Jeroen Roovers <jer@gentoo.org> gtk+-2.12.11.ebuild:
Stable for HPPA (bug #236971).
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch b/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch
new file mode 100644
index 000000000000..3fe8cffd906a
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch
@@ -0,0 +1,17 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=536767
+
+Makes inkscape and claws-mail buildable again. Basically all packages still using
+GtkCList and single included headers.
+--- gtk/gtksignal.h.orig 2008-06-12 01:40:59.000000000 -0400
++++ gtk/gtksignal.h 2008-06-11 18:21:47.000000000 -0400
+@@ -29,7 +29,9 @@
+ #ifndef __GTK_SIGNAL_H__
+ #define __GTK_SIGNAL_H__
+
+-#include <gtk/gtk.h>
++#include <gtk/gtkenums.h>
++#include <gtk/gtktypeutils.h>
++#include <gtk/gtkobject.h>
+ #include <gtk/gtkmarshal.h>
+
+ G_BEGIN_DECLS
diff --git a/x11-libs/gtk+/gtk+-2.14.3.ebuild b/x11-libs/gtk+/gtk+-2.14.3.ebuild
index 11d200186a4a..5a711f19f3dd 100644
--- a/x11-libs/gtk+/gtk+-2.14.3.ebuild
+++ b/x11-libs/gtk+/gtk+-2.14.3.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/x11-libs/gtk+/gtk+-2.14.3.ebuild,v 1.1 2008/09/25 10:05:31 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.14.3.ebuild,v 1.2 2008/09/28 10:36:40 leio Exp $
WANT_AUTOMAKE="1.7"
@@ -75,6 +75,9 @@ src_unpack() {
# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11
epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch"
+ # ...
+ epatch "${FILESDIR}/${P}-limit-gtksignal-includes.patch"
+
# -O3 and company cause random crashes in applications. Bug #133469
replace-flags -O3 -O2
strip-flags