[arch-commits] Commit in deja-dup/repos/community-x86_64 (3 files)

Balló György bgyorgy at archlinux.org
Fri Jan 19 20:53:30 UTC 2018


    Date: Friday, January 19, 2018 @ 20:53:28
  Author: bgyorgy
Revision: 284215

archrelease: copy trunk to community-x86_64

Added:
  deja-dup/repos/community-x86_64/PKGBUILD
    (from rev 284214, deja-dup/trunk/PKGBUILD)
  deja-dup/repos/community-x86_64/fix-crash-on-restore.patch
    (from rev 284214, deja-dup/trunk/fix-crash-on-restore.patch)
Deleted:
  deja-dup/repos/community-x86_64/PKGBUILD

----------------------------+
 PKGBUILD                   |   80 ++++++++++++++++++++++---------------------
 fix-crash-on-restore.patch |   64 ++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 38 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-19 20:53:18 UTC (rev 284214)
+++ PKGBUILD	2018-01-19 20:53:28 UTC (rev 284215)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=deja-dup
-pkgver=36.3
-pkgrel=2
-pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
-arch=('x86_64')
-url="https://launchpad.net/deja-dup"
-license=('GPL')
-depends=('duplicity' 'gnome-online-accounts' 'gvfs' 'libpeas' 'libnotify' 'python2-gobject')
-makedepends=('appstream-glib' 'gobject-introspection' 'intltool' 'itstool' 'meson' 'nautilus' 'vala')
-optdepends=('gnome-keyring: save passwords'
-            'nautilus: backup extension'
-            'python2-boto: Amazon S3 and Google Cloud Storage backend')
-source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz{,.asc})
-validpgpkeys=('A3A5C2FC56AE7341D308D8571B50ECA373F3F233') # Michael Terry
-md5sums=('b52e18dd5d6453052ff97b5e16290015'
-         'SKIP')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-  meson ../$pkgname-$pkgver \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --libexecdir=/usr/lib \
-        --buildtype=release
-  ninja
-}
-
-package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
-}

Copied: deja-dup/repos/community-x86_64/PKGBUILD (from rev 284214, deja-dup/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-01-19 20:53:28 UTC (rev 284215)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=deja-dup
+pkgver=36.3
+pkgrel=3
+pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
+arch=('x86_64')
+url="https://launchpad.net/deja-dup"
+license=('GPL')
+depends=('duplicity' 'gnome-online-accounts' 'gvfs' 'libpeas' 'libnotify' 'python2-gobject')
+makedepends=('appstream-glib' 'gobject-introspection' 'intltool' 'itstool' 'meson' 'nautilus' 'vala')
+optdepends=('gnome-keyring: save passwords'
+            'nautilus: backup extension'
+            'python2-boto: Amazon S3 and Google Cloud Storage backend')
+source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz{,.asc}
+        fix-crash-on-restore.patch)
+validpgpkeys=('A3A5C2FC56AE7341D308D8571B50ECA373F3F233') # Michael Terry
+sha256sums=('2c433a334bcead16f92a98914d36fbf6911cd11dcc75bc8163cefa73fff2fc22'
+            'SKIP'
+            '9b3c66d83325874d3ebe394240962e8d88bc2dc0a48d0550cb4f503f2d8d2554')
+
+prepare() {
+  mkdir build
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../fix-crash-on-restore.patch
+}
+
+build() {
+  cd build
+  meson ../$pkgname-$pkgver \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib \
+        --buildtype=release
+  ninja
+}
+
+package() {
+  cd build
+  DESTDIR="$pkgdir" ninja install
+}

Copied: deja-dup/repos/community-x86_64/fix-crash-on-restore.patch (from rev 284214, deja-dup/trunk/fix-crash-on-restore.patch)
===================================================================
--- fix-crash-on-restore.patch	                        (rev 0)
+++ fix-crash-on-restore.patch	2018-01-19 20:53:28 UTC (rev 284215)
@@ -0,0 +1,64 @@
+From 8d15219cfd237cc048069159ad351584531a3d41 Mon Sep 17 00:00:00 2001
+From: Michael Terry <mike at mterry.name>
+Date: Sat, 25 Nov 2017 18:22:24 -0500
+Subject: AssistantRestore: Fix crash with --restore-missing
+
+https://bugs.launchpad.net/deja-dup/+bug/1729935
+
+diff --git a/deja-dup/AssistantRestore.vala b/deja-dup/AssistantRestore.vala
+index e4d0e72..f6e6cf4 100644
+--- a/deja-dup/AssistantRestore.vala
++++ b/deja-dup/AssistantRestore.vala
+@@ -80,7 +80,13 @@ public class AssistantRestore : AssistantOperation
+     add_date_page();
+     add_restore_dest_page();
+   }
+-  
++
++  void ensure_config_location()
++  {
++    label_sizes = new Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL);
++    config_location = new DejaDup.ConfigLocation(true, true, label_sizes);
++  }
++
+   Gtk.Widget make_backup_location_page()
+   {
+     int rows = 0;
+@@ -91,6 +97,7 @@ public class AssistantRestore : AssistantOperation
+              "column-spacing", 12,
+              "border-width", 12);
+ 
++    ensure_config_location();
+     label = new Gtk.Label.with_mnemonic(_("_Backup location"));
+     label.set("xalign", 1.0f,
+               "mnemonic-widget", config_location);
+@@ -120,10 +127,6 @@ public class AssistantRestore : AssistantOperation
+   
+   protected override void add_custom_config_pages()
+   {
+-    // Must always make ConfigLocation, so we can grab the backend from it
+-    label_sizes = new Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL);
+-    config_location = new DejaDup.ConfigLocation(true, true, label_sizes);
+-
+     // always show for a full restore or if user hasn't ever used us
+     if (restore_files == null || !DejaDup.has_seen_settings()) {
+       var page = make_backup_location_page();
+@@ -298,6 +301,7 @@ public class AssistantRestore : AssistantOperation
+ 
+     realize();
+ 
++    ensure_config_location();
+     var rest_op = new DejaDup.OperationRestore(config_location.get_backend(),
+                                                restore_location, date, restore_files);
+     if (this.op_state != null)
+@@ -390,6 +394,7 @@ public class AssistantRestore : AssistantOperation
+   {
+     realize();
+ 
++    ensure_config_location();
+     query_op = new DejaDup.OperationStatus(config_location.get_backend());
+     op = query_op;
+ 
+-- 
+cgit v0.10.2
+



More information about the arch-commits mailing list