forked from void-linux/void-packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Also: - Add karchive as dependency [1] - Add patch to revert mandatory WebEngine dependency [2] [1] nextcloud/desktop#4768 [2] nextcloud/desktop#4875
- Loading branch information
Showing
2 changed files
with
80 additions
and
4 deletions.
There are no files selected for viewing
77 changes: 77 additions & 0 deletions
77
srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| 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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters