mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 18:47:16 -08:00
kde-plasma/libkworkspace: drop 5.19.5*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,2 +1 @@
|
||||
DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
|
||||
DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
|
||||
|
||||
@@ -1,113 +0,0 @@
|
||||
From 85564b5264546866be56b9bc546689fbab20506d Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Fri, 13 Mar 2020 00:14:31 +0100
|
||||
Subject: [PATCH] libkworkspace: Allow standalone build
|
||||
|
||||
---
|
||||
CMakeLists.txt | 71 ++++++++++++++++++++++++++++++++++--
|
||||
1 file changed, 67 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 85cbb5e6c..de17e9287 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 Init 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
|
||||
@@ -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-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)
|
||||
+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"
|
||||
@@ -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)
|
||||
|
||||
-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 )
|
||||
|
||||
|
||||
@@ -105,3 +163,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.25.1
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
ECM_TEST="true"
|
||||
KDE_ORG_NAME="plasma-workspace"
|
||||
KFMIN=5.71.0
|
||||
PVCUT=$(ver_cut 1-3)
|
||||
QTMIN=5.14.2
|
||||
inherit ecm kde.org
|
||||
|
||||
DESCRIPTION="Workspace library to interact with the Plasma session manager"
|
||||
|
||||
LICENSE="GPL-2" # TODO: CHECK
|
||||
SLOT="5"
|
||||
KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
|
||||
IUSE=""
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=dev-qt/qtdbus-${QTMIN}:5
|
||||
>=dev-qt/qtx11extras-${QTMIN}:5
|
||||
>=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
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libX11
|
||||
x11-libs/libXau
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=kde-plasma/kwin-${PVCUT}:5
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!<kde-plasma/plasma-workspace-5.14.2:5
|
||||
"
|
||||
|
||||
S="${S}/${PN}"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-5.18.80-standalone.patch" )
|
||||
|
||||
src_prepare() {
|
||||
# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
|
||||
if [[ ${KDE_BUILD_TYPE} = release ]]; then
|
||||
find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
|
||||
rm -rf po/*/docs || die
|
||||
cp -a ../po ./ || die
|
||||
fi
|
||||
ecm_src_prepare
|
||||
if [[ ${KDE_BUILD_TYPE} = release ]]; then
|
||||
cat >> CMakeLists.txt <<- _EOF_ || die
|
||||
ki18n_install(po)
|
||||
_EOF_
|
||||
fi
|
||||
|
||||
sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
|
||||
-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
|
||||
}
|
||||
Reference in New Issue
Block a user