Hello community, here is the log from the commit of package kemoticons for openSUSE:Factory checked in at 2015-06-23 12:08:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-05-11 19:48:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kemoticons.new/kemoticons.changes 2015-06-23 12:08:11.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Jun 7 19:07:22 UTC 2015 - [email protected] + +- Update to 5.11.0 + * Cache the theme in the integration plugin + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.11.0.php + +------------------------------------------------------------------- Old: ---- kemoticons-5.10.0.tar.xz New: ---- kemoticons-5.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kemoticons.spec ++++++ --- /var/tmp/diff_new_pack.rj73GV/_old 2015-06-23 12:08:11.000000000 +0200 +++ /var/tmp/diff_new_pack.rj73GV/_new 2015-06-23 12:08:11.000000000 +0200 @@ -17,9 +17,9 @@ %define lname libKF5Emoticons5 -%define _tar_path 5.10 +%define _tar_path 5.11 Name: kemoticons -Version: 5.10.0 +Version: 5.11.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kemoticons-5.10.0.tar.xz -> kemoticons-5.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.10.0/CMakeLists.txt new/kemoticons-5.11.0/CMakeLists.txt --- old/kemoticons-5.10.0/CMakeLists.txt 2015-05-01 17:15:33.000000000 +0200 +++ new/kemoticons-5.11.0/CMakeLists.txt 2015-06-06 11:26:40.000000000 +0200 @@ -2,7 +2,11 @@ project(KEmoticons) -find_package(ECM 5.10.0 REQUIRED NO_MODULE) +include(FeatureSummary) +find_package(ECM 5.11.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) @@ -13,14 +17,14 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -include(FeatureSummary) + include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) -set(KF5_VERSION "5.10.0") # handled by release scripts -set(KF5_DEP_VERSION "5.10.0") # handled by release scripts +set(KF5_VERSION "5.11.0") # handled by release scripts +set(KF5_DEP_VERSION "5.11.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.10.0/src/integrationplugin/ktexttohtml.cpp new/kemoticons-5.11.0/src/integrationplugin/ktexttohtml.cpp --- old/kemoticons-5.10.0/src/integrationplugin/ktexttohtml.cpp 2015-05-01 17:15:33.000000000 +0200 +++ new/kemoticons-5.11.0/src/integrationplugin/ktexttohtml.cpp 2015-06-06 11:26:40.000000000 +0200 @@ -23,6 +23,11 @@ #include <kemoticons.h> #include <kemoticonstheme.h> +#include <QGlobalStatic> + +Q_GLOBAL_STATIC(KEmoticonsTheme, sTheme); + + KTextToHTMLEmoticons::KTextToHTMLEmoticons() { } @@ -31,10 +36,14 @@ bool strictParse, const QStringList &exclude) { - KEmoticonsTheme theme = KEmoticons().theme(); + KEmoticons emoticons; + if (sTheme->themeName() != emoticons.currentThemeName()) { + *sTheme = emoticons.theme(); + } + KEmoticonsTheme::ParseMode mode = KEmoticonsTheme::DefaultParse; if (strictParse) { mode = KEmoticonsTheme::StrictParse; } - return theme.parseEmoticons(text, mode, exclude); + return sTheme->parseEmoticons(text, mode, exclude); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.10.0/src/providers/kde/emoticonstheme_kde.desktop new/kemoticons-5.11.0/src/providers/kde/emoticonstheme_kde.desktop --- old/kemoticons-5.10.0/src/providers/kde/emoticonstheme_kde.desktop 2015-05-01 17:15:33.000000000 +0200 +++ new/kemoticons-5.11.0/src/providers/kde/emoticonstheme_kde.desktop 2015-06-06 11:26:40.000000000 +0200 @@ -40,6 +40,7 @@ Name[nb]=KDE smilefjestema Name[nds]=KDE-Snutensett Name[nl]=KDE-emoticons-thema +Name[nn]=KDE-fjesingtema Name[pa]=KDE ਈਮੋਸ਼ਨ ਥੀਮ Name[pl]=Motyw emotikon KDE Name[pt]=Tema de Ícones Emotivos do KDE
