Adjust a header so that packages using GtkCList will remain buildable

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 29 insertions, 4 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+/Manifest b/x11-libs/gtk+/Manifest
index 962036fbdbc6..49df08c23b0a 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -18,6 +18,7 @@ AUX gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch 1116 RMD160 f63ef76bc8f35
 AUX gtk+-2.12.9-libtool-2.patch 920 RMD160 3ef1dfe66e89af4fe9b51d662e6cc3f7fdaa6e3d SHA1 2e788ff62ed2bffc7c3f5e7900466a3fa0f95b3b SHA256 0f9c8c0700d22c55dff1e943651a20165dc3de510e00169e6f03c7e57063abfb
 AUX gtk+-2.12.9-print-backend-64bit.patch 572 RMD160 986d089399597ee506e405e36b46e4adaf2bde74 SHA1 e240e7e04359defee0a4748805ac71d77415978c SHA256 32f977a50bd578089e3b67a3c49042cda7867f7da9f262d10bf0b9c20eb1d8bd
 AUX gtk+-2.12.9-treeview-search-window-type.patch 841 RMD160 610af248058e785f9456918415c2e16a92c63e51 SHA1 079db29dcc7bf1aec49822d4098597b7ee6f022f SHA256 f381550baf1348f2731e6d09f4a3399c61c538fae96a2a470136f32d32e88eb1
+AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 RMD160 ad967a5fb6b9fe2d96119d478429f10032bad8a5 SHA1 5c0df3e543303dfe456479359fea2cbd0d4b723e SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734
 AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd
 AUX gtk+-2.8.10-xinerama.patch 1083 RMD160 499801f3be2289bdc656563bb5c96797d14512f7 SHA1 7817e3c2bbec1058192d524d68e78635fa48beca SHA256 7786691d5f89588abc7174e97cbd374d8cbe98b4e8dfd27005eade03b047aa2d
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
@@ -38,6 +39,6 @@ EBUILD gtk+-2.12.12.ebuild 4857 RMD160 3de9a98829ab1484e1490a71b968248bd79264f1
 EBUILD gtk+-2.12.8.ebuild 4571 RMD160 5ee8c3872801e50cf1dc99282e74253946422c47 SHA1 2fcdb81933fd6bab2fb7b10ede0ac7fed5d553a6 SHA256 80ea9abd64a29eafcc09e4b248214f2ad0f7aebee627ab053258a911ca2f82e6
 EBUILD gtk+-2.12.9-r1.ebuild 4615 RMD160 98b7930a6ade2ad915a7101f6750922926a43c08 SHA1 e790f140baa04576a518574d076e3527cc30bca7 SHA256 1c703580dcb5620fdffd811bad7366c3484865cc570a8e319220f05f4b7b2326
 EBUILD gtk+-2.12.9-r2.ebuild 5455 RMD160 a16d03626f9b8f03a656523bac0b1239242db034 SHA1 b6f55b8277da86d740f1d6c13656cac7635b049c SHA256 3fa5da02d232e4cb17bf904a8f8fc0de582626b819373346ad7c230991eb5e01
-EBUILD gtk+-2.14.3.ebuild 4289 RMD160 bdafcd0080a66b2f40ca00317886f44691fbd589 SHA1 3eaf1b8171727e7538757ab7f07c4ceb3398e283 SHA256 c6fbdada64b7cfd0dcc0ff616305f753317daa42bc5a1e174b62d2a4678653f7
-MISC ChangeLog 57151 RMD160 a1ceb63fecdf70f0bb17db1d80103e32cdd59d24 SHA1 0dce4e69a52d71c2c913554f9de2313abe68ed22 SHA256 7b00bfe3afd275c141eadc1cce1fc8e3e96cdafb55cf47d06b995d3e3659f943
+EBUILD gtk+-2.14.3.ebuild 4355 RMD160 46b93ad097fe30fc48d89e1a8b6cff80594e9b3b SHA1 a65e626a3cce5a25383a6a09a7d6b3d9a83a20e7 SHA256 68d327c5d69ee35a534434917ff99267a38451cc6bda9efe76bb466142e0e2aa
+MISC ChangeLog 57345 RMD160 d3ef155c5595b65e4ed81b64ff3faacac35f9f44 SHA1 19140c27ee527706a1dde419c45f021f520a001c SHA256 5d5197f0ed002fd930cd807bd558594f44a0d5b40ac73a176cb1f16c101afede
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
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