Hello community, here is the log from the commit of package sonnet for openSUSE:Factory checked in at 2018-08-24 16:58:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sonnet (Old) and /work/SRC/openSUSE:Factory/.sonnet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sonnet" Fri Aug 24 16:58:06 2018 rev:58 rq:630653 version:5.49.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sonnet/sonnet.changes 2018-07-21 10:20:12.067029913 +0200 +++ /work/SRC/openSUSE:Factory/.sonnet.new/sonnet.changes 2018-08-24 16:58:09.789649109 +0200 @@ -1,0 +2,12 @@ +Sun Aug 19 09:19:38 UTC 2018 - christo...@krop.fr + +- Update to 5.49.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.49.0.php +- Changes since 5.48.0: + * Sonnet: setLanguage should schedule a rehighlight if highlight is enabled + * Use the current hunspell API +- Add Fix_Leap_42_3_build.patch to use the old hunspell api in leap 42.3. + +------------------------------------------------------------------- Old: ---- sonnet-5.48.0.tar.xz New: ---- Fix_Leap_42_3_build.patch sonnet-5.49.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sonnet.spec ++++++ --- /var/tmp/diff_new_pack.v4Cmtl/_old 2018-08-24 16:58:10.293649705 +0200 +++ /var/tmp/diff_new_pack.v4Cmtl/_new 2018-08-24 16:58:10.293649705 +0200 @@ -16,16 +16,24 @@ # -%bcond_without lang %define sonum 5 -%define _tar_path 5.48 +%define _tar_path 5.49 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} +%bcond_without lang Name: sonnet -Version: 5.48.0 +Version: 5.49.0 Release: 0 +Summary: KDE spell checking library +License: LGPL-2.1-or-later +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 +Patch0: Fix_Leap_42_3_build.patch #BuildRequires: aspell-devel BuildRequires: cmake >= 3.0 # Enchant plugin is currently disabled upstream @@ -33,50 +41,44 @@ BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem -%if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 -%endif BuildRequires: myspell-dictionaries +BuildRequires: pkgconfig BuildRequires: cmake(Qt5Core) >= 5.6.0 BuildRequires: cmake(Qt5Test) >= 5.6.0 BuildRequires: cmake(Qt5Widgets) >= 5.6.0 BuildRequires: pkgconfig(hunspell) -Summary: KDE spell checking library -License: LGPL-2.1-or-later -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 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with lang} +BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 +%endif %description Sonnet is a plugin-based spell checking library for Qt-based applications. It supports several different plugins, including HSpell, Enchant, ASpell and HUNSPELL. -%package -n libKF5SonnetCore%sonum +%package -n libKF5SonnetCore%{sonum} Summary: KDE spell checking library Group: System/GUI/KDE Requires: %{name} >= %{_kf5_bugfix_version} +%requires_ge libQt5Core5 Obsoletes: libKF5SonnetCore4 %if %{with lang} -Recommends: libKF5SonnetCore%sonum-lang = %{version} +Recommends: libKF5SonnetCore%{sonum}-lang = %{version} %endif -%requires_ge libQt5Core5 -%description -n libKF5SonnetCore%sonum +%description -n libKF5SonnetCore%{sonum} Sonnet is a plugin-based spell checking library for Qt-based applications. It supports several different plugins, including HSpell, Enchant, ASpell and HUNSPELL. -%package -n libKF5SonnetUi%sonum +%package -n libKF5SonnetUi%{sonum} Summary: KDE spell checking library Group: System/GUI/KDE +%requires_ge libKF5SonnetCore5 %requires_ge libQt5Gui5 %requires_ge libQt5Widgets5 -%requires_ge libKF5SonnetCore5 -%description -n libKF5SonnetUi%sonum +%description -n libKF5SonnetUi%{sonum} Sonnet is a plugin-based spell checking library for Qt-based applications. It supports several different plugins, including HSpell, Enchant, ASpell and HUNSPELL. @@ -85,8 +87,8 @@ Summary: KDE spell checking library: Build Environment Group: Development/Libraries/KDE Requires: extra-cmake-modules -Requires: libKF5SonnetCore%sonum = %{version} -Requires: libKF5SonnetUi%sonum = %{version} +Requires: libKF5SonnetCore%{sonum} = %{version} +Requires: libKF5SonnetUi%{sonum} = %{version} Requires: cmake(Qt5Core) >= 5.6.0 %description devel @@ -94,9 +96,13 @@ applications. It supports several different plugins, including HSpell, Enchant, ASpell and HUNSPELL. Development files. -%lang_package -n libKF5SonnetCore%sonum +%lang_package -n libKF5SonnetCore%{sonum} + %prep %setup -q +%if 0%{?suse_version} <= 1315 +%patch0 -p1 +%endif %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert @@ -110,37 +116,31 @@ %find_lang %{name}5 --with-qt --without-mo %endif -%post -n libKF5SonnetCore%sonum -p /sbin/ldconfig - -%postun -n libKF5SonnetCore%sonum -p /sbin/ldconfig - -%post -n libKF5SonnetUi%sonum -p /sbin/ldconfig - -%postun -n libKF5SonnetUi%sonum -p /sbin/ldconfig +%post -n libKF5SonnetCore%{sonum} -p /sbin/ldconfig +%postun -n libKF5SonnetCore%{sonum} -p /sbin/ldconfig +%post -n libKF5SonnetUi%{sonum} -p /sbin/ldconfig +%postun -n libKF5SonnetUi%{sonum} -p /sbin/ldconfig %if %{with lang} -%files -n libKF5SonnetCore%sonum-lang -f %{name}5.lang +%files -n libKF5SonnetCore%{sonum}-lang -f %{name}5.lang %endif %files -%defattr(-,root,root) -%doc COPYING* README* +%license COPYING* +%doc README* %{_kf5_debugdir}/sonnet.categories %{_kf5_plugindir}/ %{_kf5_datadir}/sonnet/ -%files -n libKF5SonnetCore%sonum -%defattr(-,root,root) -%doc COPYING* +%files -n libKF5SonnetCore%{sonum} +%license COPYING* %{_kf5_libdir}/libKF5SonnetCore.so.* -%files -n libKF5SonnetUi%sonum -%defattr(-,root,root) -%doc COPYING* +%files -n libKF5SonnetUi%{sonum} +%license COPYING* %{_kf5_libdir}/libKF5SonnetUi.so.* %files devel -%defattr(-,root,root) %{_kf5_bindir}/parsetrigrams %{_kf5_bindir}/gentrigrams %{_kf5_libdir}/libKF5SonnetCore.so ++++++ Fix_Leap_42_3_build.patch ++++++ commit 6b3204cbe16f23b16f856daeddc8d13e94e4290b Author: Christophe Giboudeaux <christo...@krop.fr> Date: Sun Aug 19 14:17:25 2018 +0200 Revert "Use the current hunspell API" The new hunspell api is not available in leap 42.3. This reverts commit 0a96acf251baa5c9dd042d093ab2bf8fcee10502. diff --git a/src/plugins/hunspell/hunspelldict.cpp b/src/plugins/hunspell/hunspelldict.cpp index 397bbbb..cc1dd9b 100644 --- a/src/plugins/hunspell/hunspelldict.cpp +++ b/src/plugins/hunspell/hunspelldict.cpp @@ -102,9 +102,9 @@ bool HunspellDict::isCorrect(const QString &word) const if (!m_speller) { return false; } - bool result = m_speller->spell(toDictEncoding(word).toStdString()); + int result = m_speller->spell(toDictEncoding(word).constData()); qCDebug(SONNET_HUNSPELL) << " result :" << result; - return result; + return result != 0; } QStringList HunspellDict::suggest(const QString &word) const @@ -112,10 +112,13 @@ QStringList HunspellDict::suggest(const QString &word) const if (!m_speller) { return QStringList(); } + char **selection; QStringList lst; - const auto suggestions = m_speller->suggest(toDictEncoding(word).toStdString()); - for_each (suggestions.begin(), suggestions.end(), [this, &lst](const std::string &suggestion) { - lst << m_codec->toUnicode(suggestion.c_str()); }); + int nbWord = m_speller->suggest(&selection, toDictEncoding(word).constData()); + for (int i = 0; i < nbWord; ++i) { + lst << m_codec->toUnicode(selection[i]); + } + m_speller->free_list(&selection, nbWord); return lst; } ++++++ sonnet-5.48.0.tar.xz -> sonnet-5.49.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.48.0/CMakeLists.txt new/sonnet-5.49.0/CMakeLists.txt --- old/sonnet-5.48.0/CMakeLists.txt 2018-07-08 00:34:05.000000000 +0200 +++ new/sonnet-5.49.0/CMakeLists.txt 2018-08-04 13:03:08.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.48.0") # handled by release scripts +set(KF5_VERSION "5.49.0") # handled by release scripts project(Sonnet VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.48.0 NO_MODULE) +find_package(ECM 5.49.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.48.0/po/id/sonnet5_qt.po new/sonnet-5.49.0/po/id/sonnet5_qt.po --- old/sonnet-5.48.0/po/id/sonnet5_qt.po 2018-07-08 00:34:05.000000000 +0200 +++ new/sonnet-5.49.0/po/id/sonnet5_qt.po 2018-08-04 13:03:08.000000000 +0200 @@ -9,8 +9,8 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2018-05-18 07:02+0700\n" -"Last-Translator: Neon <wanto...@gmail.com>\n" +"PO-Revision-Date: 2018-07-23 06:27+0700\n" +"Last-Translator: wantoyo <wanto...@gmail.com>\n" "Language-Team: Indonesian <kde-i18n-...@kde.org>\n" "Language: id\n" "MIME-Version: 1.0\n" @@ -257,13 +257,13 @@ "All</b>.</p>\n" "</qt>" msgstr "" -"<qt><p>Kata ini telah dianggap sebagai \"kata tak dikenal\" karena kata " +"<qt><p>Kata ini telah dianggap sebagai \"kata tidak dikenal\" karena kata " "tersebut tidak cocok dengan entri mapapun di dalam kamus yang saat ini " "digunakan. Kata tersebut mungkin sebuah kata dalam bahasa asing.</p>\n" "<p>Jika kata tersebut salah ejaan, anda dapat menambahkannya ke kamus dengan " "cara klik <b>Tambah ke Kamus</b>. Jika anda tidak ingin menambah kata yang " -"tak dikenal ke kamus, tapi anda ingin meninggalkannya tanpa perubahan, klik " -"<b>Abaikan</b> atau <b>Abaikan Semua</b>.</p>\n" +"tidak dikenal ke kamus, tapi anda ingin meninggalkannya tanpa perubahan, " +"klik <b>Abaikan</b> atau <b>Abaikan Semua</b>.</p>\n" "<p>Tetapi, jika kata tersebut salah ejaan, anda dapat mencoba untuk mencari " "penggantinya dalam senarai di bawah. Jika anda tidak dapat menemukan " "penggantinya di sana, anda dapat mengetikkannya pada kotak teks di bawah, " @@ -317,10 +317,11 @@ "</qt>" msgstr "" "<qt>\n" -"<p>Di sini anda dapat melihat bagian teks yang menampilkan kata tak dikenal " -"dalam isinya. Jika informasi ini tidak memadai untuk memilih pengganti kata " -"tak dikenal, anda dapat klik pada dokumen yang sedang anda baca, lihat " -"bagian yang lebih besar lalu kembali ke sini untuk melanjutkan baca.</p>\n" +"<p>Di sini anda dapat melihat bagian teks yang menampilkan kata tidak " +"dikenal dalam isinya. Jika informasi ini tidak memadai untuk memilih " +"pengganti kata tidak dikenal, anda dapat klik pada dokumen yang sedang anda " +"baca, lihat bagian yang lebih besar lalu kembali ke sini untuk melanjutkan " +"baca.</p>\n" "</qt>" #: ui/sonnetui.ui:96 @@ -341,12 +342,12 @@ "</qt>" msgstr "" "<qt>\n" -"<p>Kata tak dikenal telah terdeteksi dan dianggap tak dikenal karena kata " -"tersebut tidak termasuk di dalam kamus.<br>\n" -"Klik di sini jika anda menganggap kata tak dikenal tidak salah eja, dan anda " -"ingin menghindari adanya kesalahan pendeteksian lagi di masa depan. Jika " -"anda ingin tetap membiarkannya, tapi tak ingin menambahkannya ke kamus, maka " -"klik <b>Abaikan</b> atau <b>Abaikan Semua</b>.</p>\n" +"<p>Kata tidak dikenal telah terdeteksi dan dianggap tidak dikenal karena " +"kata tersebut tidak termasuk di dalam kamus.<br>\n" +"Klik di sini jika anda menganggap kata tidak dikenal tidak salah eja, dan " +"anda ingin menghindari adanya kesalahan pendeteksian lagi di masa depan. " +"Jika anda ingin tetap membiarkannya, tapi tidak ingin menambahkannya ke " +"kamus, maka klik <b>Abaikan</b> atau <b>Abaikan Semua</b>.</p>\n" "</qt>" #: ui/sonnetui.ui:112 @@ -463,10 +464,10 @@ "</qt>" msgstr "" "<qt>\n" -"<p>Klik di sini untuk membiarkan kecocokan kata tak dikenal ini tetap apa " +"<p>Klik di sini untuk membiarkan kecocokan kata tidak dikenal ini tetap apa " "adanya.</p>\n" "<p>Aksi ini berguna jika kata tersebut adalah sebuah nama, akronim, kata " -"asing atau kata tak dikenal lainnya yang ingin anda gunakan tapi tidak " +"asing atau kata tidak dikenal lainnya yang ingin anda gunakan tapi tidak " "ditambah ke kamus.</p>\n" "</qt>" @@ -487,10 +488,10 @@ "</qt>" msgstr "" "<qt>\n" -"<p>Klik di sini untuk membiarkan semua kecocokan kata tak dikenal tetap apa " -"adanya.</p>\n" +"<p>Klik di sini untuk membiarkan semua kecocokan kata tidak dikenal tetap " +"apa adanya.</p>\n" "<p>Aksi ini berguna jika kata tersebut adalah sebuah nama, akronim, kata " -"asing atau kata tak dikenal lainnya yang ingin anda gunakan tapi tidak " +"asing atau kata tidak dikenal lainnya yang ingin anda gunakan tapi tidak " "ditambah ke kamus.</p>\n" "</qt>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.48.0/po/uk/sonnet5_qt.po new/sonnet-5.49.0/po/uk/sonnet5_qt.po --- old/sonnet-5.48.0/po/uk/sonnet5_qt.po 2018-07-08 00:34:05.000000000 +0200 +++ new/sonnet-5.49.0/po/uk/sonnet5_qt.po 2018-08-04 13:03:08.000000000 +0200 @@ -1,5 +1,5 @@ # Translation of sonnet5_qt.po to Ukrainian -# Copyright (C) 2014-2015 This_file_is_part_of_KDE +# Copyright (C) 2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.48.0/po/zh_CN/sonnet5_qt.po new/sonnet-5.49.0/po/zh_CN/sonnet5_qt.po --- old/sonnet-5.48.0/po/zh_CN/sonnet5_qt.po 2018-07-08 00:34:05.000000000 +0200 +++ new/sonnet-5.49.0/po/zh_CN/sonnet5_qt.po 2018-08-04 13:03:08.000000000 +0200 @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-07-03 17:35\n" +"PO-Revision-Date: 2018-07-24 08:41\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.48.0/src/plugins/hunspell/hunspelldict.cpp new/sonnet-5.49.0/src/plugins/hunspell/hunspelldict.cpp --- old/sonnet-5.48.0/src/plugins/hunspell/hunspelldict.cpp 2018-07-08 00:34:05.000000000 +0200 +++ new/sonnet-5.49.0/src/plugins/hunspell/hunspelldict.cpp 2018-08-04 13:03:08.000000000 +0200 @@ -102,9 +102,9 @@ if (!m_speller) { return false; } - int result = m_speller->spell(toDictEncoding(word).constData()); + bool result = m_speller->spell(toDictEncoding(word).toStdString()); qCDebug(SONNET_HUNSPELL) << " result :" << result; - return result != 0; + return result; } QStringList HunspellDict::suggest(const QString &word) const @@ -112,13 +112,10 @@ if (!m_speller) { return QStringList(); } - char **selection; QStringList lst; - int nbWord = m_speller->suggest(&selection, toDictEncoding(word).constData()); - for (int i = 0; i < nbWord; ++i) { - lst << m_codec->toUnicode(selection[i]); - } - m_speller->free_list(&selection, nbWord); + const auto suggestions = m_speller->suggest(toDictEncoding(word).toStdString()); + for_each (suggestions.begin(), suggestions.end(), [this, &lst](const std::string &suggestion) { + lst << m_codec->toUnicode(suggestion.c_str()); }); return lst; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.48.0/src/ui/highlighter.cpp new/sonnet-5.49.0/src/ui/highlighter.cpp --- old/sonnet-5.48.0/src/ui/highlighter.cpp 2018-07-08 00:34:05.000000000 +0200 +++ new/sonnet-5.49.0/src/ui/highlighter.cpp 2018-08-04 13:03:08.000000000 +0200 @@ -386,7 +386,7 @@ } d->wordCount = 0; d->errorCount = 0; - if (d->automatic) { + if (d->automatic || d->active) { d->rehighlightRequest->start(0); } }
