gentoo auto-resync : 16:10:2024 - 04:04:29

6 files changed, 53 insertions, 2 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index d5837d848c67..138893526bbf 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index 4eefc66a17a6..58e90015f15a 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -3,5 +3,5 @@ DIST kquickcharts-6.6.0.tar.xz 110208 BLAKE2B 43af5f0604e2313cd8494d924caeacf233
 DIST kquickcharts-6.7.0.tar.xz 110180 BLAKE2B bdc75fe0d872336d6617837acf385fd528e614904cd96727f86a9bf332164a3b9ec85d90b85e7006e4c4855b451cdbadab852c322283edf8fad799be6eddc998 SHA512 3a1bfe21b07f510c71947bf8bdf627baa4032dc7d3b31a7501cf2f52cc608796ef4cd249514dd859ae50bbcab7d1a43b63328cdd3ab7ecee82e3ad8a5e273ca7
 EBUILD kquickcharts-5.116.0-r1.ebuild 707 BLAKE2B 562c15d91c8f493fb92be898762c43632d7f26277092351973e2869db2e2b86810f08e16c47a07d1d9251060ed5774b42bcecf1ba91dfb96bd63467833c53a19 SHA512 05575a03cc96cb8abaead7492306fc5351d9c1f8e16dfef48519fdf94885a7a3e2060192e96ac8f34aea1a9e5407aaa43b079d8d639c10b399e089344ba7d334
 EBUILD kquickcharts-6.6.0.ebuild 810 BLAKE2B fbf4cbf146efab580551b469f3c2c77fcf382efbf779a191888a5d7eb468a9ee81c444b7eb3db931c4b1d275b78568f94c5989f86cbf1ca37d942c1d6be7ecd5 SHA512 7a9142ea5949723ef392c452f3014ecb7f82c73e8b9f2bab59b1eb9b2242aec4f72dc637cc173bfe528ed873eab1c7a6daf09193afe04fc527b58814ea213e7f
-EBUILD kquickcharts-6.7.0.ebuild 812 BLAKE2B c93fd408b2c8597a7d9d391c3459751685be79472ad49dbd1a9a7c2500359051b8e5afd68b4a4f593b6857b538c16230f475a61a28d7d66f147dfde94c7eefe5 SHA512 0e2e03aa3f226695fecd2b8b8a3c33ac5ad4a1c4ff244382850f4d7a07ab08e4cef257733af47df3f1237833a8085e0f9cd02672357be96ec1269b11d70bd652
+EBUILD kquickcharts-6.7.0-r1.ebuild 847 BLAKE2B f96075a2560dd6f6df617c5a8606d1844cd5828acac3b9f2f4bbbac7706f2609f663ea2e700b39bc3cb2b662c42042644fca7f718f5c87d211414236b5639c23 SHA512 ab7caf56ab6f869d3d7a3ed2a25d5b6c1d372268933f1dec7cf6f6cec372ff1be125792ec8cee3e9c41309d96c089b278ccbbef1361315c4e0a888a1962c6b88
 MISC metadata.xml 523 BLAKE2B ac616ef6e3c895b29f1b4f67962d0291a8fa716003249efd1176dc68aae3a06ef4ad17388c62af5c788099a64105a0e0e72f7af19e9c907dcfe1907a0245fee8 SHA512 fe433c3611db66cb4be3b7288015ab48a23368fad103af778efe451ad8e645e21a1e39385d7fa942de7522512ec622f01a47c51f824ea7945f6101e6cb008f33
