Hello community, here is the log from the commit of package kemoticons for openSUSE:Factory checked in at 2019-11-12 11:45:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kemoticons (Old) and /work/SRC/openSUSE:Factory/.kemoticons.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kemoticons" Tue Nov 12 11:45:47 2019 rev:71 rq:747108 version:5.64.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kemoticons/kemoticons.changes 2019-10-14 13:35:31.614331837 +0200 +++ /work/SRC/openSUSE:Factory/.kemoticons.new.2990/kemoticons.changes 2019-11-12 11:45:57.330759685 +0100 @@ -1,0 +2,10 @@ +Sun Nov 3 15:46:59 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 5.64.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.64.0.php +- Changes since 5.63.0: + * Use ECMGenerateExportHeader to manage deprecated API better + +------------------------------------------------------------------- Old: ---- kemoticons-5.63.0.tar.xz kemoticons-5.63.0.tar.xz.sig New: ---- kemoticons-5.64.0.tar.xz kemoticons-5.64.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kemoticons.spec ++++++ --- /var/tmp/diff_new_pack.MHsFG3/_old 2019-11-12 11:46:00.046762462 +0100 +++ /var/tmp/diff_new_pack.MHsFG3/_new 2019-11-12 11:46:00.050762466 +0100 @@ -17,7 +17,7 @@ %define lname libKF5Emoticons5 -%define _tar_path 5.63 +%define _tar_path 5.64 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kemoticons -Version: 5.63.0 +Version: 5.64.0 Release: 0 Summary: Emoticon to graphical emoticon text converter License: LGPL-2.1-or-later ++++++ kemoticons-5.63.0.tar.xz -> kemoticons-5.64.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.63.0/CMakeLists.txt new/kemoticons-5.64.0/CMakeLists.txt --- old/kemoticons-5.63.0/CMakeLists.txt 2019-10-06 11:35:10.000000000 +0200 +++ new/kemoticons-5.64.0/CMakeLists.txt 2019-11-02 12:43:52.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.63.0") # handled by release scripts -set(KF5_DEP_VERSION "5.63.0") # handled by release scripts +set(KF5_VERSION "5.64.0") # handled by release scripts +set(KF5_DEP_VERSION "5.64.0") # handled by release scripts project(KEmoticons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.63.0 NO_MODULE) +find_package(ECM 5.64.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) @@ -19,14 +19,15 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) - -include(GenerateExportHeader) +include(ECMGenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMAddQch) include(CMakePackageConfigHelpers) include(ECMQtDeclareLoggingCategory) +set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") @@ -47,6 +48,7 @@ # the strings throughout this library are used to search ressources # so they don't need translations add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) +add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) add_subdirectory(themes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.63.0/docs/Doxyfile.local new/kemoticons-5.64.0/docs/Doxyfile.local --- old/kemoticons-5.63.0/docs/Doxyfile.local 1970-01-01 01:00:00.000000000 +0100 +++ new/kemoticons-5.64.0/docs/Doxyfile.local 2019-11-02 12:43:52.000000000 +0100 @@ -0,0 +1,7 @@ +### KApiDox Project-specific Overrides File + +# define so that deprecated API is not skipped +PREDEFINED += \ + "KEMOTICONS_ENABLE_DEPRECATED_SINCE(x, y)=1" \ + "KEMOTICONS_BUILD_DEPRECATED_SINCE(x, y)=1" \ + "KEMOTICONS_DEPRECATED_VERSION(x, y, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.63.0/src/core/CMakeLists.txt new/kemoticons-5.64.0/src/core/CMakeLists.txt --- old/kemoticons-5.63.0/src/core/CMakeLists.txt 2019-10-06 11:35:10.000000000 +0200 +++ new/kemoticons-5.64.0/src/core/CMakeLists.txt 2019-11-02 12:43:52.000000000 +0100 @@ -10,8 +10,15 @@ ecm_qt_declare_logging_category(kemoticons_LIB_SRCS HEADER kemoticons_core_debug.h IDENTIFIER KEMOTICONS_CORE CATEGORY_NAME kf5.kemoticons.core) add_library(KF5Emoticons ${kemoticons_LIB_SRCS}) -generate_export_header(KF5Emoticons BASE_NAME KEmoticons) add_library(KF5::Emoticons ALIAS KF5Emoticons) +ecm_generate_export_header(KF5Emoticons + BASE_NAME KEmoticons + GROUP_BASE_NAME KF + VERSION ${KF5_VERSION} + DEPRECATED_BASE_VERSION 0 + DEPRECATION_VERSIONS 5.0 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} +) target_include_directories(KF5Emoticons INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KEmoticons>") @@ -70,6 +77,7 @@ KEMOTICONS_EXPORT KEMOTICONS_DEPRECATED KEMOTICONS_DEPRECATED_EXPORT + "KEMOTICONS_DEPRECATED_VERSION(x, y, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.63.0/src/core/kemoticonsprovider.cpp new/kemoticons-5.64.0/src/core/kemoticonsprovider.cpp --- old/kemoticons-5.63.0/src/core/kemoticonsprovider.cpp 2019-10-06 11:35:10.000000000 +0200 +++ new/kemoticons-5.64.0/src/core/kemoticonsprovider.cpp 2019-11-02 12:43:52.000000000 +0100 @@ -49,10 +49,12 @@ { } +#if KEMOTICONS_BUILD_DEPRECATED_SINCE(5, 0) void KEmoticonsProvider::save() { saveTheme(); } +#endif QString KEmoticonsProvider::themeName() const { @@ -79,10 +81,12 @@ d->m_emoticonsMap.clear(); } +#if KEMOTICONS_BUILD_DEPRECATED_SINCE(5, 0) void KEmoticonsProvider::addEmoticonsMap(QString key, QStringList value) { addMapItem(key, value); } +#endif void KEmoticonsProvider::addMapItem(QString key, QStringList value) { @@ -91,10 +95,12 @@ } } +#if KEMOTICONS_BUILD_DEPRECATED_SINCE(5, 0) void KEmoticonsProvider::removeEmoticonsMap(QString key) { removeMapItem(key); } +#endif void KEmoticonsProvider::removeMapItem(QString key) { @@ -111,10 +117,12 @@ return d->m_emoticonsIndex; } +#if KEMOTICONS_BUILD_DEPRECATED_SINCE(5, 0) void KEmoticonsProvider::createNew() { newTheme(); } +#endif void KEmoticonsProvider::setThemePath(const QString &path) { @@ -132,10 +140,12 @@ return file.copy(newPath); } +#if KEMOTICONS_BUILD_DEPRECATED_SINCE(5, 0) void KEmoticonsProvider::addEmoticonIndex(const QString &path, const QStringList &emoList) { addIndexItem(path, emoList); } +#endif void KEmoticonsProvider::addIndexItem(const QString &path, const QStringList &emoList) { @@ -163,10 +173,12 @@ } } +#if KEMOTICONS_BUILD_DEPRECATED_SINCE(5, 0) void KEmoticonsProvider::removeEmoticonIndex(const QString &path, const QStringList &emoList) { removeIndexItem(path, emoList); } +#endif void KEmoticonsProvider::removeIndexItem(const QString &path, const QStringList &emoList) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.63.0/src/core/kemoticonsprovider.h new/kemoticons-5.64.0/src/core/kemoticonsprovider.h --- old/kemoticons-5.63.0/src/core/kemoticonsprovider.h 2019-10-06 11:35:10.000000000 +0200 +++ new/kemoticons-5.64.0/src/core/kemoticonsprovider.h 2019-11-02 12:43:52.000000000 +0100 @@ -89,13 +89,14 @@ */ virtual bool addEmoticon(const QString &emo, const QString &text, AddEmoticonOption option = DoNotCopy) = 0; +#if KEMOTICONS_ENABLE_DEPRECATED_SINCE(5, 0) /** * Saves the emoticon theme * * @deprecated since 5.0, use saveTheme() instead */ -#ifndef KEMOTICONS_NO_DEPRECATED - KEMOTICONS_DEPRECATED void save(); + KEMOTICONS_DEPRECATED_VERSION(5, 0, "Use KEmoticonsProvider::saveTheme()") + void save(); #endif /** @@ -135,13 +136,14 @@ */ QHash<QChar, QList<Emoticon> > emoticonsIndex() const; +#if KEMOTICONS_ENABLE_DEPRECATED_SINCE(5, 0) /** * Creates a new theme * * @deprecated since 5.0, use newTheme() instead */ -#ifndef KEMOTICONS_NO_DEPRECATED - KEMOTICONS_DEPRECATED void createNew(); + KEMOTICONS_DEPRECATED_VERSION(5, 0, "Use KEmoticonsProvider::newTheme()") + void createNew(); #endif /** @@ -190,13 +192,14 @@ */ void clearEmoticonsMap(); +#if KEMOTICONS_ENABLE_DEPRECATED_SINCE(5, 0) /** * Inserts a new item in the emoticon map * * @deprecated since 5.0, use addMapItem() instead */ -#ifndef KEMOTICONS_NO_DEPRECATED - KEMOTICONS_DEPRECATED void addEmoticonsMap(QString key, QStringList value); + KEMOTICONS_DEPRECATED_VERSION(5, 0, "Use KEmoticonsProvider::addMapItem(QString, QStringList)") + void addEmoticonsMap(QString key, QStringList value); #endif /** @@ -207,13 +210,14 @@ //FIXME kf6: use const'ref here void addMapItem(QString key, QStringList value); +#if KEMOTICONS_ENABLE_DEPRECATED_SINCE(5, 0) /** * Removes an item from the emoticon map * * @deprecated since 5.0, use removeMapItem() instead */ -#ifndef KEMOTICONS_NO_DEPRECATED - KEMOTICONS_DEPRECATED void removeEmoticonsMap(QString key); + KEMOTICONS_DEPRECATED_VERSION(5, 0, "Use KEmoticonsProvider::removeMapItem(QString)") + void removeEmoticonsMap(QString key); #endif /** * Removes an item from the emoticon map @@ -222,6 +226,7 @@ */ void removeMapItem(QString key); +#if KEMOTICONS_ENABLE_DEPRECATED_SINCE(5, 0) /** * Adds an emoticon to the index * @param path path to the emoticon @@ -229,8 +234,8 @@ * * @deprecated since 5.0, use addIndexItem() instead */ -#ifndef KEMOTICONS_NO_DEPRECATED - KEMOTICONS_DEPRECATED void addEmoticonIndex(const QString &path, const QStringList &emoList); + KEMOTICONS_DEPRECATED_VERSION(5, 0, "Use KEmoticonsProvider::addIndexItem(const QString &, const QStringList &)") + void addEmoticonIndex(const QString &path, const QStringList &emoList); #endif /** * Adds an emoticon to the index @@ -241,6 +246,7 @@ */ void addIndexItem(const QString &path, const QStringList &emoList); +#if KEMOTICONS_ENABLE_DEPRECATED_SINCE(5, 0) /** * Removes an emoticon from the index * @param path path to the emoticon @@ -248,8 +254,8 @@ * * @deprecated since 5.0, use removeIndexItem() instead */ -#ifndef KEMOTICONS_NO_DEPRECATED - KEMOTICONS_DEPRECATED void removeEmoticonIndex(const QString &path, const QStringList &emoList); + KEMOTICONS_DEPRECATED_VERSION(5, 0, "Use KEmoticonsProvider::removeIndexItem(const QString &, const QStringList &)") + void removeEmoticonIndex(const QString &path, const QStringList &emoList); #endif /** * Removes an emoticon from the index diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.63.0/src/core/kemoticonstheme.cpp new/kemoticons-5.64.0/src/core/kemoticonstheme.cpp --- old/kemoticons-5.63.0/src/core/kemoticonstheme.cpp 2019-10-06 11:35:10.000000000 +0200 +++ new/kemoticons-5.64.0/src/core/kemoticonstheme.cpp 2019-11-02 12:43:52.000000000 +0100 @@ -61,6 +61,7 @@ { } +#if KEMOTICONS_BUILD_DEPRECATED_SINCE(5, 0) bool KEmoticonsTheme::loadTheme(const QString &path) { if (!d->provider) { @@ -69,7 +70,9 @@ return d->provider->loadTheme(path); } +#endif +#if KEMOTICONS_BUILD_DEPRECATED_SINCE(5, 0) bool KEmoticonsTheme::removeEmoticon(const QString &emo) { if (!d->provider) { @@ -78,7 +81,9 @@ return d->provider->removeEmoticon(emo); } +#endif +#if KEMOTICONS_BUILD_DEPRECATED_SINCE(5, 0) bool KEmoticonsTheme::addEmoticon(const QString &emo, const QString &text, KEmoticonsProvider::AddEmoticonOption option) { if (!d->provider) { @@ -87,7 +92,9 @@ return d->provider->addEmoticon(emo, text, option); } +#endif +#if KEMOTICONS_BUILD_DEPRECATED_SINCE(5, 0) void KEmoticonsTheme::save() { if (!d->provider) { @@ -96,6 +103,7 @@ d->provider->saveTheme(); } +#endif QString KEmoticonsTheme::themeName() const { @@ -142,6 +150,7 @@ return d->provider->emoticonsMap(); } +#if KEMOTICONS_BUILD_DEPRECATED_SINCE(5, 0) void KEmoticonsTheme::createNew() { if (!d->provider) { @@ -150,6 +159,7 @@ d->provider->newTheme(); } +#endif QString KEmoticonsTheme::parseEmoticons(const QString &text, ParseMode mode, const QStringList &exclude) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.63.0/src/core/kemoticonstheme.h new/kemoticons-5.64.0/src/core/kemoticonstheme.h --- old/kemoticons-5.63.0/src/core/kemoticonstheme.h 2019-10-06 11:35:10.000000000 +0200 +++ new/kemoticons-5.64.0/src/core/kemoticonstheme.h 2019-11-02 12:43:52.000000000 +0100 @@ -132,6 +132,7 @@ */ QList<Token> tokenize(const QString &message, ParseMode mode = DefaultParse) const; +#if KEMOTICONS_ENABLE_DEPRECATED_SINCE(5, 0) /** * Loads the emoticon theme inside the directory @p path * @param path path to the directory @@ -139,10 +140,11 @@ * * @deprecated since 5.0, subclass KEmoticonsProvider instead */ -#ifndef KEMOTICONS_NO_DEPRECATED - KEMOTICONS_DEPRECATED bool loadTheme(const QString &path); + KEMOTICONS_DEPRECATED_VERSION(5, 0, "Subclass KEmoticonsProvider") + bool loadTheme(const QString &path); #endif +#if KEMOTICONS_ENABLE_DEPRECATED_SINCE(5, 0) /** * Removes the emoticon @p emo. This doesn't delete the image file. * @code @@ -154,10 +156,11 @@ * * @deprecated since 5.0, subclass KEmoticonsProvider instead */ -#ifndef KEMOTICONS_NO_DEPRECATED - KEMOTICONS_DEPRECATED bool removeEmoticon(const QString &emo); + KEMOTICONS_DEPRECATED_VERSION(5, 0, "Subclass KEmoticonsProvider") + bool removeEmoticon(const QString &emo); #endif +#if KEMOTICONS_ENABLE_DEPRECATED_SINCE(5, 0) /** * Adds the emoticon @p emo with text @p text * @code @@ -172,18 +175,20 @@ * * @deprecated since 5.0, subclass KEmoticonsProvider instead */ -#ifndef KEMOTICONS_NO_DEPRECATED - KEMOTICONS_DEPRECATED bool addEmoticon(const QString &emo, - const QString &text, - KEmoticonsProvider::AddEmoticonOption option = KEmoticonsProvider::DoNotCopy); + KEMOTICONS_DEPRECATED_VERSION(5, 0, "Subclass KEmoticonsProvider") + bool addEmoticon(const QString &emo, + const QString &text, + KEmoticonsProvider::AddEmoticonOption option = KEmoticonsProvider::DoNotCopy); #endif + +#if KEMOTICONS_ENABLE_DEPRECATED_SINCE(5, 0) /** * Saves the emoticon theme * * @deprecated since 5.0, subclass KEmoticonsProvider instead */ -#ifndef KEMOTICONS_NO_DEPRECATED - KEMOTICONS_DEPRECATED void save(); + KEMOTICONS_DEPRECATED_VERSION(5, 0, "Subclass KEmoticonsProvider") + void save(); #endif /** @@ -212,13 +217,14 @@ */ QHash<QString, QStringList> emoticonsMap() const; +#if KEMOTICONS_ENABLE_DEPRECATED_SINCE(5, 0) /** * Creates a new theme * * @deprecated since 5.0, subclass KEmoticonsProvider instead */ -#ifndef KEMOTICONS_NO_DEPRECATED - KEMOTICONS_DEPRECATED void createNew(); + KEMOTICONS_DEPRECATED_VERSION(5, 0, "Subclass KEmoticonsProvider") + void createNew(); #endif /**
