Fix compilation with introspection on Darwin, bug #372953, patch by Naohiro Aota

Package-Manager: portage-2.2.01.18826-prefix/cvs/Darwin powerpc

6 files changed, 150 insertions, 10 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 0dee7672dc0c..4e783ced9041 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.517 2011/06/22 09:41:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.518 2011/06/27 06:36:21 grobian Exp $
+
+  27 Jun 2011; Fabian Groffen <grobian@gentoo.org> gtk+-2.24.5-r1.ebuild,
+  +files/gtk+-2.24.5-darwin-quartz-introspection.patch, gtk+-3.0.11.ebuild,
+  +files/gtk+-3.0.11-darwin-quartz-introspection.patch:
+  Fix compilation with introspection on Darwin, bug #372953, patch by Naohiro
+  Aota
 
   22 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> gtk+-2.24.4.ebuild:
   x86 stable wrt security bug #371320
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index eaf93a611a05..35d187ba9681 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -12,6 +12,8 @@ AUX gtk+-2.22.1-old-icons.patch 12064 RMD160 6aba5be9d9bcd3822fba547e5da375d9609
 AUX gtk+-2.22.1-print-settings.patch 1222 RMD160 afcdd3c81cb9e14a8bc4cef866f440d61d79e477 SHA1 0fea85e06c70ee554fa963572ebb8a19f6f4a953 SHA256 245ba029eeac389fe9ce6f23864178d2851a167621b622631044f613324a0da9
 AUX gtk+-2.24.4-old-icons.patch 17368 RMD160 e7638f603a06234814b8b342584ab4e80a481cd6 SHA1 2530c85a890b618aa8e3277b4f10da632d865be9 SHA256 4cb55c322e45ea151217db40c6761e6eaaea89551ff1a4134107c92774a7b635
 AUX gtk+-2.24.5-background-repaint.patch 1884 RMD160 d20c7389127d7b6a6253c438c9b0a2563828b823 SHA1 9800e67a5457734871bb45d34e5b3724ee6e9708 SHA256 3573af25e8db2fb490b264f80cb9e617ee1a36e767e36e7bb1d830c0b715db93
+AUX gtk+-2.24.5-darwin-quartz-introspection.patch 1127 RMD160 9b08611d585fe88d8db310f91efdd22396f567d9 SHA1 d36be7be62307d1a6f4e64cd14d3da523af97488 SHA256 a0f91bf77bd2827c10c31c0f2d7de106254d3b053e5a2bf734e35bd814db3493
+AUX gtk+-3.0.11-darwin-quartz-introspection.patch 2515 RMD160 e03ad9794395099b729e4cba53135b34ace777d0 SHA1 deda072dc35c454facccc232493bca5a5150b443 SHA256 49f8e2f1635c3eb8d7a4b2d1039150fc573f6a931ad2b3736176691ad2df8faf
 AUX gtk+-3.0.8-darwin-quartz.patch 579 RMD160 e7cee263b7edbf2d8cdfb848939c0f588b595567 SHA1 5196ef95f68080e2bd8a1582db7d61b0a65b0aac SHA256 2d30683f849be9be698424514341e814833c102c4f41d12cd02536cba62846fc
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
@@ -25,15 +27,15 @@ DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 S
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
 EBUILD gtk+-2.22.1-r1.ebuild 7597 RMD160 03ba03c4ff419e7898fa2d547421727162e76658 SHA1 f5c24e1cd89a41f13ecee6f143859f9f94a5f8e9 SHA256 4224d89c2380fdc57bb15d6af05f6d442cedc21ba99dfc9a3048c33b3b45001a
 EBUILD gtk+-2.24.4.ebuild 7506 RMD160 0c2e4ee25ad1029a96d786eae71a3b206fe7f355 SHA1 d31e6a8fba1483bd276aaae853c7529ba453e328 SHA256 480f85069a993dad0ccb8b622dbbc30db83446e047fe03e21e15270b66cc24a8
-EBUILD gtk+-2.24.5-r1.ebuild 7879 RMD160 63c0982113b83f969367d558448762e22bebf977 SHA1 610972b258836272780e3ee9c0f1fd221f602f75 SHA256 e7b058276dc1199be4cd9ebf5a820356f58629695066edc9451bb6277cde3dbf
+EBUILD gtk+-2.24.5-r1.ebuild 7984 RMD160 3b6df3337e84f42d8323063f9251c752f3d19746 SHA1 bbf0d3b4df82dfb5fb88fbaddeb1063d9842d0d5 SHA256 f416e2421cf8f2a1f7ce54850f05c3ee77c9037bec7287f08a515970ed77f70f
 EBUILD gtk+-3.0.10.ebuild 5799 RMD160 593efc5363f470144c83d14803c02c95b5009d56 SHA1 cdcaa3dc8618583958d4172b23a9a49e4f437b4c SHA256 02fe8d1fc8bf2d9611d711725878cf99c690101baad6cc70277a2c0c82d33029
