[Dev] [PATCH] Update [libre/nextcloud-client] to v2.6.4

theova theova at bluewin.ch
Mon Mar 9 20:29:01 GMT 2020


The patches below update [libre/nextcloud-client] to the newest version
2.6.4.

Tested on x86_64, successfully built on i686. The arm build failes on my
arm chroot, but it is possible, that it compiles on others (such as the
one in beefcake).
-------------- next part --------------
From 3797850a1244b9970a38e8e054401f38c7a82609 Mon Sep 17 00:00:00 2001
From: Theo von Arx <theova at member.fsf.org>
Date: Wed, 19 Feb 2020 21:20:57 +0100
Subject: [PATCH 1/2] Update [libre/nextcloud-client] to 2.6.3

- Bump version number, commit, and checksum
- Add Nextcloud.conf to disable built-in updater
- Built and successfully tested on x86_64
- Built on i686
- Build on armv7h failed
---
 libre/nextcloud-client/Nextcloud.conf |  2 ++
 libre/nextcloud-client/PKGBUILD       | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 libre/nextcloud-client/Nextcloud.conf

diff --git a/libre/nextcloud-client/Nextcloud.conf b/libre/nextcloud-client/Nextcloud.conf
new file mode 100644
index 000000000..232a67665
--- /dev/null
+++ b/libre/nextcloud-client/Nextcloud.conf
@@ -0,0 +1,2 @@
+[General]
+skipUpdateCheck=true
diff --git a/libre/nextcloud-client/PKGBUILD b/libre/nextcloud-client/PKGBUILD
index 2fe462798..080dbd2ba 100644
--- a/libre/nextcloud-client/PKGBUILD
+++ b/libre/nextcloud-client/PKGBUILD
@@ -8,8 +8,8 @@
 
 
 pkgname=nextcloud-client
-pkgver=2.6.2
-_commit=1d745535f7a95ff2265d6b6b47121200338fce83
+pkgver=2.6.3
+_commit=5880c4954e0e8fcaed9df59f1134958be3f60c06
 pkgrel=1
 pkgrel+=.parabola1
 pkgdesc='Nextcloud desktop client'
@@ -30,7 +30,8 @@ source=("$pkgname::git+https://github.com/nextcloud/desktop.git?signed#commit=$_
         issue1458-workaround.patch::https://github.com/yan12125/desktop/commit/7da680ef7843a52c3136916744f50d4a003bb8b5.patch
         issue1458-2.patch::https://github.com/yan12125/desktop/commit/2b313368325dac5b8d0e69394cfcc4faaa745f75.patch
         $pkgname-fix-build.diff
-        $pkgname-FS64630.diff)
+        $pkgname-FS64630.diff
+        Nextcloud.conf)
 source+=(remove-qtwebengine.patch)
 validpgpkeys=(
   A26B951528EA1BA1678C7AE5D406C75CEE1A36D6  # one of keys controlled by github.com/camilasan
@@ -40,9 +41,11 @@ sha256sums=('SKIP'
             '07cd68f54c004175b4a09cce25830a357d0ebaafaf4e4cabfb8b0d4deeded2f3'
             '157c87a789219a3442ca5947c48dcd1ef3898612ff32070bf8842a42bfbe857a'
             '8b257a0554ceb54a7ed320dbfa3becb97d6845338e28a8aa0a4f6239f3141645'
-            '6dea4453f220b63b993722cb155d567959600af261403870f5e34d35144a4fa7')
+            '6dea4453f220b63b993722cb155d567959600af261403870f5e34d35144a4fa7'
+            '5f51e41ef01d4e5b88a4735531105b84b4fb5317adc2a2996117c03fe5a44fc7')
 sha256sums+=('77d7afd2dc65a7625e1617dd2c287c1be004deca2f64ecc18a96bb6c3cd733cf')
