summaryrefslogtreecommitdiff
path: root/kde-plasma
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/libkworkspace/Manifest2
-rw-r--r--kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch96
-rw-r--r--kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch111
-rw-r--r--kde-plasma/libkworkspace/libkworkspace-5.17.2-r314.ebuild (renamed from kde-plasma/libkworkspace/libkworkspace-5.16.5-r314.ebuild)3
4 files changed, 114 insertions, 98 deletions
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index f2ef4b26..2ce5bdba 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1 +1 @@
-DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369
+DIST plasma-workspace-5.17.2.tar.xz 4962148 BLAKE2B b1966e0db9fe9aa75bb934f7bb0f7b0cf7f6134cbb75926dbe86ff77bfb00888116c05aad070305e36498d7346bbc394cf42d9272ca8da79634a04bc008f949f SHA512 2c10f78de83d65e03a611f0928b28f723c71e2e9b02401c7e6b226bc7f5002119602d6344dca7c85a23ba3826e5f6f0b96057252a518bc9f8c0fa2931ac5f85d
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 78042c5d..00000000
--- 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
-
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 00000000..ed0d29d7
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch
@@ -0,0 +1,111 @@
+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
+
+---
+ CMakeLists.txt | 70 +++++++++++++++++++++++++++++++++---
+ 1 file changed, 66 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+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 "GENTOO_PV")
++ 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 ../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}/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()
+
+ 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,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.22.0
+
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.16.5-r314.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.17.2-r314.ebuild
index 68f6e9f5..23858bf0 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.16.5-r314.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.17.2-r314.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
@@ -32,7 +33,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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 17:39:06 +0000