[arch-commits] Commit in gnome-python-desktop/trunk (01_wnck_enums.patch PKGBUILD)
Jan de Groot
jgc at nymeria.archlinux.org
Mon Oct 14 07:42:33 UTC 2013
Date: Monday, October 14, 2013 @ 09:42:33
Author: jgc
Revision: 196473
upgpkg: gnome-python-desktop 2.32.0-14
Drop metacity bindings
Wrap wnck correctly (FS#37308)
Added:
gnome-python-desktop/trunk/01_wnck_enums.patch
Modified:
gnome-python-desktop/trunk/PKGBUILD
---------------------+
01_wnck_enums.patch | 32 ++++++++++++++++++++++++++++++++
PKGBUILD | 46 ++++++++++++++++++++--------------------------
2 files changed, 52 insertions(+), 26 deletions(-)
Added: 01_wnck_enums.patch
===================================================================
--- 01_wnck_enums.patch (rev 0)
+++ 01_wnck_enums.patch 2013-10-14 07:42:33 UTC (rev 196473)
@@ -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")
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-14 07:31:40 UTC (rev 196472)
+++ PKGBUILD 2013-10-14 07:42:33 UTC (rev 196473)
@@ -4,31 +4,35 @@
# 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')
+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 @@
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 @@
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,20 +62,10 @@
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"
@@ -78,7 +72,7 @@
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 @@
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 @@
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}"
}
More information about the arch-commits
mailing list