diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-21 10:20:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-21 10:20:03 +0100 |
commit | 6f8038813c460b4f0572d5ef595cdfa94af3a94d (patch) | |
tree | 3509e94070265053394b7f2e30a779d7e60c2064 /kde-plasma/libkworkspace | |
parent | eccb70a7f91b2d22582587f26d1a28bb31408b45 (diff) |
gentoo resync : 21.05.2019
Diffstat (limited to 'kde-plasma/libkworkspace')
4 files changed, 2 insertions, 160 deletions
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index a0395720a7da..58f744bdb5fb 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1,7 +1,4 @@ -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.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed -EBUILD libkworkspace-5.14.5.ebuild 1444 BLAKE2B c4f3e846adb30e8aeb3cdf77e78bcc178d220b7deed01864912c8b3e5e5c8f1a2937c54324b6a557b09327816b3d279625a7136a58b4a222564578d19dfb9567 SHA512 10b6e36b6c70663e61d6ecbb5638d9ca5d43a3684ea0d3e945a8299e6163126e105e5916ac73640f4cb6bedbab3e8ce53fd794bce95b079196917c88fa1ffabb -EBUILD libkworkspace-5.15.5.ebuild 1272 BLAKE2B 85e7913af4bcdba91d15292e2bbc35f58fa84d65713fd356039fd2ab8023bcb0e90eb174363a1364ee6df7a48899ee2fac5b6e9de4313058fbec38c285887f88 SHA512 ffe9f2b168f20c9b5f8686170504d0714dbf3e082b628bc29934b325fc79f228a789b75a0b433d7c44fa37eeb85118353fb495285b5690123db14d298eae7df2 +EBUILD libkworkspace-5.15.5.ebuild 1270 BLAKE2B ff5b4da45a76985e83577e178a4ac5744d86c9da8360979ca6bc121707b94ceca64bfcd1f55af92e113c49a8673834b4c38cb52aee5b8d2648ca253113515a02 SHA512 8063528d50c7e09d7d2c1fed3b87eb84e839439d97ff87e8d34eda26ab15f390ee0ef095b23d01e8a76e66b759892107c1e69f9e8e2120c33a66434e97ae327a MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch deleted file mode 100644 index f2332f726105..000000000000 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-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 "GENTOO_QT_MINIMAL") -+ set(KF5_MIN_VERSION "GENTOO_KF5_MINIMAL") -+ 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.14.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.14.5.ebuild deleted file mode 100644 index 02cc79588f50..000000000000 --- a/kde-plasma/libkworkspace/libkworkspace-5.14.5.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -FRAMEWORKS_MINIMAL="5.50.0" -QT_MINIMAL="5.11.1" -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/libkworkspace:4 - !<kde-plasma/plasma-workspace-5.14.2:5 -" - -S="${S}/${PN}" - -PATCHES=( "${FILESDIR}/${PN}-5.14.2-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/${PV}/" \ - -e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \ - -e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" -} diff --git a/kde-plasma/libkworkspace/libkworkspace-5.15.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.15.5.ebuild index 3dfe68f80a2c..f7f03cdbe1f0 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.15.5.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.15.5.ebuild @@ -9,7 +9,7 @@ inherit kde5 DESCRIPTION="Workspace library to interact with the Plasma session manager" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="" COMMON_DEPEND=" |