Hello community, here is the log from the commit of package sonnet for openSUSE:Factory checked in at 2018-10-01 08:10:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sonnet (Old) and /work/SRC/openSUSE:Factory/.sonnet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sonnet" Mon Oct 1 08:10:52 2018 rev:59 rq:636041 version:5.50.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sonnet/sonnet.changes 2018-08-24 16:58:09.789649109 +0200 +++ /work/SRC/openSUSE:Factory/.sonnet.new/sonnet.changes 2018-10-01 08:11:07.574201764 +0200 @@ -1,0 +2,14 @@ +Thu Sep 13 21:58:47 UTC 2018 - [email protected] + +- Update to 5.50.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.50.0.php +- Changes since 5.49.0: + * hunspell: Restore build with hunspell <=v1.5.0 + * Include hunspell headers as system includes + * Fix a typo +- Dropped patches, superseded by upstream changes: + * Fix_Leap_42_3_build.patch + +------------------------------------------------------------------- Old: ---- Fix_Leap_42_3_build.patch sonnet-5.49.0.tar.xz New: ---- sonnet-5.50.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sonnet.spec ++++++ --- /var/tmp/diff_new_pack.KhSxqB/_old 2018-10-01 08:11:08.002201536 +0200 +++ /var/tmp/diff_new_pack.KhSxqB/_new 2018-10-01 08:11:08.002201536 +0200 @@ -12,19 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define sonum 5 -%define _tar_path 5.49 +%define _tar_path 5.50 # 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.49.0 +Version: 5.50.0 Release: 0 Summary: KDE spell checking library License: LGPL-2.1-or-later @@ -32,8 +32,6 @@ 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 @@ -100,9 +98,6 @@ %prep %setup -q -%if 0%{?suse_version} <= 1315 -%patch0 -p1 -%endif %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert ++++++ sonnet-5.49.0.tar.xz -> sonnet-5.50.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.49.0/CMakeLists.txt new/sonnet-5.50.0/CMakeLists.txt --- old/sonnet-5.49.0/CMakeLists.txt 2018-08-04 13:03:08.000000000 +0200 +++ new/sonnet-5.50.0/CMakeLists.txt 2018-09-02 21:40:58.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.49.0") # handled by release scripts +set(KF5_VERSION "5.50.0") # handled by release scripts project(Sonnet VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.49.0 NO_MODULE) +find_package(ECM 5.50.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.49.0/po/zh_CN/sonnet5_qt.po new/sonnet-5.50.0/po/zh_CN/sonnet5_qt.po --- old/sonnet-5.49.0/po/zh_CN/sonnet5_qt.po 2018-08-04 13:03:08.000000000 +0200 +++ new/sonnet-5.50.0/po/zh_CN/sonnet5_qt.po 2018-09-02 21:40:58.000000000 +0200 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-07-24 08:41\n" -"Last-Translator: guoyunhebrave <[email protected]>\n" +"PO-Revision-Date: 2018-08-30 13:09\n" +"Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.49.0/src/plugins/hunspell/CMakeLists.txt new/sonnet-5.50.0/src/plugins/hunspell/CMakeLists.txt --- old/sonnet-5.49.0/src/plugins/hunspell/CMakeLists.txt 2018-08-04 13:03:08.000000000 +0200 +++ new/sonnet-5.50.0/src/plugins/hunspell/CMakeLists.txt 2018-09-02 21:40:58.000000000 +0200 @@ -1,18 +1,21 @@ - -########### next target ############### - -include_directories( ${HUNSPELL_INCLUDE_DIRS} ) set(sonnet_hunspell_PART_SRCS hunspellclient.cpp hunspelldict.cpp ) ecm_qt_declare_logging_category(sonnet_hunspell_PART_SRCS HEADER hunspelldebug.h IDENTIFIER SONNET_HUNSPELL CATEGORY_NAME sonnet.plugins.hunspell) -add_library(sonnet_hunspell MODULE ${sonnet_hunspell_PART_SRCS}) +# see: https://phabricator.kde.org/R246:0a96acf251baa5c9dd042d093ab2bf8fcee10502 +set(USE_OLD_HUNSPELL_API TRUE) +if (PKG_HUNSPELL_VERSION GREATER "1.5.0") + set(USE_OLD_HUNSPELL_API FALSE) # new API introduced in v1.5.1 (cf. https://github.com/hunspell/hunspell/commit/8006703dafeebce19f2144c5cf180812eb99693a) +endif() +message(STATUS "Using old hunspell API: ${USE_OLD_HUNSPELL_API}") + +configure_file(config-hunspell.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-hunspell.h) +add_library(sonnet_hunspell MODULE ${sonnet_hunspell_PART_SRCS}) +target_include_directories(sonnet_hunspell SYSTEM PUBLIC ${HUNSPELL_INCLUDE_DIRS}) target_link_libraries(sonnet_hunspell PRIVATE KF5::SonnetCore ${HUNSPELL_LIBRARIES}) target_compile_definitions(sonnet_hunspell PRIVATE DEFINITIONS SONNET_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}") install(TARGETS sonnet_hunspell DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/sonnet/) - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.49.0/src/plugins/hunspell/config-hunspell.h.cmake new/sonnet-5.50.0/src/plugins/hunspell/config-hunspell.h.cmake --- old/sonnet-5.49.0/src/plugins/hunspell/config-hunspell.h.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/sonnet-5.50.0/src/plugins/hunspell/config-hunspell.h.cmake 2018-09-02 21:40:58.000000000 +0200 @@ -0,0 +1 @@ +#cmakedefine01 USE_OLD_HUNSPELL_API diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.49.0/src/plugins/hunspell/hunspelldict.cpp new/sonnet-5.50.0/src/plugins/hunspell/hunspelldict.cpp --- old/sonnet-5.49.0/src/plugins/hunspell/hunspelldict.cpp 2018-08-04 13:03:08.000000000 +0200 +++ new/sonnet-5.50.0/src/plugins/hunspell/hunspelldict.cpp 2018-09-02 21:40:58.000000000 +0200 @@ -18,7 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA */ + #include "hunspelldict.h" + +#include "config-hunspell.h" #include "hunspelldebug.h" #include <QFile> @@ -102,9 +105,16 @@ if (!m_speller) { return false; } + +#if USE_OLD_HUNSPELL_API + int result = m_speller->spell(toDictEncoding(word).constData()); + qCDebug(SONNET_HUNSPELL) << " result :" << result; + return result != 0; +#else bool result = m_speller->spell(toDictEncoding(word).toStdString()); qCDebug(SONNET_HUNSPELL) << " result :" << result; return result; +#endif } QStringList HunspellDict::suggest(const QString &word) const @@ -112,10 +122,21 @@ if (!m_speller) { return QStringList(); } + QStringList lst; +#if USE_OLD_HUNSPELL_API + char **selection; + 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); +#else 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()); }); +#endif + return lst; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.49.0/src/plugins/voikko/voikkoclient.cpp new/sonnet-5.50.0/src/plugins/voikko/voikkoclient.cpp --- old/sonnet-5.49.0/src/plugins/voikko/voikkoclient.cpp 2018-08-04 13:03:08.000000000 +0200 +++ new/sonnet-5.50.0/src/plugins/voikko/voikkoclient.cpp 2018-09-02 21:40:58.000000000 +0200 @@ -36,7 +36,7 @@ for (int i = 0; dictionaries[i] != nullptr; ++i) { QString language = QString::fromUtf8(dictionaries[i]); m_supportedLanguages.append(language); - qCDebug(SONNET_VOIKKO) << "Found dictionary for langauge:" << language; + qCDebug(SONNET_VOIKKO) << "Found dictionary for language:" << language; } voikkoFreeCstrArray(dictionaries); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.49.0/src/plugins/voikko/voikkodict.cpp new/sonnet-5.50.0/src/plugins/voikko/voikkodict.cpp --- old/sonnet-5.49.0/src/plugins/voikko/voikkodict.cpp 2018-08-04 13:03:08.000000000 +0200 +++ new/sonnet-5.50.0/src/plugins/voikko/voikkodict.cpp 2018-09-02 21:40:58.000000000 +0200 @@ -263,7 +263,7 @@ : SpellerPlugin(language) , d(new VoikkoDictPrivate(language, this)) { - qCDebug(SONNET_VOIKKO) << "Loading dictionary for langauge:" << language; + qCDebug(SONNET_VOIKKO) << "Loading dictionary for language:" << language; } VoikkoDict::~VoikkoDict()
