[arch-commits] Commit in nextcloud-client/repos/community-testing-x86_64 (4 files)
Chih-Hsuan Yen
yan12125 at archlinux.org
Wed Nov 6 02:17:39 UTC 2019
Date: Wednesday, November 6, 2019 @ 02:17:38
Author: yan12125
Revision: 524254
archrelease: copy trunk to community-testing-x86_64
Added:
nextcloud-client/repos/community-testing-x86_64/PKGBUILD
(from rev 524253, nextcloud-client/trunk/PKGBUILD)
nextcloud-client/repos/community-testing-x86_64/nextcloud-client-fix-build.diff
(from rev 524253, nextcloud-client/trunk/nextcloud-client-fix-build.diff)
Deleted:
nextcloud-client/repos/community-testing-x86_64/PKGBUILD
nextcloud-client/repos/community-testing-x86_64/nextcloud-client-fix-build.diff
---------------------------------+
PKGBUILD | 162 +++++++++++++++++++-------------------
nextcloud-client-fix-build.diff | 26 +++---
2 files changed, 94 insertions(+), 94 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-06 02:17:19 UTC (rev 524253)
+++ PKGBUILD 2019-11-06 02:17:38 UTC (rev 524254)
@@ -1,81 +0,0 @@
-# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
-# Contributor: Tyler Dence <tyzoid at archlinux32.org>
-# Contributor: Konstantin Shalygin <k0ste at k0ste.ru>
-
-pkgname=nextcloud-client
-pkgver=2.6.1
-_commit=5adbc01ef138efd252c5c8c340f57dae0b34d8b9
-pkgrel=1
-pkgdesc='Nextcloud desktop client'
-arch=(x86_64)
-url='https://nextcloud.com/'
-license=(GPL)
-depends=(openssl sqlite qtkeychain qt5-svg qt5-webengine xdg-utils)
-makedepends=(doxygen extra-cmake-modules kio python-sphinx qt5-tools git cmocka)
-optdepends=(
- 'kio: integration with Dolphin'
- 'nemo-python: integration with Nemo'
- 'python-nautilus: integration with Nautilus'
- 'python-caja: integration with Caja'
-)
-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)
-validpgpkeys=(
- A26B951528EA1BA1678C7AE5D406C75CEE1A36D6 # one of keys controlled by github.com/camilasan
-)
-sha256sums=('SKIP'
- '07cd68f54c004175b4a09cce25830a357d0ebaafaf4e4cabfb8b0d4deeded2f3'
- '157c87a789219a3442ca5947c48dcd1ef3898612ff32070bf8842a42bfbe857a'
- '8b257a0554ceb54a7ed320dbfa3becb97d6845338e28a8aa0a4f6239f3141645')
-backup=('etc/Nextcloud/sync-exclude.lst')
-
-prepare() {
- # tmpdir for check()
- mkdir tmpdir $pkgname/build
-
- # Use system GNUInstallDirs.cmake so that we can benefit from
- # https://gitlab.kitware.com/cmake/cmake/merge_requests/3735
- rm -v $pkgname/cmake/modules/GNUInstallDirs.cmake
-
- cd $pkgname
- patch -Np1 -i ../issue1458-workaround.patch
- patch -Np1 -i ../issue1458-2.patch
-
- # https://github.com/nextcloud/desktop/pull/719
- # "Rename owncloud tests to nextcloud" - actually breaks building of tests
- patch -Np1 -i ../$pkgname-fix-build.diff
-}
-
-build() {
- cd $pkgname/build
-
- # bundled breakpad in libcrashreporter-qt submodule is too old and does not build with glibc >= 2.26
- # Upstream fix: https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DNO_SHIBBOLETH=1 \
- -DWITH_CRASHREPORTER=OFF \
- -DUNIT_TESTING=ON \
- ..
-
- make
- # TODO: fix installation of PDF and HTML documents
- # WIP at https://github.com/yan12125/desktop/tree/doc-install-path
- make doc-man
-}
-
-check() {
- cd $pkgname/build
-
- # Tests fail if $TMPDIR is too small; specify an alternative for machines
- # with a small /tmp partition.
- TMPDIR="$srcdir/tmpdir" make test ARGS="-V"
-}
-
-package() {
- cd $pkgname/build
-
- make DESTDIR="$pkgdir" install
-}
Copied: nextcloud-client/repos/community-testing-x86_64/PKGBUILD (from rev 524253, nextcloud-client/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-06 02:17:38 UTC (rev 524254)
@@ -0,0 +1,81 @@
+# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
+# Contributor: Tyler Dence <tyzoid at archlinux32.org>
+# Contributor: Konstantin Shalygin <k0ste at k0ste.ru>
+
+pkgname=nextcloud-client
+pkgver=2.6.1
+_commit=5adbc01ef138efd252c5c8c340f57dae0b34d8b9
+pkgrel=2
+pkgdesc='Nextcloud desktop client'
+arch=(x86_64)
+url='https://nextcloud.com/'
+license=(GPL)
+depends=(openssl sqlite qtkeychain qt5-svg qt5-webengine xdg-utils)
+makedepends=(doxygen extra-cmake-modules kio python-sphinx qt5-tools git cmocka)
+optdepends=(
+ 'kio: integration with Dolphin'
+ 'nemo-python: integration with Nemo'
+ 'python-nautilus: integration with Nautilus'
+ 'python2-caja: integration with Caja'
+)
+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)
+validpgpkeys=(
+ A26B951528EA1BA1678C7AE5D406C75CEE1A36D6 # one of keys controlled by github.com/camilasan
+)
+sha256sums=('SKIP'
+ '07cd68f54c004175b4a09cce25830a357d0ebaafaf4e4cabfb8b0d4deeded2f3'
+ '157c87a789219a3442ca5947c48dcd1ef3898612ff32070bf8842a42bfbe857a'
+ '8b257a0554ceb54a7ed320dbfa3becb97d6845338e28a8aa0a4f6239f3141645')
+backup=('etc/Nextcloud/sync-exclude.lst')
+
+prepare() {
+ # tmpdir for check()
+ mkdir tmpdir $pkgname/build
+
+ # Use system GNUInstallDirs.cmake so that we can benefit from
+ # https://gitlab.kitware.com/cmake/cmake/merge_requests/3735
+ rm -v $pkgname/cmake/modules/GNUInstallDirs.cmake
+
+ cd $pkgname
+ patch -Np1 -i ../issue1458-workaround.patch
+ patch -Np1 -i ../issue1458-2.patch
+
+ # https://github.com/nextcloud/desktop/pull/719
+ # "Rename owncloud tests to nextcloud" - actually breaks building of tests
+ patch -Np1 -i ../$pkgname-fix-build.diff
+}
+
+build() {
+ cd $pkgname/build
+
+ # bundled breakpad in libcrashreporter-qt submodule is too old and does not build with glibc >= 2.26
+ # Upstream fix: https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DNO_SHIBBOLETH=1 \
+ -DWITH_CRASHREPORTER=OFF \
+ -DUNIT_TESTING=ON \
+ ..
+
+ make
+ # TODO: fix installation of PDF and HTML documents
+ # WIP at https://github.com/yan12125/desktop/tree/doc-install-path
+ make doc-man
+}
+
+check() {
+ cd $pkgname/build
+
+ # Tests fail if $TMPDIR is too small; specify an alternative for machines
+ # with a small /tmp partition.
+ TMPDIR="$srcdir/tmpdir" make test ARGS="-V"
+}
+
+package() {
+ cd $pkgname/build
+
+ make DESTDIR="$pkgdir" install
+}
Deleted: nextcloud-client-fix-build.diff
===================================================================
--- nextcloud-client-fix-build.diff 2019-11-06 02:17:19 UTC (rev 524253)
+++ nextcloud-client-fix-build.diff 2019-11-06 02:17:38 UTC (rev 524254)
@@ -1,13 +0,0 @@
-diff --git a/test/testnextcloudpropagator.cpp b/test/testnextcloudpropagator.cpp
-index 6ad1a6b37..dc2e476ad 100644
---- a/test/testnextcloudpropagator.cpp
-+++ b/test/testnextcloudpropagator.cpp
-@@ -8,7 +8,7 @@
- #include <QDebug>
-
- #include "propagatedownload.h"
--#include "nextcloudpropagator_p.h"
-+#include "owncloudpropagator_p.h"
-
- using namespace OCC;
- namespace OCC {
Copied: nextcloud-client/repos/community-testing-x86_64/nextcloud-client-fix-build.diff (from rev 524253, nextcloud-client/trunk/nextcloud-client-fix-build.diff)
===================================================================
--- nextcloud-client-fix-build.diff (rev 0)
+++ nextcloud-client-fix-build.diff 2019-11-06 02:17:38 UTC (rev 524254)
@@ -0,0 +1,13 @@
+diff --git a/test/testnextcloudpropagator.cpp b/test/testnextcloudpropagator.cpp
+index 6ad1a6b37..dc2e476ad 100644
+--- a/test/testnextcloudpropagator.cpp
++++ b/test/testnextcloudpropagator.cpp
+@@ -8,7 +8,7 @@
+ #include <QDebug>
+
+ #include "propagatedownload.h"
+-#include "nextcloudpropagator_p.h"
++#include "owncloudpropagator_p.h"
+
+ using namespace OCC;
+ namespace OCC {
More information about the arch-commits
mailing list