commit 7fef2d63ac88c10de6cedf0918a38c70667ce5e0 Author: Tim Biermann <tbier@posteo.de> Date: Sat Mar 12 11:28:34 2022 +0100 Updated Pkgfile, read commit message for details - dropped dependencies: inkscape, qtwebengine - new optional dependencies: librsvg, qtwebengine - gui build is now optional and enabled, when both librsvg and qtwebengine are installed. By default, building the gui required inkscape to generate desktop icons. It can fall back to librsvg-convert for systems that don't have inkscape installed, since this pull request [1]. Since inkscape uses the private poppler libraries and is prone to break as well as the fact that librsvg is more common to have installed on a desktop install anyway, we use librsvg always here. It's perfectly possible to use nextcloud-client headless via /usr/bin/nextcloudcmd - cleaned up the Pkgfile by never building nautilus and nemo files in the first place, therefor we don't need to delete them afterwards. - help url now points to our flyspray instance. People should report to us first before asking upstream. [1] https://github.com/nextcloud/desktop/pull/3719 diff --git a/nextcloud-client/.footprint b/nextcloud-client/.footprint index 6050abe99..9c4d02e34 100644 --- a/nextcloud-client/.footprint +++ b/nextcloud-client/.footprint @@ -3,7 +3,6 @@ drwxr-xr-x root/root etc/Nextcloud/ -rw-r--r-- root/root etc/Nextcloud/sync-exclude.lst drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/nextcloud -rwxr-xr-x root/root usr/bin/nextcloudcmd drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/nextcloudsync/ @@ -28,16 +27,10 @@ lrwxrwxrwx root/root usr/lib/libnextcloudsync.so.0 -> libnextcloudsync.so.3.4.3 -rwxr-xr-x root/root usr/lib/nextcloudsync_vfs_suffix.so -rwxr-xr-x root/root usr/lib/nextcloudsync_vfs_xattr.so drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/applications/ --rw-r--r-- root/root usr/share/applications/com.nextcloud.desktopclient.nextcloud.desktop drwxr-xr-x root/root usr/share/icons/ drwxr-xr-x root/root usr/share/icons/hicolor/ -drwxr-xr-x root/root usr/share/icons/hicolor/1024x1024/ -drwxr-xr-x root/root usr/share/icons/hicolor/1024x1024/apps/ --rw-r--r-- root/root usr/share/icons/hicolor/1024x1024/apps/Nextcloud.png drwxr-xr-x root/root usr/share/icons/hicolor/128x128/ drwxr-xr-x root/root usr/share/icons/hicolor/128x128/apps/ --rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/Nextcloud.png -rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/Nextcloud_error.png -rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/Nextcloud_error_shared.png -rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/Nextcloud_ok.png @@ -48,7 +41,6 @@ drwxr-xr-x root/root usr/share/icons/hicolor/128x128/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/Nextcloud_warn_shared.png drwxr-xr-x root/root usr/share/icons/hicolor/16x16/ drwxr-xr-x root/root usr/share/icons/hicolor/16x16/apps/ --rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/Nextcloud.png -rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/Nextcloud_error.png -rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/Nextcloud_error_shared.png -rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/Nextcloud_ok.png @@ -57,12 +49,8 @@ drwxr-xr-x root/root usr/share/icons/hicolor/16x16/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/Nextcloud_sync_shared.png -rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/Nextcloud_warn.png -rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/Nextcloud_warn_shared.png -drwxr-xr-x root/root usr/share/icons/hicolor/24x24/ -drwxr-xr-x root/root usr/share/icons/hicolor/24x24/apps/ --rw-r--r-- root/root usr/share/icons/hicolor/24x24/apps/Nextcloud.png drwxr-xr-x root/root usr/share/icons/hicolor/256x256/ drwxr-xr-x root/root usr/share/icons/hicolor/256x256/apps/ --rw-r--r-- root/root usr/share/icons/hicolor/256x256/apps/Nextcloud.png -rw-r--r-- root/root usr/share/icons/hicolor/256x256/apps/Nextcloud_error.png -rw-r--r-- root/root usr/share/icons/hicolor/256x256/apps/Nextcloud_error_shared.png -rw-r--r-- root/root usr/share/icons/hicolor/256x256/apps/Nextcloud_ok.png @@ -73,7 +61,6 @@ drwxr-xr-x root/root usr/share/icons/hicolor/256x256/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/256x256/apps/Nextcloud_warn_shared.png drwxr-xr-x root/root usr/share/icons/hicolor/32x32/ drwxr-xr-x root/root usr/share/icons/hicolor/32x32/apps/ --rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/Nextcloud.png -rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/Nextcloud_error.png -rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/Nextcloud_error_shared.png -rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/Nextcloud_ok.png @@ -84,7 +71,6 @@ drwxr-xr-x root/root usr/share/icons/hicolor/32x32/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/Nextcloud_warn_shared.png drwxr-xr-x root/root usr/share/icons/hicolor/48x48/ drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/ --rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/Nextcloud.png -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/Nextcloud_error.png -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/Nextcloud_error_shared.png -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/Nextcloud_ok.png @@ -93,12 +79,8 @@ drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/Nextcloud_sync_shared.png -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/Nextcloud_warn.png -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/Nextcloud_warn_shared.png -drwxr-xr-x root/root usr/share/icons/hicolor/512x512/ -drwxr-xr-x root/root usr/share/icons/hicolor/512x512/apps/ --rw-r--r-- root/root usr/share/icons/hicolor/512x512/apps/Nextcloud.png drwxr-xr-x root/root usr/share/icons/hicolor/64x64/ drwxr-xr-x root/root usr/share/icons/hicolor/64x64/apps/ --rw-r--r-- root/root usr/share/icons/hicolor/64x64/apps/Nextcloud.png -rw-r--r-- root/root usr/share/icons/hicolor/64x64/apps/Nextcloud_error.png -rw-r--r-- root/root usr/share/icons/hicolor/64x64/apps/Nextcloud_error_shared.png -rw-r--r-- root/root usr/share/icons/hicolor/64x64/apps/Nextcloud_ok.png @@ -117,6 +99,3 @@ drwxr-xr-x root/root usr/share/icons/hicolor/72x72/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/72x72/apps/Nextcloud_sync_shared.png -rw-r--r-- root/root usr/share/icons/hicolor/72x72/apps/Nextcloud_warn.png -rw-r--r-- root/root usr/share/icons/hicolor/72x72/apps/Nextcloud_warn_shared.png -drwxr-xr-x root/root usr/share/mime/ -drwxr-xr-x root/root usr/share/mime/packages/ --rw-r--r-- root/root usr/share/mime/packages/nextcloud.xml diff --git a/nextcloud-client/.signature b/nextcloud-client/.signature index 2afe3c606..2dbe9f392 100644 --- a/nextcloud-client/.signature +++ b/nextcloud-client/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wqFHdSh5mqIVt3MeeR1bjU6ml/sbCRTc3xbd7X8HdyosYK8wSYxS/NCH5oy5Dqw2kv5uZr6nYEu0e96vtjl5wU= -SHA256 (Pkgfile) = acb821b955a94bd11ff3dcd6334e9b48d951d6a9b155ee01c598a4b7210940a4 -SHA256 (.footprint) = 21ed746045baf53c3a59b3348a31666e447b6bc98bdab34ae9469a109028ce53 +RWSagIOpLGJF35h1Hf1Mfl76jHDHtpDmbKS0etp5DIS8oeMWzF+eCYQwKfYwYh6hxO+dAMYEKOqJO2fR8BGUbxjHTqAEMoXgKQo= +SHA256 (Pkgfile) = a2b1f4f265d97e28e035344c5577a2d88cccc7255472f0fe2b7a296e2bf8ffb2 +SHA256 (.footprint) = 1941908b9faff0f4ce16be2b7f0b4d60daa97a821b8fb2019586f1af31973fbb SHA256 (nextcloud-client-3.4.3-1.tar.gz) = 3251737259bf6b32020ae09d725cca5d7caa4389503db2250df349e2961355d4 diff --git a/nextcloud-client/Pkgfile b/nextcloud-client/Pkgfile index 75e5f9429..8554650d2 100644 --- a/nextcloud-client/Pkgfile +++ b/nextcloud-client/Pkgfile @@ -1,8 +1,8 @@ # Description: Nextcloud desktop client # URL: https://nextcloud.com/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: inkscape libevent pciutils qtkeychain qtwebengine -# Optional: doxygen kde5 +# Depends on: libevent pciutils qtkeychain +# Optional: doxygen kde5 librsvg qtwebengine name=nextcloud-client version=3.4.3 @@ -10,20 +10,24 @@ release=1 source=(https://github.com/nextcloud/desktop/archive/v$version/$name-$version-$relea...) build() { - cmake -S desktop-$version -B build -G Ninja \ + # you need both librsvg and qtwebengine to build the gui client + prt-get isinst librsvg qtwebengine || PKGMK_NCC+=' -D BUILD_GUI=OFF' + # always use librsvg-convert to generate icons, if building the gui + sed -i -e 's/inkscape inkscape.exe//' desktop-$version/src/gui/CMakeLists.txt + + cmake -S desktop-$version -B build -G Ninja $PKGMK_NCC \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ -D CMAKE_INSTALL_SYSCONFDIR=/usr/etc/nextcloud \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ + -D APPLICATION_HELP_URL="https://crux.nu/bugs/" \ + -D BUILD_SHELL_INTEGRATION_DOLPHIN=OFF \ + -D BUILD_SHELL_INTEGRATION_NAUTILUS=OFF \ -Wno-dev cmake --build build DESTDIR=$PKG cmake --install build - rm -r $PKG/usr/share/nextcloud - # there are no ports for nautilus nor nemo in CRUX atm - rm -r $PKG/usr/share/{nautilus-python,nemo-python} - # there is caja for mate though, only make it available if it's installed - [[ ! -e /usr/lib/pkgconfig/libcaja-extension.pc ]] && rm -r $PKG/usr/share/caja-python || true + rm -rf $PKG/usr/share/nextcloud }