Date: Tuesday, April 10, 2018 @ 11:31:13 Author: bgyorgy Revision: 315565
upgpkg: deja-dup 38.0-1 Update to new version Modified: deja-dup/trunk/PKGBUILD Deleted: deja-dup/trunk/0002-don-t-use-ulimit.patch deja-dup/trunk/fix-crash-on-restore.patch -----------------------------+ 0002-don-t-use-ulimit.patch | 27 ----------------- PKGBUILD | 33 +++++---------------- fix-crash-on-restore.patch | 64 ------------------------------------------ 3 files changed, 8 insertions(+), 116 deletions(-) Deleted: 0002-don-t-use-ulimit.patch =================================================================== --- 0002-don-t-use-ulimit.patch 2018-04-10 11:26:33 UTC (rev 315564) +++ 0002-don-t-use-ulimit.patch 2018-04-10 11:31:13 UTC (rev 315565) @@ -1,27 +0,0 @@ -From: Jeremy Bicha <[email protected]> -Date: Fri, 16 Mar 2018 14:08:41 -0400 -Subject: don't use ulimit - -It doesn't work with webkit2gtk 2.20 - -https://launchpad.net/bugs/1751460 ---- - data/org.gnome.DejaDup.Monitor.desktop.in | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/data/org.gnome.DejaDup.Monitor.desktop.in b/data/org.gnome.DejaDup.Monitor.desktop.in -index 631455f..c429c42 100644 ---- a/data/org.gnome.DejaDup.Monitor.desktop.in -+++ b/data/org.gnome.DejaDup.Monitor.desktop.in -@@ -6,10 +6,7 @@ Comment=Schedules backups at regular intervals - - Icon=org.gnome.DejaDup - --# Try to limit memory -- we have reports of runaway deja-dup-monitor processes --# but I can't reproduce it. So until we fix whatever is happening there, try --# this. LP: #1302416 --Exec=sh -c "ulimit -v 1000000; exec @pkglibexecdir@/deja-dup-monitor" -+Exec=@pkglibexecdir@/deja-dup-monitor - - X-GNOME-Autostart-Delay=120 - X-GNOME-AutoRestart=true Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-10 11:26:33 UTC (rev 315564) +++ PKGBUILD 2018-04-10 11:31:13 UTC (rev 315565) @@ -2,8 +2,8 @@ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=deja-dup -pkgver=36.3 -pkgrel=4 +pkgver=38.0 +pkgrel=1 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"; @@ -13,33 +13,16 @@ 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 - 0002-don-t-use-ulimit.patch) +source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz{,.asc}) validpgpkeys=('A3A5C2FC56AE7341D308D8571B50ECA373F3F233') # Michael Terry -sha256sums=('2c433a334bcead16f92a98914d36fbf6911cd11dcc75bc8163cefa73fff2fc22' - 'SKIP' - '9b3c66d83325874d3ebe394240962e8d88bc2dc0a48d0550cb4f503f2d8d2554' - 'db584841e79069acdc2e2c910ea1229f5c16fec25fa836bf7e89996083dde722') +sha256sums=('bb98dae64b889edbde97f7b06ac737dd7f14dd8cd20c28c270dd6cb089507ad0' + 'SKIP') -prepare() { - mkdir build - cd $pkgname-$pkgver - patch -Np1 -i ../fix-crash-on-restore.patch - patch -Np1 -i ../0002-don-t-use-ulimit.patch -} - build() { - cd build - meson ../$pkgname-$pkgver \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --buildtype=release - ninja + arch-meson $pkgname-$pkgver build + ninja -C build } package() { - cd build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } Deleted: fix-crash-on-restore.patch =================================================================== --- fix-crash-on-restore.patch 2018-04-10 11:26:33 UTC (rev 315564) +++ fix-crash-on-restore.patch 2018-04-10 11:31:13 UTC (rev 315565) @@ -1,64 +0,0 @@ -From 8d15219cfd237cc048069159ad351584531a3d41 Mon Sep 17 00:00:00 2001 -From: Michael Terry <[email protected]> -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 -
