From 9d8a69f12352e9398d0686d96fd17bd7c4e7177b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Feb 2019 13:16:24 +0000 Subject: kde-plasma/libkworkspace : version bump --- kde-plasma/libkworkspace/Manifest | 2 +- .../files/libkworkspace-5.14.2-standalone.patch | 96 ---------------------- .../files/libkworkspace-5.14.90-standalone.patch | 96 ++++++++++++++++++++++ .../libkworkspace-5.14.5-r1337.ebuild | 58 ------------- .../libkworkspace-5.15.0-r1337.ebuild | 53 ++++++++++++ 5 files changed, 150 insertions(+), 155 deletions(-) delete mode 100644 kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch create mode 100644 kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch delete mode 100644 kde-plasma/libkworkspace/libkworkspace-5.14.5-r1337.ebuild create mode 100644 kde-plasma/libkworkspace/libkworkspace-5.15.0-r1337.ebuild diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index 9c91c2b6..3a67fdc6 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1 +1 @@ -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 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 f2332f72..00000000 --- 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 -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/files/libkworkspace-5.14.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch new file mode 100644 index 00000000..78042c5d --- /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 +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.14.5-r1337.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.14.5-r1337.ebuild deleted file mode 100644 index 6eb8e547..00000000 --- a/kde-plasma/libkworkspace/libkworkspace-5.14.5-r1337.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 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} -" -RDEPEND="${COMMON_DEPEND} - !kde-plasma/libkworkspace:4 - !> 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.0-r1337.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.15.0-r1337.ebuild new file mode 100644 index 00000000..68f6e9f5 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.15.0-r1337.ebuild @@ -0,0 +1,53 @@ +# 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} +" +RDEPEND="${COMMON_DEPEND} + !> 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" +} -- cgit v1.2.3