[gentoo-commits] gentoo-x86 commit in x11-libs/gtk+/files: gtk+-2.20.1-darwin8.patch

[gentoo-commits] gentoo-x86 commit in x11-libs/gtk+/files: gtk+-2.20.1-darwin8.patch

[Fabian Groffen (grobian)]

grobian     10/07/03 13:08:01

  Added:                gtk+-2.20.1-darwin8.patch
  Log:
  Fix compilation on Darwin8
  (Portage version: 2.2.01.15352-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.1                  x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch?rev=1.1&content-type=text/plain

Index: gtk+-2.20.1-darwin8.patch
===================================================================
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);

[gentoo-commits] gentoo-x86 commit in x11-libs/gtk+/files: gtk+-2.20.1-darwin8.patch

[Fabian Groffen (grobian)]

grobian     10/07/05 18:49:45

  Modified:             gtk+-2.20.1-darwin8.patch
  Log:
  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)

Revision  Changes    Path
1.2                  x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch?r1=1.1&r2=1.2

Index: gtk+-2.20.1-darwin8.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk+-2.20.1-darwin8.patch	3 Jul 2010 13:08:01 -0000	1.1
+++ gtk+-2.20.1-darwin8.patch	5 Jul 2010 18:49:45 -0000	1.2
@@ -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;
+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"
  
-   target = gdk_atom_name (gtk_selection_data_get_target (selection_data));
-   display = gtk_selection_data_get_display (selection_data);
+ NSImage *
+--
+cgit v0.8.3.1