Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2018-06-22 13:19:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel" Fri Jun 22 13:19:56 2018 rev:56 rq:616759 version:5.47.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2018-06-02 11:53:44.344499241 +0200 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new/kglobalaccel.changes 2018-06-22 13:20:00.036765010 +0200 @@ -1,0 +2,13 @@ +Tue Jun 12 21:26:04 UTC 2018 - [email protected] + +- Update to 5.47.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.47.0.php +- Changes since 5.46.0: + * Make sure ungrab keyboard request is processed before emitting shortcut (kde#394689) + * Use override +- Dropped patches, now upstream: + * 0001-Make-sure-ungrab-keyboard-request-is-processed-befor.patch + +------------------------------------------------------------------- Old: ---- 0001-Make-sure-ungrab-keyboard-request-is-processed-befor.patch kglobalaccel-5.46.0.tar.xz New: ---- kglobalaccel-5.47.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.YpZVE9/_old 2018-06-22 13:20:01.160723335 +0200 +++ /var/tmp/diff_new_pack.YpZVE9/_new 2018-06-22 13:20:01.164723187 +0200 @@ -19,9 +19,9 @@ %bcond_without lang %define lname libKF5GlobalAccel5 -%define _tar_path 5.46 +%define _tar_path 5.47 Name: kglobalaccel -Version: 5.46.0 +Version: 5.47.0 Release: 0 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} @@ -33,8 +33,6 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM -Patch0: 0001-Make-sure-ungrab-keyboard-request-is-processed-befor.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes @@ -112,7 +110,6 @@ %prep %setup -q -%autopatch -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert ++++++ kglobalaccel-5.46.0.tar.xz -> kglobalaccel-5.47.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.46.0/CMakeLists.txt new/kglobalaccel-5.47.0/CMakeLists.txt --- old/kglobalaccel-5.46.0/CMakeLists.txt 2018-05-05 14:57:39.000000000 +0200 +++ new/kglobalaccel-5.47.0/CMakeLists.txt 2018-06-02 19:55:18.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.46.0") # handled by release scripts -set(KF5_DEP_VERSION "5.46.0") # handled by release scripts +set(KF5_VERSION "5.47.0") # handled by release scripts +set(KF5_DEP_VERSION "5.47.0") # handled by release scripts project(KGlobalAccel VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.46.0 NO_MODULE) +find_package(ECM 5.47.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.46.0/po/zh_CN/kglobalaccel5_qt.po new/kglobalaccel-5.47.0/po/zh_CN/kglobalaccel5_qt.po --- old/kglobalaccel-5.46.0/po/zh_CN/kglobalaccel5_qt.po 2018-05-05 14:57:39.000000000 +0200 +++ new/kglobalaccel-5.47.0/po/zh_CN/kglobalaccel5_qt.po 2018-06-02 19:55:18.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-04-26 05:21-0400\n" +"PO-Revision-Date: 2018-05-18 06:23-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.46.0/src/kglobalaccel.h new/kglobalaccel-5.47.0/src/kglobalaccel.h --- old/kglobalaccel-5.46.0/src/kglobalaccel.h 2018-05-05 14:57:39.000000000 +0200 +++ new/kglobalaccel-5.47.0/src/kglobalaccel.h 2018-06-02 19:55:18.000000000 +0200 @@ -348,7 +348,7 @@ * TODO KF6 remove * @internal */ - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; Q_SIGNALS: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.46.0/src/runtime/kserviceactioncomponent.h new/kglobalaccel-5.47.0/src/runtime/kserviceactioncomponent.h --- old/kglobalaccel-5.46.0/src/runtime/kserviceactioncomponent.h 2018-05-05 14:57:39.000000000 +0200 +++ new/kglobalaccel-5.47.0/src/runtime/kserviceactioncomponent.h 2018-06-02 19:55:18.000000000 +0200 @@ -41,12 +41,12 @@ const QString &friendlyName, GlobalShortcutsRegistry *registry = nullptr); - ~KServiceActionComponent() Q_DECL_OVERRIDE; + ~KServiceActionComponent() override; void loadFromService(); - void emitGlobalShortcutPressed(const GlobalShortcut &shortcut) Q_DECL_OVERRIDE; + void emitGlobalShortcutPressed(const GlobalShortcut &shortcut) override; - bool cleanUp() Q_DECL_OVERRIDE; + bool cleanUp() override; private: QString m_serviceStorageId; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.46.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp new/kglobalaccel-5.47.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp --- old/kglobalaccel-5.46.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp 2018-05-05 14:57:39.000000000 +0200 +++ new/kglobalaccel-5.47.0/src/runtime/plugins/xcb/kglobalaccel_x11.cpp 2018-06-02 19:55:18.000000000 +0200 @@ -241,8 +241,12 @@ // Keyboard needs to be ungrabed after XGrabKey() activates the grab, // otherwise it becomes frozen. xcb_connection_t *c = QX11Info::connection(); - xcb_ungrab_keyboard(c, XCB_TIME_CURRENT_TIME); + xcb_void_cookie_t cookie = xcb_ungrab_keyboard_checked(c, XCB_TIME_CURRENT_TIME); xcb_flush(c); + // xcb_flush() only makes sure that the ungrab keyboard request has been + // sent, but is not enough to make sure that request has been fulfilled. Use + // xcb_request_check() to make sure that the request has been processed. + xcb_request_check(c, cookie); int keyQt; if (!KKeyServer::xcbKeyPressEventToQt(pEvent, &keyQt)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.46.0/src/runtime/plugins/xcb/kglobalaccel_x11.h new/kglobalaccel-5.47.0/src/runtime/plugins/xcb/kglobalaccel_x11.h --- old/kglobalaccel-5.46.0/src/runtime/plugins/xcb/kglobalaccel_x11.h 2018-05-05 14:57:39.000000000 +0200 +++ new/kglobalaccel-5.47.0/src/runtime/plugins/xcb/kglobalaccel_x11.h 2018-06-02 19:55:18.000000000 +0200 @@ -56,12 +56,12 @@ * * \return true if successful, otherwise false. */ - bool grabKey(int key, bool grab) Q_DECL_OVERRIDE; + bool grabKey(int key, bool grab) override; /// Enable/disable all shortcuts. There will not be any grabbed shortcuts at this point. - void setEnabled(bool) Q_DECL_OVERRIDE; + void setEnabled(bool) override; - bool nativeEventFilter(const QByteArray &eventType, void *message, long *) Q_DECL_OVERRIDE; + bool nativeEventFilter(const QByteArray &eventType, void *message, long *) override; static void syncX();
