Fix compilation on Darwin8

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

4 files changed, 24 insertions, 6 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 53fc3396ffef..0b7ae42af39f 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.460 2010/06/20 11:15:18 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.461 2010/07/03 13:08:01 grobian Exp $
+
+  03 Jul 2010; Fabian Groffen <grobian@gentoo.org> gtk+-2.20.1-r1.ebuild,
+  +files/gtk+-2.20.1-darwin8.patch:
+  Fix compilation on Darwin8
 
   20 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org> gtk+-2.20.1-r1.ebuild,
   metadata.xml:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 839803c75418..bd61d7698d4a 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -10,6 +10,7 @@ AUX gtk+-2.18.5-macosx-aqua.patch 5521 RMD160 2f61c470952043229de027b23f67f634ea
 AUX gtk+-2.18.7-destroy-crash.patch 1236 RMD160 e266ee532854f01a7b6dbcf61626d83e2133d0b2 SHA1 76671cca0245d8b0e25acb43eb6f65442461a573 SHA256 61ead70a439f873cc66676ef8a0b4076d2c0f44534c1e5d8898c42ef3a659b33
 AUX gtk+-2.18.9-notifications-gtkentry.patch 1274 RMD160 d397d677b76be6ea2614b33c328dcd5d237423f1 SHA1 1f9b4de6827798f7358b38ede143d2d29482a06c SHA256 fd656e194d3e734d21b6afd0d8cf9e002679d8f41da73ec41790341a0d355798
 AUX gtk+-2.20.1-GtkOffscreenWindow.patch 942 RMD160 b6cb30a8c9ced7ccbbf979c8e04373147ec12c71 SHA1 b4e43ecaf84a0c22fb51d150d0b19a50b12a7d55 SHA256 6a3c8f0d18c6f5b824712c404de33d01313faaa537b9caddd50622ccaf176b7c
+AUX gtk+-2.20.1-darwin8.patch 360 RMD160 b7e28dd4ee9f730deefb80e2f070a8e0b5b11b81 SHA1 479ec356692821dadbcba194d5e1b1bcb7867c5b SHA256 0d02cb497c69b6d6dff65c9ce42c748e17955a20beac8a35406310b9bd6b0ee7
 AUX gtk+-2.20.1-gail_cell_type.patch 2654 RMD160 1944303b539f52597c8e7dde409fa031adb1983b SHA1 8f163caf88cdd37ef2a74d750ebbc8831f5c42eb SHA256 0419bd47daadd11daf08829f8a9091f8510a2a45b9a82a8e33553ba460b07cbc
 AUX gtk+-2.20.1-gtkrange.patch 1266 RMD160 083f230d14be1bdae52a1c4d3563bcda41f6f88a SHA1 44d09fa98d9445571f0ad02fb938026704fff160 SHA256 b96bc9a669a3c941f65835fa4014ac458381afe6a003e833281a88da6e08d7af
 AUX gtk+-2.20.1-libpixbufloader-warning.patch 1633 RMD160 4535f72c05826ef14f4445f02ebc2fe930443711 SHA1 e579b8b10c79ca1f58dc2274e8df7d0e8d1b702d SHA256 800361dce46bef0b1a47b9614a55bc4789a32bed144324116fc00d7dec17844a
@@ -28,6 +29,6 @@ EBUILD gtk+-2.16.6.ebuild 4831 RMD160 9075d2db529208d4bb9fbf49f3662d268e39a525 S
 EBUILD gtk+-2.18.6.ebuild 5680 RMD160 a3bd7b9ca61f298d0164a53cde2c5e220d669836 SHA1 b18587878f3796d51d8f6a4244d4c915165959fe SHA256 7572ae590585f2ef94ad73f2ddf605c1ba8a1b16f3457b70abbd1f69d1348d77
 EBUILD gtk+-2.18.7.ebuild 5883 RMD160 1f8f3ad8ba596d2ace059cad8d838af8f569ceb7 SHA1 2658f1b41c1648c312d1b5de24c6190be1d1447f SHA256 3f392441329741992c57cb4d39240b47d55d1b03402399ebe0628541e94049df
 EBUILD gtk+-2.18.9.ebuild 5911 RMD160 9962654dbda4b4b9bbbae60224c3f2f6f5f0e529 SHA1 d326d6e98f51cdc05f3a5c5944b4e40b94705dc3 SHA256 a18900545cf91cea1bd7552659ad5512de87ab1e714f1730f2871ed4e6289b19
-EBUILD gtk+-2.20.1-r1.ebuild 6393 RMD160 98048472863aba4dbb62b6fc2db020924b125db3 SHA1 563f2331f7744ee15ec55fcc80a2770abcd5324b SHA256 02ad3b5658b03fc9882b32a0548e2136bbf205a7a1d69126e4d1119c15a250d6
-MISC ChangeLog 67845 RMD160 d352a457453dda70d232d512d78ab77ecf8548f0 SHA1 b9420ce6092c1ad7782cfa5a0bfe07ada07ac540 SHA256 a24ad7bf56815e84c2666d64521b5c38f72ccc17055745b5f643533d5c43df8f
+EBUILD gtk+-2.20.1-r1.ebuild 6408 RMD160 55079216df5bdd065ee57488400aadd02abc3eef SHA1 e2772356b7d144de47ed2649292a4bb2a89a1332 SHA256 09cefa695887d67756a19a239d765b8912afdaaea93904a417168cf8ab26f020
+MISC ChangeLog 67984 RMD160 89d280988af6cd10d0327e20c103eab2ce294623 SHA1 9dfc19b2c9fef1d79c88f23556f913c511fd283d SHA256 3decd07d5b3d5fab777c3e70ce0302bfaf868e5945ce70f61320926f88360092
 MISC metadata.xml 549 RMD160 8d6692e4cf18e0c75421ddef09e2881624c5ce3e SHA1 ce3ed4bec69816eb61b5ca9d48c2db396085a923 SHA256 2e7f82b302d91c37ecf915de09e4b85ef093b790baacbef0325b6fe9b1bb304b
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch b/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch
new file mode 100644
index 000000000000..f4a865c5d39b
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch
@@ -0,0 +1,13 @@
+NSUInteger is available starting from OSX 10.5 (Leopard)
+
+--- gtk/gtkquartz.c
++++ gtk/gtkquartz.c
+@@ -260,7 +260,7 @@
+   GdkDisplay *display;
+   gint format;
+   const guchar *data;
+-  NSUInteger length;
++  guint length;
+ 
+   target = gdk_atom_name (gtk_selection_data_get_target (selection_data));
+   display = gtk_selection_data_get_display (selection_data);
diff --git a/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild
index d6f8721b0fbe..1aa3d2d8431f 100644
--- a/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild,v 1.2 2010/06/20 11:15:18 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild,v 1.3 2010/07/03 13:08:01 grobian Exp $
 
 EAPI="3"
 
@@ -79,8 +79,8 @@ src_prepare() {
 	# Don't break inclusion of gtkclist.h, upstream bug 536767
 	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
 
-	# add correct framework linking options, for aqua
-	epatch "${FILESDIR}/${PN}-2.18.5-macosx-aqua.patch"
+	# Fix for missing NSUInteger on Darwin8 (10.4)
+	[[ ${CHOST} == *-darwin8 ]] && epatch "${FILESDIR}"/${P}-darwin8.patch
 
 	# Remove the definition of libpixbufloader_gdip_png_la_*
 	epatch "${FILESDIR}/${P}-libpixbufloader-warning.patch"