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>

3 files changed, 86 insertions, 0 deletions

diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
new file mode 100644
index 00000000000..b2cc990f7cd
--- /dev/null
+++ b/kde-frameworks/sonnet/Manifest
@@ -0,0 +1 @@
+DIST sonnet-6.4.0.tar.xz 2432824 BLAKE2B fdc79f7c2843cef02d15456a230bcefa64773630c06913db71ec0939d50bcd8016b2c70312f3704c132af59fade6822524022bf524f0840e4e9e048c0ce77817 SHA512 1b51674606c9ea3e898051f187c0ec85f2676d6f0c8ec5ab5a0f43931c7e7d8c96bd7b0bff5a43a4c62be825b0dc5b6b82a77adfacbdbf04615fb5e52bfa1b48
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
+
diff --git a/kde-frameworks/sonnet/sonnet-6.4.0.ebuild b/kde-frameworks/sonnet/sonnet-6.4.0.ebuild
new file mode 100644
index 00000000000..c1dc6ae8cb0
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-6.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="aspell +hunspell qml"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell:= )
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+PATCHES=( "${FILESDIR}/${PN}-6.3.0-cmake.patch" ) # in 6.5;  bug 935488
+
+CMAKE_SKIP_TESTS=(
+	# bug 779994
+	sonnet-test_autodetect
+	# bug 680032
+	sonnet-test_settings
+	sonnet-test_highlighter
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package aspell ASPELL)
+		$(cmake_use_find_package hunspell HUNSPELL)
+		-DSONNET_USE_QML=$(usex qml)
+	)
+
+	ecm_src_configure
+}