Hello community,
here is the log from the commit of package deja-dup for openSUSE:Factory
checked in at 2020-09-07 21:35:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deja-dup (Old)
and /work/SRC/openSUSE:Factory/.deja-dup.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deja-dup"
Mon Sep 7 21:35:42 2020 rev:59 rq:832687 version:40.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/deja-dup/deja-dup.changes 2020-01-27
00:23:38.105530846 +0100
+++ /work/SRC/openSUSE:Factory/.deja-dup.new.3399/deja-dup.changes
2020-09-07 21:35:56.669397116 +0200
@@ -1,0 +2,9 @@
+Sat Sep 5 22:07:32 UTC 2020 - Bjørn Lie <bjorn....@gmail.com>
+
+- Update to version 40.7:
+ + Fixes a bug that prevented restoring from Google Drive accounts
+ if you haven't backed up yet.
+ + Drop "Version" key from desktop files, which broke some
+ parsers.
+
+-------------------------------------------------------------------
Old:
----
deja-dup-40.6.tar.bz2
New:
----
deja-dup-40.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deja-dup.spec ++++++
--- /var/tmp/diff_new_pack.Mn0Q9m/_old 2020-09-07 21:35:57.253397387 +0200
+++ /var/tmp/diff_new_pack.Mn0Q9m/_new 2020-09-07 21:35:57.257397389 +0200
@@ -17,7 +17,7 @@
Name: deja-dup
-Version: 40.6
+Version: 40.7
Release: 0
Summary: Simple backup tool and frontend for duplicity
License: GPL-3.0-or-later
++++++ deja-dup-40.6.tar.bz2 -> deja-dup-40.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deja-dup-40.6/NEWS.md new/deja-dup-40.7/NEWS.md
--- old/deja-dup-40.6/NEWS.md 2019-12-08 20:17:02.000000000 +0100
+++ new/deja-dup-40.7/NEWS.md 2020-06-15 04:05:01.000000000 +0200
@@ -3,6 +3,15 @@
SPDX-FileCopyrightText: Michael Terry
-->
+# 40.7
+- Fixes a bug that prevented restoring from Google Drive accounts if you
haven't
+ backed up yet
+- Drop "Version" key from desktop files, which broke some parsers
+
+##### Packaging
+- appstream-util, dbus-run-session, and desktop-file-validate are now optional
+ during build if you don't intend to run tests
+
# 40.6
- Fixes a bug that prevented backing up to Google Drive accounts with unlimited
quotas
@@ -24,7 +33,7 @@
- Fix 2038 date problems by using 64-bit dates internally
- Update translations
-## Packaging
+##### Packaging
- Fix building against `valac` 0.45.2 and later
- Require `glib` 2.56
- Require `meson` 0.47
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deja-dup-40.6/data/org.gnome.DejaDup.Monitor.desktop.in
new/deja-dup-40.7/data/org.gnome.DejaDup.Monitor.desktop.in
--- old/deja-dup-40.6/data/org.gnome.DejaDup.Monitor.desktop.in 2019-12-08
20:17:02.000000000 +0100
+++ new/deja-dup-40.7/data/org.gnome.DejaDup.Monitor.desktop.in 2020-06-15
04:05:01.000000000 +0200
@@ -2,8 +2,6 @@
# SPDX-FileCopyrightText: Michael Terry
[Desktop Entry]
-Version=1.1
-
Name=Backup Monitor
Comment=Schedules backups at regular intervals
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deja-dup-40.6/data/org.gnome.DejaDup.appdata.xml.in
new/deja-dup-40.7/data/org.gnome.DejaDup.appdata.xml.in
--- old/deja-dup-40.6/data/org.gnome.DejaDup.appdata.xml.in 2019-12-08
20:17:02.000000000 +0100
+++ new/deja-dup-40.7/data/org.gnome.DejaDup.appdata.xml.in 2020-06-15
04:05:01.000000000 +0200
@@ -78,6 +78,11 @@
</screenshots>
<releases>
+ <release version="40.7" date="2020-06-14">
+ <description its:translate="no">
+ <p>Fixes a bug that prevented restoring from Google Drive accounts if
you haven't backed up yet.</p>
+ </description>
+ </release>
<release version="40.6" date="2019-12-08">
<description its:translate="no">
<p>Fixes a bug that prevented backing up to Google Drive accounts with
unlimited quotas.</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deja-dup-40.6/data/org.gnome.DejaDup.desktop.in
new/deja-dup-40.7/data/org.gnome.DejaDup.desktop.in
--- old/deja-dup-40.6/data/org.gnome.DejaDup.desktop.in 2019-12-08
20:17:02.000000000 +0100
+++ new/deja-dup-40.7/data/org.gnome.DejaDup.desktop.in 2020-06-15
04:05:01.000000000 +0200
@@ -2,8 +2,6 @@
# SPDX-FileCopyrightText: Michael Terry
[Desktop Entry]
-Version=1.1
-
Name=Backups
Comment=Change your backup settings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deja-dup-40.6/deja-dup/AssistantOperation.vala
new/deja-dup-40.7/deja-dup/AssistantOperation.vala
--- old/deja-dup-40.6/deja-dup/AssistantOperation.vala 2019-12-08
20:17:02.000000000 +0100
+++ new/deja-dup-40.7/deja-dup/AssistantOperation.vala 2020-06-15
04:05:01.000000000 +0200
@@ -484,6 +484,7 @@
page.row_spacing = 36;
page.column_spacing = 6;
page.border_width = 12;
+ page.halign = Gtk.Align.CENTER;
var l = new Gtk.Label("");
l.xalign = 0.0f;
@@ -687,25 +688,30 @@
return;
}
+ connect_operation(op);
op.done.connect(apply_finished);
- op.raise_error.connect((o, e, d) => {show_error(e, d);});
- op.passphrase_required.connect(get_passphrase);
op.action_desc_changed.connect(set_progress_label);
op.action_file_changed.connect(set_progress_label_file);
op.progress.connect(show_progress);
- op.question.connect(show_question);
-#if HAS_PACKAGEKIT
- op.install.connect(show_install);
-#endif
- op.backend.mount_op = new MountOperationAssistant(this);
- op.backend.pause_op.connect(pause_op);
- op.backend.show_oauth_consent_page.connect(show_oauth_consent_page);
ensure_status_icon(op);
op.start.begin();
}
+ protected void connect_operation(DejaDup.Operation operation)
+ {
+ operation.raise_error.connect((o, e, d) => {show_error(e, d);});
+ operation.passphrase_required.connect(get_passphrase);
+ operation.question.connect(show_question);
+#if HAS_PACKAGEKIT
+ operation.install.connect(show_install);
+#endif
+ operation.backend.mount_op = new MountOperationAssistant(this);
+ operation.backend.pause_op.connect(pause_op);
+ operation.backend.show_oauth_consent_page.connect(show_oauth_consent_page);
+ }
+
protected virtual void do_prepare(Assistant assist, Gtk.Widget page)
{
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deja-dup-40.6/deja-dup/AssistantRestore.vala
new/deja-dup-40.7/deja-dup/AssistantRestore.vala
--- old/deja-dup-40.6/deja-dup/AssistantRestore.vala 2019-12-08
20:17:02.000000000 +0100
+++ new/deja-dup-40.7/deja-dup/AssistantRestore.vala 2020-06-15
04:05:01.000000000 +0200
@@ -390,15 +390,9 @@
query_op = new DejaDup.OperationStatus(config_location.get_backend());
op = query_op;
- op.done.connect(query_finished);
- op.raise_error.connect((o, e, d) => {show_error(e, d);});
- op.passphrase_required.connect(get_passphrase);
-#if HAS_PACKAGEKIT
- op.install.connect(show_install);
-#endif
+ connect_operation(query_op);
+ query_op.done.connect(query_finished);
query_op.collection_dates.connect(handle_collection_dates);
- op.backend.mount_op = new MountOperationAssistant(this);
- op.backend.pause_op.connect(pause_op);
yield op.start();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deja-dup-40.6/deja-dup/widgets/Background.vala
new/deja-dup-40.7/deja-dup/widgets/Background.vala
--- old/deja-dup-40.6/deja-dup/widgets/Background.vala 2019-12-08
20:17:02.000000000 +0100
+++ new/deja-dup-40.7/deja-dup/widgets/Background.vala 2020-06-15
04:05:01.000000000 +0200
@@ -75,7 +75,7 @@
return "/org/freedesktop/portal/desktop/request/%s/%s".printf(sender,
token);
}
- void got_response(DBusConnection connection, string sender_name, string
object_path,
+ void got_response(DBusConnection connection, string? sender_name, string
object_path,
string interface_name, string signal_name, Variant
parameters)
{
Variant values;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deja-dup-40.6/flatpak/org.gnome.DejaDupDevel.yaml
new/deja-dup-40.7/flatpak/org.gnome.DejaDupDevel.yaml
--- old/deja-dup-40.6/flatpak/org.gnome.DejaDupDevel.yaml 2019-12-08
20:17:02.000000000 +0100
+++ new/deja-dup-40.7/flatpak/org.gnome.DejaDupDevel.yaml 2020-06-15
04:05:01.000000000 +0200
@@ -9,7 +9,7 @@
command: deja-dup
finish-args:
- - --filesystem=home
+ - --filesystem=host
- --share=ipc
- --share=network
- --socket=fallback-x11
@@ -23,10 +23,11 @@
- name: lib2to3 # needed for past module (from future module)
buildsystem: simple
build-commands:
+ - mkdir -p /app/lib/python3.7/site-packages/
- cp -r Lib/lib2to3 /app/lib/python3.7/site-packages/
sources:
- type: git
- url: https://github.com/python/cpython
+ url: https://github.com/python/cpython.git
tag: v3.8.0
commit: fa919fdf2583bdfead1df00e842f24f30b2a34bf
@@ -34,7 +35,7 @@
buildsystem: cmake-ninja
sources:
- type: git
- url: https://github.com/librsync/librsync
+ url: https://github.com/librsync/librsync.git
tag: v2.2.1
commit: 5917692418657dc78c9cbde3a8db4c85f25b9c8d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deja-dup-40.6/libdeja/BackendGoogle.vala
new/deja-dup-40.7/libdeja/BackendGoogle.vala
--- old/deja-dup-40.6/libdeja/BackendGoogle.vala 2019-12-08
20:17:02.000000000 +0100
+++ new/deja-dup-40.7/libdeja/BackendGoogle.vala 2020-06-15
04:05:01.000000000 +0200
@@ -98,40 +98,6 @@
return _("%s on Google Drive").printf(folder);
}
- async List<File> find_target_folders(File cwd, string[] needles)
- {
- // Are we done? Then just return the current folder.
- if (needles.length == 0 || needles[0] == "") {
- var found = new List<File>();
- found.append(cwd);
- return found;
- }
-
- // Not done yet, dig through the files here.
- var answers = new List<File>();
- var needle = needles[0];
- try {
- var enumerator = yield cwd.enumerate_children_async(
- "%s,%s".printf(FileAttribute.STANDARD_DISPLAY_NAME,
FileAttribute.STANDARD_NAME),
- FileQueryInfoFlags.NONE);
- var children = yield enumerator.next_files_async(50);
- while (children.length() > 0) {
- foreach (var child in children) {
- if (child.get_display_name() == needle) {
- var found = enumerator.get_child(child);
- answers.concat(yield find_target_folders(found,
needles[1:needles.length]));
- }
- }
- children = yield enumerator.next_files_async(50);
- }
- }
- catch (Error e) {
- // ignore, fall through to return answers we do have
- }
-
- return answers;
- }
-
async void delete_root_finder()
{
var message = Soup.Form.request_new(
@@ -172,6 +138,40 @@
}
#if HAS_GOA
+ async List<File> find_target_folders(File cwd, string[] needles)
+ {
+ // Are we done? Then just return the current folder.
+ if (needles.length == 0 || needles[0] == "") {
+ var found = new List<File>();
+ found.append(cwd);
+ return found;
+ }
+
+ // Not done yet, dig through the files here.
+ var answers = new List<File>();
+ var needle = needles[0];
+ try {
+ var enumerator = yield cwd.enumerate_children_async(
+ "%s,%s".printf(FileAttribute.STANDARD_DISPLAY_NAME,
FileAttribute.STANDARD_NAME),
+ FileQueryInfoFlags.NONE);
+ var children = yield enumerator.next_files_async(50);
+ while (children.length() > 0) {
+ foreach (var child in children) {
+ if (child.get_display_name() == needle) {
+ var found = enumerator.get_child(child);
+ answers.concat(yield find_target_folders(found,
needles[1:needles.length]));
+ }
+ }
+ children = yield enumerator.next_files_async(50);
+ }
+ }
+ catch (Error e) {
+ // ignore, fall through to return answers we do have
+ }
+
+ return answers;
+ }
+
async GenericSet<string?> find_duplicity_ids(string token, List<File>
parents) throws Error
{
string[] parent_ids = {};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/deja-dup-40.6/libdeja/tools/duplicity/DuplicityJob.vala
new/deja-dup-40.7/libdeja/tools/duplicity/DuplicityJob.vala
--- old/deja-dup-40.6/libdeja/tools/duplicity/DuplicityJob.vala 2019-12-08
20:17:02.000000000 +0100
+++ new/deja-dup-40.7/libdeja/tools/duplicity/DuplicityJob.vala 2020-06-15
04:05:01.000000000 +0200
@@ -432,6 +432,7 @@
}
break;
+
case DejaDup.ToolJob.Mode.RESTORE:
// We need to first check the backup status to see if we should use
// encryption.
@@ -503,6 +504,9 @@
progress(0f);
}
break;
+
+ default:
+ break;
}
// Send appropriate description for what we're about to do. Is often
@@ -741,6 +745,9 @@
}
}
break;
+
+ case NOT_STARTED:
+ break;
}
}
else if (was_stopped)
@@ -1471,6 +1478,8 @@
argv.append("--time=%s".printf(time));
argv.append(get_remote());
break;
+ default:
+ break;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/deja-dup-40.6/meson.build
new/deja-dup-40.7/meson.build
--- old/deja-dup-40.6/meson.build 2019-12-08 20:17:02.000000000 +0100
+++ new/deja-dup-40.7/meson.build 2020-06-15 04:05:01.000000000 +0200
@@ -4,7 +4,7 @@
# SPDX-FileCopyrightText: Michael Terry
project('deja-dup', ['vala', 'c'],
- version: '40.6',
+ version: '40.7',
license: 'GPL-3.0-or-later',
meson_version: '>= 0.47')
@@ -44,9 +44,9 @@
gpgerror_dep = declare_dependency(link_args: gpgerror_libs.split())
# Programs
-appstream_util = find_program('appstream-util')
-dbus_run_session = find_program('dbus-run-session')
-desktop_file_validate = find_program('desktop-file-validate')
+appstream_util = find_program('appstream-util', required: false)
+dbus_run_session = find_program('dbus-run-session', required: false)
+desktop_file_validate = find_program('desktop-file-validate', required: false)
glib_compile_schemas = find_program('glib-compile-schemas')
msgfmt = find_program('msgfmt')
