Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.52 grimoire by George Sherwood (acab25d1e211a1bf57a288d45a7bfc7a11d1eaca)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.52 grimoire by George Sherwood (acab25d1e211a1bf57a288d45a7bfc7a11d1eaca)
  • Date: Sat, 29 Jan 2011 11:32:34 -0600

GIT changes to stable-0.52 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

gnome2-libs/pygobject/DETAILS | 1 +
gnome2-libs/pygobject/HISTORY | 4 ++++
gnome2-libs/pygobject/PRE_BUILD | 3 +++
gnome2-libs/pygobject/pygobject-crash-fix.patch | 22 ++++++++++++++++++++++
4 files changed, 30 insertions(+)

New commits:
commit acab25d1e211a1bf57a288d45a7bfc7a11d1eaca
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: George Sherwood <gsherwood AT sourcemage.org>

pygobject: added patch for crasher bug 15929
(cherry picked from commit 5539251be2c962b2302a903a676601f0f0f1ab12)

diff --git a/gnome2-libs/pygobject/DETAILS b/gnome2-libs/pygobject/DETAILS
index 43a2cdd..fc91747 100755
--- a/gnome2-libs/pygobject/DETAILS
+++ b/gnome2-libs/pygobject/DETAILS
@@ -1,5 +1,6 @@
SPELL=pygobject
VERSION=2.26.0
+ PATCHLEVEL=1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-libs/pygobject/HISTORY b/gnome2-libs/pygobject/HISTORY
index 5a99e1b..a25cec9 100644
--- a/gnome2-libs/pygobject/HISTORY
+++ b/gnome2-libs/pygobject/HISTORY
@@ -1,3 +1,7 @@
+2011-01-23 Arwed von Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, pygobject-crash-fix.patch: added for bug #15929
+ * DETAILS: PATCHLEVEL=1
+
2010-10-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.26.0
* DEPENDS: added optional_depends gobject-introspection #15890
diff --git a/gnome2-libs/pygobject/PRE_BUILD b/gnome2-libs/pygobject/PRE_BUILD
new file mode 100755
index 0000000..93422e1
--- /dev/null
+++ b/gnome2-libs/pygobject/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/pygobject-crash-fix.patch
diff --git a/gnome2-libs/pygobject/pygobject-crash-fix.patch
b/gnome2-libs/pygobject/pygobject-crash-fix.patch
new file mode 100644
index 0000000..df59b48
--- /dev/null
+++ b/gnome2-libs/pygobject/pygobject-crash-fix.patch
@@ -0,0 +1,22 @@
+From 97774cb149c5b03d5ef82a5af3f19e2ce4d79d0b Mon Sep 17 00:00:00 2001
+From: John (J5) Palmieri <johnp AT redhat.com>
+Date: Mon, 04 Oct 2010 16:43:31 +0000
+Subject: return NULL instead of -1 which fixes crash when introspection is
turned off
+
+* see https://bugzilla.gnome.org/show_bug.cgi?id=631158
+---
+diff --git a/gi/pygi.h b/gi/pygi.h
+index 551bb6f..da71d28 100644
+--- a/gi/pygi.h
++++ b/gi/pygi.h
+@@ -155,7 +155,7 @@ static inline PyObject *
+ pygi_get_property_value (PyGObject *instance,
+ const gchar *attr_name)
+ {
+- return -1;
++ return NULL;
+ }
+
+ static inline gint
+--
+cgit v0.8.3.1



  • [SM-Commit] GIT changes to stable-0.52 grimoire by George Sherwood (acab25d1e211a1bf57a288d45a7bfc7a11d1eaca), George Sherwood, 01/29/2011

Archive powered by MHonArc 2.6.24.

Top of Page