summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-07-05 18:49:45 +0000
committerFabian Groffen <grobian@gentoo.org>2010-07-05 18:49:45 +0000
commit52085cdf8aec6baedc5c9b6c37f395c5db187d11 (patch)
treeed81a942842afea3ecb708ff96d6f6c65ad88fc5 /x11-libs
parentFix encoding in ChangeLog (diff)
downloadgentoo-2-52085cdf8aec6baedc5c9b6c37f395c5db187d11.tar.gz
gentoo-2-52085cdf8aec6baedc5c9b6c37f395c5db187d11.tar.bz2
gentoo-2-52085cdf8aec6baedc5c9b6c37f395c5db187d11.zip
Replace darwin8 NSUInteger patch with the one committed upstream, no longer needs to be conditional
(Portage version: 2.2.01.15352-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gtk+/ChangeLog9
-rw-r--r--x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch107
-rw-r--r--x11-libs/gtk+/gtk+-2.20.1-r1.ebuild4
3 files changed, 104 insertions, 16 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 0b7ae42af39f..6c7a9b5caedf 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,10 +1,15 @@
# 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.461 2010/07/03 13:08:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.462 2010/07/05 18:49:45 grobian Exp $
+
+ 05 Jul 2010; Fabian Groffen <grobian@gentoo.org> gtk+-2.20.1-r1.ebuild,
+ files/gtk+-2.20.1-darwin8.patch:
+ Replace darwin8 NSUInteger patch with the one committed upstream, no
+ longer needs to be conditional
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
+ Fix compilation on Darwin8, drop no longer necessary aqua patch
20 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org> gtk+-2.20.1-r1.ebuild,
metadata.xml:
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch b/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch
index f4a865c5d39b..dca75ded1ae7 100644
--- a/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch
+++ b/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch
@@ -1,13 +1,96 @@
-NSUInteger is available starting from OSX 10.5 (Leopard)
+From 7f2e4c38a9bd9ed30db937d9fc8b51cb87324c23 Mon Sep 17 00:00:00 2001
+From: Kristian Rietveld <kris@gtk.org>
+Date: Sun, 27 Jun 2010 08:32:12 +0000
+Subject: Move Leopard-specific type definitions to gdkquartz.h
---- 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);
+Update includes subsequently where it matters. Fixes build on Mac OS
+X 10.4.
+
+(cherry picked from commit e634f3fbe0498afc560530d9b92eb4709d7c7f97)
+---
+diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c
+index 02018ff..2c897fb 100644
+--- a/gdk/quartz/GdkQuartzView.c
++++ b/gdk/quartz/GdkQuartzView.c
+@@ -23,6 +23,7 @@
+ #include "gdkregion-generic.h"
+ #include "gdkwindow-quartz.h"
+ #include "gdkprivate-quartz.h"
++#include "gdkquartz.h"
+
+ @implementation GdkQuartzView
+
+diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
+index 8e9708f..11d57bf 100644
+--- a/gdk/quartz/gdkprivate-quartz.h
++++ b/gdk/quartz/gdkprivate-quartz.h
+@@ -27,6 +27,7 @@
+ #include <gdk/gdkprivate.h>
+ #include <gdk/quartz/gdkpixmap-quartz.h>
+ #include <gdk/quartz/gdkwindow-quartz.h>
++#include <gdk/quartz/gdkquartz.h>
+
+ #include <gdk/gdk.h>
+
+diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
+index d7177fe..48c4748 100644
+--- a/gdk/quartz/gdkquartz.h
++++ b/gdk/quartz/gdkquartz.h
+@@ -26,6 +26,19 @@
+
+ G_BEGIN_DECLS
+
++/* NSInteger only exists in Leopard and newer. This check has to be
++ * done after inclusion of the system headers. If NSInteger has not
++ * been defined, we know for sure that we are on 32-bit.
++ */
++#ifndef NSINTEGER_DEFINED
++typedef int NSInteger;
++typedef unsigned int NSUInteger;
++#endif
++
++#ifndef CGFLOAT_DEFINED
++typedef float CGFloat;
++#endif
++
+ NSWindow *gdk_quartz_window_get_nswindow (GdkWindow *window);
+ NSView *gdk_quartz_window_get_nsview (GdkWindow *window);
+ NSImage *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf);
+diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdkwindow-quartz.h
+index cbb0fe1..4a0e27a 100644
+--- a/gdk/quartz/gdkwindow-quartz.h
++++ b/gdk/quartz/gdkwindow-quartz.h
+@@ -25,19 +25,6 @@
+ #import <gdk/quartz/GdkQuartzView.h>
+ #import <gdk/quartz/GdkQuartzWindow.h>
+
+-/* NSInteger only exists in Leopard and newer. This check has to be
+- * done after inclusion of the system headers. If NSInteger has not
+- * been defined, we know for sure that we are on 32-bit.
+- */
+-#ifndef NSINTEGER_DEFINED
+-typedef int NSInteger;
+-typedef unsigned int NSUInteger;
+-#endif
+-
+-#ifndef CGFLOAT_DEFINED
+-typedef float CGFloat;
+-#endif
+-
+ G_BEGIN_DECLS
+
+ /* Window implementation for Quartz
+diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
+index dcc8ee0..265d9ff 100644
+--- a/gtk/gtkquartz.c
++++ b/gtk/gtkquartz.c
+@@ -21,6 +21,7 @@
+ #include "config.h"
+
+ #include "gtkquartz.h"
++#include <gdk/quartz/gdkquartz.h>
+ #include "gtkalias.h"
+
+ NSImage *
+--
+cgit v0.8.3.1
diff --git a/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild
index 1aa3d2d8431f..5de7cf8e23c9 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.3 2010/07/03 13:08:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild,v 1.4 2010/07/05 18:49:45 grobian Exp $
EAPI="3"
@@ -80,7 +80,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
# Fix for missing NSUInteger on Darwin8 (10.4)
- [[ ${CHOST} == *-darwin8 ]] && epatch "${FILESDIR}"/${P}-darwin8.patch
+ epatch "${FILESDIR}"/${P}-darwin8.patch
# Remove the definition of libpixbufloader_gdip_png_la_*
epatch "${FILESDIR}/${P}-libpixbufloader-warning.patch"