Date: Wednesday, March 4, 2020 @ 16:00:14 Author: yan12125 Revision: 590270
upgpkg: nextcloud-client 2.6.4-1; FS#64630 is fixed upstream [1][2] [1] https://github.com/nextcloud/desktop/pull/1820 [2] https://github.com/nextcloud/desktop/pull/1821 Modified: nextcloud-client/trunk/PKGBUILD Deleted: nextcloud-client/trunk/nextcloud-client-FS64630.diff -------------------------------+ PKGBUILD | 11 +++-------- nextcloud-client-FS64630.diff | 12 ------------ 2 files changed, 3 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-03-04 15:59:08 UTC (rev 590269) +++ PKGBUILD 2020-03-04 16:00:14 UTC (rev 590270) @@ -3,9 +3,9 @@ # Contributor: Konstantin Shalygin <[email protected]> pkgname=nextcloud-client -pkgver=2.6.3 -_commit=5880c4954e0e8fcaed9df59f1134958be3f60c06 -pkgrel=2 +pkgver=2.6.4 +_commit=b45f5fd1a947dc21eb11c69049a99616a2ec950e +pkgrel=1 pkgdesc='Nextcloud desktop client' arch=(x86_64) url='https://nextcloud.com/' @@ -22,7 +22,6 @@ 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) validpgpkeys=( A26B951528EA1BA1678C7AE5D406C75CEE1A36D6 # one of keys controlled by github.com/camilasan @@ -32,7 +31,6 @@ '07cd68f54c004175b4a09cce25830a357d0ebaafaf4e4cabfb8b0d4deeded2f3' '157c87a789219a3442ca5947c48dcd1ef3898612ff32070bf8842a42bfbe857a' '8b257a0554ceb54a7ed320dbfa3becb97d6845338e28a8aa0a4f6239f3141645' - '6dea4453f220b63b993722cb155d567959600af261403870f5e34d35144a4fa7' '5f51e41ef01d4e5b88a4735531105b84b4fb5317adc2a2996117c03fe5a44fc7') backup=('etc/Nextcloud/sync-exclude.lst' 'etc/Nextcloud/Nextcloud.conf') @@ -52,9 +50,6 @@ # 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() { Deleted: nextcloud-client-FS64630.diff =================================================================== --- nextcloud-client-FS64630.diff 2020-03-04 15:59:08 UTC (rev 590269) +++ nextcloud-client-FS64630.diff 2020-03-04 16:00:14 UTC (rev 590270) @@ -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 -
