[arch-commits] Commit in gnome-python-desktop/repos (10 files)

Jan de Groot jgc at nymeria.archlinux.org
Mon Oct 14 07:42:40 UTC 2013


    Date: Monday, October 14, 2013 @ 09:42:40
  Author: jgc
Revision: 196474

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gnome-python-desktop/repos/extra-i686/01_wnck_enums.patch
    (from rev 196473, gnome-python-desktop/trunk/01_wnck_enums.patch)
  gnome-python-desktop/repos/extra-i686/PKGBUILD
    (from rev 196473, gnome-python-desktop/trunk/PKGBUILD)
  gnome-python-desktop/repos/extra-i686/gnome-python-desktop-2.32.0-metacity-build.patch
    (from rev 196473, gnome-python-desktop/trunk/gnome-python-desktop-2.32.0-metacity-build.patch)
  gnome-python-desktop/repos/extra-x86_64/01_wnck_enums.patch
    (from rev 196473, gnome-python-desktop/trunk/01_wnck_enums.patch)
  gnome-python-desktop/repos/extra-x86_64/PKGBUILD
    (from rev 196473, gnome-python-desktop/trunk/PKGBUILD)
  gnome-python-desktop/repos/extra-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch
    (from rev 196473, gnome-python-desktop/trunk/gnome-python-desktop-2.32.0-metacity-build.patch)
Deleted:
  gnome-python-desktop/repos/extra-i686/PKGBUILD
  gnome-python-desktop/repos/extra-i686/gnome-python-desktop-2.32.0-metacity-build.patch
  gnome-python-desktop/repos/extra-x86_64/PKGBUILD
  gnome-python-desktop/repos/extra-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch

---------------------------------------------------------------+
 /PKGBUILD                                                     |  202 ++++++++++
 /gnome-python-desktop-2.32.0-metacity-build.patch             |   84 ++++
 extra-i686/01_wnck_enums.patch                                |   32 +
 extra-i686/PKGBUILD                                           |  107 -----
 extra-i686/gnome-python-desktop-2.32.0-metacity-build.patch   |   42 --
 extra-x86_64/01_wnck_enums.patch                              |   32 +
 extra-x86_64/PKGBUILD                                         |  107 -----
 extra-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch |   42 --
 8 files changed, 350 insertions(+), 298 deletions(-)

