From 4a0b03fe9f4f491c2b8442b74d5f1b00f45f5216 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Jul 20 2012 18:12:07 +0000 Subject: Fix gnome-shell vpn dialogs --- diff --git a/gobject-introspection.spec b/gobject-introspection.spec index e407357..d20c6cd 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -3,7 +3,7 @@ Name: gobject-introspection Version: 1.33.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Introspection system for GObject-based libraries Group: Development/Libraries @@ -12,6 +12,9 @@ URL: http://live.gnome.org/GObjectIntrospection #VCS: git:git://git.gnome.org/gobject-introspection Source0: http://download.gnome.org/sources/gobject-introspection/1.32/%{name}-%{version}.tar.xz +# upstream fix +Patch0: keyfile-load.patch + Obsoletes: gir-repository BuildRequires: glib2-devel @@ -54,6 +57,7 @@ Libraries and headers for gobject-introspection %prep %setup -q +%patch0 -p1 %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; @@ -94,6 +98,9 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' %{_datadir}/gtk-doc/html/gi/* %changelog +* Fri Jul 20 2012 Matthias Clasen - 1.33.4-2 +- Fix an unintended api break that broke vpn in gnome-shell + * Tue Jul 17 2012 Richard Hughes - 1.33.4-1 - Update to 1.33.4 diff --git a/keyfile-load.patch b/keyfile-load.patch new file mode 100644 index 0000000..1bcd85e --- /dev/null +++ b/keyfile-load.patch @@ -0,0 +1,12 @@ +diff -up gobject-introspection-1.33.4/gir/glib-2.0.c.keyfile-load gobject-introspection-1.33.4/gir/glib-2.0.c +--- gobject-introspection-1.33.4/gir/glib-2.0.c.keyfile-load 2012-07-20 14:10:18.237088099 -0400 ++++ gobject-introspection-1.33.4/gir/glib-2.0.c 2012-07-20 14:10:26.307088221 -0400 +@@ -16899,7 +16899,7 @@ + /** + * g_key_file_load_from_data: + * @key_file: an empty #GKeyFile struct +- * @data: (array length=length): key file loaded in memory ++ * @data: key file loaded in memory + * @length: the length of @data in bytes (or -1 if data is nul-terminated) + * @flags: flags from #GKeyFileFlags + * @error: return location for a #GError, or %NULL