pool/deja-dup
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 212229 from home:dimstar:branches:GNOME:Apps

Browse Source 
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
This commit is contained in:
Bjørn Lie 2013-12-25 12:18:03 +00:00 committed by Git OBS Bridge
parent 806872942b
commit 5ed191ac95
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
deja-dup-vala-0.22.patch Normal file
View File

@ -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")

6
deja-dup.changes
View File

@ -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

3
deja-dup.spec
View File

@ -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