commit: c7314eb2cdafb3c56892c65ad09b1ac9a01ecd1b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jul 10 10:29:53 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jul 10 10:29:53 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7314eb2
kde-plasma/libkworkspace: Rebase standalone-patch on top of HEAD Bug: https://bugs.gentoo.org/689466 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/libkworkspace-5.16.80-standalone.patch | 110 +++++++++++++++++++++ kde-plasma/libkworkspace/libkworkspace-9999.ebuild | 3 +- 2 files changed, 112 insertions(+), 1 deletion(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch new file mode 100644 index 0000000000..6c67a049a2 --- /dev/null +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch @@ -0,0 +1,110 @@ +From d3413c9a69b186fb20d8b4caf5f48e7d372c5294 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 10 Jul 2019 11:38:44 +0200 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + libkworkspace/CMakeLists.txt | 69 +++++++++++++++++++++++++++++++++--- + 1 file changed, 65 insertions(+), 4 deletions(-) + +diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt +index 94576213e..27d46f83a 100644 +--- a/libkworkspace/CMakeLists.txt ++++ b/libkworkspace/CMakeLists.txt +@@ -1,3 +1,56 @@ ++project(libkworkspace) ++ ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++ set(PROJECT_VERSION "5.16.80") ++ set(PROJECT_VERSION_MAJOR 5) ++ ++ cmake_minimum_required(VERSION 3.0) ++ ++ set(QT_MIN_VERSION "5.12.0") ++ set(KF5_MIN_VERSION "5.58.0") ++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) ++ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) ++ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++ include(KDEInstallDirs) ++ include(KDECMakeSettings) ++ include(KDECompilerSettings NO_POLICY_SCOPE) ++ include(ECMMarkNonGuiExecutable) ++ include(CMakePackageConfigHelpers) ++ include(WriteBasicConfigVersionFile) ++ include(CheckIncludeFiles) ++ include(FeatureSummary) ++ include(ECMQtDeclareLoggingCategory) ++ include(KDEPackageAppTemplates) ++ include(ECMMarkAsTest) ++ include(GenerateExportHeader) ++ ++ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem) ++ ++ find_package(KWinDBusInterface CONFIG REQUIRED) ++ find_package(KScreenLocker 5.13.80 REQUIRED) ++ find_package(ScreenSaverDBusInterface CONFIG REQUIRED) ++ ++ find_package(X11) ++ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" ++ URL "http://www.x.org"; ++ TYPE OPTIONAL ++ PURPOSE "Required for X11 support") ++ ++ if(X11_FOUND) ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) ++ set(HAVE_X11 1) ++ endif() ++ ++ if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++ endif() ++ ++ check_include_files(unistd.h HAVE_UNISTD_H) ++ ++ configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) ++ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) ++endif() + + set(kworkspace_LIB_SRCS kdisplaymanager.cpp + kworkspace.cpp +@@ -14,8 +67,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) ++else() + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) ++set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") ++endif() + + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" + "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" +@@ -31,11 +92,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte + qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) + +-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) + qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) +- +-set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") +- + qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface ) + + +@@ -101,3 +158,7 @@ if(BUILD_TESTING) + add_subdirectory(autotests) + add_subdirectory(tests) + endif() ++ ++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") ++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ++endif() +-- +2.22.0 + diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild index 8c4d2cbf19..1282f6d256 100644 --- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild @@ -17,6 +17,7 @@ COMMON_DEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep plasma) + $(add_plasma_dep kscreenlocker) $(add_qt_dep qtdbus) $(add_qt_dep qtx11extras) x11-libs/libICE @@ -33,7 +34,7 @@ RDEPEND="${COMMON_DEPEND} S="${S}/${PN}" -PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" ) src_prepare() { # delete colliding libkworkspace translations, let kde5_src_prepare do its magic
