Accepting request 978661 from GNOME:Apps

- Update to version 43.3:
  + Change Google/Microsoft authentication flow to use a more
    secure, non-deprecated approach (Google is turning off the
    approach we use now in just a few months).
  + Remember window size after closing.
  + Fix incorrect file permissions / mtime when restoring files
    from other users.
  + Updated translations.
- Drop 60856db.patch and 9c17deb0526b.patch: fixed upstream. (forwarded request 978273 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/978661
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/deja-dup?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger 2022-05-23 13:52:08 +00:00 committed by Git OBS Bridge
commit 490549f883
6 changed files with 17 additions and 100 deletions

View File

@ -1,62 +0,0 @@
From 60856db2ca1b37079e9a7a2e1cbbbc9d2dcb43fa Mon Sep 17 00:00:00 2001
From: Michael Terry <mike@mterry.name>
Date: Wed, 9 Mar 2022 12:28:18 -0500
Subject: [PATCH] build: fix test case ownership with latest valac
---
libdeja/tests/runner.vala | 4 ++--
libdeja/tests/unit/unit-tests.vala | 2 +-
monitor/tests/scheduler.vala | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libdeja/tests/runner.vala b/libdeja/tests/runner.vala
index 95f6dbe1..b7216328 100644
--- a/libdeja/tests/runner.vala
+++ b/libdeja/tests/runner.vala
@@ -1032,7 +1032,7 @@ int main(string[] args)
if (keyfile.has_group("Duplicity")) {
var suite = new TestSuite("duplicity");
suite.add(new TestCase(testname, backup_setup, duplicity_run, backup_teardown));
- TestSuite.get_root().add_suite(suite);
+ TestSuite.get_root().add_suite((owned)suite);
found_group = true;
}
@@ -1040,7 +1040,7 @@ int main(string[] args)
if (keyfile.has_group("Restic")) {
var suite = new TestSuite("restic");
suite.add(new TestCase(testname, backup_setup, restic_run, backup_teardown));
- TestSuite.get_root().add_suite(suite);
+ TestSuite.get_root().add_suite((owned)suite);
found_group = true;
}
#endif
diff --git a/libdeja/tests/unit/unit-tests.vala b/libdeja/tests/unit/unit-tests.vala
index 8cce6317..cbe85ea6 100644
--- a/libdeja/tests/unit/unit-tests.vala
+++ b/libdeja/tests/unit/unit-tests.vala
@@ -138,7 +138,7 @@ int main(string[] args)
unit.add(new TestCase("parse-dir", setup, parse_dir, teardown));
unit.add(new TestCase("parse-version", setup, parse_version, teardown));
unit.add(new TestCase("prompt", setup, prompt, teardown));
- TestSuite.get_root().add_suite(unit);
+ TestSuite.get_root().add_suite((owned)unit);
return Test.run();
}
diff --git a/monitor/tests/scheduler.vala b/monitor/tests/scheduler.vala
index d83da81a..beabc134 100644
--- a/monitor/tests/scheduler.vala
+++ b/monitor/tests/scheduler.vala
@@ -242,7 +242,7 @@ int main(string[] args)
unit.add(new TestCase("period-changes", setup, notices_period_changes, teardown));
unit.add(new TestCase("period-overdue", setup, period_change_overdue, teardown));
unit.add(new TestCase("backup-changes", setup, notices_last_backup_changes, teardown));
- TestSuite.get_root().add_suite(unit);
+ TestSuite.get_root().add_suite((owned)unit);
return Test.run();
}
--
GitLab

View File

@ -1,30 +0,0 @@
From 9c17deb0526b90b834bd421db872737c96f7227c Mon Sep 17 00:00:00 2001
From: Michael Terry <mike@mterry.name>
Date: Sun, 24 Apr 2022 10:59:56 -0400
Subject: [PATCH] build: add gtk wayland and x11 dep objects to deja-dup
executable
This fixes our build with vala 0.56.1+, which split those vapi
files out from the main gtk4 vapi file.
Fixes: https://gitlab.gnome.org/World/deja-dup/-/issues/294
---
app/meson.build | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/meson.build b/app/meson.build
index d2cfb394..6e732bf7 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -50,6 +50,8 @@ deja_dup = executable('deja-dup',
adwaita_dep,
gio_unix_dep,
gtk_dep,
+ gtk_wayland_dep,
+ gtk_x11_dep,
packagekit_dep,
secret_dep,
],
--
GitLab

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e49e0fe934af75fa9600dc1febddb728488df87da91b2c7f70be914896440ec3
size 971298

3
deja-dup-43.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d77c8b5280d0b3d0ae3f4b1ef86747db6080dd65990b98ba06335fff5a88ce7
size 985450

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 20 12:31:39 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 43.3:
+ Change Google/Microsoft authentication flow to use a more
secure, non-deprecated approach (Google is turning off the
approach we use now in just a few months).
+ Remember window size after closing.
+ Fix incorrect file permissions / mtime when restoring files
from other users.
+ Updated translations.
- Drop 60856db.patch and 9c17deb0526b.patch: fixed upstream.
-------------------------------------------------------------------
Mon Apr 25 11:10:25 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -17,17 +17,13 @@
Name: deja-dup
Version: 43.2
Version: 43.3
Release: 0
Summary: Simple backup tool and frontend for duplicity
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 60856db.patch dimstar@opensuse.org -- Fix build with vala 0.56.1
Patch0: https://gitlab.gnome.org/World/deja-dup/-/commit/60856db.patch
# PATCH-FIX-UPSTREAM 9c17deb0526b.patch dimstar@opensuse.org -- Fix build by adding proper lib dependencies
Patch1: https://gitlab.gnome.org/World/deja-dup/-/commit/9c17deb0526b.patch
BuildRequires: appstream-glib
BuildRequires: dbus-1
BuildRequires: desktop-file-utils