Date: Thursday, March 29, 2018 @ 12:05:38 Author: bgyorgy Revision: 313373
upgpkg: deja-dup 36.3-4 Fix deja-dup-monitor autostart (FS#58020) Added: deja-dup/trunk/0002-don-t-use-ulimit.patch Modified: deja-dup/trunk/PKGBUILD -----------------------------+ 0002-don-t-use-ulimit.patch | 27 +++++++++++++++++++++++++++ PKGBUILD | 9 ++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) Added: 0002-don-t-use-ulimit.patch =================================================================== --- 0002-don-t-use-ulimit.patch (rev 0) +++ 0002-don-t-use-ulimit.patch 2018-03-29 12:05:38 UTC (rev 313373) @@ -0,0 +1,27 @@ +From: Jeremy Bicha <jbi...@ubuntu.com> +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-03-29 11:49:03 UTC (rev 313372) +++ PKGBUILD 2018-03-29 12:05:38 UTC (rev 313373) @@ -3,7 +3,7 @@ pkgname=deja-dup pkgver=36.3 -pkgrel=3 +pkgrel=4 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" @@ -14,16 +14,19 @@ '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) + fix-crash-on-restore.patch + 0002-don-t-use-ulimit.patch) validpgpkeys=('A3A5C2FC56AE7341D308D8571B50ECA373F3F233') # Michael Terry sha256sums=('2c433a334bcead16f92a98914d36fbf6911cd11dcc75bc8163cefa73fff2fc22' 'SKIP' - '9b3c66d83325874d3ebe394240962e8d88bc2dc0a48d0550cb4f503f2d8d2554') + '9b3c66d83325874d3ebe394240962e8d88bc2dc0a48d0550cb4f503f2d8d2554' + 'db584841e79069acdc2e2c910ea1229f5c16fec25fa836bf7e89996083dde722') prepare() { mkdir build cd $pkgname-$pkgver patch -Np1 -i ../fix-crash-on-restore.patch + patch -Np1 -i ../0002-don-t-use-ulimit.patch } build() {