diff -Nru kemoticons-5.85.0/CMakeLists.txt kemoticons-5.86.0/CMakeLists.txt --- kemoticons-5.85.0/CMakeLists.txt 2021-07-28 09:33:56.000000000 +0000 +++ kemoticons-5.86.0/CMakeLists.txt 2021-09-04 15:44:18.000000000 +0000 @@ -1,18 +1,18 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.85.0") # handled by release scripts -set(KF_DEP_VERSION "5.85.0") # handled by release scripts +set(KF_VERSION "5.86.0") # handled by release scripts +set(KF_DEP_VERSION "5.86.0") # handled by release scripts project(KEmoticons VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.85.0 NO_MODULE) +find_package(ECM 5.86.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -set(REQUIRED_QT_VERSION 5.15.0) +set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui DBus) include(KDEInstallDirs) @@ -47,7 +47,7 @@ # the strings throughout this library are used to search resources # so they don't need translations -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) add_subdirectory(src) add_subdirectory(themes) diff -Nru kemoticons-5.85.0/debian/changelog kemoticons-5.86.0/debian/changelog --- kemoticons-5.85.0/debian/changelog 2021-08-06 18:08:38.000000000 +0000 +++ kemoticons-5.86.0/debian/changelog 2021-09-13 11:47:40.000000000 +0000 @@ -1,8 +1,14 @@ -kemoticons (5.85.0-0ubuntu1~ubuntu21.04~ppa1) hirsute; urgency=high +kemoticons (5.86.0-0ubuntu1~ubuntu21.04~ppa1) hirsute; urgency=medium + + * New upstream release (5.86.0) + + -- Rik Mills Mon, 13 Sep 2021 12:47:40 +0100 + +kemoticons (5.85.0-0ubuntu1) impish; urgency=medium * New upstream release (5.85.0) - -- Rik Mills Fri, 06 Aug 2021 18:08:38 +0000 + -- Rik Mills Fri, 13 Aug 2021 11:26:38 +0100 kemoticons (5.84.0-0ubuntu1) impish; urgency=medium diff -Nru kemoticons-5.85.0/debian/control kemoticons-5.86.0/debian/control --- kemoticons-5.85.0/debian/control 2021-08-06 18:08:38.000000000 +0000 +++ kemoticons-5.86.0/debian/control 2021-09-13 11:47:40.000000000 +0000 @@ -8,12 +8,12 @@ Build-Depends: cmake (>= 3.5~), debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.85.0~), + extra-cmake-modules (>= 5.86.0~), graphviz, - libkf5archive-dev (>= 5.85.0~), - libkf5config-dev (>= 5.85.0~), - libkf5coreaddons-dev (>= 5.85.0~), - libkf5service-dev (>= 5.85.0~), + libkf5archive-dev (>= 5.86.0~), + libkf5config-dev (>= 5.86.0~), + libkf5coreaddons-dev (>= 5.86.0~), + libkf5service-dev (>= 5.86.0~), libqt5sql5-sqlite, pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.14.0~), @@ -51,9 +51,9 @@ Package: libkf5emoticons-dev Section: libdevel Architecture: any -Depends: libkf5archive-dev (>= 5.85.0~), +Depends: libkf5archive-dev (>= 5.86.0~), libkf5emoticons5 (= ${binary:Version}), - libkf5service-dev (>= 5.85.0~), + libkf5service-dev (>= 5.86.0~), qtbase5-dev (>= 5.14.0~), ${misc:Depends}, Breaks: libkf5kdelibs4support-dev (<< 5.54) diff -Nru kemoticons-5.85.0/metainfo.yaml kemoticons-5.86.0/metainfo.yaml --- kemoticons-5.85.0/metainfo.yaml 2021-07-28 09:33:56.000000000 +0000 +++ kemoticons-5.86.0/metainfo.yaml 2021-09-04 15:44:18.000000000 +0000 @@ -6,7 +6,7 @@ - name: Linux - name: FreeBSD - name: Windows - - name: MacOSX + - name: macOS portingAid: false deprecated: false release: true diff -Nru kemoticons-5.85.0/src/core/kemoticons.cpp kemoticons-5.86.0/src/core/kemoticons.cpp --- kemoticons-5.85.0/src/core/kemoticons.cpp 2021-07-28 09:33:56.000000000 +0000 +++ kemoticons-5.86.0/src/core/kemoticons.cpp 2021-09-04 15:44:18.000000000 +0000 @@ -117,7 +117,7 @@ return theme; }; - for (const KPluginMetaData &plugin : qAsConst(m_plugins)) { + for (const KPluginMetaData &plugin : std::as_const(m_plugins)) { const QString fName = plugin.rawData().value(QStringLiteral("X-KDE-EmoticonsFileName")).toString(); const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("emoticons/") + name + QLatin1Char('/') + fName); @@ -129,7 +129,7 @@ } } // KF6: remove support for old plugins - for (const KService::Ptr &service : qAsConst(m_oldStylePlugins)) { + for (const KService::Ptr &service : std::as_const(m_oldStylePlugins)) { const QString fName = service->property(QStringLiteral("X-KDE-EmoticonsFileName")).toString(); const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("emoticons/") + name + QLatin1Char('/') + fName); @@ -275,13 +275,13 @@ if (currentEntry->isDirectory()) { currentDir = dynamic_cast(currentEntry); - for (const KPluginMetaData &plugin : qAsConst(d->m_plugins)) { + for (const KPluginMetaData &plugin : std::as_const(d->m_plugins)) { const QString fName = plugin.rawData().value(QStringLiteral("X-KDE-EmoticonsFileName")).toString(); if (currentDir && currentDir->entry(fName) != nullptr) { foundThemes.append(currentDir->name()); } } - for (const KService::Ptr &service : qAsConst(d->m_oldStylePlugins)) { + for (const KService::Ptr &service : std::as_const(d->m_oldStylePlugins)) { const QString fName = service->property(QStringLiteral("X-KDE-EmoticonsFileName")).toString(); if (currentDir && currentDir->entry(fName) != nullptr) { foundThemes.append(currentDir->name());