diff --git a/.gitignore b/.gitignore index d988389..6567604 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gobject-introspection-1.36.0.tar.xz +SOURCES/gobject-introspection-1.42.0.tar.xz diff --git a/.gobject-introspection.metadata b/.gobject-introspection.metadata index 8365462..ba89ec3 100644 --- a/.gobject-introspection.metadata +++ b/.gobject-introspection.metadata @@ -1 +1 @@ -8f0945bda62f2bc2a5ce36e8a1ea7d4753ab0517 SOURCES/gobject-introspection-1.36.0.tar.xz +b3e095004aa8321a5a814aacd019e6953d69c4eb SOURCES/gobject-introspection-1.42.0.tar.xz diff --git a/SOURCES/0001-scanner-dont-barf-on-anonymous-unions.patch b/SOURCES/0001-scanner-dont-barf-on-anonymous-unions.patch deleted file mode 100644 index ed8f0e1..0000000 --- a/SOURCES/0001-scanner-dont-barf-on-anonymous-unions.patch +++ /dev/null @@ -1,31 +0,0 @@ -# This patch is a hand edited backport from upstream since RPM is crap -# and doesn't understand git. - -From 305e0bd34a11e06219d1e6a7b7078918d050a4d6 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Wed, 30 Oct 2013 15:24:06 +0000 -Subject: [PATCH] scanner: Don't barf on anonymous unions - -I'd like to be able to use this inside GTK+. - -See: https://bugzilla.gnome.org/show_bug.cgi?id=711153 - -https://bugzilla.gnome.org/show_bug.cgi?id=711157 ---- - giscanner/maintransformer.py | 1 + - tests/scanner/Regress-1.0-expected.gir | 20 ++++++++++++++++++++ - tests/scanner/regress.h | 12 ++++++++++++ - 3 files changed, 33 insertions(+) - ---- giscanner/maintransformer.py~ 2013-02-19 10:57:45.000000000 -0500 -+++ giscanner/maintransformer.py 2013-10-31 11:18:05.720336577 -0400 -@@ -116,7 +116,8 @@ - for field in node.fields: - if field is None: - continue -- if (field.name.startswith('_') -+ if (field.name is not None -+ and field.name.startswith('_') - and field.anonymous_node is not None - and isinstance(field.anonymous_node, ast.Callback)): - field.introspectable = False diff --git a/SPECS/gobject-introspection.spec b/SPECS/gobject-introspection.spec index 9377822..d8f3864 100644 --- a/SPECS/gobject-introspection.spec +++ b/SPECS/gobject-introspection.spec @@ -1,14 +1,13 @@ Name: gobject-introspection -Version: 1.36.0 -Release: 4%{?dist} +Version: 1.42.0 +Release: 1%{?dist} Summary: Introspection system for GObject-based libraries Group: Development/Libraries License: GPLv2+, LGPLv2+, MIT URL: http://live.gnome.org/GObjectIntrospection #VCS: git:git://git.gnome.org/gobject-introspection -Source0: http://download.gnome.org/sources/gobject-introspection/1.36/%{name}-%{version}.tar.xz -Patch0: 0001-scanner-dont-barf-on-anonymous-unions.patch +Source0: http://download.gnome.org/sources/gobject-introspection/1.42/%{name}-%{version}.tar.xz Obsoletes: gir-repository @@ -42,7 +41,7 @@ things. %package devel Summary: Libraries and headers for gobject-introspection Group: Development/Libraries -Requires: %name = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} # Not always, but whatever, it's a tiny dep to pull in Requires: libtool # For g-ir-doctool @@ -54,7 +53,6 @@ Libraries and headers for gobject-introspection %prep %setup -q -%patch0 -p0 %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;) @@ -96,6 +94,10 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' %{_datadir}/gtk-doc/html/gi/* %changelog +* Tue Apr 28 2015 Matthias Clasen - 1.42.0-1 +- Update to 1.42.0 +- Resolves: #1174439 + * Fri Jan 24 2014 Daniel Mach - 1.36.0-4 - Mass rebuild 2014-01-24