Browse Source
* gnu/packages/gnome.scm (deja-dup): Update to 40.6. [origin]: Use gitlab.gnome.org since the project migrated away from launchpad. [home-page]: Use 'wiki.gnome.org' instead of 'launchpad.net'. [build-system]: Switch to 'meson-build-system' because upstream removed cmake support. [arguments]: Enable tests. Remove arguments 'modules', 'imported-modules' and 'test-target'. Use argument 'glib-or-gtk?'. Replace configure-flags to only adjust 'RUN_PATH'. Use standard phases for 'configure' and 'check'. Adjust and rename phase 'patch-lockfile-deletion' to 'patch-paths'. Add phases 'patch-libgpg-error' and 'skip-gtk-update-icon-cache'. [inputs]: Remove 'libpeas', 'gobject-introspection'. Replace 'python-2' and 'python2-pygobject' with python-3 versions. Add 'json-glib', 'libsoup' and 'libgpg-error'. [native-inputs]: Remove 'cmake-minimal' and 'intltool'. Add 'appstream-glib','desktop-file-utils', 'glib:bin' and 'gobject-introspection'. * gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch: Delete file.wip-hurd-vm

2 changed files with 52 additions and 94 deletions
@ -1,41 +0,0 @@ |
|||
From 5676766be5e845ccb6cdf46cfa8722497f151752 Mon Sep 17 00:00:00 2001 |
|||
From: Jeremy Bicha <jbicha@ubuntu.com> |
|||
Date: Fri, 16 Jun 2017 15:11:37 -0400 |
|||
Subject: Use 'ref' keyword for iter, requires vala 0.36 |
|||
|
|||
|
|||
diff --git a/deja-dup/widgets/ConfigList.vala b/deja-dup/widgets/ConfigList.vala
|
|||
index 15de2d6..02cd81a 100644
|
|||
--- a/deja-dup/widgets/ConfigList.vala
|
|||
+++ b/deja-dup/widgets/ConfigList.vala
|
|||
@@ -333,7 +333,7 @@ public class ConfigList : ConfigWidget
|
|||
|
|||
model.row_deleted.disconnect(write_to_config); |
|||
foreach (Gtk.TreeIter iter in iters) { |
|||
- (model as Gtk.ListStore).remove(iter);
|
|||
+ (model as Gtk.ListStore).remove(ref iter);
|
|||
} |
|||
model.row_deleted.connect(write_to_config); |
|||
|
|||
diff --git a/deja-dup/widgets/ConfigLocation.vala b/deja-dup/widgets/ConfigLocation.vala
|
|||
index 869e2a8..d21c556 100644
|
|||
--- a/deja-dup/widgets/ConfigLocation.vala
|
|||
+++ b/deja-dup/widgets/ConfigLocation.vala
|
|||
@@ -397,12 +397,12 @@ public class ConfigLocation : ConfigWidget
|
|||
if (uuid == saved_uuid) |
|||
return; |
|||
|
|||
- store.remove(iter);
|
|||
+ store.remove(ref iter);
|
|||
|
|||
if (--num_volumes == 0) { |
|||
Gtk.TreeIter sep_iter; |
|||
if (store.get_iter_from_string(out sep_iter, index_vol_sep.to_string())) { |
|||
- store.remove(sep_iter);
|
|||
+ store.remove(ref sep_iter);
|
|||
index_vol_sep = -2; |
|||
} |
|||
} |
|||
--
|
|||
cgit v0.10.2 |
|||
|
Loading…
Reference in new issue