[arch-commits] Commit in pygobject2/trunk (PKGBUILD python2-fix-type.patch)

[Gaetan Bisson]

    Date: Sunday, May 6, 2012 @ 18:43:56
  Author: bisson
Revision: 158677

fix FS#29782

Added:
  pygobject2/trunk/python2-fix-type.patch
Modified:
  pygobject2/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    5 +++-
 python2-fix-type.patch |   50 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-06 22:35:08 UTC (rev 158676)
+++ PKGBUILD	2012-05-06 22:43:56 UTC (rev 158677)
@@ -4,16 +4,18 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://www.pygtk.org/"
 license=('LGPL')
 makedepends=('python' 'python2')
 source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
+        python2-fix-type.patch
         python3-fix-build.patch
         python3-fix-maketrans.patch)
 options=('!libtool')
 sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
+            'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea'
             'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
             '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
 
@@ -32,6 +34,7 @@
   (
     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"
 

Added: python2-fix-type.patch
===================================================================
--- python2-fix-type.patch	                        (rev 0)
+++ python2-fix-type.patch	2012-05-06 22:43:56 UTC (rev 158677)
@@ -0,0 +1,50 @@
+From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Mon, 12 Mar 2012 16:44:14 -0400
+Subject: gio-types.defs: change some enums to flags
+
+These flags types were originally incorrectly handled in glib as being
+enums.  That bug was fixed, but they're still enums here, leading to
+warnings about the mismatch.
+
+Change them to flags.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668522
+---
+ gio/gio-types.defs |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gio-types.defs b/gio/gio-types.defs
+index 331e0bc..7eee5c8 100644
+--- a/gio/gio-types.defs
++++ b/gio/gio-types.defs
+@@ -526,7 +526,7 @@
+   )
+ )
+ 
+-(define-enum MountMountFlags
++(define-flags MountMountFlags
+   (in-module "gio")
+   (c-name "GMountMountFlags")
+   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
+@@ -545,7 +545,7 @@
+   )
+ )
+ 
+-(define-enum DriveStartFlags
++(define-flags DriveStartFlags
+   (in-module "gio")
+   (c-name "GDriveStartFlags")
+   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
+@@ -770,7 +770,7 @@
+   )
+ )
+ 
+-(define-enum SocketMsgFlags
++(define-flags SocketMsgFlags
+   (in-module "gio")
+   (c-name "GSocketMsgFlags")
+   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
+-- 
+1.7.9.1
+