diff --git a/.gitignore b/.gitignore index c515318..a650c36 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /khotkeys-5.21.3.tar.xz /khotkeys-5.21.4.tar.xz /khotkeys-5.21.5.tar.xz +/khotkeys-5.21.90.tar.xz diff --git a/khotkeys-5.14.4-qdbus-qt5.patch b/khotkeys-5.14.4-qdbus-qt5.patch deleted file mode 100644 index 651cba3..0000000 --- a/khotkeys-5.14.4-qdbus-qt5.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/libkhotkeysprivate/actions/dbus_action.cpp b/libkhotkeysprivate/actions/dbus_action.cpp -index 0a7a1a1..b1b8a74 100644 ---- a/libkhotkeysprivate/actions/dbus_action.cpp -+++ b/libkhotkeysprivate/actions/dbus_action.cpp -@@ -133,7 +133,7 @@ void DBusAction::execute() - } - qDebug() << "D-Bus call:" << _application << ":" << _object << ":" << _function << ":" << args_list; - KProcess proc; -- proc << "qdbus" << _application << _object << _function << args_list; -+ proc << "qdbus-qt5" << _application << _object << _function << args_list; - proc.startDetached(); - } - -diff --git a/test/main.cpp b/test/main.cpp -index 20409db..e6b7453 100644 ---- a/test/main.cpp -+++ b/test/main.cpp -@@ -16,7 +16,7 @@ int main(int argc, char** argv) - if (reply.value().contains("khotkeys")) { - qDebug() << "The khotkeys module is already running."; - qDebug() << "To unload it run:"; -- qDebug() << "qdbus org.kde.kded5 /kded org.kde.kded5.unloadModule khotkeys"; -+ qDebug() << "qdbus-qt5 org.kde.kded5 /kded org.kde.kded5.unloadModule khotkeys"; - exit(-1); - } - diff --git a/khotkeys-5.18.90-qdbusviewer-qt5.patch b/khotkeys-5.18.90-qdbusviewer-qt5.patch deleted file mode 100644 index 3d1275d..0000000 --- a/khotkeys-5.18.90-qdbusviewer-qt5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.21.90-qdbus-qt5.patch b/khotkeys-5.21.90-qdbus-qt5.patch new file mode 100644 index 0000000..b018f84 --- /dev/null +++ b/khotkeys-5.21.90-qdbus-qt5.patch @@ -0,0 +1,24 @@ +diff -up khotkeys-5.21.90/libkhotkeysprivate/actions/dbus_action.cpp.101 khotkeys-5.21.90/libkhotkeysprivate/actions/dbus_action.cpp +--- khotkeys-5.21.90/libkhotkeysprivate/actions/dbus_action.cpp.101 2021-05-15 08:36:12.713568004 -0500 ++++ khotkeys-5.21.90/libkhotkeysprivate/actions/dbus_action.cpp 2021-05-15 08:37:00.916992469 -0500 +@@ -106,7 +106,7 @@ void DBusAction::execute() + } + qDebug() << "D-Bus call:" << _application << ":" << _object << ":" << _function << ":" << args_list; + KProcess proc; +- proc << "qdbus" << _application << _object << _function << args_list; ++ proc << "qdbus-qt5" << _application << _object << _function << args_list; + proc.startDetached(); + } + +diff -up khotkeys-5.21.90/test/main.cpp.101 khotkeys-5.21.90/test/main.cpp +--- khotkeys-5.21.90/test/main.cpp.101 2021-05-13 08:07:53.000000000 -0500 ++++ khotkeys-5.21.90/test/main.cpp 2021-05-15 08:36:12.714568013 -0500 +@@ -16,7 +16,7 @@ int main(int argc, char **argv) + if (reply.value().contains("khotkeys")) { + qDebug() << "The khotkeys module is already running."; + qDebug() << "To unload it run:"; +- qDebug() << "qdbus org.kde.kded5 /kded org.kde.kded5.unloadModule khotkeys"; ++ qDebug() << "qdbus-qt5 org.kde.kded5 /kded org.kde.kded5.unloadModule khotkeys"; + exit(-1); + } + diff --git a/khotkeys-5.21.90-qdbusviewer-qt5.patch b/khotkeys-5.21.90-qdbusviewer-qt5.patch new file mode 100644 index 0000000..7f267c5 --- /dev/null +++ b/khotkeys-5.21.90-qdbusviewer-qt5.patch @@ -0,0 +1,12 @@ +diff -up khotkeys-5.21.90/kcm_hotkeys/actions/dbus_action_widget.cpp.100 khotkeys-5.21.90/kcm_hotkeys/actions/dbus_action_widget.cpp +--- khotkeys-5.21.90/kcm_hotkeys/actions/dbus_action_widget.cpp.100 2021-05-15 08:34:27.568642146 -0500 ++++ khotkeys-5.21.90/kcm_hotkeys/actions/dbus_action_widget.cpp 2021-05-15 08:35:11.083025319 -0500 +@@ -79,7 +79,7 @@ bool DbusActionWidget::isChanged() const + + 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.spec b/khotkeys.spec index 32c937a..b913891 100644 --- a/khotkeys.spec +++ b/khotkeys.spec @@ -1,12 +1,10 @@ -%undefine __cmake_in_source_build Name: khotkeys -Version: 5.21.5 +Version: 5.21.90 Release: 1%{?dist} Summary: Application to configure hotkeys in KDE License: GPLv2+ -URL: https://cgit.kde.org/%{name}.git - +URL: https://invent.kde.org/plasma/%{name} %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -18,10 +16,10 @@ 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.18.90-qdbusviewer-qt5.patch +Patch100: khotkeys-5.21.90-qdbusviewer-qt5.patch # use qdbus-qt5 instead of hard-coding (unpathed) qdbus # FIXME: make upstreamable -Patch101: khotkeys-5.14.4-qdbus-qt5.patch +Patch101: khotkeys-5.21.90-qdbus-qt5.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-kcmutils-devel @@ -72,13 +70,9 @@ developing applications that use %{name}. %build -%{cmake_kf5} -%cmake_build +%cmake_kf5 -# hack around FTBFS: -# make[2]: *** No rule to make target 'app/org.kde.khotkeys.xml', needed by 'kcm_hotkeys/khotkeys_interface.cpp'. Stop. -#make_build -C %{_target_platform}/app -#make_build -C %{_target_platform} +%cmake_build %install @@ -103,6 +97,9 @@ developing applications that use %{name}. %changelog +* Sat May 15 2021 Rex Dieter - 5.21.90-1 +- 5.21.90 + * Tue May 04 2021 Jan Grulich - 5.21.5-1 - 5.21.5 diff --git a/sources b/sources index 216ce94..57e0385 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (khotkeys-5.21.5.tar.xz) = 16409a928af050278dda012150e969b60617a66aa000cbb722781788defb02268ac56ef521916e55f257e4b166df8ddffcf14c9c35b49410a79491f197b4aef5 +SHA512 (khotkeys-5.21.90.tar.xz) = 3c0dd27abbb86f9ed12abfd674e212b5e2901a0be097dddb7addfb826cfb51c1b6125d606f6228c2f2159a73239c6a4136627b5d7f6c4943cda682ad9b5c5854