-EBUILD gtk+-3.0.11.ebuild 5825 RMD160 d3bf9a4a28e3e6844f9fb9be3e3fbd006badf134 SHA1 f771faf35e81e98ac83f7ee5f4fad202bd17bc19 SHA256 511a22b7d0bf4619d63a0060346068015ee7521b9b61844207347764397e4c95
-MISC ChangeLog 77389 RMD160 e7d61544633268bf174d147662ffe040fb30307c SHA1 71acec3db0eced10504cb7fbc36fa00e6a8dffa7 SHA256 3c540abfd4ea51b57579b49dc59068f1b0464dc7b57f7fca77cae1d41cd0b7ce
+EBUILD gtk+-3.0.11.ebuild 6048 RMD160 26d127360b9f624d5d9c8dd6becd8ebe441929d5 SHA1 1ac2e5a717ac3090c2b6a8df9aaf893e2cf74913 SHA256 c45d9abfefdd0f254425c0b47473e9ddef9970ea313bb74778ab427ec7f16f63
+MISC ChangeLog 77678 RMD160 85f3bf54c0b12768b8b045fed91ce8008f4c002a SHA1 ffbd810977a7d410d200b4cab2f07aeb3a044a62 SHA256 e00bb3151a3350a171a40c5ea51e302d145677243d9a5f5943bab9d6069539eb
 MISC metadata.xml 549 RMD160 8d6692e4cf18e0c75421ddef09e2881624c5ce3e SHA1 ce3ed4bec69816eb61b5ca9d48c2db396085a923 SHA256 2e7f82b302d91c37ecf915de09e4b85ef093b790baacbef0325b6fe9b1bb304b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.17 (Darwin)
 
-iEYEARECAAYFAk4BuMYACgkQuUQtlDBCeQJbRgCfaHmy302sYiTXGjvVd8mSgNo1
-GAMAnikIKuBtHJIeOwiEniQ5ttfoXk+E
-=J/eO
+iEYEARECAAYFAk4IJMMACgkQX3X2B8XHTol32wCgjv8I2aqZaZNjrTI+BwfH3dWf
+xNoAn2467bKx+aRAqzPzyyrlnGfbQ2+C
+=C1du
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-2.24.5-darwin-quartz-introspection.patch b/x11-libs/gtk+/files/gtk+-2.24.5-darwin-quartz-introspection.patch
new file mode 100644
index 000000000000..c165a01e6dc1
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.5-darwin-quartz-introspection.patch
@@ -0,0 +1,42 @@
+https://bugs.gentoo.org/attachment.cgi?id=278091&action=diff&context=patch&collapsed=&headers=1&format=raw
+https://bugs.gentoo.org/show_bug.cgi?id=372953
+
+--- a/gtk/Makefile.am	
++++ a/gtk/Makefile.am	
+@@ -32,7 +32,7 @@ endif
+ endif
+ endif
+ 
+-INCLUDES =						\
++INCLUDES_COMMON =					\
+ 	-DG_LOG_DOMAIN=\"Gtk\"				\
+ 	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATADIR=\"$(datadir)\"			\
+@@ -52,10 +52,17 @@ INCLUDES =						\
+ 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
+ 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
+ 	$(GTK_DEBUG_FLAGS)				\
+-	$(GTK_DEP_CFLAGS)				\
++	$(GTK_DEP_CFLAGS)
++
++INCLUDES= 						\
++	$(INCLUDES_COMMON)				\
+ 	$(gtk_clipboard_dnd_c_sources_CFLAGS)		\
+ 	$(INCLUDED_IMMODULE_DEFINE)
+ 
++INCLUDES_GIR=						\
++	$(INCLUDES_COMMON)				\
++	$(INCLUDED_IMMODULE_DEFINE)
++
+ gtarget=$(gdktarget)
+ 
+ if PLATFORM_WIN32
+@@ -999,7 +1006,7 @@ Gtk_2_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
+ endif
+ Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0
+ Gtk_2_0_gir_CFLAGS = \
+-		$(INCLUDES) \
++		$(INCLUDES_GIR) \
+ 		-UGDK_DISABLE_DEPRECATED \
+ 		-UGTK_DISABLE_DEPRECATED \
+ 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
diff --git a/x11-libs/gtk+/files/gtk+-3.0.11-darwin-quartz-introspection.patch b/x11-libs/gtk+/files/gtk+-3.0.11-darwin-quartz-introspection.patch
new file mode 100644
index 000000000000..ae2f0e9c1dbe
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.0.11-darwin-quartz-introspection.patch
@@ -0,0 +1,83 @@
+forward port of the patch from:
+
+https://bugs.gentoo.org/attachment.cgi?id=278091&action=diff&context=patch&collapsed=&headers=1&format=raw
+https://bugs.gentoo.org/show_bug.cgi?id=372953
+
+--- gtk/Makefile.am
++++ gtk/Makefile.am
+@@ -32,7 +32,7 @@
+ endif
+ endif
+ 
+-INCLUDES =						\
++INCLUDES_COMMON =						\
+ 	-DG_LOG_DOMAIN=\"Gtk\"				\
+ 	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATADIR=\"$(datadir)\"			\
+@@ -53,10 +53,17 @@
+ 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
+ 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
+ 	$(GTK_DEBUG_FLAGS)				\
+-	$(GTK_DEP_CFLAGS)				\
++	$(GTK_DEP_CFLAGS)
++
++INCLUDES = 								\
++	$(INCLUDES_COMMON)					\
+ 	$(gtk_clipboard_dnd_c_sources_CFLAGS)		\
+ 	$(INCLUDED_IMMODULE_DEFINE)
+ 
++INCLUDES_GIR =							\
++	$(INCLUDES_COMMON)					\
++	$(INCLUDED_IMMODULE_DEFINE)
++
+ if PLATFORM_WIN32
+ no_undefined = -no-undefined
+ endif
+@@ -997,7 +1004,7 @@
+ Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
+ Gtk_3_0_gir_INCLUDES = Atk-1.0
+ Gtk_3_0_gir_CFLAGS = \
+-		$(INCLUDES) \
++		$(INCLUDES_GIR) \
+ 		-UGDK_DISABLE_DEPRECATED \
+ 		-UGTK_DISABLE_DEPRECATED \
+ 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
+--- gtk/Makefile.in
++++ gtk/Makefile.in
+@@ -708,7 +708,7 @@
+ @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi
+ @HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups
+ @HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
+-INCLUDES = \
++COMMON_INCLUDES = \
+ 	-DG_LOG_DOMAIN=\"Gtk\"				\
+ 	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATADIR=\"$(datadir)\"			\
+@@ -729,10 +729,17 @@
+ 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
+ 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
+ 	$(GTK_DEBUG_FLAGS)				\
+-	$(GTK_DEP_CFLAGS)				\
++	$(GTK_DEP_CFLAGS)
++
++INCLUDES =								\
++	$(COMMON_INCLUDES)					\
+ 	$(gtk_clipboard_dnd_c_sources_CFLAGS)		\
+ 	$(INCLUDED_IMMODULE_DEFINE)
+ 
++INCLUDES_GIR =							\
++	$(COMMON_INCLUDES)					\
++	$(INCLUDED_IMMODULE_DEFINE)
++
+ @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
+ @OS_WIN32_TRUE@gtk_def = gtk.def
+ @OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
+@@ -1407,7 +1414,7 @@
+ @HAVE_INTROSPECTION_TRUE@	--c-include="gtk/gtkx.h"
+ @HAVE_INTROSPECTION_TRUE@Gtk_3_0_gir_INCLUDES = Atk-1.0
+ @HAVE_INTROSPECTION_TRUE@Gtk_3_0_gir_CFLAGS = \
+-@HAVE_INTROSPECTION_TRUE@		$(INCLUDES) \
++@HAVE_INTROSPECTION_TRUE@		$(INCLUDES_GIR) \
+ @HAVE_INTROSPECTION_TRUE@		-UGDK_DISABLE_DEPRECATED \
+ @HAVE_INTROSPECTION_TRUE@		-UGTK_DISABLE_DEPRECATED \
+ @HAVE_INTROSPECTION_TRUE@		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
diff --git a/x11-libs/gtk+/gtk+-2.24.5-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.5-r1.ebuild
index f6b43e5a1eef..cdf02ef22627 100644
--- a/x11-libs/gtk+/gtk+-2.24.5-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.5-r1.ebuild,v 1.1 2011/06/18 15:44:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.5-r1.ebuild,v 1.2 2011/06/27 06:36:21 grobian Exp $
 
 EAPI="3"
 GNOME2_LA_PUNT="yes"