-backup=('etc/Nextcloud/sync-exclude.lst')
+backup=('etc/Nextcloud/sync-exclude.lst'
+        'etc/Nextcloud/Nextcloud.conf')
 
 prepare() {
   # tmpdir for check()
@@ -97,4 +100,7 @@ package() {
   cd $pkgname/build
 
   make DESTDIR="$pkgdir" install
+
+  # Disables built-in update checker
+  install -Dm644 "$srcdir/Nextcloud.conf" -t "$pkgdir"/etc/Nextcloud
 }
-- 
2.25.1

-------------- next part --------------
From cce91fcae3a067b3f03fa2c63a5f480cea9cae09 Mon Sep 17 00:00:00 2001
From: Theo von Arx <theova at member.fsf.org>
Date: Fri, 6 Mar 2020 18:32:50 +0100
Subject: [PATCH 2/2] Update [libre/nextcloud-client] to 2.6.4

---
 libre/nextcloud-client/PKGBUILD                      |  9 ++-------
 libre/nextcloud-client/nextcloud-client-FS64630.diff | 12 ------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 libre/nextcloud-client/nextcloud-client-FS64630.diff

diff --git a/libre/nextcloud-client/PKGBUILD b/libre/nextcloud-client/PKGBUILD
index 080dbd2ba..9afa9b0fb 100644
--- a/libre/nextcloud-client/PKGBUILD
+++ b/libre/nextcloud-client/PKGBUILD
@@ -8,8 +8,8 @@
 
 
 pkgname=nextcloud-client
-pkgver=2.6.3
-_commit=5880c4954e0e8fcaed9df59f1134958be3f60c06
+pkgver=2.6.4
+_commit=b45f5fd1a947dc21eb11c69049a99616a2ec950e
 pkgrel=1
 pkgrel+=.parabola1
 pkgdesc='Nextcloud desktop client'
@@ -30,7 +30,6 @@ source=("$pkgname::git+https://github.com/nextcloud/desktop.git?signed#commit=$_
         issue1458-workaround.patch::https://github.com/yan12125/desktop/commit/7da680ef7843a52c3136916744f50d4a003bb8b5.patch
         issue1458-2.patch::https://github.com/yan12125/desktop/commit/2b313368325dac5b8d0e69394cfcc4faaa745f75.patch
         $pkgname-fix-build.diff
-        $pkgname-FS64630.diff
         Nextcloud.conf)
 source+=(remove-qtwebengine.patch)
 validpgpkeys=(
@@ -41,7 +40,6 @@ sha256sums=('SKIP'
             '07cd68f54c004175b4a09cce25830a357d0ebaafaf4e4cabfb8b0d4deeded2f3'
             '157c87a789219a3442ca5947c48dcd1ef3898612ff32070bf8842a42bfbe857a'
             '8b257a0554ceb54a7ed320dbfa3becb97d6845338e28a8aa0a4f6239f3141645'
-            '6dea4453f220b63b993722cb155d567959600af261403870f5e34d35144a4fa7'
             '5f51e41ef01d4e5b88a4735531105b84b4fb5317adc2a2996117c03fe5a44fc7')
 sha256sums+=('77d7afd2dc65a7625e1617dd2c287c1be004deca2f64ecc18a96bb6c3cd733cf')
 backup=('etc/Nextcloud/sync-exclude.lst'
@@ -63,9 +61,6 @@ prepare() {
   # "Rename owncloud tests to nextcloud" - actually breaks building of tests
   patch -Np1 -i ../$pkgname-fix-build.diff
 
-  # https://bugs.archlinux.org/task/64630
-  patch -Np1 -i ../$pkgname-FS64630.diff
-
   # Remove qt5-webengine dependency
   patch -Np1 -i ../remove-qtwebengine.patch
 }
diff --git a/libre/nextcloud-client/nextcloud-client-FS64630.diff b/libre/nextcloud-client/nextcloud-client-FS64630.diff
deleted file mode 100644
index fc3654c31..000000000
--- a/libre/nextcloud-client/nextcloud-client-FS64630.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
-index 62381d36d..c69592c82 100644
---- a/src/gui/generalsettings.cpp
-+++ b/src/gui/generalsettings.cpp
-@@ -91,6 +91,7 @@ GeneralSettings::GeneralSettings(QWidget *parent)
-     #else
-         if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows10)
-     #endif
-+#else
-             _ui->showInExplorerNavigationPaneCheckBox->setVisible(false);
- #endif
- 
-- 
2.25.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.parabola.nu/pipermail/dev/attachments/20200309/aa27d962/attachment.sig>


More information about the Dev mailing list