gentoo auto-resync : 06:07:2024 - 08:06:15

6 files changed, 49 insertions, 3 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 3157090c150d..9d06cad99e53 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index a3efcae51bca..c4cb8331b4e4 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,5 @@
 DIST kcrash-5.116.0.tar.xz 28288 BLAKE2B 28b06fb3e3aaf318ffe47245350edbb5ec200a024934c380c04f6f123714f1197f5b1122c34a6370b657ce13619625e0377eeed795b58d218017d26aa57f01f4 SHA512 051ad694f0db1463c1105d3ff37221633a91c282850b6e295dadf07a323ba610046650c7d2e3b45dcd56214709b58989360b727b16dca0ca44dbc9b143f68e07
 DIST kcrash-6.3.0.tar.xz 29028 BLAKE2B f12aa113e63f7278d7c644cfca5f008a67cb7b4e1807b14083c5840ab78369c840b2785212f88614204d76866f67cd6e2a6130e06cf35c8e684f4dfa84b7a9a2 SHA512 764dd3290fb08b3c2c8243277de761ff938d4f109eacd92dce7e728d92d87c4926a047bc72ac2d6da7bdd2271de3840d20500a46843ad7b1a9ec3afaefe0064d
 EBUILD kcrash-5.116.0.ebuild 777 BLAKE2B d767db125cc35760c2b6bfc06fe62d4f5624cb5c4bc979fd5815565affc93f804a869f1b4f52587e0c469032efb822ed0948c1c55cdbe149984bde380cba3f59 SHA512 bed6a3ef77d9d0d2636c51a1ce0c09d7a822f16466132ee1c34cbc6b1e0664cc54e10c8d7fdbe7591fa74648b8be793fe3d9403bd56be4485bb27e736170c72f
-EBUILD kcrash-6.3.0.ebuild 734 BLAKE2B 9e2e545c923bee4d37b848d0f387369f56d2dc63f0b900cfec23ae7423029bfec004f5b42e3478449cf78e87e0f843b280766ccb7df9e6092efbbc79f5116867 SHA512 f0d5171351ae65e6eca9dcba41f3b192bfe9825ad16cdc50ccaeb8f3081e5a1bdd11eca148305d74145a062fb27637386e91bed11903d55b934cb4ffea52746d
+EBUILD kcrash-6.3.0-r1.ebuild 741 BLAKE2B d6b23fa9186b33f01301e2dc363218fbdb3819f2441f5f4fbac7d66703c1f7e87fed8f0c2c2d5f8a3ab5dfa84117625752c7ff5c9835411815b91885087d41c7 SHA512 040dac2a2f270e9534d66f534f26c7606dc85937d7f3fdf6e680cba6f5616d78eaa8a64c67714f6349553269d3e94b4652c5a6927c2c734e59480d521a5e93d7
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcrash/kcrash-6.3.0.ebuild b/kde-frameworks/kcrash/kcrash-6.3.0-r1.ebuild
index eff69651a396..dd02fd35a8a6 100644
--- a/kde-frameworks/kcrash/kcrash-6.3.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-6.3.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="X"
 RESTRICT="test"
 
 RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,opengl]
 	=kde-frameworks/kcoreaddons-${PVCUT}*:6
 	X? ( x11-libs/libX11 )
 "
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 384638d57427..acce2302b14e 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,6 @@
+AUX sonnet-6.3.0-cmake.patch 1040 BLAKE2B e502c304b8745ca2263fcc4896640ab2624733ade1b94ac0b9589fd2af642638d9daf18174ec84de5d77fd513f7c88144bf75481b571f66c13f92ea80e041d7b SHA512 500e56471ee5e990754dcccef520446e454755473830eb14b4c7827f6bab1af991134ef6db32d4d0a47c751906bd1ae9421b8f38eb661dbcf8612a3b19ffb4ac
 DIST sonnet-5.116.0.tar.xz 2406608 BLAKE2B 9ccdcf3ff032182ea5a76de9b2a523c48ada455cda5b997d534042bf25371c95bfc017d6d8c57fc16b49ad41e8049b0f51ea10c392b7bb4ba9d54d9de3ab26c0 SHA512 d40f721679f77d0eef706eddaa4369c63bb28a45852f0ad8f09518762ef249983dcdc1b4fac2b08fa37b2f4d53a6c301ec1abe2aab2af075ee52d442c248e88b
 DIST sonnet-6.3.0.tar.xz 2432984 BLAKE2B 015cb21c2e528258eeaa2962451d022fe7e46ae79d4e19bead2e856aba718801b3f384c2f57875685c2985502b41c57ac8e46e7388c756023d50c4fd717a312a SHA512 6d80a047db12fe2ef8de17f40beb4174370faf7923de9380084f89a3ec800f622c54a66d3f95cd3ec13748fe083b37d4c6bbb825cd8ef1fd02ec0f5caf466a99
 EBUILD sonnet-5.116.0.ebuild 939 BLAKE2B 1979a40412f8adb131a4aa8dfedd46c12055ffd648034b56d924d03a8e04df73c1e3fe1c6289a74aa825ea4b292207d936be81ce0b99fdc76c6c383d44131353 SHA512 b7cefb76fc7626bb85c0cdf5b956c8ddb3547615ed0171de7871a147d49dfba311de30fca1e57f444b96bf89000f6787018c24bc7a3852edf0f5998ba8a50f0f
-EBUILD sonnet-6.3.0.ebuild 899 BLAKE2B 632fecee6a28071b35d193ff755c78281d94c6a6a4420b1eddbfb1c5f2f405df290b5997756d44b9ad406d4bb833667b2f2de73edda4f9f1dda5bf7d6f2ed017 SHA512 3cbc02b226eb00c9440ecd442115adb3cf73b3f7711da987115b4fad906dff63627d02e5c45e14a532e120945f246e5f1d6f4aa0ebb8749c4f0fca4159bebd92
+EBUILD sonnet-6.3.0.ebuild 1029 BLAKE2B 8d7061f09f841e07ada48b976e6a5dc9e789019d8b0e3cd5eac26ae2470197acfd36c82e1b2ade35bbdea5fe0a9ee0509809290ec3ad7ef4635a2454d2807acc SHA512 c5be5d73885c334fe8b4184e03a1b2d4bb74b7489a4451bc932653741089146cb71ab966a61ba64829c322b4567c01e47e8e3abb2e5426a3eaf15a71bd248e72
 MISC metadata.xml 820 BLAKE2B f325a864172a141f2c05e3a798edd7d978f268de3d51c9014220654942ebba783a300bb55b943f82da43f7296f6f24b940aa079e9c5de5a9061ea5ef4ce6fa3c SHA512 2a71a8af916c56a07bca5d90ccf024d49e6fe06bf6a383b9aef09ec24623db306b1ed93e9c1e240555e8c9735b01930c92f7e89f19dd21f4e3d9db71481c1da2
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 000000000000..b218b5618339
--- /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
+
diff --git a/kde-frameworks/sonnet/sonnet-6.3.0.ebuild b/kde-frameworks/sonnet/sonnet-6.3.0.ebuild
index ce1b9390145e..91f260142222 100644
--- a/kde-frameworks/sonnet/sonnet-6.3.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-6.3.0.ebuild
@@ -22,6 +22,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
 
+# Pending: https://invent.kde.org/frameworks/sonnet/-/merge_requests/108
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 935488
+
 CMAKE_SKIP_TESTS=(
 	# bug 779994
 	sonnet-test_autodetect