From c6e58da83833d0a6ca03de310457f34a7ab18b01 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 18 Jul 2012 09:08:19 +0100 Subject: [PATCH] Update to 3.3.4 --- ...fix-segfault-with-class-interface-mismatch.patch | 12 ------------ pygobject3.spec | 13 +++++-------- sources | 2 +- 3 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 pygobject-3.3.3.1-fix-segfault-with-class-interface-mismatch.patch diff --git a/pygobject-3.3.3.1-fix-segfault-with-class-interface-mismatch.patch b/pygobject-3.3.3.1-fix-segfault-with-class-interface-mismatch.patch deleted file mode 100644 index 39fcc4a..0000000 --- a/pygobject-3.3.3.1-fix-segfault-with-class-interface-mismatch.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up pygobject-3.3.3.1/gi/pygi-cache.c.old pygobject-3.3.3.1/gi/pygi-cache.c ---- pygobject-3.3.3.1/gi/pygi-cache.c.old 2012-06-26 13:55:44.987711357 -0400 -+++ pygobject-3.3.3.1/gi/pygi-cache.c 2012-06-26 13:56:39.242033085 -0400 -@@ -1277,6 +1277,8 @@ _args_cache_generate (GICallableInfo *ca - return_direction, - -1, - -1); -+ if (return_cache == NULL) -+ return FALSE; - - return_cache->is_skipped = g_callable_info_skip_return (callable_info); - callable_cache->return_cache = return_cache; diff --git a/pygobject3.spec b/pygobject3.spec index 2c5e6bf..752fb94 100644 --- a/pygobject3.spec +++ b/pygobject3.spec @@ -11,8 +11,8 @@ ### Abstract ### Name: pygobject3 -Version: 3.3.3.1 -Release: 2%{?dist} +Version: 3.3.4 +Release: 1%{?dist} License: LGPLv2+ and MIT Group: Development/Languages Summary: Python 2 bindings for GObject Introspection @@ -20,11 +20,6 @@ URL: https://live.gnome.org/PyGObject #VCS: git:git://git.gnome.org/pygobject Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.3/pygobject-%{version}.tar.xz -# Fix a segfault when dealing with a typelib file that's out-of-sync with the -# underlying code. -# Reported upstream as https://bugzilla.gnome.org/show_bug.cgi?id=678914 -Patch1: pygobject-3.3.3.1-fix-segfault-with-class-interface-mismatch.patch - ### Build Dependencies ### BuildRequires: glib2-devel >= %{glib2_version} @@ -76,7 +71,6 @@ for use in Python 3 programs. %prep %setup -q -n pygobject-%{version} -%patch1 -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -150,6 +144,9 @@ find $RPM_BUILD_ROOT -name '*.a' -delete %endif # with_python3 %changelog +* Tue Jul 17 2012 Richard Hughes - 3.3.4-1 +- Update to 3.3.4 + * Tue Jun 26 2012 David Malcolm - 3.3.3.1-2 - fix a segfault when dealing with mismatched .so/typelib files diff --git a/sources b/sources index 3078ef1..9113ecb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3ed0019c00fd41727d90394cd1894da pygobject-3.3.3.1.tar.xz +676dc96593362b7b0aa54fea0c8e744c pygobject-3.3.4.tar.xz