From ad4cca1e58a40cd0780a9661e9651c344d43266d Mon Sep 17 00:00:00 2001 From: Martin Kyral Date: May 18 2020 13:15:14 +0000 Subject: khotkeys: new pacth for qdbusviewer-qt5 --- diff --git a/khotkeys-5.18.90-qdbusviewer-qt5.patch b/khotkeys-5.18.90-qdbusviewer-qt5.patch new file mode 100644 index 0000000..3d1275d --- /dev/null +++ b/khotkeys-5.18.90-qdbusviewer-qt5.patch @@ -0,0 +1,11 @@ +--- khotkeys-5.18.90/kcm_hotkeys/actions/dbus_action_widget.cpp.orig 2020-05-18 15:10:17.524706213 +0200 ++++ khotkeys-5.18.90/kcm_hotkeys/actions/dbus_action_widget.cpp 2020-05-18 15:10:33.047714522 +0200 +@@ -117,7 +117,7 @@ + + void DbusActionWidget::launchDbusBrowser() const + { +- auto *job = new KIO::CommandLauncherJob("qdbusviewer"); ++ auto *job = new KIO::CommandLauncherJob("qdbusviewer-qt5"); + job->setUiDelegate(new KDialogJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, window())); + job->start(); + } diff --git a/khotkeys-5.4.2-qdbusviewer-qt5.patch b/khotkeys-5.4.2-qdbusviewer-qt5.patch deleted file mode 100644 index 15e97c5..0000000 --- a/khotkeys-5.4.2-qdbusviewer-qt5.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up khotkeys-5.4.2/kcm_hotkeys/actions/dbus_action_widget.cpp.qdbusviewer-qt5 khotkeys-5.4.2/kcm_hotkeys/actions/dbus_action_widget.cpp ---- khotkeys-5.4.2/kcm_hotkeys/actions/dbus_action_widget.cpp.qdbusviewer-qt5 2015-10-01 04:41:32.000000000 -0500 -+++ khotkeys-5.4.2/kcm_hotkeys/actions/dbus_action_widget.cpp 2015-10-19 10:42:54.251917280 -0500 -@@ -117,9 +117,9 @@ bool DbusActionWidget::isChanged() const - - void DbusActionWidget::launchDbusBrowser() const - { -- if( KRun::runCommand( "qdbusviewer", window()) == 0 ) -+ if( KRun::runCommand( "qdbusviewer-qt5", window()) == 0 ) - { -- KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer" )); -+ KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer-qt5" )); - } - } - diff --git a/khotkeys.spec b/khotkeys.spec index c2d1095..c9df9fe 100644 --- a/khotkeys.spec +++ b/khotkeys.spec @@ -17,7 +17,7 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{ve ## downstream patches # kcm_hotkeys, use qdbusviewer-qt5, see also http://bugs.kde.org/329094 -Patch100: khotkeys-5.4.2-qdbusviewer-qt5.patch +Patch100: khotkeys-5.18.90-qdbusviewer-qt5.patch # use qdbus-qt5 instead of hard-coding (unpathed) qdbus # FIXME: make upstreamable Patch101: khotkeys-5.14.4-qdbus-qt5.patch