[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/sonnet/files/, kde-frameworks/sonnet/

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/sonnet/files/, kde-frameworks/sonnet/

[Johannes Huber]

commit:     e9172037f4e3386e63d186ff56a3ab1c4ae133c6
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 18:36:10 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 18:36:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9172037

kde-frameworks/sonnet: Fix configure w/ hunspell 1.5

Revision bump adds upstream to fix configure to search for hunspell 1.5 too.

Package-Manager: portage-2.3.2

 .../sonnet/files/sonnet-5.28.0-hunspell-1.5.patch  | 21 ++++++++++++++
 kde-frameworks/sonnet/sonnet-5.28.0-r1.ebuild      | 33 ++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/kde-frameworks/sonnet/files/sonnet-5.28.0-hunspell-1.5.patch b/kde-frameworks/sonnet/files/sonnet-5.28.0-hunspell-1.5.patch
new file mode 100644
index 00000000..bc4bb93
--- /dev/null
+++ b/kde-frameworks/sonnet/files/sonnet-5.28.0-hunspell-1.5.patch
@@ -0,0 +1,21 @@
+commit 5fc1e9679e0607d7d918b27ee13092a234abefe6
+Author: Heiko Becker <heirecka@exherbo.org>
+Date:   Fri Nov 25 15:13:53 2016 +0100
+
+    Also search for hunspell-1.5
+    
+    REVIEW: 129559
+
+diff --git a/cmake/FindHUNSPELL.cmake b/cmake/FindHUNSPELL.cmake
+index f028abe..d5ed183 100644
+--- a/cmake/FindHUNSPELL.cmake
++++ b/cmake/FindHUNSPELL.cmake
+@@ -14,7 +14,7 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES)
+ 
+ FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
+ 
+-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.4 hunspell-1.3 hunspell-1.2)
++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2)
+ 
+ # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if 
+ # all listed variables are TRUE

diff --git a/kde-frameworks/sonnet/sonnet-5.28.0-r1.ebuild b/kde-frameworks/sonnet/sonnet-5.28.0-r1.ebuild
new file mode 100644
index 00000000..1ff3e95
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.28.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="aspell +hunspell nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell:= )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-hunspell-1.5.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package aspell ASPELL)
+		$(cmake-utils_use_find_package hunspell HUNSPELL)
+	)
+
+	kde5_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/sonnet/files/, kde-frameworks/sonnet/

[Andreas Sturmlechner]

commit:     34eccab8e4f02db922e8ff0915c79db5ef36c960
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  5 13:09:11 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 13:15:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34eccab8

kde-frameworks/sonnet: Fix build with USE=-qml

Pending upstream MR:
https://invent.kde.org/frameworks/sonnet/-/merge_requests/108

Closes: https://bugs.gentoo.org/935488
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../sonnet/files/sonnet-6.3.0-cmake.patch          | 42 ++++++++++++++++++++++
 kde-frameworks/sonnet/sonnet-6.3.0.ebuild          |  3 ++
 2 files changed, 45 insertions(+)

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