From 007dd214cd2f8be0ee5520a42e0d594354feebccde678adc1449b40505db0c08 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 18 Sep 2010 13:19:53 +0000 Subject: [PATCH 1/3] Accepting request 48422 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/48422 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=24 --- gobject-introspection-0.9.3.tar.bz2 | 3 - gobject-introspection-0.9.6.tar.bz2 | 3 + ...ect-introspection-keyring-workaround.patch | 30 +++++++++ gobject-introspection.changes | 51 ++++++++++++++ gobject-introspection.spec | 67 ++++++++++++------- 5 files changed, 125 insertions(+), 29 deletions(-) delete mode 100644 gobject-introspection-0.9.3.tar.bz2 create mode 100644 gobject-introspection-0.9.6.tar.bz2 create mode 100644 gobject-introspection-keyring-workaround.patch diff --git a/gobject-introspection-0.9.3.tar.bz2 b/gobject-introspection-0.9.3.tar.bz2 deleted file mode 100644 index 988c80c..0000000 --- a/gobject-introspection-0.9.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:662bdd2bf70239fa579777f58bfd0bbb08c6f9b6313020a9b672505d7e3c1c1d -size 780411 diff --git a/gobject-introspection-0.9.6.tar.bz2 b/gobject-introspection-0.9.6.tar.bz2 new file mode 100644 index 0000000..1471938 --- /dev/null +++ b/gobject-introspection-0.9.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e653258394b44a7fc4cdac604c72948c3eff7f1b882f094cfea21ed19acb9ee6 +size 585940 diff --git a/gobject-introspection-keyring-workaround.patch b/gobject-introspection-keyring-workaround.patch new file mode 100644 index 0000000..f42bef8 --- /dev/null +++ b/gobject-introspection-keyring-workaround.patch @@ -0,0 +1,30 @@ +commit 41d11cd82ddfc38d4d347cb039919f11536d12d3 +Author: Vincent Untz +Date: Sat Sep 18 11:34:47 2010 +0200 + + scanner: Add workaround for libgnome-keyring + + https://bugzilla.gnome.org/show_bug.cgi?id=629426 + +diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py +index b7d64a6..2cb878c 100644 +--- a/giscanner/maintransformer.py ++++ b/giscanner/maintransformer.py +@@ -57,6 +57,17 @@ class MainTransformer(object): + alias = ast.Alias('AttributeSet', target=ast.TYPE_ANY) + self._namespace.append(alias, replace=True) + ++ ## WORKAROUND ## ++ # Same hack as Atk hack. ++ # https://bugzilla.gnome.org/show_bug.cgi?id=629426 ++ # https://bugzilla.gnome.org/show_bug.cgi?id=629682 ++ if self._namespace.name == 'GnomeKeyring': ++ attribute = self._namespace.get('Attribute') ++ attributelist = self._namespace.get('AttributeList') ++ if attribute and attributelist: ++ alias = ast.Alias('AttributeList', target=ast.TYPE_ANY) ++ self._namespace.append(alias, replace=True) ++ + # Some initial namespace surgery + self._namespace.walk(self._pass_fixup_hidden_fields) + diff --git a/gobject-introspection.changes b/gobject-introspection.changes index f7302ca..11aa689 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,54 @@ +------------------------------------------------------------------- +Fri Sep 17 16:43:37 CEST 2010 - vuntz@opensuse.org + +- Drop gir-repository Recommends from libgirepository-1_0-1: there + is no real interesting file there anymore. +- Temporarily remove --enable-gtk-doc option from configure: the + 0.9.6 tarball is missing all the files needed for this. See + bgo#629871. +- Move all gir files to the main package (as well as the m4 file + and the Makefile), but still keep the /usr/share/gir-1.0 + directory in libgirepository-1_0-1, to not force everybody to own + it. The reason for the move is that the gobject-introspection + package is more or less like a compiler, while the devel package + is really the devel package for the libgirepository-1.0 library. +- However, we need to keep the pkg-config file in the devel + subpackage at the moment, since they cover both the library and + the gobject-introspection tools. We'll be able to change this + when bgo#629930 gets fixed. +- Move the AUTHORS, NEWS and similar files to the main package. +- Add gobject-introspection-keyring-workaround.patch: this is a + workaround needed when generating the gir file for + libgnome-keyring. See bgo#629426. + +------------------------------------------------------------------- +Thu Sep 16 21:28:42 CEST 2010 - dimstar@opensuse.org + +- Update to version 0.9.6: + + Fix regressions in the scanner rewrite from 0.9.5, especially + issues that stopped other modules from building correctly. + + Various other small improvements and code cleanups in the + scanner. + + Add missing annotations to GLib and Gio. + + Various bug fixes. + +------------------------------------------------------------------- +Sat Sep 11 20:42:17 CEST 2010 - dimstar@opensuse.org + +- Update to version 0.9.5: + + Major rewrite, that leads to a bump in the gir format (version + 1.2). + + Rename Everything to Regress, and do no longer install it by + default; instead, ship the C files in + $(datadir)/gobject-introspection/tests/ + + Fix giscanner crash with no cache directory. + + Make the scanner parse C++ files too. + + If GI_SCANNER_DEBUG is set, drop into a debugger on error in + the scanner. + + Import DBus, DBusGLib gir from gir-repository. + + Update some gir files shipped with gobject-introspection. + + Various bug fixes. + ------------------------------------------------------------------- Fri Aug 6 22:24:00 CEST 2010 - vuntz@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index ec0686f..4460437 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -1,5 +1,5 @@ # -# spec file for package gobject-introspection (Version 0.9.3) +# spec file for package gobject-introspection (Version 0.9.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,6 +18,17 @@ Name: gobject-introspection +Version: 0.9.6 +# FIXME: next tarball should have gtk-doc again, so pass --enable-gtk-doc to configure. See bgo#629871 +# FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel +Release: 1 +License: LGPLv2.1+ +Summary: GObject Introspection Tools +Url: http://live.gnome.org/GObjectIntrospection +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 BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -27,13 +38,6 @@ BuildRequires: python-devel BuildRequires: python-xml BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gobject-2.0) -Version: 0.9.3 -Release: 1 -License: LGPLv2.1+ -Summary: GObject Introspection Tools -Url: http://live.gnome.org/GObjectIntrospection -Group: Development/Libraries/GNOME -Source: %{name}-%{version}.tar.bz2 Requires: libgirepository-1_0-1 = %{version} Requires: python-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,7 +50,6 @@ a uniform, machine readable format. License: LGPLv2.1+ Summary: GObject Introspection Library Group: Development/Libraries/GNOME -Recommends: gir-repository %description -n libgirepository-1_0-1 The goal of the project is to describe the APIs and collect them in @@ -66,11 +69,12 @@ a uniform, machine readable format. %prep %setup -q +%patch0 -p1 %build %configure \ - --disable-static \ - --enable-gtk-doc + --disable-static +# --enable-gtk-doc %__make %{?jobs:-j%jobs} %install @@ -87,31 +91,42 @@ rm -rf %{buildroot} %files %defattr(-,root,root) -%doc COPYING COPYING.GPL -%{_bindir}/* +%doc AUTHORS CONTRIBUTORS COPYING COPYING.GPL NEWS README TODO +%{_bindir}/g-ir-compiler +%{_bindir}/g-ir-generate +%{_bindir}/g-ir-scanner +%doc %{_mandir}/man1/g-ir-compiler.1* +%doc %{_mandir}/man1/g-ir-generate.1* +%doc %{_mandir}/man1/g-ir-scanner.1* +%{_datadir}/aclocal/introspection.m4 +%{_datadir}/gir-1.0/*.gir # We don't include directly %{_libdir}/gobject-introspection since there might # be files there in the future that belong to the library package %dir %{_libdir}/gobject-introspection -%{_libdir}/gobject-introspection/giscanner -%doc %{_mandir}/man?/*.* +%{_libdir}/gobject-introspection/giscanner/ +# We explicitly list the content of the directory that is of interest to us, +# since there might be files there in the future that belong to the library +# package +%dir %{_datadir}/gobject-introspection-1.0 +%{_datadir}/gobject-introspection-1.0/Makefile.introspection +%{_datadir}/gobject-introspection-1.0/tests/ %files -n libgirepository-1_0-1 %defattr(-,root,root) -%doc AUTHORS CONTRIBUTORS COPYING.LGPL NEWS README TODO -%{_datadir}/gir-1.0/ -%{_libdir}/*.so.* +%doc COPYING.LGPL +# We own this directory here instead of devel to make sure other packages do +# not have to own it +%dir %{_datadir}/gir-1.0 +%{_libdir}/libgirepository-1.0.so.* %{_libdir}/girepository-1.0/ %files devel %defattr(-,root,root) -%doc %{_datadir}/gtk-doc/html/gi/ +#%doc %{_datadir}/gtk-doc/html/gi/ %{_includedir}/gobject-introspection-1.0/ -%{_datadir}/aclocal/*.m4 -# We explicitly list the content of the directory that is of interest to us, -# since not everything might go into the devel package in the future -%dir %{_datadir}/gobject-introspection-1.0 -%{_datadir}/gobject-introspection-1.0/Makefile.introspection -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc +%{_libdir}/libgirepository-1.0.so +# FIXME: those two files should be moved to the main package when bgo#629930 gets fixed +%{_libdir}/pkgconfig/gobject-introspection-1.0.pc +%{_libdir}/pkgconfig/gobject-introspection-no-export-1.0.pc %changelog From 6b6be83a3605b797deea7865b9b9bdda66ad093b0cc4dd9c2ae64fef32685b47 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 18 Sep 2010 18:05:53 +0000 Subject: [PATCH 2/3] 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 | 26 +++++++++++++++++++ gobject-introspection.changes | 7 +++++ gobject-introspection.spec | 3 +++ 3 files changed, 36 insertions(+) create mode 100644 gobject-introspection-libgda-workaround.patch diff --git a/gobject-introspection-libgda-workaround.patch b/gobject-introspection-libgda-workaround.patch new file mode 100644 index 0000000..04e8d28 --- /dev/null +++ b/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) + diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 11aa689..d6e8b81 100644 --- a/gobject-introspection.changes +++ b/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 diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 4460437..1ae301f 100644 --- a/gobject-introspection.spec +++ b/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 \ From 249ee5f6ed09e0f3886b7c073bc5586182797a7a40225673cc440b5aee9f8ae1 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 23 Sep 2010 21:54:12 +0000 Subject: [PATCH 3/3] Accepting request 48926 from GNOME:Factory checked in (request 48926) OBS-URL: https://build.opensuse.org/request/show/48926 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=26 --- gobject-introspection.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 1ae301f..e0e727b 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -19,9 +19,9 @@ Name: gobject-introspection Version: 0.9.6 +Release: 1 # FIXME: next tarball should have gtk-doc again, so pass --enable-gtk-doc to configure. See bgo#629871 # FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel -Release: 1 License: LGPLv2.1+ Summary: GObject Introspection Tools Url: http://live.gnome.org/GObjectIntrospection