diff --git a/kde-frameworks/kquickcharts/kquickcharts-6.7.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-6.7.0-r1.ebuild
index 15f1e1833e1f..7cf78ede197c 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-6.7.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-6.7.0-r1.ebuild
@@ -20,6 +20,7 @@ IUSE=""
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtshadertools-${QTMIN}:6
 	examples? (
 		>=dev-qt/qtbase-${QTMIN}:6[widgets]
 		=kde-frameworks/kdeclarative-${PVCUT}*:6
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index c75537b73a24..8bdbdea8fd84 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,7 +1,8 @@
+AUX sonnet-6.7.0-no-backend.patch 1794 BLAKE2B 6aa56632a06d5222dc9abb51f57a1b292bcbfab70e0a2b09c394b6f59fdcfe5b2de929f89fdde81932d196e4487965c9ef95b45791a31c7faf1a10bf97c7c9e5 SHA512 31bd594c79ef23a03189dd047f6ce556188e25c394c4caf759f191abadf68917097e6c17705979b18c0d0a1e16fd723ca1440d66fe636ed465fb98000bc98162
 DIST sonnet-5.116.0.tar.xz 2406608 BLAKE2B 9ccdcf3ff032182ea5a76de9b2a523c48ada455cda5b997d534042bf25371c95bfc017d6d8c57fc16b49ad41e8049b0f51ea10c392b7bb4ba9d54d9de3ab26c0 SHA512 d40f721679f77d0eef706eddaa4369c63bb28a45852f0ad8f09518762ef249983dcdc1b4fac2b08fa37b2f4d53a6c301ec1abe2aab2af075ee52d442c248e88b
 DIST sonnet-6.6.0.tar.xz 2432952 BLAKE2B 8c6d9a25b182c71bf83409506d491203ebd922c02e4ac937c937c82095201da234dabaaea0ee3cdd1ed9fb6e6ff31e8a2be0d382330914649dfa76442faf3ed4 SHA512 4139545217d656c856cb6346e1cb7c07892ba0e68f034563e979ae36e42f5ee7e52b168eaa8b8a557be8b21869bf44833bbbacc04960f422082e3f7dce244735
 DIST sonnet-6.7.0.tar.xz 2433280 BLAKE2B d7c39c98e646c5f44ed2decccf05dcd974188698e225b59df200802092806891b02bfda5fc1e1013f5aa842ea91d9cf1dd8f807ac9b79ea3a763b5190b922aaf SHA512 b2cbf6029bc532d27ef151a4a2332d18840330e08195bcc902a26e1d3ad8d1eff555be17f3a951c03e82a8c144011af606c5ee6c33d2d764fca36d9b92f023a2
 EBUILD sonnet-5.116.0.ebuild 939 BLAKE2B 1979a40412f8adb131a4aa8dfedd46c12055ffd648034b56d924d03a8e04df73c1e3fe1c6289a74aa825ea4b292207d936be81ce0b99fdc76c6c383d44131353 SHA512 b7cefb76fc7626bb85c0cdf5b956c8ddb3547615ed0171de7871a147d49dfba311de30fca1e57f444b96bf89000f6787018c24bc7a3852edf0f5998ba8a50f0f
 EBUILD sonnet-6.6.0.ebuild 908 BLAKE2B 0f45ff99cb1ce18938f6fd7b5e30c5fbf52098ddcad0551843ae7bd34c9a0b19fd2079da08943a9557fb95af63a3b9f8946f096d93be67db7338e901d9398210 SHA512 d57120c76824ad12abc2ee549b2402534033ee5cff14d4fe7f1c5b86e5c15ba8329936fef21589dec27db14c98a7b17717b710bb4aaaf34348abd4c0e1413fae
-EBUILD sonnet-6.7.0.ebuild 911 BLAKE2B 9d22377ec1370f113cf8323df67caedcbbb0ed3a91dde6e5067706339ebac2fdfbe309d78753b97b5e8ee9bc38a9598d12d5852c33667654a4b2d19daa68a3f4 SHA512 feaa7d1aee46c9caeda75bb89c0b23caae5687c705414da5086bffffcf3f7bb2b8ea5f9649e0b9d1e5374a4543ce5763acba81ce0200b71b12b827dafb6e1727
+EBUILD sonnet-6.7.0.ebuild 1061 BLAKE2B b7e88e181a1b2cab7faf677a45934198d8c9a500f2f7ed0786803d2e1013773696466a0ad5fa43a6ade1934c7497f85d554cb80455a4f0bf9012b8136d17ae5b SHA512 4cda2332ac675370647f7e41a3ef00a7a250530ca8b71bcd848b4e4cc8a499d9566bb6e140bbf075d6ccc9e5a5388ed4365f5cae74e942aa047c9306d706d09b
 MISC metadata.xml 820 BLAKE2B f325a864172a141f2c05e3a798edd7d978f268de3d51c9014220654942ebba783a300bb55b943f82da43f7296f6f24b940aa079e9c5de5a9061ea5ef4ce6fa3c SHA512 2a71a8af916c56a07bca5d90ccf024d49e6fe06bf6a383b9aef09ec24623db306b1ed93e9c1e240555e8c9735b01930c92f7e89f19dd21f4e3d9db71481c1da2
diff --git a/kde-frameworks/sonnet/files/sonnet-6.7.0-no-backend.patch b/kde-frameworks/sonnet/files/sonnet-6.7.0-no-backend.patch
new file mode 100644
index 000000000000..7c8ffd35a67d
--- /dev/null
+++ b/kde-frameworks/sonnet/files/sonnet-6.7.0-no-backend.patch
@@ -0,0 +1,44 @@
+From 1764decd7b7426320f24f3dbde44fc13993d1ed2 Mon Sep 17 00:00:00 2001
+From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
+Date: Sun, 13 Oct 2024 08:19:16 +0200
+Subject: [PATCH] Provide SONNET_NO_BACKENDS option to deactivate build
+ failures with no backends
+
+For cross-compilation tooling, both a native host and a target device
+build is needed in which the first provides the parsediagrams6
+executable. We do not want to build any plugins when just the
+cross-build tooling is being built.
+---
+ CMakeLists.txt             | 1 +
+ src/plugins/CMakeLists.txt | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8e03cf0..b9425a19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,6 +32,7 @@ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprec
+ set(REQUIRED_QT_VERSION 6.5.0)
+ option(SONNET_USE_WIDGETS "Build components using Qt6Widgets" ON)
+ option(SONNET_USE_QML "Build components using Qt6Quick" ON)
++option(SONNET_NO_BACKENDS "Do not fail when no backends are built (to be used for cross-build host tooling)" OFF)
+ 
+ if(SONNET_USE_WIDGETS)
+     find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets)
+diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
+index 85441211..b53c9de7 100644
+--- a/src/plugins/CMakeLists.txt
++++ b/src/plugins/CMakeLists.txt
+@@ -53,7 +53,7 @@ if (WIN32)
+ endif ()
+ 
+ # if we did not find any backend, that is bad
+-# do that on Andriod, too, if we have some backend for it
+-if (NOT ANDROID AND NOT SONNET_BACKEND_FOUND)
++# do that on Android, too, if we have some backend for it
++if (NOT ANDROID AND NOT SONNET_BACKEND_FOUND AND NOT SONNET_NO_BACKENDS)
+     message(FATAL_ERROR "Can not build any backend plugin for Sonnet.")
+ endif ()
+-- 
+GitLab
+
diff --git a/kde-frameworks/sonnet/sonnet-6.7.0.ebuild b/kde-frameworks/sonnet/sonnet-6.7.0.ebuild
index 518249d7ab30..f49e856bd186 100644
--- a/kde-frameworks/sonnet/sonnet-6.7.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-6.7.0.ebuild
@@ -22,6 +22,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
 
+PATCHES=( "${FILESDIR}/${P}-no-backend.patch" ) # bug 941425
+
 CMAKE_SKIP_TESTS=(
 	# bug 779994
 	sonnet-test_autodetect
@@ -36,6 +38,9 @@ src_configure() {
 		$(cmake_use_find_package hunspell HUNSPELL)
 		-DSONNET_USE_QML=$(usex qml)
 	)
+	if ! use aspell && ! use hunspell; then
+		mycmakeargs+=( -DSONNET_NO_BACKENDS=ON )
+	fi
 
 	ecm_src_configure
 }