[arch-commits] Commit in deja-dup/trunk (PKGBUILD fix-build.patch)

[Balló György]

    Date: Monday, April 7, 2014 @ 23:26:29
  Author: bgyorgy
Revision: 108943

upgpkg: deja-dup 30.0-1

Update to version 30.0

Modified:
  deja-dup/trunk/PKGBUILD
Deleted:
  deja-dup/trunk/fix-build.patch

-----------------+
 PKGBUILD        |   23 ++++++++++-------------
 fix-build.patch |   24 ------------------------
 2 files changed, 10 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-07 21:25:41 UTC (rev 108942)
+++ PKGBUILD	2014-04-07 21:26:29 UTC (rev 108943)
@@ -2,7 +2,7 @@
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=deja-dup
-pkgver=28.0
+pkgver=30.0
 pkgrel=1
 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
 arch=('i686' 'x86_64')
@@ -9,16 +9,13 @@
 url="https://launchpad.net/deja-dup"
 license=('GPL')
 depends=('duplicity' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'xdg-utils')
-makedepends=('vala' 'intltool' 'itstool' 'nautilus')
+makedepends=('cmake' 'vala' 'intltool' 'itstool' 'nautilus')
 optdepends=('gnome-keyring: save passwords'
             'nautilus: backup extension'
-            'python2-boto: Amazon S3 backend'
-            'ubuntuone-client: Ubuntu One backend')
+            'python2-boto: Amazon S3 backend')
 install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
-        fix-build.patch)
-md5sums=('480516869f49813880f2bbb35700c9af'
-         '4988fed3a3d3c2fec9318cc57e1710df')
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
+md5sums=('1f714b88cec80ed38f770e95708a16d8')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -25,16 +22,16 @@
 
   # Python2 fix
   sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
-
-  # Fix build
-  patch -Np0 -i ../fix-build.patch
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static --disable-schemas-compile --without-unity
+  cmake . -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+          -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+          -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$pkgname
   make
 }
 

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2014-04-07 21:25:41 UTC (rev 108942)
+++ fix-build.patch	2014-04-07 21:26:29 UTC (rev 108943)
@@ -1,24 +0,0 @@
-=== modified file 'deja-dup/widgets/WidgetUtils.vala'
---- deja-dup/widgets/WidgetUtils.vala	2013-10-14 14:34:37 +0000
-+++ deja-dup/widgets/WidgetUtils.vala	2013-12-06 17:19:31 +0000
-@@ -19,6 +19,10 @@
- 
- using GLib;
- 
-+// vala 0.22.1 changed the prototype for Notify.get_server_caps.
-+// Rather than require that specific version, use 0.22.1's definition directly.
-+extern GLib.List notify_get_server_caps();
-+
- namespace DejaDup {
- 
- public void show_uri(Gtk.Window? parent, string link)
-@@ -59,7 +63,7 @@
-       // Use Legacy unless we detect a different shell.
-       shell = ShellEnv.LEGACY;
-       // Next check for Shell by notification capabilities
--      unowned List<string> caps = Notify.get_server_caps();
-+      List<string> caps = notify_get_server_caps();
-       bool persistence = false, actions = false;
-       foreach (string cap in caps) {
-         if (cap == "persistence")
-