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

[Andreas Sturmlechner]

commit:     667fbf72b79ff75aac2855950676090216a776c3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  9 19:28:31 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  9 19:29:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667fbf72

kde-frameworks/kdelibs: Fix build with app-text/enchant-2.1.0

Thanks-to: Arfrever
Gentoo-bug: 629806
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../kdelibs/files/kdelibs-4.14.35-enchant2.patch   | 33 ++++++++++++++++++++++
 kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild      |  2 ++
 2 files changed, 35 insertions(+)

diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-enchant2.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-enchant2.patch
new file mode 100644
index 00000000000..85be2d1ad2b
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-enchant2.patch
@@ -0,0 +1,33 @@
+From 668ef94b2b861f7ec4aa20941bcb6493bc4367be Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@×××××.com>
+Date: Sat, 9 Sep 2017 19:39:14 +0200
+Subject: Fix build with >=enchant-2
+
+Summary: Forwarding a user-contributed patch.
+
+Reviewers: aacid
+
+Reviewed By: aacid
+
+Differential Revision: https://phabricator.kde.org/D7748
+---
+ sonnet/plugins/enchant/enchantdict.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/sonnet/plugins/enchant/enchantdict.cpp b/sonnet/plugins/enchant/enchantdict.cpp
+index 52f7fad..80e40fc 100644
+--- a/sonnet/plugins/enchant/enchantdict.cpp
++++ b/sonnet/plugins/enchant/enchantdict.cpp
+@@ -82,8 +82,7 @@ bool QSpellEnchantDict::storeReplacement(const QString &bad,
+ 
+ bool QSpellEnchantDict::addToPersonal(const QString &word)
+ {
+-    enchant_dict_add_to_pwl(m_dict, word.toUtf8(),
+-                            word.toUtf8().length());
++    enchant_dict_add(m_dict, word.toUtf8(), word.toUtf8().length());
+     return true;
+ }
+ 
+-- 
+cgit v0.11.2
+

diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild
index f7eb7c73bd1..8c04429eea7 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild
@@ -126,6 +126,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-3dnow.patch"
 	"${FILESDIR}/${P}-kde3support.patch"
 	"${FILESDIR}/${P}-plasma4.patch"
+	# upstream:
+	"${FILESDIR}/${P}-enchant2.patch"
 )
 
 src_prepare() {