From 6104867be32e050c05a374a6ad123a4e7524b38a Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveira Date: Tue, 12 Dec 2023 11:33:44 -0300 Subject: [PATCH 1/2] nextcloud-client: update to 3.11.0 --- .../patches/revert-mandatory-webengine.patch | 77 ------------------- srcpkgs/nextcloud-client/template | 6 +- 2 files changed, 3 insertions(+), 80 deletions(-) delete mode 100644 srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch diff --git a/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch b/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch deleted file mode 100644 index 76aa42fdf54b4..0000000000000 --- a/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 02dd76cdcec49e49b60f99a98dbe241007f548d1 Mon Sep 17 00:00:00 2001 -From: Rodrigo Oliveira -Date: Thu, 23 Feb 2023 12:56:27 -0300 -Subject: [PATCH] Revert "makes Qt WebEngine optional only on macOS" - -This reverts commit b81cdf177d3410db45e6f97eb3575ceddabb73dd. ---- - src/CMakeLists.txt | 53 ++-------------------------------------------- - 1 file changed, 2 insertions(+), 51 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a4d06844a..cd3805799 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -4,57 +4,8 @@ endif() - - include(ECMEnableSanitizers) - --set(REQUIRED_QT_VERSION "5.15.0") -- --find_package(Qt5Core ${REQUIRED_QT_VERSION} CONFIG QUIET) --set_package_properties(Qt5Core PROPERTIES -- DESCRIPTION "Qt5 Core component." -- TYPE REQUIRED --) -- --find_package(Qt5Network ${REQUIRED_QT_VERSION} CONFIG QUIET) --set_package_properties(Qt5Network PROPERTIES -- DESCRIPTION "Qt5 Network component." -- TYPE REQUIRED --) -- --find_package(Qt5Xml ${REQUIRED_QT_VERSION} CONFIG QUIET) --set_package_properties(Qt5Xml PROPERTIES -- DESCRIPTION "Qt5 Xml component." -- TYPE REQUIRED --) -- --find_package(Qt5Concurrent ${REQUIRED_QT_VERSION} CONFIG QUIET) --set_package_properties(Qt5Concurrent PROPERTIES -- DESCRIPTION "Qt5 Concurrent component." -- TYPE REQUIRED --) -- --find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION} CONFIG QUIET) --if(APPLE) -- set_package_properties(Qt5WebEngineWidgets PROPERTIES -- DESCRIPTION "Qt5 WebEngineWidgets component." -- TYPE RECOMMENDED -- ) --else() -- set_package_properties(Qt5WebEngineWidgets PROPERTIES -- DESCRIPTION "Qt5 WebEngineWidgets component." -- TYPE REQUIRED -- ) --endif() -- --find_package(Qt5WebEngine ${REQUIRED_QT_VERSION} CONFIG QUIET) --if(APPLE) -- set_package_properties(Qt5WebEngine PROPERTIES -- DESCRIPTION "Qt5 WebEngine component." -- TYPE RECOMMENDED -- ) --else() -- set_package_properties(Qt5WebEngine PROPERTIES -- DESCRIPTION "Qt5 WebEngine component." -- TYPE REQUIRED -- ) --endif() -+find_package(Qt5 5.15 COMPONENTS Core Network Xml Concurrent REQUIRED) -+find_package(Qt5 5.15 COMPONENTS WebEngineWidgets WebEngine) - - if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND) - add_compile_definitions(WITH_WEBENGINE=1) --- -2.39.2 - diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template index 5bada5e710fec..89d4dabc1eb54 100644 --- a/srcpkgs/nextcloud-client/template +++ b/srcpkgs/nextcloud-client/template @@ -1,9 +1,9 @@ # Template file for 'nextcloud-client' pkgname=nextcloud-client -version=3.10.1 +version=3.11.0 revision=1 build_style=cmake -configure_args="-DBUILD_UPDATER=NO -Wno-dev" +configure_args="-DBUILD_UPDATER=NO -DBUILD_WITH_WEBENGINE=NO -Wno-dev" hostmakedepends="pkg-config inkscape" makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel @@ -19,7 +19,7 @@ license="GPL-2.0-or-later" homepage="https://nextcloud.com/clients/" changelog="https://github.com/nextcloud/desktop/releases" distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz" -checksum=11355941f2b2d83a72868c3dd6101ec1968e6cabb67834a0684ba860faedcee4 +checksum=75d53751411a7544ed5b9f23c3e71c19a96f4096313d76dad77314c3773319d9 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549 make_check=ci-skip From fc7eae72c18f52d5a7b21b1c15a82e7279fa88fe Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveira Date: Thu, 4 Jan 2024 20:27:23 -0300 Subject: [PATCH 2/2] WIP --- srcpkgs/nextcloud-client/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template index 89d4dabc1eb54..3febbae67b657 100644 --- a/srcpkgs/nextcloud-client/template +++ b/srcpkgs/nextcloud-client/template @@ -3,13 +3,17 @@ pkgname=nextcloud-client version=3.11.0 revision=1 build_style=cmake -configure_args="-DBUILD_UPDATER=NO -DBUILD_WITH_WEBENGINE=NO -Wno-dev" +# configure_args="-DBUILD_UPDATER=NO -DBUILD_WITH_WEBENGINE=NO -Wno-dev" +configure_args="-DBUILD_UPDATER=NO -Wno-dev" hostmakedepends="pkg-config inkscape" +# makedepends="qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel karchive-devel + qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds $(vopt_if dolphin 'extra-cmake-modules kio-devel') $(vopt_if webengine 'qt5-webengine-devel')" +# depends="qt5-graphicaleffects qt5-plugin-mysql qt5-plugin-sqlite" depends="qt5-graphicaleffects" checkdepends="cmocka-devel" conf_files="/etc/Nextcloud/sync-exclude.lst"