From f8134f9393708f51864c423ac95ec4933ad3eecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Fiestas?= Date: Mon, 24 Mar 2014 16:30:22 +0100 Subject: [PATCH] Add a copy of org.freedesktop.ScreenSaver.xml for KWin Since it is a standard (fd.o) it makes sense to copy the interface rather than creating a dependency with plasma-workspace which it actually doesn't since KWin will work with any screensaver using the freedesktop specification. --- CMakeLists.txt | 10 +------- org.freedesktop.ScreenSaver.xml | 41 +++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 org.freedesktop.ScreenSaver.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 98dc45fff..616149753 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,14 +64,6 @@ find_package(KF5 CONFIG COMPONENTS Activities) # TODO: remove once the build system is completely cleaned find_package(KF5KDE4Support REQUIRED NO_MODULE) -# HACK: remove after split -if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") - # screensaver and ksmserver dbus interface - find_package(ScreenSaverDBusInterface CONFIG REQUIRED) -else() - set(SCREENSAVER_DBUS_INTERFACE ${ksmserver_SOURCE_DIR}/screenlocker/dbus/org.freedesktop.ScreenSaver.xml) -endif() - if(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GL") find_package(OpenGL) set_package_properties(OpenGL PROPERTIES DESCRIPTION "The OpenGL libraries" @@ -369,7 +361,7 @@ qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml dbusinterface.h KWin::D qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Compositing.xml composite.h KWin::Compositor ) qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Effects.xml effects.h KWin::EffectsHandlerImpl ) -qt5_add_dbus_interface( kwin_KDEINIT_SRCS ${SCREENSAVER_DBUS_INTERFACE} screenlocker_interface) +qt5_add_dbus_interface( kwin_KDEINIT_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.ScreenSaver.xml screenlocker_interface) qt5_add_resources( kwin_KDEINIT_SRCS resources.qrc ) diff --git a/org.freedesktop.ScreenSaver.xml b/org.freedesktop.ScreenSaver.xml new file mode 100644 index 000000000..5efd9433c --- /dev/null +++ b/org.freedesktop.ScreenSaver.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +