Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package kactivitymanagerd.15654 for 
openSUSE:Leap:15.2:Update checked in at 2021-01-30 09:25:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2:Update/kactivitymanagerd.15654 (Old)
 and      
/work/SRC/openSUSE:Leap:15.2:Update/.kactivitymanagerd.15654.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kactivitymanagerd.15654"

Sat Jan 30 09:25:53 2021 rev:1 rq:867221 version:5.18.5

Changes:
--------
New Changes file:

--- /dev/null   2021-01-11 18:20:20.070723563 +0100
+++ 
/work/SRC/openSUSE:Leap:15.2:Update/.kactivitymanagerd.15654.new.28504/kactivitymanagerd.changes
    2021-01-30 09:25:53.531395031 +0100
@@ -0,0 +1,1229 @@
+-------------------------------------------------------------------
+Wed Jan 20 11:21:25 UTC 2021 - Wolfgang Bauer <[email protected]>
+
+- Add upstream patch to fix switching to a certain activity via a
+  global keyboard shortcut (boo#1172261, kde#374575):
+  * Use-correct-way-to-register-for-a-shortcut.patch
+
+-------------------------------------------------------------------
+Tue May  5 13:01:51 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.18.5
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.18.5.php
+- Changes since 5.18.4.1:
+  * Remove too strict Qt/KF5 deprecation rule
+
+-------------------------------------------------------------------
+Tue Mar 31 15:16:25 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.18.4.1:
+  * Version fixed
+
+-------------------------------------------------------------------
+Tue Mar 31 14:47:39 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.18.4
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.18.4.php
+- No code changes since 5.18.3
+
+-------------------------------------------------------------------
+Tue Mar 10 14:55:30 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.18.3
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.18.3.php
+- Changes since 5.18.2:
+  * set correct version
+  * KF5 only deprecate up to target frameworks
+
+-------------------------------------------------------------------
+Tue Feb 25 14:07:16 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.18.2
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.18.2.php
+- No code changes since 5.18.1
+
+-------------------------------------------------------------------
+Tue Feb 18 14:05:55 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.18.1
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.18.1.php
+- Changes since 5.18.0:
+  * Replace plasma.kde.org with kde.org/plasma-desktop
+
+-------------------------------------------------------------------
+Thu Feb  6 15:10:03 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.18.0
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.18.0.php
+- No code changes since 5.17.90
+
+-------------------------------------------------------------------
+Thu Jan 23 11:19:46 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Replace %make_jobs with %cmake_build
+
+-------------------------------------------------------------------
+Thu Jan 16 14:04:15 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.17.90
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.17.90.php
+- Changes since 5.17.5:
+  * KF5_MIN_VERSION for plasma 5.18 is KF5 5.66.0
+  * Remove pointless QDBusServiceWatcher
+  * Remove transient file CMakeLists.txt.user
+  * Add KDEClangFormat cmake support
+  * Rename cmake project to KActivityManagerd, remove unused option
+  * Fix two clazy performance warning: missing &
+  * Fix minor issues found by EBN
+  * Now we depend against kf5.58
+  * Add previous-/nextActivity methods
+  * Make it compile without deprecated methods
+
+-------------------------------------------------------------------
+Tue Jan  7 16:24:35 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.17.5
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.17.5.php
+- No code changes since 5.17.4
+
+-------------------------------------------------------------------
+Wed Dec  4 08:36:58 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Update to 5.17.4
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.17.4.php
+- No code changes since 5.17.3
+
+-------------------------------------------------------------------
+Tue Nov 12 11:01:06 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Update to 5.17.3
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.17.3.php
+- No code changes since 5.17.2
+
+-------------------------------------------------------------------
+Tue Oct 29 20:45:50 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Update to 5.17.2
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.17.2.php
+- No code changes since 5.17.1
+
+-------------------------------------------------------------------
+Tue Oct 22 16:44:43 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Update to 5.17.1
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.17.1.php
+- No code changes since 5.17.0
+
+-------------------------------------------------------------------
+Thu Oct 10 14:25:45 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Update to 5.17.0
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.17.0.php
+- No code changes since 5.16.90
+
+-------------------------------------------------------------------
+Thu Sep 19 12:32:34 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Update to 5.16.90
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.16.90.php
+- Changes since 5.16.5:
+  * update to latest kf5 dependency
+  * Extract mimetype from recentlyused.xbel
+  * Fix compile warning
+  * Add a event Spy for GtkFileChooser recent files
+  * Set a parent for the dir watcher
+  * Fix bug found by Andreas Scholta reported on github
+  * Fix typo in CREATE_GETTER_AND_SETTER
+  * Install in new logging directory when we use kf5 5.59.0
+  * Fix forward declaration
+
+-------------------------------------------------------------------
+Tue Sep  3 12:44:11 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Update to 5.16.5
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.16.5.php
+- No code changes since 5.16.4
+
+-------------------------------------------------------------------
+Tue Jul 30 12:40:17 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Update to 5.16.4
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.16.4.php
+- No code changes since 5.16.3
+
+-------------------------------------------------------------------
+Tue Jul  9 17:29:05 UTC 2019 - [email protected]
+
+- Update to 5.16.3
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.16.3.php
+- No code changes since 5.16.2
+
+-------------------------------------------------------------------
+Tue Jun 25 12:41:16 UTC 2019 - [email protected]
+
++++ 1032 more lines (skipped)
++++ between /dev/null
++++ and 
/work/SRC/openSUSE:Leap:15.2:Update/.kactivitymanagerd.15654.new.28504/kactivitymanagerd.changes

New:
----
  Use-correct-way-to-register-for-a-shortcut.patch
  kactivitymanagerd-5.18.5.tar.xz
  kactivitymanagerd-5.18.5.tar.xz.sig
  kactivitymanagerd.changes
  kactivitymanagerd.spec
  plasma.keyring

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kactivitymanagerd.spec ++++++
#
# spec file for package kactivitymanagerd
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

%global kf5_version 5.58.0
%global qt5_version 5.12.0

%bcond_without lang
Name:           kactivitymanagerd
Version:        5.18.5
Release:        0
Summary:        KDE Plasma Activities support
License:        GPL-2.0-or-later
Group:          System/GUI/KDE
Url:            http://projects.kde.org/kactivitymanagerd
Source:         
https://download.kde.org/stable/plasma/%{version}/kactivitymanagerd-%{version}.tar.xz
%if %{with lang}
Source1:        
https://download.kde.org/stable/plasma/%{version}/kactivitymanagerd-%{version}.tar.xz.sig
Source2:        plasma.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch:          Use-correct-way-to-register-for-a-shortcut.patch
%if 0%{?suse_version} > 1325
BuildRequires:  libboost_headers-devel
%else
BuildRequires:  boost-devel >= 1.49.0
%endif
BuildRequires:  cmake >= 2.8.12
BuildRequires:  extra-cmake-modules >= %{kf5_version}
BuildRequires:  fdupes
BuildRequires:  cmake(KF5KCMUtils) >= %{kf5_version}
BuildRequires:  cmake(KF5Config) >= %{kf5_version}
BuildRequires:  cmake(KF5CoreAddons) >= %{kf5_version}
BuildRequires:  cmake(KF5DBusAddons) >= %{kf5_version}
BuildRequires:  cmake(KF5Declarative) >= %{kf5_version}
BuildRequires:  cmake(KF5Crash) >= %{kf5_version}
BuildRequires:  kf5-filesystem
BuildRequires:  cmake(KF5GlobalAccel) >= %{kf5_version}
BuildRequires:  cmake(KF5I18n) >= %{kf5_version}
BuildRequires:  cmake(KF5KIO) >= %{kf5_version}
BuildRequires:  cmake(KF5Service) >= %{kf5_version}
BuildRequires:  cmake(KF5WindowSystem) >= %{kf5_version}
BuildRequires:  cmake(KF5XmlGui) >= %{kf5_version}
BuildRequires:  xz
BuildRequires:  cmake(Qt5Core) >= %{qt5_version}
BuildRequires:  cmake(Qt5DBus) >= %{qt5_version}
BuildRequires:  cmake(Qt5Gui) >= %{qt5_version}
BuildRequires:  cmake(Qt5Qml) >= %{qt5_version}
BuildRequires:  cmake(Qt5Quick) >= %{qt5_version}
BuildRequires:  cmake(Qt5Sql) >= %{qt5_version}
BuildRequires:  cmake(Qt5Test) >= %{qt5_version}
BuildRequires:  cmake(Qt5Widgets) >= %{qt5_version}
Recommends:     %{name}-lang
# for kactivitymanagerd_plugin_sqlite.so
Requires:       libQt5Sql5-sqlite
Provides:       kactivities4 = %{version}
Provides:       kactivities5 = 5.20.0
Obsoletes:      kactivities4 < %{version}
Obsoletes:      kactivities5 < 5.20.0

%description
Kactivities provides an API for using and interacting with the Plasma 
Activities Manager.

%package lang
Summary:        KDE Plasma Activities support
Group:          System/GUI/KDE
Requires:       %{name} = %{version}
Provides:       libKF5Activities5-lang = 5.20.0
Obsoletes:      libKF5Activities5-lang < 5.20.0

%description lang
Provides translations to the package %{name}.

%prep
%autosetup -p1 -n kactivitymanagerd-%{version}

%build
  %cmake_kf5 -d build
  %cmake_build

%install
  %kf5_makeinstall -C build
  %fdupes %{buildroot}

%if %{with lang}
%find_lang kactivities5
%endif

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%if %{with lang}
%files -n %name-lang -f kactivities5.lang
%endif

%files
%license COPYING*
%{_kf5_libdir}/libexec/kactivitymanagerd
%{_kf5_libdir}/libkactivitymanagerd_plugin.so
%{_kf5_plugindir}/
%{_kf5_servicesdir}/
%{_kf5_servicetypesdir}/
%{_kf5_sharedir}/dbus-1/services/org.kde.activitymanager.service
%{_kf5_debugdir}/kactivitymanagerd.categories

%changelog
++++++ Use-correct-way-to-register-for-a-shortcut.patch ++++++
>From bd2fab0a52f85cad26c5dd1562313e4138d3352c Mon Sep 17 00:00:00 2001
From: David Edmundson <[email protected]>
Date: Fri, 25 Sep 2020 14:59:03 +0100
Subject: [PATCH] Use correct way to register for a shortcut

setDefaultShortcut sets a default shortcut, but it doesn't bind it to
the action.

We want setShortcut.

setGlobalShortcut wraps both. By setting autoloading, it doesn't
actually overwrite the user-set shortcut if one is set.

BUG: 374575
---
 src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp 
b/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp
index ec5de6c..0353def 100644
--- a/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp
+++ b/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp
@@ -87,7 +87,7 @@ void GlobalShortcutsPlugin::activityAdded(const QString 
&activity)
         objectNamePattern.arg(activity));
 
     action->setText(i18nc("@action", "Switch to activity \"%1\"", 
activityName(activity)));
-    KGlobalAccel::self()->setDefaultShortcut(action, QList<QKeySequence>{});
+    KGlobalAccel::setGlobalShortcut(action, QList<QKeySequence>{});
 
     connect(action, &QAction::triggered, [this, activity]() { Q_EMIT 
currentActivityChanged(activity);});
 
-- 
GitLab

Reply via email to