Tue May 8 00:01:42 UTC 2012

3 files changed, 60 insertions, 6 deletions

diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index b9f00fba0..30f30d19d 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 156808 2012-04-23 09:06:19Z ibiru $
+# $Id: PKGBUILD 158679 2012-05-06 22:44:37Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64')
 depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
          'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
          'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower'
-         'libsystemd' 'cheese')
+         'libsystemd')
 optdepends=('mesa-demos: provides glxinfo for graphics information'
             'apg: adds password generation for user accounts'
             'gnome-color-manager: for color management tasks')
@@ -32,7 +32,8 @@ build() {
   gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-systemd --with-libsocialweb \
-      --disable-update-mimedb
+      --disable-update-mimedb \
+      --without-cheese
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656229
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD
index 85897fda7..987c1545c 100644
--- a/extra/pygobject2/PKGBUILD
+++ b/extra/pygobject2/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 157409 2012-04-28 09:27:01Z allan $
+# $Id: PKGBUILD 158678 2012-05-06 22:44:32Z bisson $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 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 @@ 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"
 
diff --git a/extra/pygobject2/python2-fix-type.patch b/extra/pygobject2/python2-fix-type.patch
new file mode 100644
index 000000000..78e7ddfd5
--- /dev/null
+++ b/extra/pygobject2/python2-fix-type.patch
@@ -0,0 +1,50 @@
+From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@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
+