| 1 |
grobian 10/07/05 18:49:45 |
| 2 |
|
| 3 |
Modified: gtk+-2.20.1-darwin8.patch |
| 4 |
Log: |
| 5 |
Replace darwin8 NSUInteger patch with the one committed upstream, no longer needs to be conditional |
| 6 |
(Portage version: 2.2.01.15352-prefix/cvs/Darwin powerpc) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch?rev=1.2&view=markup |
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: gtk+-2.20.1-darwin8.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- gtk+-2.20.1-darwin8.patch 3 Jul 2010 13:08:01 -0000 1.1 |
| 22 |
+++ gtk+-2.20.1-darwin8.patch 5 Jul 2010 18:49:45 -0000 1.2 |
| 23 |
@@ -1,13 +1,96 @@ |
| 24 |
-NSUInteger is available starting from OSX 10.5 (Leopard) |
| 25 |
+From 7f2e4c38a9bd9ed30db937d9fc8b51cb87324c23 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Kristian Rietveld <kris@×××.org> |
| 27 |
+Date: Sun, 27 Jun 2010 08:32:12 +0000 |
| 28 |
+Subject: Move Leopard-specific type definitions to gdkquartz.h |
| 29 |
|
| 30 |
---- gtk/gtkquartz.c |
| 31 |
-+++ gtk/gtkquartz.c |
| 32 |
-@@ -260,7 +260,7 @@ |
| 33 |
- GdkDisplay *display; |
| 34 |
- gint format; |
| 35 |
- const guchar *data; |
| 36 |
-- NSUInteger length; |
| 37 |
-+ guint length; |
| 38 |
+Update includes subsequently where it matters. Fixes build on Mac OS |
| 39 |
+X 10.4. |
| 40 |
+ |
| 41 |
+(cherry picked from commit e634f3fbe0498afc560530d9b92eb4709d7c7f97) |
| 42 |
+--- |
| 43 |
+diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c |
| 44 |
+index 02018ff..2c897fb 100644 |
| 45 |
+--- a/gdk/quartz/GdkQuartzView.c |
| 46 |
++++ b/gdk/quartz/GdkQuartzView.c |
| 47 |
+@@ -23,6 +23,7 @@ |
| 48 |
+ #include "gdkregion-generic.h" |
| 49 |
+ #include "gdkwindow-quartz.h" |
| 50 |
+ #include "gdkprivate-quartz.h" |
| 51 |
++#include "gdkquartz.h" |
| 52 |
+ |
| 53 |
+ @implementation GdkQuartzView |
| 54 |
+ |
| 55 |
+diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h |
| 56 |
+index 8e9708f..11d57bf 100644 |
| 57 |
+--- a/gdk/quartz/gdkprivate-quartz.h |
| 58 |
++++ b/gdk/quartz/gdkprivate-quartz.h |
| 59 |
+@@ -27,6 +27,7 @@ |
| 60 |
+ #include <gdk/gdkprivate.h> |
| 61 |
+ #include <gdk/quartz/gdkpixmap-quartz.h> |
| 62 |
+ #include <gdk/quartz/gdkwindow-quartz.h> |
| 63 |
++#include <gdk/quartz/gdkquartz.h> |
| 64 |
+ |
| 65 |
+ #include <gdk/gdk.h> |
| 66 |
+ |
| 67 |
+diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h |
| 68 |
+index d7177fe..48c4748 100644 |
| 69 |
+--- a/gdk/quartz/gdkquartz.h |
| 70 |
++++ b/gdk/quartz/gdkquartz.h |
| 71 |
+@@ -26,6 +26,19 @@ |
| 72 |
+ |
| 73 |
+ G_BEGIN_DECLS |
| 74 |
+ |
| 75 |
++/* NSInteger only exists in Leopard and newer. This check has to be |
| 76 |
++ * done after inclusion of the system headers. If NSInteger has not |
| 77 |
++ * been defined, we know for sure that we are on 32-bit. |
| 78 |
++ */ |
| 79 |
++#ifndef NSINTEGER_DEFINED |
| 80 |
++typedef int NSInteger; |
| 81 |
++typedef unsigned int NSUInteger; |
| 82 |
++#endif |
| 83 |
++ |
| 84 |
++#ifndef CGFLOAT_DEFINED |
| 85 |
++typedef float CGFloat; |
| 86 |
++#endif |
| 87 |
++ |
| 88 |
+ NSWindow *gdk_quartz_window_get_nswindow (GdkWindow *window); |
| 89 |
+ NSView *gdk_quartz_window_get_nsview (GdkWindow *window); |
| 90 |
+ NSImage *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf); |
| 91 |
+diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdkwindow-quartz.h |
| 92 |
+index cbb0fe1..4a0e27a 100644 |
| 93 |
+--- a/gdk/quartz/gdkwindow-quartz.h |
| 94 |
++++ b/gdk/quartz/gdkwindow-quartz.h |
| 95 |
+@@ -25,19 +25,6 @@ |
| 96 |
+ #import <gdk/quartz/GdkQuartzView.h> |
| 97 |
+ #import <gdk/quartz/GdkQuartzWindow.h> |
| 98 |
+ |
| 99 |
+-/* NSInteger only exists in Leopard and newer. This check has to be |
| 100 |
+- * done after inclusion of the system headers. If NSInteger has not |
| 101 |
+- * been defined, we know for sure that we are on 32-bit. |
| 102 |
+- */ |
| 103 |
+-#ifndef NSINTEGER_DEFINED |
| 104 |
+-typedef int NSInteger; |
| 105 |
+-typedef unsigned int NSUInteger; |
| 106 |
+-#endif |
| 107 |
+- |
| 108 |
+-#ifndef CGFLOAT_DEFINED |
| 109 |
+-typedef float CGFloat; |
| 110 |
+-#endif |
| 111 |
+- |
| 112 |
+ G_BEGIN_DECLS |
| 113 |
+ |
| 114 |
+ /* Window implementation for Quartz |
| 115 |
+diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c |
| 116 |
+index dcc8ee0..265d9ff 100644 |
| 117 |
+--- a/gtk/gtkquartz.c |
| 118 |
++++ b/gtk/gtkquartz.c |
| 119 |
+@@ -21,6 +21,7 @@ |
| 120 |
+ #include "config.h" |
| 121 |
+ |
| 122 |
+ #include "gtkquartz.h" |
| 123 |
++#include <gdk/quartz/gdkquartz.h> |
| 124 |
+ #include "gtkalias.h" |
| 125 |
|
| 126 |
- target = gdk_atom_name (gtk_selection_data_get_target (selection_data)); |
| 127 |
- display = gtk_selection_data_get_display (selection_data); |
| 128 |
+ NSImage * |
| 129 |
+-- |
| 130 |
+cgit v0.8.3.1 |
Archives