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-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 f204513..e9c05a3 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,10 +1,59 @@ +------------------------------------------------------------------- +Mon Sep 5 15:52:27 UTC 2011 - fcrozat@suse.com + +- 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 + +- 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 + +- 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..76634c4 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 @@ -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 @@ -112,6 +115,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* @@ -131,6 +135,10 @@ 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} <= 1140 +# This was not in old versions of rpm +%dir %{_rpmconfigdir}/fileattrs +%endif %{_rpmconfigdir}/fileattrs/gobjectintrospection.attr %files -n libgirepository-1_0-1