diff options
| author | Theo von Arx <theova@member.fsf.org> | 2020-03-06 18:32:50 +0100 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2020-03-11 10:08:13 +0100 |
| commit | 041b23d2c08e95082b1b405f6c22574153cc8619 (patch) | |
| tree | 4475898009017adeb9c71f0717aa02661fd7e80d /libre | |
| parent | be72a6504e3294c7faeb1ca5a2075fefde3e6a92 (diff) | |
| download | abslibre-041b23d2c08e95082b1b405f6c22574153cc8619.tar.gz abslibre-041b23d2c08e95082b1b405f6c22574153cc8619.tar.bz2 abslibre-041b23d2c08e95082b1b405f6c22574153cc8619.zip | |
Update [libre/nextcloud-client] to 2.6.4
Signed-off-by: Andreas Grapentin <andreas@grapentin.org>
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/nextcloud-client/PKGBUILD | 9 | ||||
| -rw-r--r-- | libre/nextcloud-client/nextcloud-client-FS64630.diff | 12 |
2 files changed, 2 insertions, 19 deletions
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 - |