Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2020-11-25 19:28:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel" Wed Nov 25 19:28:38 2020 rev:88 rq:849870 version:5.76.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2020-11-23 10:32:17.193479415 +0100 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new.5913/kglobalaccel.changes 2020-11-25 19:28:56.218458944 +0100 @@ -1,0 +2,7 @@ +Fri Nov 20 20:41:50 UTC 2020 - Fabian Vogt <[email protected]> + +- Add patch to workaround kglobalaccel breaking persistently after + unclean logout (kde#429415, boo#1179033) + * 0001-Revert-systemd-dbus-activation.patch + +------------------------------------------------------------------- New: ---- 0001-Revert-systemd-dbus-activation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.eZCaPk/_old 2020-11-25 19:28:56.854459744 +0100 +++ /var/tmp/diff_new_pack.eZCaPk/_new 2020-11-25 19:28:56.858459750 +0100 @@ -36,6 +36,8 @@ Source2: frameworks.keyring %endif Source99: baselibs.conf +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-systemd-dbus-activation.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -172,6 +174,7 @@ %{_kf5_plugindir}/org.kde.kglobalaccel5.platforms/KF5GlobalAccelPrivateXcb.so %{_kf5_sharedir}/dbus-1/services/org.kde.kglobalaccel.service %{_kf5_servicesdir}/kglobalaccel5.desktop -%{_userunitdir}/plasma-kglobalaccel.service +#Disabled by Patch1 +#%{_userunitdir}/plasma-kglobalaccel.service %changelog ++++++ 0001-Revert-systemd-dbus-activation.patch ++++++ From 659018b469db2401f766b69bd565e88e1731c9c3 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Fri, 20 Nov 2020 21:40:32 +0100 Subject: [PATCH] Revert "systemd dbus activation" This reverts commit 3b9a6ba78d552a83554fc13f93d52d238559325b. Work around kde#429415, boo#1179033 --- src/runtime/CMakeLists.txt | 15 +-------------- src/runtime/plasma-kglobalaccel.service.in | 10 ---------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 src/runtime/plasma-kglobalaccel.service.in diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt index 0e30e74..06e9729 100644 --- a/src/runtime/CMakeLists.txt +++ b/src/runtime/CMakeLists.txt @@ -71,17 +71,4 @@ install(FILES DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KGlobalAccel/private COMPONENT Devel ) -# D-Bus activation service file, and associated systemd service -include (ECMGenerateDBusServiceFile) -include (ECMConfiguredInstall) -ecm_generate_dbus_service_file( - NAME org.kde.kglobalaccel - EXECUTABLE "${KDE_INSTALL_FULL_BINDIR}/kglobalaccel5" - SYSTEMD_SERVICE plasma-kglobalaccel.service - DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR} -) - -ecm_install_configured_files( - INPUT plasma-kglobalaccel.service.in - DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR} -) +kdbusaddons_generate_dbus_service_file(kglobalaccel5 org.kde.kglobalaccel ${KDE_INSTALL_FULL_BINDIR}) diff --git a/src/runtime/plasma-kglobalaccel.service.in b/src/runtime/plasma-kglobalaccel.service.in deleted file mode 100644 index 5a88581..0000000 --- a/src/runtime/plasma-kglobalaccel.service.in +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=KDE Global Shortcuts Server -PartOf=graphical-session.target - -[Service] -ExecStart=@KDE_INSTALL_FULL_BINDIR@/kglobalaccel5 -BusName=org.kde.kglobalaccel -Slice=background.slice -TimeoutSec=5sec -Restart=on-failure -- 2.25.1 _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
