[arch-commits] Commit in nextcloud-client/repos/community-x86_64 (4 files)
Antonio Rojas
arojas at gemini.archlinux.org
Tue Dec 14 16:47:04 UTC 2021
Date: Tuesday, December 14, 2021 @ 16:47:04
Author: arojas
Revision: 1072788
archrelease: copy trunk to community-x86_64
Added:
nextcloud-client/repos/community-x86_64/PKGBUILD
(from rev 1072787, nextcloud-client/trunk/PKGBUILD)
nextcloud-client/repos/community-x86_64/fix-translations.patch
(from rev 1072787, nextcloud-client/trunk/fix-translations.patch)
Deleted:
nextcloud-client/repos/community-x86_64/PKGBUILD
nextcloud-client/repos/community-x86_64/fix-translations.patch
------------------------+
PKGBUILD | 206 +++++++++++++++++++++++------------------------
fix-translations.patch | 26 ++---
2 files changed, 115 insertions(+), 117 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-14 16:46:54 UTC (rev 1072787)
+++ PKGBUILD 2021-12-14 16:47:04 UTC (rev 1072788)
@@ -1,104 +0,0 @@
-# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
-# Contributor: Tyler Dence <tyzoid at archlinux32.org>
-# Contributor: Konstantin Shalygin <k0ste at k0ste.ru>
-
-pkgbase=nextcloud-client
-# Put config files for libcloudproviders integration in a separate package as
-# there is no simple way yet to disable it.
-# See: https://gitlab.gnome.org/World/libcloudproviders/-/issues/17
-pkgname=(nextcloud-client nextcloud-client-cloudproviders)
-epoch=1
-# Upstream does not provide signed tarballs (yet)
-# https://github.com/nextcloud/desktop/issues/1510
-pkgver=3.4.0
-# `git rev-parse v$pkgver`
-_tag=9121a8cc9109ecc35fbade79827483f3049fef99
-pkgrel=2
-arch=(x86_64)
-url='https://nextcloud.com/'
-license=(GPL)
-makedepends=(libcloudproviders openssl sqlite
- qt5-quickcontrols2 qt5-svg qt5-tools qt5-webengine qt5-websockets qtkeychain-qt5
- extra-cmake-modules kio
- cmocka doxygen git inkscape python-sphinx)
-source=("$pkgbase::git+https://github.com/nextcloud/desktop.git?signed#tag=$_tag"
- fix-translations.patch)
-validpgpkeys=(
- A26B951528EA1BA1678C7AE5D406C75CEE1A36D6 # one of keys controlled by github.com/camilasan
- 42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28 # controlled by github.com/misch7
- 17166A5275C5FA6F1A48FD78074BBBCB8DECC9E2 # https://github.com/er-vin.gpg
- 01D736173523DFC7A7B55258C2FBEF0E1C7E72D0 # https://github.com/allexzander
- 267BF70F7905C2723B0243267D0F74F05C22F553 # https://github.com/mgallien
- 3A877D9A896A057948059DEDAD2C27357B2CB11D # https://github.com/FlexW
-)
-sha256sums=('SKIP'
- 'd112358031ddf79c08acde1f1b5e39aad9e3ee84ba161817d4f6e0259f9a5832')
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-prepare() {
- # tmpdir for check()
- mkdir tmpdir
-
- patch -d $pkgbase -p1 < fix-translations.patch # https://github.com/nextcloud/desktop/pull/4022
-}
-
-build() {
- cd $pkgbase
-
- # 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 \
- -DWITH_CRASHREPORTER=OFF \
- -DUNIT_TESTING=ON \
- -DPLUGINDIR=lib/qt/plugins # Fix vfs plugin install dir https://github.com/nextcloud/desktop/issues/3781#issuecomment-918918320
-
- # 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 $pkgbase/build
-
- # Tests fail if $TMPDIR is too small; specify an alternative for machines
- # with a small /tmp partition.
- # Use UTC as TestCookies is sensitive to the timezone
- # https://github.com/nextcloud/desktop/blob/v3.2.2/test/testcookies.cpp#L24
- QT_QPA_PLATFORM=offscreen TMPDIR="$srcdir/tmpdir" TZ=UTC ARGS="--rerun-failed --output-on-failure" make test
-}
-
-package_nextcloud-client() {
- pkgdesc='Nextcloud desktop client'
- depends=(openssl sqlite qtkeychain-qt5 qt5-svg qt5-webengine qt5-websockets xdg-utils libcloudproviders
- qt5-graphicaleffects qt5-quickcontrols2)
- optdepends=(
- 'kio: integration with Dolphin'
- 'nemo-python: integration with Nemo'
- 'python-nautilus: integration with Nautilus'
- 'python-caja: integration with Caja'
- 'nextcloud-client-cloudproviders: cloudproviders support'
- )
- backup=('etc/Nextcloud/sync-exclude.lst')
-
- cd $pkgbase/build
-
- make DESTDIR="$pkgdir" install
-
- rm -v "$pkgdir"/usr/share/cloud-providers/com.nextcloudgmbh.Nextcloud.ini
- rm -v "$pkgdir"/usr/share/dbus-1/services/com.nextcloudgmbh.Nextcloud.service
- cd "$pkgdir"/usr/share && rmdir -p cloud-providers dbus-1/services
-}
-
-package_nextcloud-client-cloudproviders() {
- pkgdesc='cloudproviders support for the Nextcloud desktop client'
- depends=(nextcloud-client)
-
- cd $pkgbase/build
- make -C shell_integration/libcloudproviders DESTDIR="$pkgdir" install
-}
Copied: nextcloud-client/repos/community-x86_64/PKGBUILD (from rev 1072787, nextcloud-client/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-14 16:47:04 UTC (rev 1072788)
@@ -0,0 +1,102 @@
+# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
+# Contributor: Tyler Dence <tyzoid at archlinux32.org>
+# Contributor: Konstantin Shalygin <k0ste at k0ste.ru>
+
+pkgbase=nextcloud-client
+# Put config files for libcloudproviders integration in a separate package as
+# there is no simple way yet to disable it.
+# See: https://gitlab.gnome.org/World/libcloudproviders/-/issues/17
+pkgname=(nextcloud-client nextcloud-client-cloudproviders)
+epoch=2
+# Upstream does not provide signed tarballs (yet)
+# https://github.com/nextcloud/desktop/issues/1510
+pkgver=3.3.6
+# `git rev-parse v$pkgver`
+_tag=21fc888a815471fc2b853aadff32c1c04e9e5be5
+pkgrel=1
+arch=(x86_64)
+url='https://nextcloud.com/'
+license=(GPL)
+makedepends=(libcloudproviders openssl sqlite
+ qt5-quickcontrols2 qt5-svg qt5-tools qt5-webengine qt5-websockets qtkeychain-qt5
+ extra-cmake-modules kio
+ cmocka doxygen git inkscape python-sphinx)
+source=("$pkgbase::git+https://github.com/nextcloud/desktop.git?signed#tag=$_tag")
+validpgpkeys=(
+ A26B951528EA1BA1678C7AE5D406C75CEE1A36D6 # one of keys controlled by github.com/camilasan
+ 42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28 # controlled by github.com/misch7
+ 17166A5275C5FA6F1A48FD78074BBBCB8DECC9E2 # https://github.com/er-vin.gpg
+ 01D736173523DFC7A7B55258C2FBEF0E1C7E72D0 # https://github.com/allexzander
+ 267BF70F7905C2723B0243267D0F74F05C22F553 # https://github.com/mgallien
+ 3A877D9A896A057948059DEDAD2C27357B2CB11D # https://github.com/FlexW
+)
+sha256sums=('SKIP')
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+ # tmpdir for check()
+ mkdir tmpdir
+
+ rm -v $pkgbase/cmake/modules/GNUInstallDirs.cmake
+}
+
+build() {
+ cd $pkgbase
+
+ # 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 \
+ -DWITH_CRASHREPORTER=OFF \
+ -DUNIT_TESTING=ON \
+ -DPLUGINDIR=lib/qt/plugins # Fix vfs plugin install dir https://github.com/nextcloud/desktop/issues/3781#issuecomment-918918320
+
+ # 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 $pkgbase/build
+
+ # Tests fail if $TMPDIR is too small; specify an alternative for machines
+ # with a small /tmp partition.
+ # Use UTC as TestCookies is sensitive to the timezone
+ # https://github.com/nextcloud/desktop/blob/v3.2.2/test/testcookies.cpp#L24
+ QT_QPA_PLATFORM=offscreen TMPDIR="$srcdir/tmpdir" TZ=UTC ARGS="--rerun-failed --output-on-failure" make test
+}
+
+package_nextcloud-client() {
+ pkgdesc='Nextcloud desktop client'
+ depends=(openssl sqlite qtkeychain-qt5 qt5-svg qt5-webengine qt5-websockets xdg-utils libcloudproviders
+ qt5-graphicaleffects qt5-quickcontrols2)
+ optdepends=(
+ 'kio: integration with Dolphin'
+ 'nemo-python: integration with Nemo'
+ 'python-nautilus: integration with Nautilus'
+ 'python-caja: integration with Caja'
+ 'nextcloud-client-cloudproviders: cloudproviders support'
+ )
+ backup=('etc/Nextcloud/sync-exclude.lst')
+
+ cd $pkgbase/build
+
+ make DESTDIR="$pkgdir" install
+
+ rm -v "$pkgdir"/usr/share/cloud-providers/com.nextcloudgmbh.Nextcloud.ini
+ rm -v "$pkgdir"/usr/share/dbus-1/services/com.nextcloudgmbh.Nextcloud.service
+ cd "$pkgdir"/usr/share && rmdir -p cloud-providers dbus-1/services
+}
+
+package_nextcloud-client-cloudproviders() {
+ pkgdesc='cloudproviders support for the Nextcloud desktop client'
+ depends=(nextcloud-client)
+
+ cd $pkgbase/build
+ make -C shell_integration/libcloudproviders DESTDIR="$pkgdir" install
+}
Deleted: fix-translations.patch
===================================================================
--- fix-translations.patch 2021-12-14 16:46:54 UTC (rev 1072787)
+++ fix-translations.patch 2021-12-14 16:47:04 UTC (rev 1072788)
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec65cd595..930e5a9e7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -96,7 +96,7 @@ endif()
- message(STATUS "GIT_SHA1 ${GIT_SHA1}")
-
- set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
--set(SHAREDIR ${CMAKE_INSTALL_DATADIR})
-+set(SHAREDIR ${CMAKE_INSTALL_FULL_DATADIR})
-
- # Build MacOS app bundle if wished
- if(APPLE AND BUILD_OWNCLOUD_OSX_BUNDLE)
Copied: nextcloud-client/repos/community-x86_64/fix-translations.patch (from rev 1072787, nextcloud-client/trunk/fix-translations.patch)
===================================================================
--- fix-translations.patch (rev 0)
+++ fix-translations.patch 2021-12-14 16:47:04 UTC (rev 1072788)
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ec65cd595..930e5a9e7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -96,7 +96,7 @@ endif()
+ message(STATUS "GIT_SHA1 ${GIT_SHA1}")
+
+ set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
+-set(SHAREDIR ${CMAKE_INSTALL_DATADIR})
++set(SHAREDIR ${CMAKE_INSTALL_FULL_DATADIR})
+
+ # Build MacOS app bundle if wished
+ if(APPLE AND BUILD_OWNCLOUD_OSX_BUNDLE)
More information about the arch-commits
mailing list