[gtk-osx] Bug 667759: Gtkdnd-quartz.c is missing annotations for introspection

[John Ralls <jralls src gnome org>]

commit 972f474ac7d38bf2a3b5fe76f703ba5477d168ca
Author: John Ralls <jralls ceridwen us>
Date:   Fri May 3 11:11:30 2013 -0700

    Bug 667759: Gtkdnd-quartz.c is missing annotations for introspection
    
    So is gtkclipboard.c. Patch introspects the properly annotated non-quartz files instead.

 modulesets-stable/gtk-osx.modules                  |    3 +-
 ...gtkdnd-quartz.c-is-missing-annotations-fo.patch |   47 ++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 60d9fe6..6195a12 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -167,7 +167,8 @@
              autogenargs="--enable-quartz-backend --enable-quartz-relocation">
     <branch module="gtk+/3.6/gtk+-3.6.4.tar.xz" version="3.6.4"
             hash="sha256:dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1">
-     </branch>
+      <patch 
file='http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-667759-gtkdnd-quartz.c-is-missing-annotations-fo.patch'
 strip='1'/>
+    </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="pango"/>
diff --git a/patches/0001-Bug-667759-gtkdnd-quartz.c-is-missing-annotations-fo.patch 
b/patches/0001-Bug-667759-gtkdnd-quartz.c-is-missing-annotations-fo.patch
new file mode 100644
index 0000000..0fbf03e
--- /dev/null
+++ b/patches/0001-Bug-667759-gtkdnd-quartz.c-is-missing-annotations-fo.patch
@@ -0,0 +1,47 @@
+From 4aebe6d4f08297066b231eee7aa15d33d8dd6d98 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Fri, 3 May 2013 10:31:47 -0700
+Subject: [PATCH] Bug 667759 - gtkdnd-quartz.c is missing annotations for
+ introspection
+
+Work around this by introspecting gtkclipboard.c and gtkdnd.c instead
+of the quartz alternatives.
+
+Note that this is temporary: The implementation of GdkSelection
+will make the quartz alternatives unnecessary. See bug 571582.
+---
+ gtk/Makefile.am | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 6e7bbf1..0b82797 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1313,13 +1313,23 @@ LDADDS =                                                               \
+       $(GTK_DEP_LIBS)
+ 
+ if HAVE_INTROSPECTION
++# The Quartz clipboard and dnd files aren't annotated for
++# introspection. Rather than copy the annotations over from the
++# regular files, exclude the quartz ones:
+ introspection_files = \
+-    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) 
$(deprecatedinclude_HEADERS)) \
++    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) 
$(deprecatedinclude_HEADERS) gtkclipboard-quartz.c gtkdnd-quartz.c) \
+     $(gtk_base_c_sources) \
+     gtkprintoperation-unix.c \
+     gtktypebuiltins.h \
+     gtktypebuiltins.c
+ 
++# And include the regular ones:
++if USE_QUARTZ
++introspection_files += \
++    gtkclipboard.c \
++    gtkdnd.c
++endif
++
+ if USE_X11
+ introspection_files += \
+     gtksocket.c \
+-- 
+1.8.3.rc0
+