Thu Mar 13 03:41:44 UTC 2014

3 files changed, 32 insertions, 82 deletions

diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index cf7956e0a..527a83e23 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99726 2013-10-30 23:20:21Z allan $
+# $Id: PKGBUILD 107060 2014-03-12 01:01:17Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=deja-dup
@@ -15,14 +15,19 @@ optdepends=('gnome-keyring: save passwords'
             'python2-boto: Amazon S3 backend'
             'ubuntuone-client: Ubuntu One backend')
 install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
-md5sums=('480516869f49813880f2bbb35700c9af')
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
+        fix-build.patch)
+md5sums=('480516869f49813880f2bbb35700c9af'
+         '4988fed3a3d3c2fec9318cc57e1710df')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # Python2 fix
   sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
+
+  # Fix build
+  patch -Np0 -i ../fix-build.patch
 }
 
 build() {
diff --git a/community/deja-dup/fix-build.patch b/community/deja-dup/fix-build.patch
new file mode 100644
index 000000000..49b58cd96
--- /dev/null
+++ b/community/deja-dup/fix-build.patch
@@ -0,0 +1,24 @@
+=== 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")
+
diff --git a/community/deja-dup/libsecret-1.vapi b/community/deja-dup/libsecret-1.vapi
deleted file mode 100644
index 7d3f4a3a6..000000000
--- a/community/deja-dup/libsecret-1.vapi
+++ /dev/null
@@ -1,79 +0,0 @@
-/* libsecret-1.vapi generated by vapigen-0.20, do not modify. */
-
-[CCode (cprefix = "Secret", gir_namespace = "Secret", gir_version = "1", lower_case_cprefix = "secret_")]
-namespace Secret {
-	[CCode (cheader_filename = "libsecret/secret.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "secret_schema_get_type ()")]
-	[Compact]
-	public class Schema {
-		[CCode (array_length = false, array_null_terminated = true)]
-		public weak Secret.SchemaAttribute[] attributes;
-		public Secret.SchemaFlags flags;
-		public weak string name;
-		[CCode (has_construct_function = false)]
-		public Schema (string name, Secret.SchemaFlags flags, ...);
-		[CCode (cname = "secret_schema_newv", has_construct_function = false)]
-		public Schema.newv (string name, Secret.SchemaFlags flags, GLib.HashTable<string,Secret.SchemaAttributeType> attribute_names_and_types);
-		public Secret.Schema @ref ();
-		public void unref ();
-	}
-	[CCode (cheader_filename = "libsecret/secret.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "secret_schema_attribute_get_type ()")]
-	[Compact]
-	public class SchemaAttribute {
-		public weak string name;
-		public Secret.SchemaAttributeType type;
-	}
-	[CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_ERROR_", has_type_id = false)]
-	public enum Error {
-		PROTOCOL,
-		IS_LOCKED,
-		NO_SUCH_OBJECT,
-		ALREADY_EXISTS;
-		public static GLib.Quark get_quark ();
-	}
-	[CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_SCHEMA_ATTRIBUTE_", has_type_id = false)]
-	public enum SchemaAttributeType {
-		STRING,
-		INTEGER,
-		BOOLEAN
-	}
-	[CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_SCHEMA_", has_type_id = false)]
-	[Flags]
-	public enum SchemaFlags {
-		NONE,
-		DONT_MATCH_NAME
-	}
-	[CCode (cheader_filename = "libsecret/secret.h", cname = "SECRET_COLLECTION_DEFAULT")]
-	public const string COLLECTION_DEFAULT;
-	[CCode (cheader_filename = "libsecret/secret.h", cname = "SECRET_COLLECTION_SESSION")]
-	public const string COLLECTION_SESSION;
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static GLib.HashTable<string,string> attributes_build (Secret.Schema schema, ...);
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static GLib.HashTable<string,string> attributes_buildv (Secret.Schema schema, va_list va);
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static async bool password_clear (Secret.Schema schema, GLib.Cancellable? cancellable, ...) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static bool password_clear_sync (Secret.Schema schema, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_clear_finish")]
-	public static async bool password_clearv (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static bool password_clearv_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable = null) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static async string password_lookup (Secret.Schema schema, GLib.Cancellable? cancellable, ...) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static string password_lookup_sync (Secret.Schema schema, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_lookup_finish")]
-	public static async string password_lookupv (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static string password_lookupv_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable = null) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static async bool password_store (Secret.Schema schema, string? collection, string label, string password, GLib.Cancellable? cancellable, ...) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static bool password_store_sync (Secret.Schema schema, string? collection, string label, string password, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_store_finish")]
-	public static async bool password_storev (Secret.Schema schema, GLib.HashTable<string,string> attributes, string? collection, string label, string password, GLib.Cancellable? cancellable) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static bool password_storev_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, string? collection, string label, string password, GLib.Cancellable? cancellable = null) throws GLib.Error;
-	[CCode (cheader_filename = "libsecret/secret.h")]
-	public static void password_wipe (string? password);
-}