[arch-commits] Commit in nextcloud-client/repos/community-x86_64 (6 files)

Chih-Hsuan Yen yan12125 at archlinux.org
Fri Jul 10 13:45:33 UTC 2020


    Date: Friday, July 10, 2020 @ 13:45:33
  Author: yan12125
Revision: 663100

archrelease: copy trunk to community-x86_64

Added:
  nextcloud-client/repos/community-x86_64/Nextcloud.conf
    (from rev 663099, nextcloud-client/trunk/Nextcloud.conf)
  nextcloud-client/repos/community-x86_64/PKGBUILD
    (from rev 663099, nextcloud-client/trunk/PKGBUILD)
  nextcloud-client/repos/community-x86_64/nextcloud-client-fix-build.diff
    (from rev 663099, nextcloud-client/trunk/nextcloud-client-fix-build.diff)
Deleted:
  nextcloud-client/repos/community-x86_64/Nextcloud.conf
  nextcloud-client/repos/community-x86_64/PKGBUILD
  nextcloud-client/repos/community-x86_64/nextcloud-client-fix-build.diff

---------------------------------+
 Nextcloud.conf                  |    4 
 PKGBUILD                        |  174 ++++++++++++++++++--------------------
 nextcloud-client-fix-build.diff |   26 ++---
 3 files changed, 101 insertions(+), 103 deletions(-)

Deleted: Nextcloud.conf
===================================================================
--- Nextcloud.conf	2020-07-10 13:45:12 UTC (rev 663099)
+++ Nextcloud.conf	2020-07-10 13:45:33 UTC (rev 663100)
@@ -1,2 +0,0 @@
-[General]
-skipUpdateCheck=true

Copied: nextcloud-client/repos/community-x86_64/Nextcloud.conf (from rev 663099, nextcloud-client/trunk/Nextcloud.conf)
===================================================================
--- Nextcloud.conf	                        (rev 0)
+++ Nextcloud.conf	2020-07-10 13:45:33 UTC (rev 663100)
@@ -0,0 +1,2 @@
+[General]
+skipUpdateCheck=true

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-10 13:45:12 UTC (rev 663099)
+++ PKGBUILD	2020-07-10 13:45:33 UTC (rev 663100)
@@ -1,88 +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.4
-_commit=b45f5fd1a947dc21eb11c69049a99616a2ec950e
-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 libcloudproviders)
-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
-        Nextcloud.conf)
-validpgpkeys=(
-  A26B951528EA1BA1678C7AE5D406C75CEE1A36D6  # one of keys controlled by github.com/camilasan
-  42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28  # controlled by github.com/misch7
-)
-sha256sums=('SKIP'
-            '07cd68f54c004175b4a09cce25830a357d0ebaafaf4e4cabfb8b0d4deeded2f3'
-            '157c87a789219a3442ca5947c48dcd1ef3898612ff32070bf8842a42bfbe857a'
-            '8b257a0554ceb54a7ed320dbfa3becb97d6845338e28a8aa0a4f6239f3141645'
-            '5f51e41ef01d4e5b88a4735531105b84b4fb5317adc2a2996117c03fe5a44fc7')
-backup=('etc/Nextcloud/sync-exclude.lst'
-        'etc/Nextcloud/Nextcloud.conf')
-
-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
-
-  # Disables built-in update checker
-  install -Dm644 "$srcdir/Nextcloud.conf" -t "$pkgdir"/etc/Nextcloud
-}

Copied: nextcloud-client/repos/community-x86_64/PKGBUILD (from rev 663099, nextcloud-client/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-10 13:45:33 UTC (rev 663100)
@@ -0,0 +1,86 @@
+# 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
+# Upstream does not provide signed tarballs (yet)
+# https://github.com/nextcloud/desktop/issues/236#issuecomment-540538247
+pkgver=2.6.5
+_commit=adada8b2eecd65d7a587b6abe0ae2aabca9a0b75
+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 libcloudproviders)
+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'
+)
+# Remove ?signed temporarily as the tagged commit is signed by nextcloud-bot,
+# whose GPG public key is missing. See https://github.com/nextcloud/desktop/issues/2185
+source=("$pkgname::git+https://github.com/nextcloud/desktop.git#commit=$_commit"
+        $pkgname-fix-build.diff
+        Nextcloud.conf)
+validpgpkeys=(
+  A26B951528EA1BA1678C7AE5D406C75CEE1A36D6  # one of keys controlled by github.com/camilasan
+  42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28  # controlled by github.com/misch7
+  # 8B5274AEE6EC9C06B0DDAA96130DAB86D3FB356C # github.com/nextcloud-bot, public key missing
+)
+sha256sums=('SKIP'
+            '8b257a0554ceb54a7ed320dbfa3becb97d6845338e28a8aa0a4f6239f3141645'
+            '5f51e41ef01d4e5b88a4735531105b84b4fb5317adc2a2996117c03fe5a44fc7')
+backup=('etc/Nextcloud/sync-exclude.lst'
+        'etc/Nextcloud/Nextcloud.conf')
+
+prepare() {
+  # tmpdir for check()
+  mkdir tmpdir
+
+  # 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
+
+  # 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
+
+  # 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 -B build -S . \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DNO_SHIBBOLETH=1 \
+    -DWITH_CRASHREPORTER=OFF \
+    -DUNIT_TESTING=ON
+
+  # TODO: fix installation of PDF and HTML documents
+  # WIP at https://github.com/yan12125/desktop/tree/doc-install-path
+  make -C build all 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
+}
+
+package() {
+  cd $pkgname/build
+
+  make DESTDIR="$pkgdir" install
+
+  # Disables built-in update checker
+  install -Dm644 "$srcdir/Nextcloud.conf" -t "$pkgdir"/etc/Nextcloud
+}

Deleted: nextcloud-client-fix-build.diff
===================================================================
--- nextcloud-client-fix-build.diff	2020-07-10 13:45:12 UTC (rev 663099)
+++ nextcloud-client-fix-build.diff	2020-07-10 13:45:33 UTC (rev 663100)
@@ -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-x86_64/nextcloud-client-fix-build.diff (from rev 663099, nextcloud-client/trunk/nextcloud-client-fix-build.diff)
===================================================================
--- nextcloud-client-fix-build.diff	                        (rev 0)
+++ nextcloud-client-fix-build.diff	2020-07-10 13:45:33 UTC (rev 663100)
@@ -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