diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2024-07-06 00:28:10 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-07-08 22:11:28 +0200 |
| commit | 214d4fc16f728f519db9330f5bfd7f46517a548b (patch) | |
| tree | 131473eb0288845b6b240c038d62660c2bdcf985 /kde-frameworks/sonnet/files/sonnet-6.3.0-cmake.patch | |
| parent | 337071403cf8dace2eda8bbcdea4862e720ee934 (diff) | |
| download | kde-214d4fc16f728f519db9330f5bfd7f46517a548b.tar.gz kde-214d4fc16f728f519db9330f5bfd7f46517a548b.tar.bz2 kde-214d4fc16f728f519db9330f5bfd7f46517a548b.zip | |
kde-frameworks/sonnet: 6.4.0 version bump
Fix build with USE=-qml (backport from 6.5)
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/sonnet/files/sonnet-6.3.0-cmake.patch')
| -rw-r--r-- | kde-frameworks/sonnet/files/sonnet-6.3.0-cmake.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/kde-frameworks/sonnet/files/sonnet-6.3.0-cmake.patch b/kde-frameworks/sonnet/files/sonnet-6.3.0-cmake.patch new file mode 100644 index 00000000000..b218b561833 --- /dev/null +++ b/kde-frameworks/sonnet/files/sonnet-6.3.0-cmake.patch @@ -0,0 +1,42 @@ +From 7ee068b3da7e8b60a6c0a5c95b9026ef2c82ebb7 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 5 Jul 2024 15:03:09 +0200 +Subject: [PATCH] Fix SONNET_USE_QML=OFF by moving ECMQmlModule behind the + conditional + +Otherwise we still end up with + +> -- Could NOT find Qt6Qml (missing: Qt6Qml_DIR) + +and finally + +> Failed setting up ECMQmlModule + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3427bb12..892f77d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,6 @@ include(ECMSetupVersion) + include(ECMGenerateHeaders) + include(ECMGenerateQmlTypes) + include(ECMFindQmlModule) +-include(ECMQmlModule) + include(ECMDeprecationSettings) + include(ECMAddQch) + include(ECMPoQmTools) +@@ -39,6 +38,7 @@ if(SONNET_USE_WIDGETS) + endif() + + if(SONNET_USE_QML) ++ include(ECMQmlModule) + find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Quick) + endif() + +-- +2.45.2 + |