diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
commit | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch) | |
tree | ade7cb031f363fad64c77139dea7aa3d81908537 /kde-plasma/libkworkspace | |
parent | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff) |
gentoo resync : 16.02.1018
Diffstat (limited to 'kde-plasma/libkworkspace')
-rw-r--r-- | kde-plasma/libkworkspace/Manifest | 3 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch | 96 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/libkworkspace-5.15.0.ebuild | 54 |
3 files changed, 153 insertions, 0 deletions
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index c2558c530687..3eee35c56205 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1,4 +1,7 @@ AUX libkworkspace-5.14.2-standalone.patch 3399 BLAKE2B 3e36f83f6112f00fa1864759ad5094450072df9aa726d88b102fc5694a1662b0b62d1cf7361ef08c9070439a581b40794e14cd2d17e85399d1cacb788f44ed8b SHA512 d2cfde759df79776daec10a8108e6bd20c89f94db8eaeebac23844a9240f08c8e53254905632f100b4c31f48070162de1736109d05f8abadeba71f8124662a2f +AUX libkworkspace-5.14.90-standalone.patch 3376 BLAKE2B c76206c19939ebe7209dba4172ada0d0aab01f2520cc5ab465c40173d3e6c92cbb7ad9b0bc73e2e229d33792ee6313872fcab73994818e9100e0efdea64b78ae SHA512 6c6ddeca6e2178189b3d63ae77f7bee1b900842a72392fba812bd9231ac6f701fd1655d1212a286d914202c7182223742bb1cc93916f373db99925fb9a9411b2 DIST plasma-workspace-5.14.5.tar.xz 4578556 BLAKE2B 3c37bd9f880225f0e8b2496b90e5afc5ad591e8e356bd68ae135c3e9ccfe646adcb2418e2e80185f396c3b412f0df603ba0902e5a6d54a6d9a5abdff500a71f7 SHA512 247abdfe4ed4c7b6bb847c5352b3df11d110d59f8cc62b51dfd9de76c62549a0191efdd1e1f5a6ab82a87eccdc9fd28481a85c1252d05595e0f1a72174b3f8c6 +DIST plasma-workspace-5.15.0.tar.xz 4706936 BLAKE2B f1f772bf0c27b491ed2e8b9e4342694b5e1acaabec701ca44b252fb522c72688be1bf4c8db8826e5c7cd407c47ca1c205ae422312532bb7ea2dce165d9b9204e SHA512 2ed2f0ce2ef15aafa337a2b4943389668d18e18f026df67950f4d506d2c5647660ddade6f9c915b1e2fb36c79fbcddf563c25fdac69aac3f14e26afb603c533c EBUILD libkworkspace-5.14.5.ebuild 1444 BLAKE2B c4f3e846adb30e8aeb3cdf77e78bcc178d220b7deed01864912c8b3e5e5c8f1a2937c54324b6a557b09327816b3d279625a7136a58b4a222564578d19dfb9567 SHA512 10b6e36b6c70663e61d6ecbb5638d9ca5d43a3684ea0d3e945a8299e6163126e105e5916ac73640f4cb6bedbab3e8ce53fd794bce95b079196917c88fa1ffabb +EBUILD libkworkspace-5.15.0.ebuild 1272 BLAKE2B 85e7913af4bcdba91d15292e2bbc35f58fa84d65713fd356039fd2ab8023bcb0e90eb174363a1364ee6df7a48899ee2fac5b6e9de4313058fbec38c285887f88 SHA512 ffe9f2b168f20c9b5f8686170504d0714dbf3e082b628bc29934b325fc79f228a789b75a0b433d7c44fa37eeb85118353fb495285b5690123db14d298eae7df2 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 new file mode 100644 index 000000000000..78042c5d16b2 --- /dev/null +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch @@ -0,0 +1,96 @@ +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.15.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.15.0.ebuild new file mode 100644 index 000000000000..3dfe68f80a2c --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.15.0.ebuild @@ -0,0 +1,54 @@ +# 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_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.14.90-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" +} |