@@ -95,6 +95,9 @@ src_prepare() {
 	# Revert this commit as it causes gnome-panel problems, bug #372147
 	EPATCH_OPTS="-R" epatch "${FILESDIR}/${P}-background-repaint.patch"
 
+	# fix building with gir #372953
+	epatch "${FILESDIR}"/${PN}-2.24.5-darwin-quartz-introspection.patch
+
 	# Stop trying to build unmaintained docs, bug #349754
 	strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
 	strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
diff --git a/x11-libs/gtk+/gtk+-3.0.11.ebuild b/x11-libs/gtk+/gtk+-3.0.11.ebuild
index af6327063b7e..3a428133f2c4 100644
--- a/x11-libs/gtk+/gtk+-3.0.11.ebuild
+++ b/x11-libs/gtk+/gtk+-3.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.0.11.ebuild,v 1.2 2011/06/11 03:05:04 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.0.11.ebuild,v 1.3 2011/06/27 06:36:21 grobian Exp $
 
 EAPI="3"
 GNOME_TARBALL_SUFFIX="xz"
@@ -15,6 +15,8 @@ SLOT="3"
 # NOTE: This gtk+ has multi-gdk-backend support, see:
 #  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
+# I tried this and got it all compiling, but the end result is unusable as it
+# horribly mixes up the backends -- grobian
 IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
@@ -112,6 +114,8 @@ src_prepare() {
 
 	# http://mail.gnome.org/archives/commits-list/2011-March/msg04372.html
 	epatch "${FILESDIR}"/${PN}-3.0.8-darwin-quartz.patch
+	# fix building with gir #372953
+	epatch "${FILESDIR}"/${PN}-3.0.11-darwin-quartz-introspection.patch
 }
 
 src_configure() {