Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2016-04-12 19:17:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel" Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2016-04-01 13:01:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new/kglobalaccel.changes 2016-04-12 19:17:10.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Apr 6 09:29:15 UTC 2016 - alarr...@suse.com + +- Don't apply 0001-Make-kglobalaccel5-properly-killable-fixing-super-sl.patch + in SLE12 since Qt 5.5.1 in SLE12 is not patched to support the new + session management API from 5.6.0 . + +------------------------------------------------------------------- +Mon Apr 4 14:20:19 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.21.0 (boo#974793) + * Make kglobalaccel5 properly killable, fixing super slow shutdown + * Upgrade Qt version requirement to 5.4.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.21.0.php +- Rebased 0001-Make-kglobalaccel5-properly-killable-fixing-super-sl.patch + since part of the patch is already included in 5.21.0 + +------------------------------------------------------------------- Old: ---- kglobalaccel-5.20.0.tar.xz New: ---- kglobalaccel-5.21.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.TdUpbk/_old 2016-04-12 19:17:11.000000000 +0200 +++ /var/tmp/diff_new_pack.TdUpbk/_new 2016-04-12 19:17:11.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5GlobalAccel5 -%define _tar_path 5.20 +%define _tar_path 5.21 Name: kglobalaccel -Version: 5.20.0 +Version: 5.21.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -33,13 +33,13 @@ BuildRequires: kf5-filesystem BuildRequires: kwindowsystem-devel >= %{_tar_path} %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.3.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.4.0 %endif BuildRequires: libxcb-devel -BuildRequires: cmake(Qt5DBus) >= 5.3.0 -BuildRequires: cmake(Qt5Test) >= 5.3.0 -BuildRequires: cmake(Qt5Widgets) >= 5.3.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.3.0 +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb-keysyms) Summary: Global desktop keyboard shortcuts @@ -87,8 +87,8 @@ Requires: %lname = %{version} Requires: extra-cmake-modules Requires: libKF5GlobalAccelPrivate5 = %{version} -Requires: cmake(Qt5DBus) >= 5.3.0 -Requires: cmake(Qt5Widgets) >= 5.3.0 +Requires: cmake(Qt5DBus) >= 5.4.0 +Requires: cmake(Qt5Widgets) >= 5.4.0 %description devel KGlobalAccel allows you to have global accelerators that are independent of @@ -107,7 +107,9 @@ %lang_package -n %lname %prep %setup -q +%if 0%{?is_opensuse} || 0%{?suse_version} > 1315 %patch0 -p1 +%endif rm -rf po/*/kglobalaccel5.po %build ++++++ 0001-Make-kglobalaccel5-properly-killable-fixing-super-sl.patch ++++++ --- /var/tmp/diff_new_pack.TdUpbk/_old 2016-04-12 19:17:11.000000000 +0200 +++ /var/tmp/diff_new_pack.TdUpbk/_new 2016-04-12 19:17:11.000000000 +0200 @@ -33,62 +33,22 @@ (cherry picked from commit 9a8866c2a424a29ef06ee6ad594c92c62ac099c3) --- - src/runtime/kglobalacceld.cpp | 7 ++++++- src/runtime/main.cpp | 16 ++-------------- - 2 files changed, 8 insertions(+), 15 deletions(-) + 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/src/runtime/kglobalacceld.cpp b/src/runtime/kglobalacceld.cpp -index 3a55ffe..fbb0aa9 100644 ---- a/src/runtime/kglobalacceld.cpp -+++ b/src/runtime/kglobalacceld.cpp -@@ -240,7 +240,12 @@ bool KGlobalAccelD::init() - - KGlobalAccelD::~KGlobalAccelD() - { -- GlobalShortcutsRegistry::self()->deactivateShortcuts(); -+ GlobalShortcutsRegistry *const reg = GlobalShortcutsRegistry::self(); -+ if (d->writeoutTimer.isActive()) { -+ d->writeoutTimer.stop(); -+ reg->writeSettings(); -+ } -+ reg->deactivateShortcuts(); - delete d; - } - diff --git a/src/runtime/main.cpp b/src/runtime/main.cpp index 81dbde5..5264ad4 100644 --- a/src/runtime/main.cpp +++ b/src/runtime/main.cpp -@@ -37,14 +37,6 @@ static bool isEnabled() - return true; - } - -- --static void sighandler(int /*sig*/) --{ -- if (qApp) -- qApp->quit(); --} -- -- - extern "C" Q_DECL_EXPORT int main(int argc, char **argv) - { - // Disable Session Management the right way (C) -@@ -78,12 +70,8 @@ extern "C" Q_DECL_EXPORT int main(int argc, char **argv) +@@ -68,7 +68,7 @@ extern "C" Q_DECL_EXPORT int main(int argc, char **argv) KDBusService service(KDBusService::Unique); app.setQuitOnLastWindowClosed( false ); -- -- // Stop gracefully -- ::signal(SIGINT, sighandler); -- ::signal(SIGTERM, sighandler); --#ifndef Q_OS_WIN -- ::signal(SIGHUP, sighandler); +-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1) -+ QGuiApplication::setFallbackSessionManagementEnabled(false); + QGuiApplication::setFallbackSessionManagementEnabled(false); #endif - // Restart on a crash -- 2.6.2 ++++++ kglobalaccel-5.20.0.tar.xz -> kglobalaccel-5.21.0.tar.xz ++++++ ++++ 1897 lines of diff (skipped)
