[arch-commits] Commit in deja-dup (8 files)
Balló György
bgyorgy at nymeria.archlinux.org
Wed Mar 12 01:01:18 UTC 2014
Date: Wednesday, March 12, 2014 @ 02:01:17
Author: bgyorgy
Revision: 107060
Fix build (FS#39289)
Added:
deja-dup/repos/community-i686/fix-build.patch
deja-dup/repos/community-x86_64/fix-build.patch
deja-dup/trunk/fix-build.patch
Modified:
deja-dup/repos/community-i686/PKGBUILD
deja-dup/repos/community-x86_64/PKGBUILD
deja-dup/trunk/PKGBUILD
Deleted:
deja-dup/repos/community-i686/libsecret-1.vapi
deja-dup/repos/community-x86_64/libsecret-1.vapi
-----------------------------------------+
repos/community-i686/PKGBUILD | 9 ++-
repos/community-i686/fix-build.patch | 24 +++++++++
repos/community-i686/libsecret-1.vapi | 79 ------------------------------
repos/community-x86_64/PKGBUILD | 9 ++-
repos/community-x86_64/fix-build.patch | 24 +++++++++
repos/community-x86_64/libsecret-1.vapi | 79 ------------------------------
trunk/PKGBUILD | 9 ++-
trunk/fix-build.patch | 24 +++++++++
8 files changed, 93 insertions(+), 164 deletions(-)
Modified: repos/community-i686/PKGBUILD
===================================================================
--- repos/community-i686/PKGBUILD 2014-03-12 00:38:36 UTC (rev 107059)
+++ repos/community-i686/PKGBUILD 2014-03-12 01:01:17 UTC (rev 107060)
@@ -15,8 +15,10 @@
'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"
@@ -23,6 +25,9 @@
# Python2 fix
sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
+
+ # Fix build
+ patch -Np0 -i ../fix-build.patch
}
build() {
Added: repos/community-i686/fix-build.patch
===================================================================
--- repos/community-i686/fix-build.patch (rev 0)
+++ repos/community-i686/fix-build.patch 2014-03-12 01:01:17 UTC (rev 107060)
@@ -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")
+
Deleted: repos/community-i686/libsecret-1.vapi
===================================================================
--- repos/community-i686/libsecret-1.vapi 2014-03-12 00:38:36 UTC (rev 107059)
+++ repos/community-i686/libsecret-1.vapi 2014-03-12 01:01:17 UTC (rev 107060)
@@ -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);
-}
Modified: repos/community-x86_64/PKGBUILD
===================================================================
--- repos/community-x86_64/PKGBUILD 2014-03-12 00:38:36 UTC (rev 107059)
+++ repos/community-x86_64/PKGBUILD 2014-03-12 01:01:17 UTC (rev 107060)
@@ -15,8 +15,10 @@
'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"
@@ -23,6 +25,9 @@
# Python2 fix
sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
+
+ # Fix build
+ patch -Np0 -i ../fix-build.patch
}
build() {
Added: repos/community-x86_64/fix-build.patch
===================================================================
--- repos/community-x86_64/fix-build.patch (rev 0)
+++ repos/community-x86_64/fix-build.patch 2014-03-12 01:01:17 UTC (rev 107060)
@@ -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")
+
Deleted: repos/community-x86_64/libsecret-1.vapi
===================================================================
--- repos/community-x86_64/libsecret-1.vapi 2014-03-12 00:38:36 UTC (rev 107059)
+++ repos/community-x86_64/libsecret-1.vapi 2014-03-12 01:01:17 UTC (rev 107060)
@@ -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);
-}
Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2014-03-12 00:38:36 UTC (rev 107059)
+++ trunk/PKGBUILD 2014-03-12 01:01:17 UTC (rev 107060)
@@ -15,8 +15,10 @@
'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"
@@ -23,6 +25,9 @@
# Python2 fix
sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
+
+ # Fix build
+ patch -Np0 -i ../fix-build.patch
}
build() {
Added: trunk/fix-build.patch
===================================================================
--- trunk/fix-build.patch (rev 0)
+++ trunk/fix-build.patch 2014-03-12 01:01:17 UTC (rev 107060)
@@ -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")
+
More information about the arch-commits
mailing list