gentoo resync : 25.11.2020

1 files changed, 18 insertions, 21 deletions

diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch
index ed0d29d759f9..8c8213d002dc 100644
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch
@@ -1,14 +1,14 @@
-From 7e2bf26af99f5b242b2e4bb2ee5e62914d5d5861 Mon Sep 17 00:00:00 2001
+From 30d75ef4b3e75155e78924aa82aa9f368bb86f4f Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 10 Jul 2019 11:38:44 +0200
+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(-)
+ libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++-
+ 1 file changed, 66 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c4c47870..53bc780b5 100644
+index 7ba097a6e..66f70c0b6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,3 +1,56 @@
@@ -20,8 +20,8 @@ index 3c4c47870..53bc780b5 100644
 +
 +    cmake_minimum_required(VERSION 3.0)
 +
-+    set(QT_MIN_VERSION "5.12.0")
-+    set(KF5_MIN_VERSION "5.58.0")
++    set(QT_MIN_VERSION "5.14.0")
++    set(KF5_MIN_VERSION "5.71.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})
@@ -39,7 +39,7 @@ index 3c4c47870..53bc780b5 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,36 +68,33 @@ index 3c4c47870..53bc780b5 100644
  
  set(kworkspace_LIB_SRCS kdisplaymanager.cpp
                          kworkspace.cpp
-@@ -14,8 +67,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
+@@ -16,9 +69,17 @@ 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.Shutdown.xml shutdown_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-shutdown/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}/startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/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
+@@ -34,7 +95,6 @@ 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,8 @@ if(BUILD_TESTING)
+ add_library(kworkspace ${kworkspace_LIB_SRCS})
+@@ -100,3 +160,8 @@ if(BUILD_TESTING)
      add_subdirectory(autotests)
      add_subdirectory(tests)
  endif()
@@ -107,5 +104,5 @@ index 3c4c47870..53bc780b5 100644
 +    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 +endif()
 -- 
-2.22.0
+2.27.0