Hello community, here is the log from the commit of package krunner for openSUSE:Factory checked in at 2019-12-18 14:41:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krunner (Old) and /work/SRC/openSUSE:Factory/.krunner.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krunner" Wed Dec 18 14:41:30 2019 rev:71 rq:757060 version:5.65.0 Changes: -------- --- /work/SRC/openSUSE:Factory/krunner/krunner.changes 2019-11-12 11:49:44.414991900 +0100 +++ /work/SRC/openSUSE:Factory/.krunner.new.4691/krunner.changes 2019-12-18 14:43:22.537802968 +0100 @@ -1,0 +2,13 @@ +Sun Dec 8 11:18:48 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 5.65.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.65.0.php +- Changes since 5.64.0: + * Use ECMGenerateExportHeader to manage deprecated API better + * Include KDE CMake settings macros as first + * KRunner: port away from deprecated KF5 API + * Remove unused variable "package" + +------------------------------------------------------------------- Old: ---- krunner-5.64.0.tar.xz krunner-5.64.0.tar.xz.sig New: ---- krunner-5.65.0.tar.xz krunner-5.65.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krunner.spec ++++++ --- /var/tmp/diff_new_pack.zoiEV7/_old 2019-12-18 14:43:23.049803202 +0100 +++ /var/tmp/diff_new_pack.zoiEV7/_new 2019-12-18 14:43:23.049803202 +0100 @@ -1,7 +1,7 @@ # # spec file for package krunner # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ %define lname libKF5Runner5 -%define _tar_path 5.64 +%define _tar_path 5.65 # 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: krunner -Version: 5.64.0 +Version: 5.65.0 Release: 0 Summary: Plugins responsible for better integration of Qt applications in KDE Workspace License: LGPL-2.1-or-later ++++++ krunner-5.64.0.tar.xz -> krunner-5.65.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.64.0/CMakeLists.txt new/krunner-5.65.0/CMakeLists.txt --- old/krunner-5.64.0/CMakeLists.txt 2019-11-02 12:46:05.000000000 +0100 +++ new/krunner-5.65.0/CMakeLists.txt 2019-12-07 20:45:21.000000000 +0100 @@ -1,29 +1,31 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.64.0") # handled by release scripts -set(KF5_DEP_VERSION "5.64.0") # handled by release scripts +set(KF5_VERSION "5.65.0") # handled by release scripts +set(KF5_DEP_VERSION "5.65.0") # handled by release scripts project(KRunner VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.64.0 NO_MODULE) +find_package(ECM 5.65.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}) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -include(GenerateExportHeader) +include(ECMGenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMAddQch) include(CMakePackageConfigHelpers) -include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -include(KDECMakeSettings) include(KDEPackageAppTemplates) 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)") @@ -53,7 +55,8 @@ list(APPEND CMAKE_AUTOMOC_MACRO_NAMES ${KRunner_AUTOMOC_MACRO_NAMES}) endif() add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x053f00) +add_definitions(-DPLASMA_DISABLE_DEPRECATED_BEFORE_AND_AT=0x050500) # needed because we use Plasma::Package in the API add_definitions(-DQT_NO_FOREACH) # Subdirectories diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.64.0/docs/Doxyfile.local new/krunner-5.65.0/docs/Doxyfile.local --- old/krunner-5.64.0/docs/Doxyfile.local 1970-01-01 01:00:00.000000000 +0100 +++ new/krunner-5.65.0/docs/Doxyfile.local 2019-12-07 20:45:21.000000000 +0100 @@ -0,0 +1,8 @@ +### KApiDox Project-specific Overrides File + +# define so that deprecated API is not skipped +PREDEFINED += \ + "PLASMA_ENABLE_DEPRECATED_SINCE(x, y)=1" \ + "KRUNNER_ENABLE_DEPRECATED_SINCE(x, y)=1" \ + "KRUNNER_BUILD_DEPRECATED_SINCE(x, y)=1" \ + "KRUNNER_DEPRECATED_VERSION(x, y, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.64.0/src/CMakeLists.txt new/krunner-5.65.0/src/CMakeLists.txt --- old/krunner-5.64.0/src/CMakeLists.txt 2019-11-02 12:46:05.000000000 +0100 +++ new/krunner-5.65.0/src/CMakeLists.txt 2019-12-07 20:45:21.000000000 +0100 @@ -13,12 +13,19 @@ add_library(KF5Runner ${KF5Runner_SRCS}) - -generate_export_header(KF5Runner BASE_NAME KRunner) add_library(KF5::Runner ALIAS KF5Runner) +ecm_generate_export_header(KF5Runner + BASE_NAME KRunner + GROUP_BASE_NAME KF + VERSION ${KF5_VERSION} + DEPRECATED_BASE_VERSION 0 + DEPRECATION_VERSIONS 5.28 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} +) +set(KRunner_BUILD_INCLUDE_DIRS ${KRunner_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(KF5Runner INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KRunner>") -target_include_directories(KF5Runner PUBLIC "$<BUILD_INTERFACE:${KRunner_BINARY_DIR};${CMAKE_CURRENT_BINARY_DIR}>") +target_include_directories(KF5Runner PUBLIC "$<BUILD_INTERFACE:${KRunner_BUILD_INCLUDE_DIRS}>") target_link_libraries(KF5Runner @@ -95,10 +102,15 @@ MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" LINK_QCHS Qt5Core_QCH + INCLUDE_DIRS + ${KRunner_BUILD_INCLUDE_DIRS} BLANK_MACROS KRUNNER_EXPORT KRUNNER_DEPRECATED KRUNNER_DEPRECATED_EXPORT + "KRUNNER_DEPRECATED_VERSION(x, y, t)" + PREDEFINED_MACROS + "PLASMA_ENABLE_DEPRECATED_SINCE(x, y)=1" 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/krunner-5.64.0/src/abstractrunner.cpp new/krunner-5.65.0/src/abstractrunner.cpp --- old/krunner-5.64.0/src/abstractrunner.cpp 2019-11-02 12:46:05.000000000 +0100 +++ new/krunner-5.65.0/src/abstractrunner.cpp 2019-12-07 20:45:21.000000000 +0100 @@ -31,7 +31,9 @@ #include <ksharedconfig.h> #include <kservicetypetrader.h> #include <klocalizedstring.h> -#include <Plasma/PluginLoader> +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 65) +#include <Plasma/Package> +#endif #include <qstandardpaths.h> #include "querymatch.h" @@ -323,11 +325,12 @@ return d->runnerDescription; } +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 65) Package AbstractRunner::package() const { - return d->package ? *d->package : Package(); + return Package(); } - +#endif void AbstractRunner::init() { @@ -360,7 +363,6 @@ blackListed(RunnerContext::None), runner(r), fastRuns(0), - package(nullptr), defaultSyntax(nullptr), hasRunOptions(false), suspendMatching(false) @@ -369,8 +371,6 @@ AbstractRunnerPrivate::~AbstractRunnerPrivate() { - delete package; - package = nullptr; } void AbstractRunnerPrivate::init(const KService::Ptr service) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.64.0/src/abstractrunner.h new/krunner-5.65.0/src/abstractrunner.h --- old/krunner-5.64.0/src/abstractrunner.h 2019-11-02 12:46:05.000000000 +0100 +++ new/krunner-5.65.0/src/abstractrunner.h 2019-12-07 20:45:21.000000000 +0100 @@ -33,6 +33,7 @@ #include "runnercontext.h" #include "runnersyntax.h" #include <plasma_version.h> +#include <plasma/plasma_export.h> // for PLASMA_ENABLE_DEPRECATED_SINCE class QAction; class QMimeData; @@ -242,6 +243,8 @@ */ QIcon icon() const; +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 65) // not 5.28 here, this KRUNNER visibility control only added at 5.65 +#if PLASMA_ENABLE_DEPRECATED_SINCE(5, 28) // Plasma::Package is defined with this condition /** * Accessor for the associated Package object if any. * @@ -249,8 +252,12 @@ * the runner. * * @return the Package object, which may be invalid + * @deprecated since 5.28, use KPackage::Package instead, no accessor in this class **/ + KRUNNER_DEPRECATED_VERSION(5, 28, "No longer use, feature removed") Package package() const; +#endif +#endif /** * Signal runner to reload its configuration. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.64.0/src/abstractrunner_p.h new/krunner-5.65.0/src/abstractrunner_p.h --- old/krunner-5.64.0/src/abstractrunner_p.h 2019-11-02 12:46:05.000000000 +0100 +++ new/krunner-5.65.0/src/abstractrunner_p.h 2019-12-07 20:45:21.000000000 +0100 @@ -44,7 +44,6 @@ AbstractRunner *runner; int fastRuns; QReadWriteLock speedLock; - Package *package; QHash<QString, QAction*> actions; QList<RunnerSyntax> syntaxes; RunnerSyntax *defaultSyntax;
