Sonnet: disable hunspell plugin

* Set en_US as default language * Add aspell_en to REQUIRES
haikuports · Oct 2, 2019 · 4ce6893 · 4ce6893
1 parent c06bfdd
commit 4ce6893
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/kde-frameworks/sonnet/patches/sonnet-5.55.0.patchset b/kde-frameworks/sonnet/patches/sonnet-5.55.0.patchset
@@ -1,4 +1,4 @@
-From dd12fab36a7988dabb67aafb7664b1b3700c14ae Mon Sep 17 00:00:00 2001
+From b80aae073a55dfdae750751f328d491b1dfa62cf Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 2 Mar 2019 23:57:01 +1000
 Subject: Add hunspell dictionary paths for Haiku
@@ -19,5 +19,28 @@ index 3bd7830..6774c51 100644
      maybeAddPath(QStringLiteral("/System/Library/Spelling"));
      maybeAddPath(QStringLiteral("/usr/share/hunspell/"));
 -- 
-2.19.1
+2.23.0
+
+
+From de54cd50eadb0db51e0a3822b987fe2705aae5b5 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 2 Oct 2019 22:17:23 +1000
+Subject: Set en_US as default language
+
+
+diff --git a/src/core/settings.cpp b/src/core/settings.cpp
+index 0db0134..6560699 100644
+--- a/src/core/settings.cpp
++++ b/src/core/settings.cpp
+@@ -289,7 +289,7 @@ void Settings::restore()
+     QSettings settings(QStringLiteral("KDE"), QStringLiteral("Sonnet"));
+     d->defaultClient = settings.value(QStringLiteral("defaultClient"), QString()).toString();
+     d->defaultLanguage = settings.value(QStringLiteral("defaultLanguage"),
+-                                        QLocale::system().name()).toString();
++                                        QStringLiteral("en_US")).toString();
+     d->preferredLanguages = settings.value(QStringLiteral("preferredLanguages")).toStringList();
+
+     //same defaults are in the default filter (filter.cpp)
+-- 
+2.23.0
 
diff --git a/kde-frameworks/sonnet/sonnet-5.55.0.recipe b/kde-frameworks/sonnet/sonnet-5.55.0.recipe
@@ -11,7 +11,7 @@ SpellCheckDecorator class on your QTextEdit."
 HOMEPAGE="https://github.com/KDE/sonnet/"
 COPYRIGHT="2010-2019 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://github.com/KDE/sonnet/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="d371e1325369c263ec29355189e8e53f4f2a10a1ee3a036a1216d89e9a915e30"
 PATCHES="sonnet-$portVersion.patchset"
@@ -31,8 +31,8 @@ PROVIDES="
 	lib:libKF5SonnetUi$secondaryArchSuffix = $portVersion compat >= 5
 	"
 REQUIRES="
+	aspell_en
 	haiku$secondaryArchSuffix
-	cmd:hunspell$secondaryArchSuffix
 	lib:libaspell$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
@@ -51,9 +51,8 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	extra_cmake_modules$secondaryArchSuffix >= $portVersion
-	hunspell${secondaryArchSuffix}_devel
 	devel:libaspell$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix >= 5.7
+	devel:libQt5Core$secondaryArchSuffix >= 5.13
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake