[arch-commits] Commit in gnome-python-desktop/repos (8 files)
Felix Yan
fyan at nymeria.archlinux.org
Sat May 17 06:14:03 UTC 2014
Date: Saturday, May 17, 2014 @ 08:14:03
Author: fyan
Revision: 212996
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
gnome-python-desktop/repos/staging-i686/
gnome-python-desktop/repos/staging-i686/01_wnck_enums.patch
(from rev 212995, gnome-python-desktop/trunk/01_wnck_enums.patch)
gnome-python-desktop/repos/staging-i686/PKGBUILD
(from rev 212995, gnome-python-desktop/trunk/PKGBUILD)
gnome-python-desktop/repos/staging-i686/gnome-python-desktop-2.32.0-metacity-build.patch
(from rev 212995, gnome-python-desktop/trunk/gnome-python-desktop-2.32.0-metacity-build.patch)
gnome-python-desktop/repos/staging-x86_64/
gnome-python-desktop/repos/staging-x86_64/01_wnck_enums.patch
(from rev 212995, gnome-python-desktop/trunk/01_wnck_enums.patch)
gnome-python-desktop/repos/staging-x86_64/PKGBUILD
(from rev 212995, gnome-python-desktop/trunk/PKGBUILD)
gnome-python-desktop/repos/staging-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch
(from rev 212995, gnome-python-desktop/trunk/gnome-python-desktop-2.32.0-metacity-build.patch)
-----------------------------------------------------------------+
staging-i686/01_wnck_enums.patch | 32 +++
staging-i686/PKGBUILD | 100 ++++++++++
staging-i686/gnome-python-desktop-2.32.0-metacity-build.patch | 42 ++++
staging-x86_64/01_wnck_enums.patch | 32 +++
staging-x86_64/PKGBUILD | 100 ++++++++++
staging-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch | 42 ++++
6 files changed, 348 insertions(+)
Copied: gnome-python-desktop/repos/staging-i686/01_wnck_enums.patch (from rev 212995, gnome-python-desktop/trunk/01_wnck_enums.patch)
===================================================================
--- staging-i686/01_wnck_enums.patch (rev 0)
+++ staging-i686/01_wnck_enums.patch 2014-05-17 06:14:03 UTC (rev 212996)
@@ -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")
Copied: gnome-python-desktop/repos/staging-i686/PKGBUILD (from rev 212995, gnome-python-desktop/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-05-17 06:14:03 UTC (rev 212996)
@@ -0,0 +1,100 @@
+# $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=15
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+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}"
+}
Copied: gnome-python-desktop/repos/staging-i686/gnome-python-desktop-2.32.0-metacity-build.patch (from rev 212995, gnome-python-desktop/trunk/gnome-python-desktop-2.32.0-metacity-build.patch)
===================================================================
--- staging-i686/gnome-python-desktop-2.32.0-metacity-build.patch (rev 0)
+++ staging-i686/gnome-python-desktop-2.32.0-metacity-build.patch 2014-05-17 06:14:03 UTC (rev 212996)
@@ -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/staging-x86_64/01_wnck_enums.patch (from rev 212995, gnome-python-desktop/trunk/01_wnck_enums.patch)
===================================================================
--- staging-x86_64/01_wnck_enums.patch (rev 0)
+++ staging-x86_64/01_wnck_enums.patch 2014-05-17 06:14:03 UTC (rev 212996)
@@ -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")
Copied: gnome-python-desktop/repos/staging-x86_64/PKGBUILD (from rev 212995, gnome-python-desktop/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2014-05-17 06:14:03 UTC (rev 212996)
@@ -0,0 +1,100 @@
+# $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=15
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+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}"
+}
Copied: gnome-python-desktop/repos/staging-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch (from rev 212995, gnome-python-desktop/trunk/gnome-python-desktop-2.32.0-metacity-build.patch)
===================================================================
--- staging-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch (rev 0)
+++ staging-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch 2014-05-17 06:14:03 UTC (rev 212996)
@@ -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