diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /kde-plasma/libkworkspace | |
parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) |
gentoo resync : 03.11.2019
Diffstat (limited to 'kde-plasma/libkworkspace')
-rw-r--r-- | kde-plasma/libkworkspace/Manifest | 3 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch | 111 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/libkworkspace-5.17.2.ebuild | 55 |
3 files changed, 169 insertions, 0 deletions
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index a73a6e8913a9..62e3bf20ed3d 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1,4 +1,7 @@ AUX libkworkspace-5.14.90-standalone.patch 3376 BLAKE2B c76206c19939ebe7209dba4172ada0d0aab01f2520cc5ab465c40173d3e6c92cbb7ad9b0bc73e2e229d33792ee6313872fcab73994818e9100e0efdea64b78ae SHA512 6c6ddeca6e2178189b3d63ae77f7bee1b900842a72392fba812bd9231ac6f701fd1655d1212a286d914202c7182223742bb1cc93916f373db99925fb9a9411b2 +AUX libkworkspace-5.16.80-standalone.patch 4815 BLAKE2B 8269cba2d49020e643ae7aca211d9ecf2c38a8abf5c87cdb2185c80cb67824be1a3b79da67cd267e917c8d9ee3b67eef37b58b2845a6383d98c322b3ca90e4e9 SHA512 20bc3f75521e548311b2126ce40e59ce61e0beb85a0ce643e2b31e3a82ce3deb578e2b4049f5524d81129c4872661303bff9011623f0d8436358b3790115efa5 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 EBUILD libkworkspace-5.16.5.ebuild 1269 BLAKE2B ea0f0ead80950429ff9a2ff46fa5c65974b36c04287278cde657420259f3b182fe5fdb7775db38eb02e2535b175b5ac5936266688e362ff621ec011c72584887 SHA512 f137931810e653df1b8d3d7cebec3c4ddb819df4c91fc999aba19a597b35b8be183dd5c488315a03fcf48f395b9fb219c0f19ec24f8be5526ce077852c05dcf3 +EBUILD libkworkspace-5.17.2.ebuild 1305 BLAKE2B b2ea7d64fb71e6c2e4e6637d31d0748f3b2246017973ecb754f9cbe79b07f3be6d48944b697498555d38b24f2b0f3bac586244dd35df2e7484fded1a144f4f5b SHA512 39a77a9a87e1aca110732da680c1c70b4aafc2a00284f2a41465a7ae5a818ff88dd81e4b6dbc3afba17063824198888eb0fc201d71f913961d4025ff482a8522 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 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 000000000000..ed0d29d759f9 --- /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.17.2.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.17.2.ebuild new file mode 100644 index 000000000000..25022518d06f --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.17.2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_TEST="true" +KMNAME="plasma-workspace" +inherit kde5 + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="" + +COMMON_DEPEND=" + $(add_frameworks_dep kcoreaddons) + $(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 + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${COMMON_DEPEND} + $(add_plasma_dep kwin) +" +RDEPEND="${COMMON_DEPEND} + !<kde-plasma/plasma-workspace-5.14.2:5 +" + +S="${S}/${PN}" + +PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" ) + +src_prepare() { + # delete colliding libkworkspace translations, let kde5_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 + kde5_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" +} |