From d848a5ae0519f35d72acdb2ee790b5196f66559d72c039d66e4b7bbed5684936 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Aug 2011 07:15:17 +0000 Subject: [PATCH 1/5] Updating link to change in openSUSE:Factory/gobject-introspection revision 32.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=85efb6e88a31375f8ca9c053792ccbe2 --- gobject-introspection.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 098ebc3..0de4f47 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -19,7 +19,7 @@ Name: gobject-introspection Version: 1.29.16 -Release: 1 +Release: 2 # FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel License: LGPLv2.1+ Summary: GObject Introspection Tools From a641b9e9678cdb2e391b9aad3d1ca98bc32fe3aac2439c9af3313ebd91dba95b Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 2 Sep 2011 16:00:46 +0000 Subject: [PATCH 2/5] Accepting request 80698 from home:vuntz:branches:GNOME:Factory Update to 1.29.17 OBS-URL: https://build.opensuse.org/request/show/80698 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=69 --- gobject-introspection-1.29.16.tar.bz2 | 3 -- gobject-introspection-1.29.17.tar.bz2 | 3 ++ gobject-introspection.changes | 44 ++++++++++++++++++++++++--- gobject-introspection.spec | 5 +-- 4 files changed, 46 insertions(+), 9 deletions(-) delete mode 100644 gobject-introspection-1.29.16.tar.bz2 create mode 100644 gobject-introspection-1.29.17.tar.bz2 diff --git a/gobject-introspection-1.29.16.tar.bz2 b/gobject-introspection-1.29.16.tar.bz2 deleted file mode 100644 index 4c9fb97..0000000 --- a/gobject-introspection-1.29.16.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0291708e5991ba77b50246259d79d93ac3c1a9197aaf2c60c02198099dafa05 -size 1288656 diff --git a/gobject-introspection-1.29.17.tar.bz2 b/gobject-introspection-1.29.17.tar.bz2 new file mode 100644 index 0000000..59698c9 --- /dev/null +++ b/gobject-introspection-1.29.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0760324a3c251abc61dbe626aeb14bb3be9e22bc61ec053c71e525b8507fa766 +size 1247153 diff --git a/gobject-introspection.changes b/gobject-introspection.changes index f204513..84822e1 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,10 +1,46 @@ +------------------------------------------------------------------- +Fri Sep 2 12:33:16 UTC 2011 - vuntz@opensuse.org + +- Update to version 1.29.17: + + Fix declarations in xlib-2.0.gir. + + Regenerate Gio/GLib/GObject annotations. + + libgirepository: + - Deprecate ErrorDomain + - Switch to storing string form of error quarks + - Add g_irepository_find_by_error_domain() + - Allow enums and bitfields to have static methods + - Documentation improvements + + giscanner: + - Add DocBook and Mallard generator + - Various fixes to correctly handle the docs + - Add signal flags + - Recognize constructors ending in 'newv' + - Handle static methods on all types + - Allow enums and bitfields to have static methods + - Try harder to preserve c:type + - Forbid GPtrArrays holding non-pointer types + - Disallow non byte types for GByteArrays + - Properly handle GParamSpec and descendants + - Add a moved_to property to backcompat functions + - Avoid most of the special-casing of GObject.Object in the + scanner + - Fix warning for missing (element-type) + - Fix symbols being reported in invalid files + - Teach scanner's girparser about fundamentals + - Make the Transformer respect 'skip' annotations + - Allow passing additional include dirs when parsing a gir + - Workaround: Automatically turn Gdk.Rectangle gtype into + cairo.RectangleInt + + Various code cleanups. + + Tests improvements. + ------------------------------------------------------------------- Wed Aug 17 19:47:13 UTC 2011 - dimstar@opensuse.org -- Extend gi-find-deps.sh: Special case for .py files: - raise ImportError.* lines are deleted. pygobject for example - tries to explain how to convert the sources to the new gi-based - python bindings. +- Extend gi-find-deps.sh with a special case for .py files: + "raise ImportError.*" lines are deleted. This is needed as + pygobject tries to explain with such lines how to convert the + sources to the new gi-based python bindings. ------------------------------------------------------------------- Wed Jul 27 23:29:04 CEST 2011 - vuntz@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 0de4f47..36720c1 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -18,8 +18,8 @@ Name: gobject-introspection -Version: 1.29.16 -Release: 2 +Version: 1.29.17 +Release: 1 # FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel License: LGPLv2.1+ Summary: GObject Introspection Tools @@ -112,6 +112,7 @@ rm -rf %{buildroot} %doc AUTHORS CONTRIBUTORS COPYING COPYING.GPL NEWS README TODO %{_bindir}/g-ir-annotation-tool %{_bindir}/g-ir-compiler +%{_bindir}/g-ir-doc-tool %{_bindir}/g-ir-generate %{_bindir}/g-ir-scanner %doc %{_mandir}/man1/g-ir-compiler.1* From 03e77ba149a85874215502d6837607ff06583353c10d4430ea1f686d86fa19f2 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 2 Sep 2011 16:44:34 +0000 Subject: [PATCH 3/5] Accepting request 80713 from home:vuntz:branches:GNOME:Factory Add patch to fix build of gjs/python-gobject OBS-URL: https://build.opensuse.org/request/show/80713 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=70 --- gobject-introspection-fix-regress.patch | 21 +++++++++++++++++++++ gobject-introspection.changes | 7 +++++++ gobject-introspection.spec | 3 +++ 3 files changed, 31 insertions(+) create mode 100644 gobject-introspection-fix-regress.patch diff --git a/gobject-introspection-fix-regress.patch b/gobject-introspection-fix-regress.patch new file mode 100644 index 0000000..62c480e --- /dev/null +++ b/gobject-introspection-fix-regress.patch @@ -0,0 +1,21 @@ +commit f02d8bd8aca34817a9085fc700fad88c874e3f18 +Author: Vincent Untz +Date: Fri Sep 2 18:40:54 2011 +0200 + + Fix wrong type of variable in regression test + + https://bugzilla.gnome.org/show_bug.cgi?id=658075 + +diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c +index 04b4950..d44e692 100644 +--- a/tests/scanner/regress.c ++++ b/tests/scanner/regress.c +@@ -224,7 +224,7 @@ regress_test_closure_variant (GClosure *closure, const GVariant* arg) + { + GValue return_value = {0, }; + GValue arguments[1] = {{0,} }; +- int ret; ++ GVariant *ret; + + g_value_init (&return_value, G_TYPE_VARIANT); + diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 84822e1..14f55e2 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 2 16:39:40 UTC 2011 - vuntz@opensuse.org + +- Add gobject-introspection-fix-regress.patch: fix wrong type for a + variable, which was causing build issues in gjs and + python-gobject. + ------------------------------------------------------------------- Fri Sep 2 12:33:16 UTC 2011 - vuntz@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 36720c1..e3a37d5 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -31,6 +31,8 @@ Source1: gi-find-deps.sh Source2: gobjectintrospection.attr Source3: gobject-introspection-typelib.template Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM gobject-introspection-fix-regress.patch bgo#658075 vuntz@opensuse.org -- Fix wrong type for variable +Patch0: gobject-introspection-fix-regress.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -77,6 +79,7 @@ a uniform, machine readable format. %prep %setup -q +%patch0 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh From 2137cf89d1e57a760f9d9cd4e3fa5170925a63eb161933bd87a09d800996bf1b Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 6 Sep 2011 19:49:35 +0000 Subject: [PATCH 4/5] Accepting request 80996 from home:fcrozat:gnome3.2 - Fix build on 11.4 OBS-URL: https://build.opensuse.org/request/show/80996 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=71 --- gobject-introspection.changes | 5 +++++ gobject-introspection.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 14f55e2..7e8354c 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 5 15:52:27 UTC 2011 - fcrozat@suse.com + +- Fix build on 11.4 + ------------------------------------------------------------------- Fri Sep 2 16:39:40 UTC 2011 - vuntz@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index e3a37d5..08c6de2 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -135,6 +135,9 @@ rm -rf %{buildroot} %{_datadir}/gobject-introspection-1.0/tests/ %{_datadir}/gobject-introspection-1.0/gdump.c %{_rpmconfigdir}/gi-find-deps.sh +%if 0%{suse_version} < 1210 +%dir %{_rpmconfigdir}/fileattrs +%endif %{_rpmconfigdir}/fileattrs/gobjectintrospection.attr %files -n libgirepository-1_0-1 From 7670f5a1fc4e8f7307d2d1d61c7da99eaa915f15c01beea3550dd049f31fd107 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 6 Sep 2011 19:51:14 +0000 Subject: [PATCH 5/5] Accepting request 81146 from home:vuntz:branches:GNOME:Factory tweak OBS-URL: https://build.opensuse.org/request/show/81146 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=72 --- gobject-introspection.changes | 3 ++- gobject-introspection.spec | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 7e8354c..e9c05a3 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Mon Sep 5 15:52:27 UTC 2011 - fcrozat@suse.com -- Fix build on 11.4 +- Fix build on 11.4 by owning %{_rpmconfigdir}/fileattrs, that + appeared in recent rpm. ------------------------------------------------------------------- Fri Sep 2 16:39:40 UTC 2011 - vuntz@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 08c6de2..76634c4 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -135,7 +135,8 @@ rm -rf %{buildroot} %{_datadir}/gobject-introspection-1.0/tests/ %{_datadir}/gobject-introspection-1.0/gdump.c %{_rpmconfigdir}/gi-find-deps.sh -%if 0%{suse_version} < 1210 +%if 0%{suse_version} <= 1140 +# This was not in old versions of rpm %dir %{_rpmconfigdir}/fileattrs %endif %{_rpmconfigdir}/fileattrs/gobjectintrospection.attr