wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nextcloud-client: update to 3.11.0

Browse source 
Removed the patch to revert the mandatory webengine dependency, as
upstream have added a build argument to disable it [1].

[1] 56f043f375
This commit is contained in:
Rodrigo Oliveira 2024-01-05 12:26:56 -03:00 • committed by Andrew J. Hesford
parent 3ef9b20c5a
commit d05becd774
2 changed files with 4 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch
View file

@ -1,77 +0,0 @@
From 02dd76cdcec49e49b60f99a98dbe241007f548d1 Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
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

7
srcpkgs/nextcloud-client/template
View file

@ -1,13 +1,14 @@
# Template file for 'nextcloud-client' # Template file for 'nextcloud-client'
pkgname=nextcloud-client pkgname=nextcloud-client
version=3.10.1 version=3.11.0
revision=1 revision=1
build_style=cmake build_style=cmake
configure_args="-DBUILD_UPDATER=NO -Wno-dev" configure_args="-DBUILD_UPDATER=NO -DBUILD_WITH_WEBENGINE=OFF -Wno-dev"
hostmakedepends="pkg-config inkscape" hostmakedepends="pkg-config inkscape"
makedepends="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-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel karchive-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 dolphin 'extra-cmake-modules kio-devel')
$(vopt_if webengine 'qt5-webengine-devel')" $(vopt_if webengine 'qt5-webengine-devel')"
depends="qt5-graphicaleffects" depends="qt5-graphicaleffects"
@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
homepage="https://nextcloud.com/clients/" homepage="https://nextcloud.com/clients/"
changelog="https://github.com/nextcloud/desktop/releases" changelog="https://github.com/nextcloud/desktop/releases"
distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz" 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 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
make_check=ci-skip make_check=ci-skip