Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2017-11-16 14:37:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel" Thu Nov 16 14:37:54 2017 rev:48 rq:541657 version:5.40.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2017-10-27 13:54:58.970075278 +0200 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new/kglobalaccel.changes 2017-11-16 14:37:55.665386031 +0100 @@ -1,0 +2,12 @@ +Mon Nov 13 07:01:14 CET 2017 - [email protected] + +- Update to 5.40.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.40.0.php +- Changes since 5.39.0: + * Revert "Revert "KGlobalAccel: port to KKeyServer's new method symXModXToKeyQt, to fix numpad keys"" + * Component can't be null (tested line before it). + * Add .arcconfig + +------------------------------------------------------------------- Old: ---- kglobalaccel-5.39.0.tar.xz New: ---- kglobalaccel-5.40.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.jl4Omq/_old 2017-11-16 14:37:56.221365876 +0100 +++ /var/tmp/diff_new_pack.jl4Omq/_new 2017-11-16 14:37:56.225365731 +0100 @@ -19,9 +19,9 @@ %bcond_without lang %define lname libKF5GlobalAccel5 -%define _tar_path 5.39 +%define _tar_path 5.40 Name: kglobalaccel -Version: 5.39.0 +Version: 5.40.0 Release: 0 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} ++++++ kglobalaccel-5.39.0.tar.xz -> kglobalaccel-5.40.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.39.0/.arcconfig new/kglobalaccel-5.40.0/.arcconfig --- old/kglobalaccel-5.39.0/.arcconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/kglobalaccel-5.40.0/.arcconfig 2017-11-05 09:30:36.000000000 +0100 @@ -0,0 +1,3 @@ +{ + "phabricator.uri" : "https://phabricator.kde.org/"; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.39.0/CMakeLists.txt new/kglobalaccel-5.40.0/CMakeLists.txt --- old/kglobalaccel-5.39.0/CMakeLists.txt 2017-10-07 21:14:37.000000000 +0200 +++ new/kglobalaccel-5.40.0/CMakeLists.txt 2017-11-05 09:30:36.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.39.0") # handled by release scripts -set(KF5_DEP_VERSION "5.39.0") # handled by release scripts +set(KF5_VERSION "5.40.0") # handled by release scripts +set(KF5_DEP_VERSION "5.40.0") # handled by release scripts project(KGlobalAccel VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.39.0 NO_MODULE) +find_package(ECM 5.40.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/kglobalaccel-5.39.0/src/runtime/kglobalacceld.cpp new/kglobalaccel-5.40.0/src/runtime/kglobalacceld.cpp --- old/kglobalaccel-5.39.0/src/runtime/kglobalacceld.cpp 2017-10-07 21:14:37.000000000 +0200 +++ new/kglobalaccel-5.40.0/src/runtime/kglobalacceld.cpp 2017-11-05 09:30:36.000000000 +0100 @@ -123,9 +123,7 @@ return nullptr; } - GlobalShortcut *shortcut = component - ? component->getShortcutByName(shortcutUnique, contextUnique) - : nullptr; + GlobalShortcut *shortcut = component->getShortcutByName(shortcutUnique, contextUnique); #ifdef KDEDGLOBALACCEL_TRACE if (shortcut) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.39.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp new/kglobalaccel-5.40.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp --- old/kglobalaccel-5.39.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp 2017-10-07 21:14:37.000000000 +0200 +++ new/kglobalaccel-5.40.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp 2017-11-05 09:30:36.000000000 +0100 @@ -122,6 +122,7 @@ // can remove shift for some keys. (all the %&* and such) if( !(keyQt & Qt::SHIFT) && !KKeyServer::isShiftAsModifierAllowed( keyQt ) && + !(keyQt & Qt::KeypadModifier) && keySymX != xcb_key_symbols_get_keysym(m_keySymbols, keyCodeX, 0) && keySymX == xcb_key_symbols_get_keysym(m_keySymbols, keyCodeX, 1) ) { @@ -243,51 +244,12 @@ xcb_ungrab_keyboard(c, XCB_TIME_CURRENT_TIME); xcb_flush(c); - xcb_keycode_t keyCodeX = pEvent->detail; - uint16_t keyModX = pEvent->state & (g_keyModMaskXAccel | KKeyServer::MODE_SWITCH); - - xcb_keysym_t keySymX = xcb_key_press_lookup_keysym(m_keySymbols, pEvent, 0); - - // If numlock is active and a keypad key is pressed, XOR the SHIFT state. - // e.g., KP_4 => Shift+KP_Left, and Shift+KP_4 => KP_Left. - if (pEvent->state & KKeyServer::modXNumLock()) { - // If this is a keypad key, - if( keySymX >= XK_KP_Space && keySymX <= XK_KP_9 ) { - switch( keySymX ) { - - // Leave the following keys unaltered - // FIXME: The proper solution is to see which keysyms don't change when shifted. - case XK_KP_Multiply: - case XK_KP_Add: - case XK_KP_Subtract: - case XK_KP_Divide: - case XK_KP_Enter: - break; - - default: - keyModX ^= KKeyServer::modXShift(); - } - } - } - - int keyCodeQt; - int keyModQt; - KKeyServer::symXToKeyQt(keySymX, &keyCodeQt); - KKeyServer::modXToQt(keyModX, &keyModQt); - - if ((keyModQt & Qt::SHIFT) && !KKeyServer::isShiftAsModifierAllowed( keyCodeQt ) ) { -#ifdef KDEDGLOBALACCEL_TRACE - qCDebug(KGLOBALACCELD) << "removing shift modifier"; -#endif - if (keyCodeQt != Qt::Key_Tab) { // KKeySequenceWidget does not map shift+tab to backtab - static const int FirstLevelShift = 1; - keySymX = xcb_key_symbols_get_keysym(m_keySymbols, keyCodeX, FirstLevelShift); - KKeyServer::symXToKeyQt(keySymX, &keyCodeQt); - } - keyModQt &= ~Qt::SHIFT; - } - - int keyQt = keyCodeQt | keyModQt; + int keyQt; + if (!KKeyServer::xcbKeyPressEventToQt(pEvent, &keyQt)) { + qCWarning(KGLOBALACCELD) << "KKeyServer::xcbKeyPressEventToQt failed"; + return false; + } + //qDebug() << "keyQt=" << QString::number(keyQt, 16); // All that work for this hey... argh... if (NET::timestampCompare(pEvent->time, QX11Info::appTime()) > 0) {
