From 5ed191ac95402080852431cecfeb47c1dd31ee3f17036456f6581c8edc67e343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Wed, 25 Dec 2013 12:18:03 +0000
Subject: [PATCH] Accepting request 212229 from
 home:dimstar:branches:GNOME:Apps

Fix build with vala 0.22

OBS-URL: https://build.opensuse.org/request/show/212229
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=54
---
 deja-dup-vala-0.22.patch | 25 +++++++++++++++++++++++++
 deja-dup.changes         |  6 ++++++
 deja-dup.spec            |  3 +++
 3 files changed, 34 insertions(+)
 create mode 100644 deja-dup-vala-0.22.patch

diff --git a/deja-dup-vala-0.22.patch b/deja-dup-vala-0.22.patch
new file mode 100644
index 0000000..d361e0a
--- /dev/null
+++ b/deja-dup-vala-0.22.patch
@@ -0,0 +1,25 @@
+=== modified file 'CMakeLists.txt'
+Index: deja-dup/widgets/WidgetUtils.vala
+===================================================================
+--- deja-dup/widgets/WidgetUtils.vala.orig
++++ deja-dup/widgets/WidgetUtils.vala
+@@ -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)
+@@ -60,7 +64,7 @@ public ShellEnv get_shell()
+       // 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/deja-dup.changes b/deja-dup.changes
index 674d80d..91b26cc 100644
--- a/deja-dup.changes
+++ b/deja-dup.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 24 21:06:08 UTC 2013 - dimstar@opensuse.org
+
+- Add deja-dup-vala-0.22.patch: Support building against vala
+  0.22; taken from deja-dup 30 branch.
+
 -------------------------------------------------------------------
 Sat Sep 28 08:18:47 UTC 2013 - zaitor@opensuse.org
 
diff --git a/deja-dup.spec b/deja-dup.spec
index af19064..58d48c0 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -25,6 +25,8 @@ License:        GPL-3.0+
 Group:          Productivity/Archiving/Backup
 Url:            https://launchpad.net/deja-dup
 Source0:        https://launchpad.net/deja-dup/28/%{version}/+download/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM deja-dup-vala-0.22.patch dimstar@opensuse.org -- Fix build with Vala 0.22, taken from launchpad.
+Patch0:         deja-dup-vala-0.22.patch
 # For make check to work, we need dbus-launch
 BuildRequires:  dbus-1-x11
 BuildRequires:  fdupes
@@ -80,6 +82,7 @@ This package contains a plugin to integrate Déjà Dup into Nautilus.
 %lang_package
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure --disable-static