3 files changed, 32 insertions, 19 deletions
diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD
index 51e54fff1..c1c9c1c7b 100644
--- a/community/ubuntuone-client-gnome/PKGBUILD
+++ b/community/ubuntuone-client-gnome/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 77831 2012-10-15 01:46:26Z bgyorgy $
+# $Id: PKGBUILD 88682 2013-04-21 22:16:52Z heftig $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=ubuntuone-client-gnome
-pkgver=4.0.0
-pkgrel=1
+pkgver=4.2.0
+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=(http://launchpad.net/ubuntuone-client-gnome/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('26e9e391cabe1047eeb203d99ee2d9c6')
+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
diff --git a/community/ubuntuone-client-gnome/disable-gsd-plugin.patch b/community/ubuntuone-client-gnome/disable-gsd-plugin.patch
new file mode 100644
index 000000000..2199536e2
--- /dev/null
+++ b/community/ubuntuone-client-gnome/disable-gsd-plugin.patch
@@ -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
diff --git a/community/ubuntuone-client-gnome/fix-build.patch b/community/ubuntuone-client-gnome/fix-build.patch
deleted file mode 100644
index 237ba323e..000000000
--- a/community/ubuntuone-client-gnome/fix-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur ubuntuone-client-gnome-3.0.0.orig/nautilus/utils.c ubuntuone-client-gnome-3.0.0/nautilus/utils.c
---- ubuntuone-client-gnome-3.0.0.orig/nautilus/utils.c	2012-02-22 16:40:56.000000000 +0100
-+++ ubuntuone-client-gnome-3.0.0/nautilus/utils.c	2012-05-13 22:26:35.267409857 +0200
-@@ -26,8 +26,7 @@
- #include <limits.h>
- #include <stdlib.h>
- #include <glib/gi18n.h>
--#include <glib/gutils.h>
--#include <glib/gfileutils.h>
-+#include <glib.h>
- #include <libnautilus-extension/nautilus-file-info.h>
- #include <libsyncdaemon/libsyncdaemon.h>
- #include "ubuntuone-nautilus.h"