Hello community, here is the log from the commit of package kded for openSUSE:Factory checked in at 2018-05-18 14:20:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kded (Old) and /work/SRC/openSUSE:Factory/.kded.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kded" Fri May 18 14:20:10 2018 rev:54 rq:607548 version:5.46.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kded/kded.changes 2018-04-19 15:15:52.836000914 +0200 +++ /work/SRC/openSUSE:Factory/.kded.new/kded.changes 2018-05-18 14:20:26.682794020 +0200 @@ -1,0 +2,12 @@ +Sun May 13 21:03:01 UTC 2018 - [email protected] + +- Update to 5.46.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.46.0.php +- Changes since 5.45.0: + * Add platform detection and adjustment to kded +- Dropped patches, now upstream: + * 0001-Add-platform-detection-and-adjustment-to-kded.patch + +------------------------------------------------------------------- Old: ---- 0001-Add-platform-detection-and-adjustment-to-kded.patch kded-5.45.0.tar.xz New: ---- kded-5.46.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kded.spec ++++++ --- /var/tmp/diff_new_pack.YWTQIj/_old 2018-05-18 14:20:27.318770681 +0200 +++ /var/tmp/diff_new_pack.YWTQIj/_new 2018-05-18 14:20:27.318770681 +0200 @@ -17,13 +17,13 @@ %bcond_without lang -%define _tar_path 5.45 +%define _tar_path 5.46 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kded -Version: 5.45.0 +Version: 5.46.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 @@ -52,8 +52,6 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch1: 0001-Add-platform-detection-and-adjustment-to-kded.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -74,7 +72,6 @@ %lang_package %prep %setup -q -%autopatch -p1 %build %cmake_kf5 -d build ++++++ kded-5.45.0.tar.xz -> kded-5.46.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.45.0/CMakeLists.txt new/kded-5.46.0/CMakeLists.txt --- old/kded-5.45.0/CMakeLists.txt 2018-04-07 21:34:09.000000000 +0200 +++ new/kded-5.46.0/CMakeLists.txt 2018-05-05 14:56:41.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.45.0") # handled by release scripts -set(KF5_DEP_VERSION "5.45.0") # handled by release scripts +set(KF5_VERSION "5.46.0") # handled by release scripts +set(KF5_DEP_VERSION "5.46.0") # handled by release scripts project(KDED VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.45.0 NO_MODULE) +find_package(ECM 5.46.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.45.0/src/kded.cpp new/kded-5.46.0/src/kded.cpp --- old/kded-5.45.0/src/kded.cpp 2018-04-07 21:34:09.000000000 +0200 +++ new/kded-5.46.0/src/kded.cpp 2018-05-05 14:56:41.000000000 +0200 @@ -689,6 +689,33 @@ app->setApplicationVersion(QStringLiteral(KDED_VERSION_STRING)); } +static bool detectPlatform(int argc, char **argv) +{ + if (qEnvironmentVariableIsSet("QT_QPA_PLATFORM")) { + return false; + } + for (int i = 0; i < argc; i++) { + if (qstrcmp(argv[i], "-platform") == 0 || + qstrcmp(argv[i], "--platform") == 0 || + QByteArray(argv[i]).startsWith("-platform=") || + QByteArray(argv[i]).startsWith("--platform=")) { + return false; + } + } + const QByteArray sessionType = qgetenv("XDG_SESSION_TYPE"); + if (sessionType.isEmpty()) { + return false; + } + if (qstrcmp(sessionType, "wayland") == 0) { + qputenv("QT_QPA_PLATFORM", "wayland"); + return true; + } else if (qstrcmp(sessionType, "x11") == 0) { + qputenv("QT_QPA_PLATFORM", "xcb"); + return true; + } + return false; +} + extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[]) { #ifdef Q_OS_OSX @@ -710,11 +737,16 @@ // WABA: Make sure not to enable session management. qunsetenv("SESSION_MANAGER"); + const bool unsetQpa = detectPlatform(argc, argv); + // In older versions, QApplication creation was postponed until after // testing for --check, in which case, only a QCoreApplication was created. // Since that option is no longer used at startup, we removed that speed // optimization for code clarity and easier support of standard parameters. QApplication app(argc, argv); + if (unsetQpa) { + qunsetenv("QT_QPA_PLATFORM"); + } setupAppInfo(&app); app.setQuitOnLastWindowClosed(false);
