diff options
Diffstat (limited to 'kde-plasma/libkworkspace')
| -rw-r--r-- | kde-plasma/libkworkspace/Manifest | 7 | ||||
| -rw-r--r-- | kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch | 96 | ||||
| -rw-r--r-- | kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild | 2 | ||||
| -rw-r--r-- | kde-plasma/libkworkspace/libkworkspace-5.17.5.ebuild (renamed from kde-plasma/libkworkspace/libkworkspace-5.16.5.ebuild) | 36 |
4 files changed, 25 insertions, 116 deletions
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index 25807dc8587e..2e988e75cad1 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1,7 +1,6 @@ -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.4.tar.xz 4962200 BLAKE2B 2050dbf77dbdf144017e0ddf4b827b9dbe27b8f475eedaed969a442e036f162cabad5d6b47fd650491ed5989cade48ebafbd5f599dbc790c14515ce01ebfd626 SHA512 3f5aa07ccd19604bc399bb1d30dd16ac82e1405613c1f4a939e3c2cba3b4a478213095617052440dda222f1712608533e5806939117752d31b0616a6009cf45b -EBUILD libkworkspace-5.16.5.ebuild 1269 BLAKE2B ea0f0ead80950429ff9a2ff46fa5c65974b36c04287278cde657420259f3b182fe5fdb7775db38eb02e2535b175b5ac5936266688e362ff621ec011c72584887 SHA512 f137931810e653df1b8d3d7cebec3c4ddb819df4c91fc999aba19a597b35b8be183dd5c488315a03fcf48f395b9fb219c0f19ec24f8be5526ce077852c05dcf3 -EBUILD libkworkspace-5.17.4.ebuild 1450 BLAKE2B 766115ad987df10c52aa71a38f39230370c71206a633271fd88a271a7791a79f35159aaf448ec321d6012aa2ee39a55795592f6041d92b7f47da3cdda514d850 SHA512 be9eee5ee3264afb1b3e49a1be41bcf21e2a3bb12812cfd93604457e23f4ce1cdbe45ca9ca70d6fc0310f2cdde4a6f73d75a11532bd0dba6cf52b95c117b4c5f +DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a +EBUILD libkworkspace-5.17.4.ebuild 1447 BLAKE2B a66fdaa59ab5a7716eae6b5922f28ebbb26eb3dcd9dcc5fc7a3b7499e408177c287355ceb423544fa90fdc14eb39db4d407f52d46bf552d6007328adeb0e1771 SHA512 f34e912429dd42333448e226758de94564f12ed1de44d81953556e2c7caddcf3c593ddb3d49465624065e0f83e1072634ba30110608a66c31297c6c803899fd9 +EBUILD libkworkspace-5.17.5.ebuild 1450 BLAKE2B b868fe9d8729dd893d6fb5b5f9641b434aa9fc4f362ea97232348d1e00e1fbc68e16adfe31fde3f9c00ce1f46027e64a56fec9224dcc923f86152e4ec9bcf2c4 SHA512 313037235e8a82ac700364ddd4cf26c4d77f3bd80cea83e3320fb82e53f52a422592a7acc8dafc10a84e03639122cb90f1a41eec46916ab360ec7967a07c315a MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 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 78042c5d16b2..000000000000 --- 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/libkworkspace-5.17.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild index 623419ba9675..123fca5f9095 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm arm64 x86" IUSE="" COMMON_DEPEND=" diff --git a/kde-plasma/libkworkspace/libkworkspace-5.16.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.17.5.ebuild index a02f4ae52f21..5812223a6e1d 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.16.5.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.17.5.ebuild @@ -1,31 +1,37 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -KDE_TEST="true" -KMNAME="plasma-workspace" -inherit kde5 +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.64.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="Workspace library to interact with the Plasma session manager" -KEYWORDS="amd64 ~arm arm64 x86" +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +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_qt_dep qtdbus) - $(add_qt_dep qtx11extras) + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau " DEPEND="${COMMON_DEPEND} - $(add_plasma_dep kwin) + >=kde-plasma/kwin-${PVCUT}:5 " RDEPEND="${COMMON_DEPEND} !<kde-plasma/plasma-workspace-5.14.2:5 @@ -33,16 +39,16 @@ 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 + # 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 - kde5_src_prepare + ecm_src_prepare if [[ ${KDE_BUILD_TYPE} = release ]]; then cat >> CMakeLists.txt <<- _EOF_ || die ki18n_install(po) |