Hello community, here is the log from the commit of package kemoticons for openSUSE:Factory checked in at 2016-04-12 19:16:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kemoticons (Old) and /work/SRC/openSUSE:Factory/.kemoticons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kemoticons" Changes: -------- --- /work/SRC/openSUSE:Factory/kemoticons/kemoticons.changes 2016-03-16 10:29:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kemoticons.new/kemoticons.changes 2016-04-12 19:16:25.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Apr 4 14:20:10 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.21.0 (boo#974793) + * KEmoticons: fix crash when loadProvider fails for some reason + * Upgrade Qt version requirement to 5.4.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.21.0.php + +------------------------------------------------------------------- Old: ---- kemoticons-5.20.0.tar.xz New: ---- kemoticons-5.21.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kemoticons.spec ++++++ --- /var/tmp/diff_new_pack.luG1Jf/_old 2016-04-12 19:16:26.000000000 +0200 +++ /var/tmp/diff_new_pack.luG1Jf/_new 2016-04-12 19:16:26.000000000 +0200 @@ -17,9 +17,9 @@ %define lname libKF5Emoticons5 -%define _tar_path 5.20 +%define _tar_path 5.21 Name: kemoticons -Version: 5.20.0 +Version: 5.21.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -29,9 +29,9 @@ BuildRequires: kconfig-devel >= %{_tar_path} BuildRequires: kf5-filesystem BuildRequires: kservice-devel >= %{_tar_path} -BuildRequires: cmake(Qt5Gui) >= 5.3.0 -BuildRequires: cmake(Qt5Test) >= 5.3.0 -BuildRequires: cmake(Qt5Widgets) >= 5.3.0 +BuildRequires: cmake(Qt5Gui) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 Summary: Convert text emoticons to graphical emoticons License: LGPL-2.1+ Group: System/GUI/KDE @@ -62,7 +62,7 @@ Requires: extra-cmake-modules Requires: karchive-devel >= %{_tar_path} Requires: kservice-devel >= %{_tar_path} -Requires: cmake(Qt5Gui) >= 5.3.0 +Requires: cmake(Qt5Gui) >= 5.4.0 %description devel KEmoticons converts emoticons from text to a graphical representation with ++++++ kemoticons-5.20.0.tar.xz -> kemoticons-5.21.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.20.0/CMakeLists.txt new/kemoticons-5.21.0/CMakeLists.txt --- old/kemoticons-5.20.0/CMakeLists.txt 2016-03-04 23:15:32.000000000 +0100 +++ new/kemoticons-5.21.0/CMakeLists.txt 2016-04-03 22:31:21.000000000 +0200 @@ -3,14 +3,14 @@ project(KEmoticons) include(FeatureSummary) -find_package(ECM 5.20.0 NO_MODULE) +find_package(ECM 5.21.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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -set(REQUIRED_QT_VERSION 5.3.0) +set(REQUIRED_QT_VERSION 5.4.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) include(KDEInstallDirs) @@ -23,8 +23,8 @@ include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) -set(KF5_VERSION "5.20.0") # handled by release scripts -set(KF5_DEP_VERSION "5.20.0") # handled by release scripts +set(KF5_VERSION "5.21.0") # handled by release scripts +set(KF5_DEP_VERSION "5.21.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KEMOTICONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kemoticons_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.20.0/src/core/kemoticons.cpp new/kemoticons-5.21.0/src/core/kemoticons.cpp --- old/kemoticons-5.20.0/src/core/kemoticons.cpp 2016-03-04 23:15:32.000000000 +0100 +++ new/kemoticons-5.21.0/src/core/kemoticons.cpp 2016-04-03 22:31:21.000000000 +0200 @@ -102,11 +102,13 @@ if (QFile::exists(path)) { KEmoticonsProvider *provider = loadProvider(m_loaded.at(i)); - KEmoticonsTheme theme(provider); - provider->loadTheme(path); - m_themes.insert(name, theme); - m_fileWatcher.addPath(path); - return theme; + if (provider) { + KEmoticonsTheme theme(provider); + provider->loadTheme(path); + m_themes.insert(name, theme); + m_fileWatcher.addPath(path); + return theme; + } } } return KEmoticonsTheme(); @@ -173,12 +175,15 @@ KEmoticonsTheme KEmoticons::newTheme(const QString &name, const KService::Ptr &service) { KEmoticonsProvider *provider = d->loadProvider(service); - KEmoticonsTheme theme(provider); - theme.setThemeName(name); + if (provider) { + KEmoticonsTheme theme(provider); + theme.setThemeName(name); - provider->newTheme(); + provider->newTheme(); - return theme; + return theme; + } + return KEmoticonsTheme(); } QStringList KEmoticons::installTheme(const QString &archiveName)
