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
This commit is contained in:
Dominique Leuenberger 2019-09-03 07:22:10 +00:00 committed by Git OBS Bridge
parent d1fa3ce91e
commit 549e5fb2d0
3 changed files with 43 additions and 0 deletions

View File

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

View File

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

View File

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