[gtk-osx] Fix double-typedef in gi/pygi-cache.h.



commit 55ff901ee06aae76c46a93bd41f7d165a705355b
Author: John Ralls <jralls ceridwen us>
Date:   Sun Feb 22 14:50:36 2015 -0800

    Fix double-typedef in gi/pygi-cache.h.

 modulesets-stable/gtk-osx-python.modules |    4 ++-
 patches/pygi-cache-double-typedef.patch  |   31 ++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index bfeaa8b..a12b284 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -172,7 +172,9 @@
 
    <autotools id="pygobject3" autogen-sh="configure" >
     <branch version="3.14.0" module="pygobject/3.14/pygobject-3.14.0.tar.xz"
-            hash="sha256:779effa93f4b59cdb72f4ab0128fb3fd82900bf686193b570fd3a8ce63392d54"/>
+           hash="sha256:779effa93f4b59cdb72f4ab0128fb3fd82900bf686193b570fd3a8ce63392d54">
+            <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/pygi-cache-double-typedef.patch"; 
strip="1"/>
+    </branch>
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
     </dependencies>
diff --git a/patches/pygi-cache-double-typedef.patch b/patches/pygi-cache-double-typedef.patch
new file mode 100644
index 0000000..aa8293a
--- /dev/null
+++ b/patches/pygi-cache-double-typedef.patch
@@ -0,0 +1,31 @@
+diff -c 
/Users/john/Development/Gramps-Build/gramps-41-tarball-Leopard/src/pygobject-3.14.0/gi/pygi-cache.h\~ 
/Users/john/Development/Gramps-Build/gramps-41-tarball-Leopard/src/pygobject-3.14.0/gi/pygi-cache.h
+--- a/gi/pygi-cache.h  Wed Sep 10 15:10:32 2014
++++ b/gi/pygi-cache.h  Tue Feb 17 16:04:45 2015
+@@ -197,7 +197,7 @@
+                                      GICallableInfo *callable_info);
+ };
+ 
+-typedef struct _PyGIFunctionCache {
++struct _PyGIFunctionCache {
+     PyGICallableCache callable_cache;
+ 
+     /* An invoker with ffi_cif already setup */
+@@ -207,13 +207,13 @@
+                          PyGIInvokeState *state,
+                          PyObject *py_args,
+                          PyObject *py_kwargs);
+-} PyGIFunctionCache;
++};
+ 
+-typedef struct _PyGIVFuncCache {
++struct _PyGIVFuncCache {
+     PyGIFunctionWithInstanceCache fwi_cache;
+ 
+     GIBaseInfo *info;
+-} PyGIVFuncCache;
++};
+ 
+ 
+ gboolean
+
+Diff finished.  Sun Feb 22 14:44:00 2015


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]