Accepting request 972592 from GNOME:Next
Scripted push from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/972592 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=127
This commit is contained in:
Git OBS Bridge
parent
638b86cfbb
commit
ed34cc33e6
62
60856db.patch
Normal file
62
60856db.patch
Normal file
@ -0,0 +1,62 @@
|
||||
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
|
||||
|
||||
30
9c17deb0526b.patch
Normal file
30
9c17deb0526b.patch
Normal file
@ -0,0 +1,30 @@
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cd0b0c4b1ab2a06e2a30a9d9018cbd35c7fd648cc6d04de2709d5bcbedcce118
|
||||
size 959650
|
||||
3
deja-dup-43.2.tar.bz2
Normal file
3
deja-dup-43.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e49e0fe934af75fa9600dc1febddb728488df87da91b2c7f70be914896440ec3
|
||||
size 971298
|
||||
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 25 11:10:25 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 43.2:
|
||||
+ Fix a crash if you select a mount in the Local Folder settings
|
||||
file chooser.
|
||||
+ Fix the "hostname has changed" dialog to let you actually
|
||||
continue the backup.
|
||||
+ Fix a bogus notification that complained about not being
|
||||
connected to the network for scheduled backups to Network
|
||||
Servers, even if you were connected.
|
||||
+ Make replacing existing monitor processes during upgrade work
|
||||
better.
|
||||
+ Add a hidden advanced setting to run setup/teardown commands
|
||||
when running the backup tool (useful if you have an unusual
|
||||
manual mount you need).
|
||||
+ Updated translations.
|
||||
- Add 60856db.patch: fix test case ownership with latest valac.
|
||||
- Add 9c17deb0526b.patch: add gtk wayland and x11 dep objects to
|
||||
deja-dup executable.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 8 17:18:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
@ -17,14 +17,17 @@
|
||||
|
||||
|
||||
Name: deja-dup
|
||||
Version: 43.1
|
||||
Version: 43.2
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user