Copied: gnome-python-desktop/repos/extra-i686/01_wnck_enums.patch (from rev 196473, gnome-python-desktop/trunk/01_wnck_enums.patch)
===================================================================
--- extra-i686/01_wnck_enums.patch	                        (rev 0)
+++ extra-i686/01_wnck_enums.patch	2013-10-14 07:42:40 UTC (rev 196474)
@@ -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")

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-10-14 07:42:33 UTC (rev 196473)
+++ extra-i686/PKGBUILD	2013-10-14 07:42:40 UTC (rev 196474)
@@ -1,107 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Arjan Timmerman <arjan at soulfly.nl>
-# Contributor: Wael Nasreddine <gandalf at 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')
-pkgver=2.32.0
-pkgrel=13
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' '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)
-sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
-            'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3')
-
-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
-  make
-}
-
-package_gnome-python-desktop() {
-  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python')
-  pkgdesc="Python bindings for the GNOME desktop environment"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make install-pkgconfigDATA DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomedesktop() {
-  depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
-  pkgdesc="Python bindings for gnome-desktop 2.x"
-  conflicts=('python-gnomedesktop<=2.32.0-10')
-  replaces=('python-gnomedesktop<=2.32.0-10')
-  
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomedesktop install DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomekeyring() {
-  depends=('pygtk' 'libgnome-keyring')
-  pkgdesc="Python bindings for libgnome-keyring"
-  conflicts=('python-gnomekeyring<=2.32.0-10')
-  replaces=('python-gnomekeyring<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomekeyring install DESTDIR="${pkgdir}"
-}
-
-package_python2-gtop() {
-  depends=('pygtk' 'libgtop')
-  pkgdesc="Python bindings for libgtop"
-  conflicts=('python-gtop<=2.32.0-10')
-  replaces=('python-gtop<=2.32.0-10')
-
-  cd "${srcdir}/${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}"
-  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/"
-}
-
-package_python2-totem-plparser() {
-  depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
-  pkgdesc="Python bindings for totem-plparser"
-  conflicts=('python-totem-plparser<=2.32.0-10')
-  replaces=('python-totem-plparser<=2.32.0-10')
-
-  cd "${srcdir}/${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/"
-}
-
-package_python2-wnck() {
-  depends=('pygtk' 'libwnck')
-  pkgdesc="Python bindings for libwnck"
-  conflicts=('python-wnck<=2.32.0-10')
-  replaces=('python-wnck<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C wnck install DESTDIR="${pkgdir}"
-}

Copied: gnome-python-desktop/repos/extra-i686/PKGBUILD (from rev 196473, gnome-python-desktop/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-10-14 07:42:40 UTC (rev 196474)
@@ -0,0 +1,101 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Arjan Timmerman <arjan at soulfly.nl>
+# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+
+pkgbase=gnome-python-desktop
+pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
+pkgver=2.32.0
+pkgrel=14
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+options=('!libtool')
+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
+        01_wnck_enums.patch)
+sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
+            'bb51a303bc745f13f9386c734c0467267a19cb193c330eff0b7d39aad0edb1c1')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -Np1 -i ../01_wnck_enums.patch
+}
+
+build() {
+  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-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python')
+  pkgdesc="Python bindings for the GNOME desktop environment"
+
+  cd $pkgbase-$pkgver
+  make install-pkgconfigDATA DESTDIR="${pkgdir}"
+}
+
+package_python2-gnomedesktop() {
+  depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
+  pkgdesc="Python bindings for gnome-desktop 2.x"
+  conflicts=('python-gnomedesktop<=2.32.0-10')
+  replaces=('python-gnomedesktop<=2.32.0-10')
+  
+  cd $pkgbase-$pkgver
+  make -C gnomedesktop install DESTDIR="${pkgdir}"
+}
+
+package_python2-gnomekeyring() {
+  depends=('pygtk' 'libgnome-keyring')
+  pkgdesc="Python bindings for libgnome-keyring"
+  conflicts=('python-gnomekeyring<=2.32.0-10')
+  replaces=('python-gnomekeyring<=2.32.0-10')
+
+  cd $pkgbase-$pkgver
+  make -C gnomekeyring install DESTDIR="${pkgdir}"
+}
+
+package_python2-gtop() {
+  depends=('pygtk' 'libgtop')
+  pkgdesc="Python bindings for libgtop"
+  conflicts=('python-gtop<=2.32.0-10')
+  replaces=('python-gtop<=2.32.0-10')
+
+  cd $pkgbase-$pkgver
+  make -C gtop 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 $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/"
+}
+
+package_python2-totem-plparser() {
+  depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
+  pkgdesc="Python bindings for totem-plparser"
+  conflicts=('python-totem-plparser<=2.32.0-10')
+  replaces=('python-totem-plparser<=2.32.0-10')
+
+  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/"
+}
+
+package_python2-wnck() {
+  depends=('pygtk' 'libwnck')
+  pkgdesc="Python bindings for libwnck"
+  conflicts=('python-wnck<=2.32.0-10')
+  replaces=('python-wnck<=2.32.0-10')
+
+  cd $pkgbase-$pkgver
+  make -C wnck install DESTDIR="${pkgdir}"
+}

Deleted: extra-i686/gnome-python-desktop-2.32.0-metacity-build.patch
===================================================================
--- extra-i686/gnome-python-desktop-2.32.0-metacity-build.patch	2013-10-14 07:42:33 UTC (rev 196473)
+++ extra-i686/gnome-python-desktop-2.32.0-metacity-build.patch	2013-10-14 07:42:40 UTC (rev 196474)
@@ -1,42 +0,0 @@
-From: Daniel Drake <dsd at laptop.org>
-
-Fix build against metacity-2.34.2. The port to GSettings
-removed these constants from the codebase.
-
-Index: gnome-python-desktop-2.32.0/metacity/metacity.defs
-===================================================================
---- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs
-+++ gnome-python-desktop-2.32.0/metacity/metacity.defs
-@@ -120,32 +120,6 @@
-   )
- )
- 
--(define-enum FocusMode
--  (in-module "Meta")
--  (c-name "MetaFocusMode")
--;   (gtype-id "META_TYPE_FOCUS_MODE")
--  (values
--    '("click" "META_FOCUS_MODE_CLICK")
--    '("sloppy" "META_FOCUS_MODE_SLOPPY")
--    '("mouse" "META_FOCUS_MODE_MOUSE")
--  )
--)
--
--(define-enum ActionTitlebar
--  (in-module "Meta")
--  (c-name "MetaActionTitlebar")
--;   (gtype-id "META_TYPE_ACTION_TITLEBAR")
--  (values
--    '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE")
--    '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE")
--    '("minimize" "META_ACTION_TITLEBAR_MINIMIZE")
--    '("none" "META_ACTION_TITLEBAR_NONE")
--    '("lower" "META_ACTION_TITLEBAR_LOWER")
--    '("menu" "META_ACTION_TITLEBAR_MENU")
--    '("last" "META_ACTION_TITLEBAR_LAST")
--  )
--)
--
- (define-enum FrameType
-   (in-module "Meta")
-   (c-name "MetaFrameType")

Copied: gnome-python-desktop/repos/extra-i686/gnome-python-desktop-2.32.0-metacity-build.patch (from rev 196473, gnome-python-desktop/trunk/gnome-python-desktop-2.32.0-metacity-build.patch)
===================================================================
--- extra-i686/gnome-python-desktop-2.32.0-metacity-build.patch	                        (rev 0)
+++ extra-i686/gnome-python-desktop-2.32.0-metacity-build.patch	2013-10-14 07:42:40 UTC (rev 196474)
@@ -0,0 +1,42 @@
+From: Daniel Drake <dsd at laptop.org>
+
+Fix build against metacity-2.34.2. The port to GSettings
+removed these constants from the codebase.
+
+Index: gnome-python-desktop-2.32.0/metacity/metacity.defs
+===================================================================
+--- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs
++++ gnome-python-desktop-2.32.0/metacity/metacity.defs
+@@ -120,32 +120,6 @@
+   )
+ )
+ 
+-(define-enum FocusMode
+-  (in-module "Meta")
+-  (c-name "MetaFocusMode")
+-;   (gtype-id "META_TYPE_FOCUS_MODE")
+-  (values
+-    '("click" "META_FOCUS_MODE_CLICK")
+-    '("sloppy" "META_FOCUS_MODE_SLOPPY")
+-    '("mouse" "META_FOCUS_MODE_MOUSE")
+-  )
+-)
+-
+-(define-enum ActionTitlebar
+-  (in-module "Meta")
+-  (c-name "MetaActionTitlebar")
+-;   (gtype-id "META_TYPE_ACTION_TITLEBAR")
+-  (values
+-    '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE")
+-    '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE")
+-    '("minimize" "META_ACTION_TITLEBAR_MINIMIZE")
+-    '("none" "META_ACTION_TITLEBAR_NONE")
+-    '("lower" "META_ACTION_TITLEBAR_LOWER")
+-    '("menu" "META_ACTION_TITLEBAR_MENU")
+-    '("last" "META_ACTION_TITLEBAR_LAST")
+-  )
+-)
+-
+ (define-enum FrameType
+   (in-module "Meta")
+   (c-name "MetaFrameType")

Copied: gnome-python-desktop/repos/extra-x86_64/01_wnck_enums.patch (from rev 196473, gnome-python-desktop/trunk/01_wnck_enums.patch)
===================================================================
--- extra-x86_64/01_wnck_enums.patch	                        (rev 0)
+++ extra-x86_64/01_wnck_enums.patch	2013-10-14 07:42:40 UTC (rev 196474)
@@ -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")

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-10-14 07:42:33 UTC (rev 196473)
+++ extra-x86_64/PKGBUILD	2013-10-14 07:42:40 UTC (rev 196474)
@@ -1,107 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Arjan Timmerman <arjan at soulfly.nl>
-# Contributor: Wael Nasreddine <gandalf at 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')
-pkgver=2.32.0
-pkgrel=13
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' '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)
-sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
-            'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3')
-
-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
-  make
-}
-
-package_gnome-python-desktop() {
-  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python')
-  pkgdesc="Python bindings for the GNOME desktop environment"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make install-pkgconfigDATA DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomedesktop() {
-  depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
-  pkgdesc="Python bindings for gnome-desktop 2.x"
-  conflicts=('python-gnomedesktop<=2.32.0-10')
-  replaces=('python-gnomedesktop<=2.32.0-10')
-  
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomedesktop install DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomekeyring() {
-  depends=('pygtk' 'libgnome-keyring')
-  pkgdesc="Python bindings for libgnome-keyring"
-  conflicts=('python-gnomekeyring<=2.32.0-10')
-  replaces=('python-gnomekeyring<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomekeyring install DESTDIR="${pkgdir}"
-}
-
-package_python2-gtop() {
-  depends=('pygtk' 'libgtop')
-  pkgdesc="Python bindings for libgtop"
-  conflicts=('python-gtop<=2.32.0-10')
-  replaces=('python-gtop<=2.32.0-10')
-
-  cd "${srcdir}/${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}"
-  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/"
-}
-
-package_python2-totem-plparser() {
-  depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
-  pkgdesc="Python bindings for totem-plparser"
-  conflicts=('python-totem-plparser<=2.32.0-10')
-  replaces=('python-totem-plparser<=2.32.0-10')
-
-  cd "${srcdir}/${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/"
-}
-
-package_python2-wnck() {
-  depends=('pygtk' 'libwnck')
-  pkgdesc="Python bindings for libwnck"
-  conflicts=('python-wnck<=2.32.0-10')
-  replaces=('python-wnck<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C wnck install DESTDIR="${pkgdir}"
-}

Copied: gnome-python-desktop/repos/extra-x86_64/PKGBUILD (from rev 196473, gnome-python-desktop/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-10-14 07:42:40 UTC (rev 196474)
@@ -0,0 +1,101 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Arjan Timmerman <arjan at soulfly.nl>
+# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+
+pkgbase=gnome-python-desktop
+pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
+pkgver=2.32.0
+pkgrel=14
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+options=('!libtool')
+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
+        01_wnck_enums.patch)
+sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
+            'bb51a303bc745f13f9386c734c0467267a19cb193c330eff0b7d39aad0edb1c1')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -Np1 -i ../01_wnck_enums.patch
+}
+
+build() {
+  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-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python')
+  pkgdesc="Python bindings for the GNOME desktop environment"
+
+  cd $pkgbase-$pkgver
+  make install-pkgconfigDATA DESTDIR="${pkgdir}"
+}
+
+package_python2-gnomedesktop() {
+  depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
+  pkgdesc="Python bindings for gnome-desktop 2.x"
+  conflicts=('python-gnomedesktop<=2.32.0-10')
+  replaces=('python-gnomedesktop<=2.32.0-10')
+  
+  cd $pkgbase-$pkgver
+  make -C gnomedesktop install DESTDIR="${pkgdir}"
+}
+
+package_python2-gnomekeyring() {
+  depends=('pygtk' 'libgnome-keyring')
+  pkgdesc="Python bindings for libgnome-keyring"
+  conflicts=('python-gnomekeyring<=2.32.0-10')
+  replaces=('python-gnomekeyring<=2.32.0-10')
+
+  cd $pkgbase-$pkgver
+  make -C gnomekeyring install DESTDIR="${pkgdir}"
+}
+
+package_python2-gtop() {
+  depends=('pygtk' 'libgtop')
+  pkgdesc="Python bindings for libgtop"
+  conflicts=('python-gtop<=2.32.0-10')
+  replaces=('python-gtop<=2.32.0-10')
+
+  cd $pkgbase-$pkgver
+  make -C gtop 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 $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/"
+}
+
+package_python2-totem-plparser() {
+  depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
+  pkgdesc="Python bindings for totem-plparser"
+  conflicts=('python-totem-plparser<=2.32.0-10')
+  replaces=('python-totem-plparser<=2.32.0-10')
+
+  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/"
+}
+
+package_python2-wnck() {
+  depends=('pygtk' 'libwnck')
+  pkgdesc="Python bindings for libwnck"
+  conflicts=('python-wnck<=2.32.0-10')
+  replaces=('python-wnck<=2.32.0-10')
+
+  cd $pkgbase-$pkgver
+  make -C wnck install DESTDIR="${pkgdir}"
+}

Deleted: extra-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch
===================================================================
--- extra-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch	2013-10-14 07:42:33 UTC (rev 196473)
+++ extra-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch	2013-10-14 07:42:40 UTC (rev 196474)
@@ -1,42 +0,0 @@
-From: Daniel Drake <dsd at laptop.org>
-
-Fix build against metacity-2.34.2. The port to GSettings
-removed these constants from the codebase.
-
-Index: gnome-python-desktop-2.32.0/metacity/metacity.defs
-===================================================================
---- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs
-+++ gnome-python-desktop-2.32.0/metacity/metacity.defs
-@@ -120,32 +120,6 @@
-   )
- )
- 
--(define-enum FocusMode
--  (in-module "Meta")
--  (c-name "MetaFocusMode")
--;   (gtype-id "META_TYPE_FOCUS_MODE")
--  (values
--    '("click" "META_FOCUS_MODE_CLICK")
--    '("sloppy" "META_FOCUS_MODE_SLOPPY")
--    '("mouse" "META_FOCUS_MODE_MOUSE")
--  )
--)
--
--(define-enum ActionTitlebar
--  (in-module "Meta")
--  (c-name "MetaActionTitlebar")
--;   (gtype-id "META_TYPE_ACTION_TITLEBAR")
--  (values
--    '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE")
--    '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE")
--    '("minimize" "META_ACTION_TITLEBAR_MINIMIZE")
--    '("none" "META_ACTION_TITLEBAR_NONE")
--    '("lower" "META_ACTION_TITLEBAR_LOWER")
--    '("menu" "META_ACTION_TITLEBAR_MENU")
--    '("last" "META_ACTION_TITLEBAR_LAST")
--  )
--)
--
- (define-enum FrameType
-   (in-module "Meta")
-   (c-name "MetaFrameType")

Copied: gnome-python-desktop/repos/extra-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch (from rev 196473, gnome-python-desktop/trunk/gnome-python-desktop-2.32.0-metacity-build.patch)
===================================================================
--- extra-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch	                        (rev 0)
+++ extra-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch	2013-10-14 07:42:40 UTC (rev 196474)
@@ -0,0 +1,42 @@
+From: Daniel Drake <dsd at laptop.org>
+
+Fix build against metacity-2.34.2. The port to GSettings
+removed these constants from the codebase.
+
+Index: gnome-python-desktop-2.32.0/metacity/metacity.defs
+===================================================================
+--- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs
++++ gnome-python-desktop-2.32.0/metacity/metacity.defs
+@@ -120,32 +120,6 @@
+   )
+ )
+ 
+-(define-enum FocusMode
+-  (in-module "Meta")
+-  (c-name "MetaFocusMode")
+-;   (gtype-id "META_TYPE_FOCUS_MODE")
+-  (values
+-    '("click" "META_FOCUS_MODE_CLICK")
+-    '("sloppy" "META_FOCUS_MODE_SLOPPY")
+-    '("mouse" "META_FOCUS_MODE_MOUSE")
+-  )
+-)
+-
+-(define-enum ActionTitlebar
+-  (in-module "Meta")
+-  (c-name "MetaActionTitlebar")
+-;   (gtype-id "META_TYPE_ACTION_TITLEBAR")
+-  (values
+-    '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE")
+-    '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE")
+-    '("minimize" "META_ACTION_TITLEBAR_MINIMIZE")
+-    '("none" "META_ACTION_TITLEBAR_NONE")
+-    '("lower" "META_ACTION_TITLEBAR_LOWER")
+-    '("menu" "META_ACTION_TITLEBAR_MENU")
+-    '("last" "META_ACTION_TITLEBAR_LAST")
+-  )
+-)
+-
+ (define-enum FrameType
+   (in-module "Meta")
+   (c-name "MetaFrameType")




More information about the arch-commits mailing list