Tue Oct 15 01:02:49 PDT 2013

2 files changed, 53 insertions, 27 deletions

diff --git a/extra/gnome-python-desktop/01_wnck_enums.patch b/extra/gnome-python-desktop/01_wnck_enums.patch
new file mode 100644
index 000000000..512b702df
--- /dev/null
+++ b/extra/gnome-python-desktop/01_wnck_enums.patch
@@ -0,0 +1,32 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=630063
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597414
+
+--- a/wnck/wnck.defs
++++ b/wnck/wnck.defs
+@@ -100,7 +100,7 @@
+   )
+ )
+ 
+-(define-enum WindowState
++(define-flags WindowState
+   (in-module "Wnck")
+   (c-name "WnckWindowState")
+   (gtype-id "WNCK_TYPE_WINDOW_STATE")
+@@ -121,7 +121,7 @@
+   )
+ )
+ 
+-(define-enum WindowActions
++(define-flags WindowActions
+   (in-module "Wnck")
+   (c-name "WnckWindowActions")
+   (gtype-id "WNCK_TYPE_WINDOW_ACTIONS")
+@@ -184,7 +184,7 @@
+   )
+ )
+ 
+-(define-enum WindowMoveResizeMask
++(define-flags WindowMoveResizeMask
+   (in-module "Wnck")
+   (c-name "WnckWindowMoveResizeMask")
+   (gtype-id "WNCK_TYPE_WINDOW_MOVE_RESIZE_MASK")
diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD
index ab07d1d88..fd0ea9a27 100644
--- a/extra/gnome-python-desktop/PKGBUILD
+++ b/extra/gnome-python-desktop/PKGBUILD
@@ -1,34 +1,38 @@
-# $Id: PKGBUILD 196074 2013-10-07 11:51:47Z jgc $
+# $Id: PKGBUILD 196474 2013-10-14 07:42:40Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 
 pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
+pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
 pkgver=2.32.0
-pkgrel=13
+pkgrel=14
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg' 'libwnck')
+makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'librsvg' 'libwnck')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
-        gnome-python-desktop-2.32.0-metacity-build.patch)
+        01_wnck_enums.patch)
 sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
-            'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3')
+            'bb51a303bc745f13f9386c734c0467267a19cb193c330eff0b7d39aad0edb1c1')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -Np1 -i ../01_wnck_enums.patch
+}
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity
+  cd $pkgbase-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-metacity
   make
 }
 
 package_gnome-python-desktop() {
-  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python')
+  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python')
   pkgdesc="Python bindings for the GNOME desktop environment"
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make install-pkgconfigDATA DESTDIR="${pkgdir}"
 }
 
@@ -38,7 +42,7 @@ package_python2-gnomedesktop() {
   conflicts=('python-gnomedesktop<=2.32.0-10')
   replaces=('python-gnomedesktop<=2.32.0-10')
   
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C gnomedesktop install DESTDIR="${pkgdir}"
 }
 
@@ -48,7 +52,7 @@ package_python2-gnomekeyring() {
   conflicts=('python-gnomekeyring<=2.32.0-10')
   replaces=('python-gnomekeyring<=2.32.0-10')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C gnomekeyring install DESTDIR="${pkgdir}"
 }
 
@@ -58,27 +62,17 @@ package_python2-gtop() {
   conflicts=('python-gtop<=2.32.0-10')
   replaces=('python-gtop<=2.32.0-10')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C gtop install DESTDIR="${pkgdir}"
 }
 
-package_python2-metacity() {
-  depends=('pygtk' 'metacity')
-  pkgdesc="Python bindings for metacity"
-  conflicts=('python-metacity<=2.32.0-10')
-  replaces=('python-metacity<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C metacity install DESTDIR="${pkgdir}"
-}
-
 package_python2-rsvg() {
   depends=('pygtk' 'librsvg')
   pkgdesc="Python bindings for librsvg"
   conflicts=('python-rsvg<=2.32.0-10')
   replaces=('python-rsvg<=2.32.0-10')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C rsvg install DESTDIR="${pkgdir}"
   install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
   install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
@@ -90,7 +84,7 @@ package_python2-totem-plparser() {
   conflicts=('python-totem-plparser<=2.32.0-10')
   replaces=('python-totem-plparser<=2.32.0-10')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C totem install DESTDIR="${pkgdir}"
   install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
   install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
@@ -102,6 +96,6 @@ package_python2-wnck() {
   conflicts=('python-wnck<=2.32.0-10')
   replaces=('python-wnck<=2.32.0-10')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C wnck install DESTDIR="${pkgdir}"
 }