Apply upstream Bug#737874 fix, remove redefinitions.

2 files changed, 35 insertions, 1 deletions

diff --git a/devel/py-gobject3/distinfo b/devel/py-gobject3/distinfo
index a9a4fbb0bfe..6a24414be91 100644
--- a/devel/py-gobject3/distinfo
+++ b/devel/py-gobject3/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2014/10/25 11:27:09 prlw1 Exp $
+$NetBSD: distinfo,v 1.12 2014/11/01 11:25:41 obache Exp $
 
 SHA1 (pygobject-3.14.0.tar.xz) = 638302e7b97a7a8f7bc1f9014f2765cf22dd197e
 RMD160 (pygobject-3.14.0.tar.xz) = 9d8c217252798a38ac9420285dbb2b50080f749d
 Size (pygobject-3.14.0.tar.xz) = 720128 bytes
+SHA1 (patch-gi_pygi-cache.h) = d73a649077a89f43db0d98e05223cf6f3ebdb4d2
diff --git a/devel/py-gobject3/patches/patch-gi_pygi-cache.h b/devel/py-gobject3/patches/patch-gi_pygi-cache.h
new file mode 100644
index 00000000000..c357925d2bc
--- /dev/null
+++ b/devel/py-gobject3/patches/patch-gi_pygi-cache.h
@@ -0,0 +1,33 @@
+$NetBSD: patch-gi_pygi-cache.h,v 1.1 2014/11/01 11:25:41 obache Exp $
+
+* Remove redefinitions of function and vfunc cache typedefs
+  https://bugzilla.gnome.org/show_bug.cgi?id=737874
+
+--- gi/pygi-cache.h.orig	2014-09-10 22:10:32.000000000 +0000
++++ gi/pygi-cache.h
+@@ -197,7 +197,7 @@ struct _PyGICallableCache
+                                      GICallableInfo *callable_info);
+ };
+ 
+-typedef struct _PyGIFunctionCache {
++struct _PyGIFunctionCache {
+     PyGICallableCache callable_cache;
+ 
+     /* An invoker with ffi_cif already setup */
+@@ -207,13 +207,13 @@ typedef struct _PyGIFunctionCache {
+                          PyGIInvokeState *state,
+                          PyObject *py_args,
+                          PyObject *py_kwargs);
+-} PyGIFunctionCache;
++} ;
+ 
+-typedef struct _PyGIVFuncCache {
++struct _PyGIVFuncCache {
+     PyGIFunctionWithInstanceCache fwi_cache;
+ 
+     GIBaseInfo *info;
+-} PyGIVFuncCache;
++};
+ 
+ 
+ gboolean