From 549e5fb2d001531f93a3ea24fcc666ff59267616ee387bb64439f407a135ca0a Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 3 Sep 2019 07:22:10 +0000
Subject: [PATCH] Accepting request 727843 from GNOME:Next

Add upstream patch

OBS-URL: https://build.opensuse.org/request/show/727843
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=106
---
 deja-dup-duplicity-Mark-GPGError-extern.patch | 34 +++++++++++++++++++
 deja-dup.changes                              |  7 ++++
 deja-dup.spec                                 |  2 ++
 3 files changed, 43 insertions(+)
 create mode 100644 deja-dup-duplicity-Mark-GPGError-extern.patch

diff --git a/deja-dup-duplicity-Mark-GPGError-extern.patch b/deja-dup-duplicity-Mark-GPGError-extern.patch
new file mode 100644
index 0000000..d6c43e7
--- /dev/null
+++ b/deja-dup-duplicity-Mark-GPGError-extern.patch
@@ -0,0 +1,34 @@
+From 05422eab47e444525427b4108c64a00721139712 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 10 Jul 2019 13:33:47 +0200
+Subject: [PATCH] duplicity: Mark GPGError as extern and prevent GPG symbols to
+ be public API
+
+This also fixes building with vala 0.45.2+
+---
+ libdeja/tools/duplicity/DuplicityJob.vala | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libdeja/tools/duplicity/DuplicityJob.vala b/libdeja/tools/duplicity/DuplicityJob.vala
+index 82c0c603..00a9f6ab 100644
+--- a/libdeja/tools/duplicity/DuplicityJob.vala
++++ b/libdeja/tools/duplicity/DuplicityJob.vala
+@@ -20,13 +20,13 @@
+ using GLib;
+ 
+ [CCode (cheader_filename = "gpgrt.h", cname = "gpg_err_code_t", cprefix = "GPG_ERR_", has_type_id = false)]
+-public enum GPGError {
++extern enum GPGError {
+   NO_SECKEY = 17,
+   BAD_KEY = 19,
+ }
+ 
+ [CCode (cheader_filename = "gpgrt.h")]
+-public extern unowned string gpg_strerror(GPGError code);
++extern unowned string gpg_strerror(GPGError code);
+ 
+ internal class DuplicityJob : DejaDup.ToolJob
+ {
+-- 
+2.22.0
+
diff --git a/deja-dup.changes b/deja-dup.changes
index c7eaf72..873fb66 100644
--- a/deja-dup.changes
+++ b/deja-dup.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep  2 20:32:41 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add deja-dup-duplicity-Mark-GPGError-extern.patch: Mark GPGError
+  as extern and prevent GPG symbols to be public API. Also fixes
+  building with new vala.
+
 -------------------------------------------------------------------
 Fri Jul  5 09:48:53 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/deja-dup.spec b/deja-dup.spec
index 910ec11..d78430e 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -24,6 +24,8 @@ License:        GPL-3.0-or-later
 Group:          Productivity/Archiving/Backup
 URL:            https://wiki.gnome.org/Apps/DejaDup
 Source0:        https://gitlab.gnome.org/World/deja-dup/-/archive/%{version}/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM deja-dup-duplicity-Mark-GPGError-extern.patch -- Fix build with new vala
+Patch0:         deja-dup-duplicity-Mark-GPGError-extern.patch
 
 BuildRequires:  appstream-glib
 BuildRequires:  dbus-1