[arch-commits] Commit in nextcloud-client/trunk (2 files)

[Chih-Hsuan Yen]

    Date: Sunday, November 24, 2019 @ 09:48:34
  Author: yan12125
Revision: 532893

upgpkg: nextcloud-client 2.6.1-3 - fix FS#64630

The option "Show sync folders in Explorer's Navigation Pane" is supposed to
be hidden on non-Windows platforms, but there is a bug.

Added:
  nextcloud-client/trunk/nextcloud-client-FS64630.diff
Modified:
  nextcloud-client/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   11 ++++++++---
 nextcloud-client-FS64630.diff |   12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-24 09:45:22 UTC (rev 532892)
+++ PKGBUILD	2019-11-24 09:48:34 UTC (rev 532893)
@@ -5,7 +5,7 @@
 pkgname=nextcloud-client
 pkgver=2.6.1
 _commit=5adbc01ef138efd252c5c8c340f57dae0b34d8b9
-pkgrel=2
+pkgrel=3
 pkgdesc='Nextcloud desktop client'
 arch=(x86_64)
 url='https://nextcloud.com/'
@@ -21,7 +21,8 @@
 source=("$pkgname::git+https://github.com/nextcloud/desktop.git?signed#commit=$_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-fix-build.diff
+        $pkgname-FS64630.diff)
 validpgpkeys=(
   A26B951528EA1BA1678C7AE5D406C75CEE1A36D6  # one of keys controlled by github.com/camilasan
 )
@@ -28,7 +29,8 @@
 sha256sums=('SKIP'
             '07cd68f54c004175b4a09cce25830a357d0ebaafaf4e4cabfb8b0d4deeded2f3'
             '157c87a789219a3442ca5947c48dcd1ef3898612ff32070bf8842a42bfbe857a'
-            '8b257a0554ceb54a7ed320dbfa3becb97d6845338e28a8aa0a4f6239f3141645')
+            '8b257a0554ceb54a7ed320dbfa3becb97d6845338e28a8aa0a4f6239f3141645'
+            '6dea4453f220b63b993722cb155d567959600af261403870f5e34d35144a4fa7')
 backup=('etc/Nextcloud/sync-exclude.lst')
 
 prepare() {
@@ -46,6 +48,9 @@
   # https://github.com/nextcloud/desktop/pull/719
   # "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
 }
 
 build() {

Added: nextcloud-client-FS64630.diff
===================================================================
--- nextcloud-client-FS64630.diff	                        (rev 0)
+++ nextcloud-client-FS64630.diff	2019-11-24 09:48:34 UTC (rev 532893)
@@ -0,0 +1,12 @@
+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
+