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

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

[Andreas Sturmlechner]

commit:     ba84c4bca4439ae1bb37a797130c52c19b9de329
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 14:52:24 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 14:52:24 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ba84c4bc

kde-plasma/libkworkspace: Rebase standalone-patch on top of HEAD

Bug: https://bugs.gentoo.org/689466
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libkworkspace-5.16.80-standalone.patch           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch
index 6c67a049a2..d27bb3b275 100644
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch
@@ -1,4 +1,4 @@
-From d3413c9a69b186fb20d8b4caf5f48e7d372c5294 Mon Sep 17 00:00:00 2001
+From 74087723f0738f4a4a3a60ec72480e8bc4f1b53c Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
 Date: Wed, 10 Jul 2019 11:38:44 +0200
 Subject: [PATCH] libkworkspace: Allow standalone build
@@ -7,10 +7,10 @@ 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
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c4c47870..cd41a54ce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -1,3 +1,56 @@
 +project(libkworkspace)
 +
@@ -74,11 +74,11 @@ index 94576213e..27d46f83a 100644
  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)
++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()
  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)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/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()

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

[Andreas Sturmlechner]

commit:     9757d81546d349739813297ce7f66225c964c6aa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 11:41:11 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 11:43:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9757d815

kde-plasma/libkworkspace: Fix libkworspace standalone.patch

Thanks-to: Urmet Saar <urmet.saar <AT> gmail.com>
Closes: https://bugs.gentoo.org/690098
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libkworkspace-5.16.80-standalone.patch            | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch
index d27bb3b275..ed0d29d759 100644
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch
@@ -1,21 +1,21 @@
-From 74087723f0738f4a4a3a60ec72480e8bc4f1b53c Mon Sep 17 00:00:00 2001
+From 7e2bf26af99f5b242b2e4bb2ee5e62914d5d5861 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
 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(-)
+ CMakeLists.txt | 70 +++++++++++++++++++++++++++++++++---
+ 1 file changed, 66 insertions(+), 4 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c4c47870..cd41a54ce 100644
+index 3c4c47870..53bc780b5 100644
 --- a/CMakeLists.txt
 +++ b/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 "GENTOO_PV")
 +    set(PROJECT_VERSION_MAJOR 5)
 +
 +    cmake_minimum_required(VERSION 3.0)
@@ -97,12 +97,13 @@ index 3c4c47870..cd41a54ce 100644
  qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
  
  
-@@ -101,3 +158,7 @@ if(BUILD_TESTING)
+@@ -101,3 +158,8 @@ if(BUILD_TESTING)
      add_subdirectory(autotests)
      add_subdirectory(tests)
  endif()
 +
 +if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++    install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
 +    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 +endif()
 -- 

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

[Andreas Sturmlechner]

commit:     4cbf9c0eed4462eb08fe0be20d64ea8807075fec
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 15:39:34 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 15:39:34 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4cbf9c0e

kde-plasma/libkworkspace: Drop unused patch

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libkworkspace-5.14.90-standalone.patch   | 96 ----------------------
 1 file changed, 96 deletions(-)

diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch
deleted file mode 100644
index 78042c5d16..0000000000
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 2e0a1d8f524d3bb645248787eed4532a250540fc Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 22 Oct 2018 10:35:10 +0200
-Subject: [PATCH] libkworkspace: Allow standalone build
-
----
- libkworkspace/CMakeLists.txt | 64 +++++++++++++++++++++++++++++++++---
- 1 file changed, 60 insertions(+), 4 deletions(-)
-
-diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt
-index f66013f9..4e58bd60 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,59 @@
-+project(libkworkspace)
-+
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+    set(PROJECT_VERSION "GENTOO_PV")
-+    set(PROJECT_VERSION_MAJOR 5)
-+
-+    cmake_minimum_required(VERSION 3.0)
-+
-+    set(QT_MIN_VERSION "5.11.0")
-+    set(KF5_MIN_VERSION "5.54.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(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)
-+
-+    set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
-+else()
-+    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(kworkspace_LIB_SRCS kdisplaymanager.cpp
-                         kworkspace.cpp
-@@ -9,11 +65,7 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
- remove_definitions(-DQT_NO_CAST_TO_ASCII)
- 
- 
--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 )
- 
- 
-@@ -77,3 +129,7 @@ install(EXPORT libkworkspaceLibraryTargets
- if(BUILD_TESTING)
-     add_subdirectory(autotests)
- endif()
-+
-+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-+    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-+endif()
--- 
-2.19.1
-

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

[Andreas Sturmlechner]

commit:     ec6b5a1e8fb547754f055f0d0a5cec35ad2d73c6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 23:31:49 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 23:33:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec6b5a1e

kde-plasma/libkworkspace: Rebase ${PN}-5.18.80-standalone.patch on HEAD

Necessary after upstream commit 3c34dfa97

Thanks-to: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/712226
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libkworkspace-5.18.80-standalone.patch             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 28ee1c5851..8f0523ab8e 100644
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch
@@ -1,6 +1,6 @@
-From 34cbb4d2482c0df07bf9cd376e30ed878ed44b9f Mon Sep 17 00:00:00 2001
+From 85564b5264546866be56b9bc546689fbab20506d Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 2 Feb 2020 18:29:57 +0100
+Date: Fri, 13 Mar 2020 00:14:31 +0100
 Subject: [PATCH] libkworkspace: Allow standalone build
 
 ---
@@ -8,7 +8,7 @@ Subject: [PATCH] libkworkspace: Allow standalone build
  1 file changed, 67 insertions(+), 4 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a1869fae2..8de7a5c28 100644
+index 85cbb5e6c..de17e9287 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,3 +1,56 @@
@@ -75,12 +75,12 @@ index a1869fae2..8de7a5c28 100644
 +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)
++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.Startup.xml startup_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-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()
@@ -109,5 +109,5 @@ index a1869fae2..8de7a5c28 100644
 +    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 +endif()
 -- 
-2.25.0
+2.25.1
 

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

[Andreas Sturmlechner]

commit:     d7c0b528bb916a1d67902d794068301c45b66246
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 11:31:22 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 11:47:06 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7c0b528

kde-plasma/libkworkspace: Drop obsolete patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libkworkspace-5.21.90-standalone.patch   | 108 ---------------------
 1 file changed, 108 deletions(-)

diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch
deleted file mode 100644
index 430b98aadc..0000000000
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 2 Feb 2020 18:29:57 +0100
-Subject: [PATCH] libkworkspace: Allow standalone build
-
----
- libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++-
- 1 file changed, 66 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 015c5181f..0aa635e11 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,56 @@
-+project(libkworkspace)
-+
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+    set(PROJECT_VERSION "GENTOO_PV")
-+    set(PROJECT_VERSION_MAJOR 5)
-+
-+    cmake_minimum_required(VERSION 3.16)
-+
-+    set(QT_MIN_VERSION "5.15.0")
-+    set(KF5_MIN_VERSION "5.82.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 Config CoreAddons I18n Init 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
-@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\")
- 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-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.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)
-+endif()
- 
- set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
-                             "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
-@@ -30,7 +91,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 )
- 
- add_library(kworkspace ${kworkspace_LIB_SRCS})
-@@ -98,3 +158,8 @@ if(BUILD_TESTING)
-     add_subdirectory(autotests)
-     add_subdirectory(tests)
- endif()
-+
-+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-+    install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
-+    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-+endif()
--- 
-2.31.1
-

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

[Andreas Sturmlechner]

commit:     aa6e6425a5f809fb51df9edc01b1dcff52585dae
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 08:32:29 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 08:32:29 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=aa6e6425

kde-plasma/libkworkspace: Drop obsolete patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...bkworkspace-5.23.3-synchronous-dbus-calls.patch | 48 ----------------------
 1 file changed, 48 deletions(-)

diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
deleted file mode 100644
index 411bebf704..0000000000
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9ecd45f28dc5c3a4b1716d09e0ba121ec5fb2a50 Mon Sep 17 00:00:00 2001
-From: Joe Breuer <kde@jmbreuer.net>
-Date: Mon, 1 Nov 2021 07:19:51 +0000
-Subject: [PATCH] Fix sleep/suspend sometimes not working ... from
- ksmserver-logout-greeter, by making the DBus calls synchronous.
-
----
- libkworkspace/sessionmanagementbackend.cpp | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/sessionmanagementbackend.cpp b/sessionmanagementbackend.cpp
-index 83cd39395..a77a8a475 100644
---- a/sessionmanagementbackend.cpp
-+++ b/sessionmanagementbackend.cpp
-@@ -137,7 +137,6 @@ void LogindSessionBackend::shutdown()
- {
-     // logind will confirm credentials with the caller, if the app quits after sending this
-     // this may fail
--    // its not really needed for suspend tasks where the calling app won't be closing
-     m_login1->PowerOff(true).waitForFinished();
- }
- 
-@@ -148,17 +147,19 @@ void LogindSessionBackend::reboot()
- 
- void LogindSessionBackend::suspend()
- {
--    m_login1->Suspend(true);
-+    // these need to be synchronous as well - ksmserver-logout-greeter specifically calls these
-+    // and will quit immediately after
-+    m_login1->Suspend(true).waitForFinished();
- }
- 
- void LogindSessionBackend::hybridSuspend()
- {
--    m_login1->HybridSleep(true);
-+    m_login1->HybridSleep(true).waitForFinished();
- }
- 
- void LogindSessionBackend::hibernate()
- {
--    m_login1->Hibernate(true);
-+    m_login1->Hibernate(true).waitForFinished();;
- }
- 
- bool LogindSessionBackend::canShutdown() const
--- 
-GitLab
-