Accepting request 48439 from home:vuntz:branches:GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/48439
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=25

gobject-introspection-libgda-workaround.patch

@@ -0,0 +1,26 @@
+Index: gobject-introspection-0.9.6/giscanner/maintransformer.py
+===================================================================
+--- gobject-introspection-0.9.6.orig/giscanner/maintransformer.py
++++ gobject-introspection-0.9.6/giscanner/maintransformer.py
+@@ -68,6 +68,21 @@ class MainTransformer(object):
+                 alias = ast.Alias('AttributeList', target=ast.TYPE_ANY)
+                 self._namespace.append(alias, replace=True)
+ 
++        ## WORKAROUND ##
++        # Same hack as Atk hack.
++        # https://bugzilla.gnome.org/show_bug.cgi?id=629779
++        # https://bugzilla.gnome.org/show_bug.cgi?id=629682
++        if self._namespace.name == 'Gda':
++            valuecompare = self._namespace.get('value_compare')
++            slist = self._namespace.get('SList')
++            valuelist = self._namespace.get('ValueList')
++            if valuecompare and valuelist:
++                alias = ast.Alias('ValueList', target=ast.TYPE_ANY)
++                self._namespace.append(alias, replace=True)
++            if slist and valuelist:
++                alias = ast.Alias('SList', target=ast.TYPE_ANY)
++                self._namespace.append(alias, replace=True)
++
+         # Some initial namespace surgery
+         self._namespace.walk(self._pass_fixup_hidden_fields)
+ 

gobject-introspection.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Sep 18 19:53:28 CEST 2010 - vuntz@opensuse.org
+
+- Add gobject-introspection-libgda-workaround.patch: this is a
+  workaround needed when generating the gir file for libgda. See
+  bgo#629779.
+
 -------------------------------------------------------------------
 Fri Sep 17 16:43:37 CEST 2010 - vuntz@opensuse.org
 

gobject-introspection.spec

@@ -29,6 +29,8 @@ Group:          Development/Libraries/GNOME
 Source:         %{name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM gobject-introspection-keyring-workaround.patch bgo#629426 vuntz@opensuse.org -- Workaround for libgnome-keyring
 Patch0:         gobject-introspection-keyring-workaround.patch
+# PATCH-FIX-UPSTREAM gobject-introspection-libgda-workaround.patch bgo#629779 vuntz@opensuse.org -- Workaround for libgda
+Patch1:         gobject-introspection-libgda-workaround.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
@@ -70,6 +72,7 @@ a uniform, machine readable format.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \