diff -Nurp /var/abs/extra/pygobject2/PKGBUILD ./PKGBUILD --- /var/abs/extra/pygobject2/PKGBUILD 2012-07-31 06:04:22.000000000 +0200 +++ ./PKGBUILD 2012-07-31 18:03:20.560592690 +0200 @@ -11,16 +11,29 @@ license=('LGPL') makedepends=('python' 'python2') source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz python2-fix-type.patch + python2-fix-set_qdata.patch python3-fix-build.patch python3-fix-maketrans.patch) options=('!libtool') sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' 'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea' + '844660f10a5c0d206dad0fe3fc43acb569e32f971d85e0ba1543f60de29cd83f' 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') build() { cd "${srcdir}" + + ( + cd "pygobject-${pkgver}" + + #patches available in 2.28 branch but unreleased. + patch -Np1 -i "${srcdir}/python2-fix-type.patch" + patch -Np1 -i "${srcdir}/python2-fix-set_qdata.patch" + patch -Np1 -i "${srcdir}/python3-fix-build.patch" + patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" + ) + cp -a "pygobject-${pkgver}" python2-build mkdir devel @@ -33,11 +46,6 @@ build() { ( cd "pygobject-${pkgver}" - #patches available in 2.28 branch but unreleased. - patch -Np1 -i "${srcdir}/python2-fix-type.patch" - patch -Np1 -i "${srcdir}/python3-fix-build.patch" - patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" - ./configure --prefix=/usr --disable-introspection make ) diff -Nurp /var/abs/extra/pygobject2/python2-fix-set_qdata.patch ./python2-fix-set_qdata.patch --- /var/abs/extra/pygobject2/python2-fix-set_qdata.patch 1970-01-01 01:00:00.000000000 +0100 +++ ./python2-fix-set_qdata.patch 2012-07-31 17:58:50.000000000 +0200 @@ -0,0 +1,24 @@ +From 42d871eb0b08ee6d55e95cc7e4b90844919555b9 Mon Sep 17 00:00:00 2001 +From: Ivan Stankovic +Date: Tue, 21 Feb 2012 11:24:58 +0000 +Subject: Fix set_qdata warning on accessing NULL gobject property + +https://bugzilla.gnome.org/show_bug.cgi?id=661155 +--- +diff --git a/gobject/pygobject.c b/gobject/pygobject.c +index 6c2f06c..70dc89a 100644 +--- a/gobject/pygobject.c ++++ b/gobject/pygobject.c +@@ -991,7 +991,9 @@ pygobject_new(GObject *obj) + PyObject * + pygobject_new_sunk(GObject *obj) + { +- g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1)); ++ if (obj) ++ g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1)); ++ + return pygobject_new_full(obj, TRUE, NULL); + } + +-- +cgit v0.9.0.2