Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
windows:mingw:win32
mingw32-kinit
0008-Restore-the-MainApplication-dbus-object-pa...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0008-Restore-the-MainApplication-dbus-object-path-require.patch of Package mingw32-kinit
From 98ec01eb7294063feadb6f53e5165d38bb5fefe1 Mon Sep 17 00:00:00 2001 From: Ralf Habacker <ralf.habacker@freenet.de> Date: Mon, 11 Jul 2022 09:45:11 +0200 Subject: [PATCH 08/18] Restore the /MainApplication dbus object path required to kill klauncher via dbus --- CMakeLists.txt | 1 + src/klauncher/CMakeLists.txt | 2 ++ src/klauncher/klauncher_main.cpp | 2 ++ 3 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 391d50f..791d773 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) find_package(KF5DocTools ${KF5_DEP_VERSION}) +find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED) if (NOT WIN32) find_package(Libcap) diff --git a/src/klauncher/CMakeLists.txt b/src/klauncher/CMakeLists.txt index 7c39179..b57eaea 100644 --- a/src/klauncher/CMakeLists.txt +++ b/src/klauncher/CMakeLists.txt @@ -31,6 +31,7 @@ target_link_libraries(kdeinit_klauncher KF5::WindowSystem # KStartupInfo + fixx11 KF5::I18n # i18n() Qt5::DBus + KF5::DBusAddons ) if(WIN32) set_target_properties(klauncher PROPERTIES OUTPUT_NAME klauncher5) @@ -44,6 +45,7 @@ if (HAVE_XCB) target_link_libraries(kdeinit_klauncher XCB::XCB) endif() +target_link_libraries(klauncher KF5::DBusAddons) install(TARGETS kdeinit_klauncher ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS klauncher DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5} ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} RENAME kf5_org.kde.KLauncher.xml) diff --git a/src/klauncher/klauncher_main.cpp b/src/klauncher/klauncher_main.cpp index 74b0d9e..32ec9e9 100644 --- a/src/klauncher/klauncher_main.cpp +++ b/src/klauncher/klauncher_main.cpp @@ -17,6 +17,7 @@ #include <stdlib.h> #include <signal.h> #include <KLocalizedString> +#include <KDBusService> #include "klauncher_cmds.h" #include <QGuiApplication> @@ -167,6 +168,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) // We need a QGuiApplication as we use X11 QGuiApplication app(argc, argv); app.setApplicationName(QStringLiteral("klauncher")); + KDBusService service(KDBusService::Unique); // Now get rid of QT_NO_GLIB again so launched processes don't inherit it if (!wasQtNoGlibSet) { -- 2.26.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor