[arch-commits] Commit in ubuntuone-client-gnome/trunk (2 files)

[Balló György]

    Date: Tuesday, April 9, 2013 @ 22:43:37
  Author: bgyorgy
Revision: 87980

upgpkg: ubuntuone-client-gnome 4.2.0-2

Disable GSD plugin due incompatibility with GNOME 3.8

Added:
  ubuntuone-client-gnome/trunk/disable-gsd-plugin.patch
Modified:
  ubuntuone-client-gnome/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   13 +++++++++----
 disable-gsd-plugin.patch |   21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-09 19:30:43 UTC (rev 87979)
+++ PKGBUILD	2013-04-09 20:43:37 UTC (rev 87980)
@@ -3,22 +3,27 @@
 
 pkgname=ubuntuone-client-gnome
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/ubuntuone-client-gnome"
 license=('GPL')
 depends=('nautilus' 'gconf' 'ubuntuone-client')
 makedepends=('intltool' 'gnome-settings-daemon')
-optdepends=('gnome-settings-daemon: shows a warning when Ubuntu One runs out of space')
 options=('!libtool')
 install=$pkgname.install
-source=(https://launchpad.net/ubuntuone-client-gnome/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('e2f5e4ef6f4eca6ffcf838b3aa46c3ef')
+source=(https://launchpad.net/ubuntuone-client-gnome/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        disable-gsd-plugin.patch)
+md5sums=('e2f5e4ef6f4eca6ffcf838b3aa46c3ef'
+         'e2b1b677844c3b61530f3653808b6644')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Disable gsd plugin, as it's not compatible with gnome-settings-daemon 3.8
+  patch -Np1 -i "$srcdir/disable-gsd-plugin.patch"
+
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --disable-schemas-compile
   make

Added: disable-gsd-plugin.patch
===================================================================
--- disable-gsd-plugin.patch	                        (rev 0)
+++ disable-gsd-plugin.patch	2013-04-09 20:43:37 UTC (rev 87980)
@@ -0,0 +1,21 @@
+diff -Naur ubuntuone-client-gnome-4.2.0.orig/configure.ac ubuntuone-client-gnome-4.2.0/configure.ac
+--- ubuntuone-client-gnome-4.2.0.orig/configure.ac	2013-03-26 20:48:40.000000000 +0100
++++ ubuntuone-client-gnome-4.2.0/configure.ac	2013-04-09 22:26:38.135983473 +0200
+@@ -5,7 +5,7 @@
+ AC_CONFIG_SRCDIR([config.h.in])
+ 
+ AM_INIT_AUTOMAKE([1.10 foreign])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ 
+diff -Naur ubuntuone-client-gnome-4.2.0.orig/Makefile.am ubuntuone-client-gnome-4.2.0/Makefile.am
+--- ubuntuone-client-gnome-4.2.0.orig/Makefile.am	2013-03-21 18:13:58.000000000 +0100
++++ ubuntuone-client-gnome-4.2.0/Makefile.am	2013-04-09 22:22:05.109626589 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = gsd nautilus po
++SUBDIRS = nautilus po
+ 
+ # Shut libtoolize up
+ ACLOCAL_AMFLAGS = -I m4