Accepting request 337681 from KDE:Frameworks5

Update to 5.15.0

OBS-URL: https://build.opensuse.org/request/show/337681
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sonnet?expand=0&rev=22

dictionary-locations.patch

@@ -1,29 +0,0 @@
-diff --git a/src/plugins/hunspell/hunspellclient.cpp b/src/plugins/hunspell/hunspellclient.cpp
-index 46963ef..80c2636 100644
---- a/src/plugins/hunspell/hunspellclient.cpp
-+++ b/src/plugins/hunspell/hunspellclient.cpp
-@@ -47,7 +47,7 @@ SpellerPlugin *HunspellClient::createSpeller(const QString &language)
- QStringList HunspellClient::languages() const
- {
-     QStringList lst;
--    QDir dir(QStringLiteral("/usr/share/myspell/dicts/"));
-+    QDir dir(QStringLiteral("/usr/share/hunspell/"));
-     if (dir.exists()) {
-         QStringList lstDic = dir.entryList(QStringList(QStringLiteral("*.dic")), QDir::Files);
-         foreach (const QString &tmp, lstDic) {
-diff --git a/src/plugins/hunspell/hunspelldict.cpp b/src/plugins/hunspell/hunspelldict.cpp
-index fda4a4c..489bc9b 100644
---- a/src/plugins/hunspell/hunspelldict.cpp
-+++ b/src/plugins/hunspell/hunspelldict.cpp
-@@ -31,9 +31,9 @@ HunspellDict::HunspellDict(const QString &lang)
-     : SpellerPlugin(lang), m_speller(0)
- {
-     qCDebug(SONNET_HUNSPELL) << " HunspellDict::HunspellDict( const QString& lang ):" << lang;
--    QString dic = QStringLiteral("/usr/share/myspell/dicts/%1.dic").arg(lang);
-+    QString dic = QStringLiteral("/usr/share/hunspell/%1.dic").arg(lang);
-     if (QFileInfo(dic).exists()) {
--        m_speller = new Hunspell(QStringLiteral("/usr/share/myspell/dicts/%1.aff").arg(lang).toUtf8().constData(), dic.toUtf8().constData());
-+        m_speller = new Hunspell(QStringLiteral("/usr/share/hunspell/%1.aff").arg(lang).toUtf8().constData(), dic.toUtf8().constData());
-     } else {
-         m_speller = 0;
-     }

sonnet-5.14.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8993d7baed751f9e443c175168e3124c08e08257bb8cd7ae71fac8ddfb4fd61a
-size 277648

sonnet-5.15.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0be638acbed60a513e1aa086bc86a8e6876341e4f981617e55f6edfbe2e1aa3
+size 279080

sonnet.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Oct  5 17:37:48 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.15.0
+  * Fix hunspell plugin ID for proper loading
+  * Support static compilation on windows, add windows libreoffice
+    hunspell dict path
+  * Do not assume UTF-8 encoded Hunspell dictionaries. (kde#353133)
+  * Fix Highlighter::setCurrentLanguage() for the case when
+    previous language was invalid (kde#349151)
+  * Support /usr/share/hunspell as dict location
+  * NSSpellChecker-based plugin
+  * For more details please see:
+    https://www.kde.org/announcements/kde-frameworks-5.15.0.php
+- Drop dictionary-locations.patch, no longer needed
+- Add myspell-dictionaries BuildRequires
+
 -------------------------------------------------------------------
 Tue Sep  8 17:13:45 UTC 2015 - hrvoje.senjan@gmail.com
 

sonnet.spec

@@ -18,9 +18,9 @@
 
 %bcond_without lang
 %define sonum   5
-%define _tar_path 5.14
+%define _tar_path 5.15
 Name:           sonnet
-Version:        5.14.0
+Version:        5.15.0
 Release:        0
 #BuildRequires:  aspell-devel
 BuildRequires:  cmake >= 2.8.12
@@ -32,6 +32,7 @@ BuildRequires:  kf5-filesystem
 %if %{with lang}
 BuildRequires:  cmake(Qt5LinguistTools) >= 5.3.0
 %endif
+BuildRequires:  myspell-dictionaries
 BuildRequires:  cmake(Qt5Core) >= 5.3.0
 BuildRequires:  cmake(Qt5Test) >= 5.3.0
 BuildRequires:  cmake(Qt5Widgets) >= 5.3.0
@@ -42,8 +43,6 @@ Group:          System/GUI/KDE
 Url:            http://www.kde.org
 Source:         http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-OPENSUSE dictionary-locations.patch -- find dictionaries in openSUSE locations
-Patch0:         dictionary-locations.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -93,7 +92,6 @@ HSpell, Enchant, ASpell and HUNSPELL. Development files.
 %lang_package -n libKF5SonnetCore%sonum
 %prep
 %setup -q
-%patch0 -p1
 
 %build
   %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert