Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2020-01-14 21:01:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel" Tue Jan 14 21:01:08 2020 rev:77 rq:763458 version:5.66.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2019-12-18 14:42:44.993785796 +0100 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new.6675/kglobalaccel.changes 2020-01-14 21:04:33.318687103 +0100 @@ -1,0 +2,12 @@ +Sun Jan 5 09:02:08 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.66.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.66.0.php +- Changes since 5.65.0: + * Make it compile against qt5.15 + * insertMulti is already a QMultiHash. + * Update the obsolete projects.kde.org URL + +------------------------------------------------------------------- Old: ---- kglobalaccel-5.65.0.tar.xz kglobalaccel-5.65.0.tar.xz.sig New: ---- kglobalaccel-5.66.0.tar.xz kglobalaccel-5.66.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.IP7ZIK/_old 2020-01-14 21:04:34.226687524 +0100 +++ /var/tmp/diff_new_pack.IP7ZIK/_new 2020-01-14 21:04:34.250687534 +0100 @@ -1,7 +1,7 @@ # # spec file for package kglobalaccel # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ %define lname libKF5GlobalAccel5 -%define _tar_path 5.65 +%define _tar_path 5.66 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kglobalaccel -Version: 5.65.0 +Version: 5.66.0 Release: 0 Summary: Global desktop keyboard shortcuts License: LGPL-2.1-or-later ++++++ kglobalaccel-5.65.0.tar.xz -> kglobalaccel-5.66.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.65.0/CMakeLists.txt new/kglobalaccel-5.66.0/CMakeLists.txt --- old/kglobalaccel-5.65.0/CMakeLists.txt 2019-12-07 22:43:05.000000000 +0100 +++ new/kglobalaccel-5.66.0/CMakeLists.txt 2020-01-04 11:07:54.000000000 +0100 @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.65.0") # handled by release scripts -set(KF5_DEP_VERSION "5.65.0") # handled by release scripts +set(KF5_VERSION "5.66.0") # handled by release scripts +set(KF5_DEP_VERSION "5.66.0") # handled by release scripts project(KGlobalAccel VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -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";) +find_package(ECM 5.66.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}) @@ -36,7 +36,7 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION 5.11.0) +set(REQUIRED_QT_VERSION 5.12.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets) # Dependencies of runtime component @@ -64,7 +64,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) endif() add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x053f00) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054100) # Subdirectories if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ecm_install_po_files_as_qm(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.65.0/src/kglobalaccel.cpp new/kglobalaccel-5.66.0/src/kglobalaccel.cpp --- old/kglobalaccel-5.65.0/src/kglobalaccel.cpp 2019-12-07 22:43:05.000000000 +0100 +++ new/kglobalaccel-5.66.0/src/kglobalaccel.cpp 2020-01-04 11:07:54.000000000 +0100 @@ -248,7 +248,7 @@ QStringList actionId = makeActionId(action); - nameToAction.insertMulti(actionId.at(KGlobalAccel::ActionUnique), action); + nameToAction.insert(actionId.at(KGlobalAccel::ActionUnique), action); actions.insert(action); iface()->doRegister(actionId); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.65.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp new/kglobalaccel-5.66.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp --- old/kglobalaccel-5.65.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp 2019-12-07 22:43:05.000000000 +0100 +++ new/kglobalaccel-5.66.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp 2020-01-04 11:07:54.000000000 +0100 @@ -112,13 +112,27 @@ // Resolve the modifier if( !KKeyServer::keyQtToModX(keyQt, &keyModX) ) { - qCDebug(KGLOBALACCELD) << "keyQt (0x" << hex << keyQt << ") failed to resolve to x11 modifier"; + qCDebug(KGLOBALACCELD) << "keyQt (0x" + << + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + hex + #else + Qt::hex + #endif + << keyQt << ") failed to resolve to x11 modifier"; return false; } // Resolve the X symbol if( !KKeyServer::keyQtToSymX(keyQt, (int *)&keySymX) ) { - qCDebug(KGLOBALACCELD) << "keyQt (0x" << hex << keyQt << ") failed to resolve to x11 keycode"; + qCDebug(KGLOBALACCELD) << "keyQt (0x" + << + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + hex + #else + Qt::hex + #endif + << keyQt << ") failed to resolve to x11 keycode"; return false; } @@ -146,7 +160,14 @@ keyModX &= g_keyModMaskXAccel; // Get rid of any non-relevant bits in mod if( !keyCodeX ) { - qCDebug(KGLOBALACCELD) << "keyQt (0x" << hex << keyQt << ") was resolved to x11 keycode 0"; + qCDebug(KGLOBALACCELD) << "keyQt (0x" + << + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + hex + #else + Qt::hex + #endif + << keyQt << ") was resolved to x11 keycode 0"; continue; }
