Page MenuHomeSolus

D7728.diff
No OneTemporary

D7728.diff

diff --git a/files/duplicity-Mark-GPGError-as-extern.patch b/files/duplicity-Mark-GPGError-as-extern.patch
deleted file mode 100644
--- a/files/duplicity-Mark-GPGError-as-extern.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : deja-dup
-version : '40.1'
-release : 18
+version : '40.5'
+release : 19
source :
- - https://gitlab.gnome.org/World/deja-dup/-/archive/40.1/deja-dup-40.1.tar.gz : 0c068f369ba4e9e68f3e5989eb375ff4b7decfd1f5b02ab42c94d9b3ad995faf
+ - https://gitlab.gnome.org/World/deja-dup/-/archive/40.5/deja-dup-40.5.tar.bz2 : b60d8cc5f024cf0cdea12bbb7ef62f2b304dc6b3ef87d337aae92afbb535f8ca
license : GPL-3.0-or-later
component : system.utils
summary : Déjà Dup backup tool
@@ -27,9 +27,8 @@
- duplicity
- gvfs
setup : |
- %patch -p1 < $pkgfiles/duplicity-Mark-GPGError-as-extern.patch
%meson_configure
build : |
- %meson_build -j1
+ %ninja_build -j1
install : |
- %meson_install
+ %ninja_install
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>deja-dup</Name>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Packager>
<License>GPL-3.0-or-later</License>
<PartOf>system.utils</PartOf>
@@ -26,7 +26,6 @@
<Path fileType="library">/usr/lib64/deja-dup/libdeja.so</Path>
<Path fileType="library">/usr/lib64/deja-dup/libwidgets.so</Path>
<Path fileType="library">/usr/lib64/nautilus/extensions-3.0/libdeja-dup.so</Path>
- <Path fileType="data">/usr/share/GConf/gsettings/deja-dup.convert</Path>
<Path fileType="data">/usr/share/applications/org.gnome.DejaDup.desktop</Path>
<Path fileType="data">/usr/share/dbus-1/services/org.gnome.DejaDup.service</Path>
<Path fileType="data">/usr/share/glib-2.0/schemas/org.gnome.DejaDup.gschema.xml</Path>
@@ -560,6 +559,7 @@
<Path fileType="doc">/usr/share/help/zh_TW/deja-dup/support.page</Path>
<Path fileType="data">/usr/share/icons/hicolor/scalable/apps/org.gnome.DejaDup.svg</Path>
<Path fileType="data">/usr/share/icons/hicolor/symbolic/apps/org.gnome.DejaDup-symbolic.svg</Path>
+ <Path fileType="localedata">/usr/share/locale/af/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/ar/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/ast/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/az/LC_MESSAGES/deja-dup.mo</Path>
@@ -609,6 +609,7 @@
<Path fileType="localedata">/usr/share/locale/lv/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/mhr/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/ml/LC_MESSAGES/deja-dup.mo</Path>
+ <Path fileType="localedata">/usr/share/locale/mnw/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/mr/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/ms/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/my/LC_MESSAGES/deja-dup.mo</Path>
@@ -633,6 +634,7 @@
<Path fileType="localedata">/usr/share/locale/sq/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/sr/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/sv/LC_MESSAGES/deja-dup.mo</Path>
+ <Path fileType="localedata">/usr/share/locale/szl/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/ta/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/te/LC_MESSAGES/deja-dup.mo</Path>
<Path fileType="localedata">/usr/share/locale/tg/LC_MESSAGES/deja-dup.mo</Path>
@@ -651,12 +653,12 @@
</Files>
</Package>
<History>
- <Update release="18">
- <Date>2019-09-23</Date>
- <Version>40.1</Version>
+ <Update release="19">
+ <Date>2019-11-28</Date>
+ <Version>40.5</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Jun 5 2023, 4:57 AM (9 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5823036
Default Alt Text
D7728.diff (5 KB)

Event Timeline