From 763bb666571947378b3b94762c9a7ae3acf99a1fef352dd3f20739b655737cc1 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 5 Oct 2015 18:06:58 +0000 Subject: [PATCH 1/4] 5.15.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=68 --- sonnet-5.14.0.tar.xz | 3 --- sonnet-5.15.0.tar.xz | 3 +++ sonnet.changes | 7 +++++++ sonnet.spec | 8 +++----- 4 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 sonnet-5.14.0.tar.xz create mode 100644 sonnet-5.15.0.tar.xz diff --git a/sonnet-5.14.0.tar.xz b/sonnet-5.14.0.tar.xz deleted file mode 100644 index 40b0dc3..0000000 --- a/sonnet-5.14.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8993d7baed751f9e443c175168e3124c08e08257bb8cd7ae71fac8ddfb4fd61a -size 277648 diff --git a/sonnet-5.15.0.tar.xz b/sonnet-5.15.0.tar.xz new file mode 100644 index 0000000..d318ac0 --- /dev/null +++ b/sonnet-5.15.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0be638acbed60a513e1aa086bc86a8e6876341e4f981617e55f6edfbe2e1aa3 +size 279080 diff --git a/sonnet.changes b/sonnet.changes index 8119106..c13dfe0 100644 --- a/sonnet.changes +++ b/sonnet.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 5 17:37:48 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.15.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.15.0.php + ------------------------------------------------------------------- Tue Sep 8 17:13:45 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/sonnet.spec b/sonnet.spec index 2382672..7b4f391 100644 --- a/sonnet.spec +++ b/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 From 4298aefa3f42bb93f5960701a597d0d0b02ceba460012d1b81637795be517db6 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 5 Oct 2015 18:08:15 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=69 --- sonnet.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sonnet.changes b/sonnet.changes index c13dfe0..06bae8f 100644 --- a/sonnet.changes +++ b/sonnet.changes @@ -4,6 +4,8 @@ Mon Oct 5 17:37:48 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.15.0 * 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 From 5f8ba939cbb6c43456a5098f6d590dda9a85b12f8160ade53eeb648d5ec8cefc Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 5 Oct 2015 18:10:03 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=70 --- dictionary-locations.patch | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 dictionary-locations.patch diff --git a/dictionary-locations.patch b/dictionary-locations.patch deleted file mode 100644 index 2701655..0000000 --- a/dictionary-locations.patch +++ /dev/null @@ -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; - } From 16cdf008b8b0ad505cb7c1a2d166bc5df727c13742c04ea79abc7a41d3739129 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 10 Oct 2015 13:09:45 +0000 Subject: [PATCH 4/4] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=71 --- sonnet.changes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sonnet.changes b/sonnet.changes index 06bae8f..0522d7d 100644 --- a/sonnet.changes +++ b/sonnet.changes @@ -2,6 +2,14 @@ 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