packages: python-pygobject/python-pygobject.spec, python-pygobject/gobject-...

[patrys]

Author: patrys                       Date: Thu Jul 22 18:03:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patched for new gobject-introspection

---- Files affected:
packages/python-pygobject:
   python-pygobject.spec (1.44 -> 1.45) , gobject-introspection.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/python-pygobject/python-pygobject.spec
diff -u packages/python-pygobject/python-pygobject.spec:1.44 packages/python-pygobject/python-pygobject.spec:1.45
--- packages/python-pygobject/python-pygobject.spec:1.44	Thu Jul  8 13:59:11 2010
+++ packages/python-pygobject/python-pygobject.spec	Thu Jul 22 20:03:00 2010
@@ -6,13 +6,14 @@
 Summary(pl.UTF-8):	Wiązania Pythona do biblioteki GObject
 Name:		python-%{module}
 Version:	2.20.0
-Release:	4
+Release:	5
 License:	LGPL v2+
 Group:		Libraries/Python
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.20/%{module}-%{version}.tar.bz2
 # Source0-md5:	10e1fb79be3d698476a28b1e1b0c5640
 Patch0:		%{name}-pc.patch
 Patch1:		%{name}-pyc.patch
+Patch2:		gobject-introspection.patch
 URL:		http://www.pygtk.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1:1.7
@@ -84,6 +85,7 @@
 %setup -q -n %{module}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -174,6 +176,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2010/07/22 18:03:00  patrys
+- patched for new gobject-introspection
+
 Revision 1.44  2010/07/08 11:59:11  arekm
 - release 4
 

================================================================
Index: packages/python-pygobject/gobject-introspection.patch
diff -u /dev/null packages/python-pygobject/gobject-introspection.patch:1.1
--- /dev/null	Thu Jul 22 20:03:09 2010
+++ packages/python-pygobject/gobject-introspection.patch	Thu Jul 22 20:03:00 2010
@@ -0,0 +1,85 @@
+--- pygobject-2.20.0/girepository/bank.c~	2009-06-17 22:48:38.000000000 +0200
++++ pygobject-2.20.0/girepository/bank.c	2010-07-22 19:56:35.923703860 +0200
+@@ -114,15 +114,15 @@
+     /* FIXME: Removed from metadata format, fix properly by introducing
+        special-case struct */
+ /*     PyModule_AddIntConstant(m, "TYPE_TAG_GSTRING", GI_TYPE_TAG_GSTRING); */
+-    PyModule_AddIntConstant(m, "TYPE_TAG_INT", GI_TYPE_TAG_INT);
++/*     PyModule_AddIntConstant(m, "TYPE_TAG_INT", GI_TYPE_TAG_INT);
+     PyModule_AddIntConstant(m, "TYPE_TAG_UINT", GI_TYPE_TAG_UINT);
+     PyModule_AddIntConstant(m, "TYPE_TAG_LONG", GI_TYPE_TAG_LONG);
+     PyModule_AddIntConstant(m, "TYPE_TAG_ULONG", GI_TYPE_TAG_ULONG);
+     PyModule_AddIntConstant(m, "TYPE_TAG_SSIZE", GI_TYPE_TAG_SSIZE);
+-    PyModule_AddIntConstant(m, "TYPE_TAG_SIZE", GI_TYPE_TAG_SIZE);
++    PyModule_AddIntConstant(m, "TYPE_TAG_SIZE", GI_TYPE_TAG_SIZE); */
+     PyModule_AddIntConstant(m, "TYPE_TAG_FLOAT", GI_TYPE_TAG_FLOAT);
+     PyModule_AddIntConstant(m, "TYPE_TAG_DOUBLE", GI_TYPE_TAG_DOUBLE);
+-    PyModule_AddIntConstant(m, "TYPE_TAG_TIME_T", GI_TYPE_TAG_TIME_T);
++/*     PyModule_AddIntConstant(m, "TYPE_TAG_TIME_T", GI_TYPE_TAG_TIME_T); */
+     PyModule_AddIntConstant(m, "TYPE_TAG_GTYPE", GI_TYPE_TAG_GTYPE);
+     PyModule_AddIntConstant(m, "TYPE_TAG_UTF8", GI_TYPE_TAG_UTF8);
+     PyModule_AddIntConstant(m, "TYPE_TAG_FILENAME", GI_TYPE_TAG_FILENAME);
+--- pygobject-2.20.0/girepository/bank-argument.c~	2009-06-17 22:48:38.000000000 +0200
++++ pygobject-2.20.0/girepository/bank-argument.c	2010-07-22 20:01:00.901173773 +0200
+@@ -43,9 +43,6 @@
+     case GI_TYPE_TAG_UINT8:
+         arg.v_uint8 = PyInt_AsLong(object);
+         break;
+-    case GI_TYPE_TAG_UINT:
+-        arg.v_uint = PyInt_AsLong(object);
+-        break;
+     case GI_TYPE_TAG_UINT16:
+         arg.v_uint16 = PyInt_AsLong(object);
+         break;
+@@ -63,15 +60,6 @@
+     case GI_TYPE_TAG_INT8:
+         arg.v_int8 = PyInt_AsLong(object);
+         break;
+-    case GI_TYPE_TAG_INT:
+-        arg.v_int = PyInt_AsLong(object);
+-        break;
+-    case GI_TYPE_TAG_LONG:
+-        arg.v_long = PyInt_AsLong(object);
+-        break;
+-    case GI_TYPE_TAG_ULONG:
+-        arg.v_ulong = PyInt_AsLong(object);
+-        break;
+     case GI_TYPE_TAG_BOOLEAN:
+         arg.v_boolean = PyInt_AsLong(object);
+         break;
+@@ -184,9 +172,6 @@
+ 
+     // FIXME: Doesn't seem right to have this here:
+     switch (type_tag) {
+-    case GI_TYPE_TAG_INT:
+-        size = sizeof(int);
+-        break;
+     case GI_TYPE_TAG_INTERFACE:
+         size = sizeof(gpointer);
+         break;
+@@ -248,9 +233,6 @@
+     case GI_TYPE_TAG_UINT8:
+         obj = PyInt_FromLong(arg->v_uint8);
+         break;
+-    case GI_TYPE_TAG_UINT:
+-        obj = PyInt_FromLong(arg->v_uint);
+-        break;
+     case GI_TYPE_TAG_UINT16:
+         obj = PyInt_FromLong(arg->v_uint16);
+         break;
+@@ -260,15 +242,6 @@
+     case GI_TYPE_TAG_UINT64:
+         obj = PyLong_FromUnsignedLongLong(arg->v_uint64);
+         break;
+-    case GI_TYPE_TAG_INT:
+-        obj = PyInt_FromLong(arg->v_int);
+-        break;
+-    case GI_TYPE_TAG_LONG:
+-        obj = PyInt_FromLong(arg->v_long);
+-        break;
+-    case GI_TYPE_TAG_ULONG:
+-        obj = PyInt_FromLong(arg->v_ulong);
+-        break;
+     case GI_TYPE_TAG_INT8:
+         obj = PyInt_FromLong(arg->v_int8);
+         break;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-pygobject/python-pygobject.spec?r1=1.44&r2=1.45&f=u