[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/

[Andreas Sturmlechner]

commit:     bf1fce5d328c12dba297b2f4be5274ebb1ac4475
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 19:59:26 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 20:01:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf1fce5d

kde-plasma/libkworkspace: Properly rebase on top of HEAD, fix DEPENDs

Upstream commit 6253163af827e049d53b912494e04c1ea36d4e57
Thanks-to: Urmet Saar <urmet.saar <AT> gmail.com>
Closes: https://bugs.gentoo.org/707670
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libkworkspace-5.18.80-standalone.patch        | 17 +++++++++--------
 kde-plasma/libkworkspace/libkworkspace-9999.ebuild      |  1 +
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch
index 79c039afd5..28ee1c5851 100644
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch
@@ -1,14 +1,14 @@
-From 04f6a5fed3df9b1443159befd8e17ac6cd797916 Mon Sep 17 00:00:00 2001
+From 34cbb4d2482c0df07bf9cd376e30ed878ed44b9f Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@g.o>
 Date: Sun, 2 Feb 2020 18:29:57 +0100
 Subject: [PATCH] libkworkspace: Allow standalone build
 
 ---
- CMakeLists.txt | 70 +++++++++++++++++++++++++++++++++---
- 1 file changed, 66 insertions(+), 4 deletions(-)
+ CMakeLists.txt | 71 ++++++++++++++++++++++++++++++++++--
+ 1 file changed, 67 insertions(+), 4 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a1869fae2..c7768ce17 100644
+index a1869fae2..8de7a5c28 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,3 +1,56 @@
@@ -39,7 +39,7 @@ index a1869fae2..c7768ce17 100644
 +    include(ECMMarkAsTest)
 +    include(GenerateExportHeader)
 +
-+    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem)
++    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Init Plasma WindowSystem)
 +
 +    find_package(KWinDBusInterface CONFIG REQUIRED)
 +    find_package(KScreenLocker 5.13.80 REQUIRED)
@@ -68,12 +68,13 @@ index a1869fae2..c7768ce17 100644
  
  set(kworkspace_LIB_SRCS kdisplaymanager.cpp
                          kworkspace.cpp
-@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+@@ -16,9 +69,18 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
  qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
  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 ../startkde/plasma-session/org.kde.Startup.xml startup_interface)
 +qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface)
 +set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
 +else()
@@ -86,7 +87,7 @@ index a1869fae2..c7768ce17 100644
  
  set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
                              "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
-@@ -34,11 +95,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
+@@ -34,11 +96,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)
  
@@ -98,7 +99,7 @@ index a1869fae2..c7768ce17 100644
  qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
  
  
-@@ -105,3 +162,8 @@ if(BUILD_TESTING)
+@@ -105,3 +163,8 @@ if(BUILD_TESTING)
      add_subdirectory(autotests)
      add_subdirectory(tests)
  endif()

diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
index b7b8b72673..66ba007363 100644
--- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
@@ -20,6 +20,7 @@ IUSE=""
 COMMON_DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-plasma/kscreenlocker-${PVCUT}:5