[arch-commits] Commit in gnome-python-desktop/trunk (2 files)

[Jan de Groot]

    Date: Wednesday, January 25, 2017 @ 22:58:07
  Author: jgc
Revision: 287462

upgpkg: gnome-python-desktop 2.32.0-16

Remove all modules except wnck and gnomekeyring

Modified:
  gnome-python-desktop/trunk/PKGBUILD
Deleted:
  gnome-python-desktop/trunk/gnome-python-desktop-2.32.0-metacity-build.patch

--------------------------------------------------+
 PKGBUILD                                         |   53 +--------------------
 gnome-python-desktop-2.32.0-metacity-build.patch |   42 ----------------
 2 files changed, 5 insertions(+), 90 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-25 22:53:51 UTC (rev 287461)
+++ PKGBUILD	2017-01-25 22:58:07 UTC (rev 287462)
@@ -4,12 +4,12 @@
 # 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')
+pkgname=('gnome-python-desktop' 'python2-gnomekeyring' 'python2-wnck')
 pkgver=2.32.0
-pkgrel=15
+pkgrel=16
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'librsvg' 'libwnck')
+makedepends=('intltool' 'pkg-config' 'gnome-python' 'libwnck')
 url="http://www.gnome.org"
 source=(https://download.gnome.org/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
         01_wnck_enums.patch)
@@ -24,11 +24,12 @@
 build() {
   cd $pkgbase-$pkgver
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-metacity
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package_gnome-python-desktop() {
-  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python')
+  depends=('python2-gnomekeyring' 'python2-wnck' 'gnome-python')
   pkgdesc="Python bindings for the GNOME desktop environment"
 
   cd $pkgbase-$pkgver
@@ -35,16 +36,6 @@
   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"
@@ -55,40 +46,6 @@
   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"

Deleted: gnome-python-desktop-2.32.0-metacity-build.patch
===================================================================
--- gnome-python-desktop-2.32.0-metacity-build.patch	2017-01-25 22:53:51 UTC (rev 287461)
+++ gnome-python-desktop-2.32.0-metacity-build.patch	2017-01-25 22:58:07 UTC (rev 287462)
@@ -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")