diff options
author | 2021-09-14 10:06:44 +0200 | |
---|---|---|
committer | 2021-09-14 11:03:20 +0200 | |
commit | 182269cf7b3c557adbd5d1dac3ce73d4bc7be93f (patch) | |
tree | 4563f2142f3f61e5bbe1b284df3a68ac78daf05f /kde-frameworks/kwindowsystem | |
parent | kde-frameworks/kwidgetsaddons: drop 5.82.0* (diff) | |
download | gentoo-182269cf7b3c557adbd5d1dac3ce73d4bc7be93f.tar.gz gentoo-182269cf7b3c557adbd5d1dac3ce73d4bc7be93f.tar.bz2 gentoo-182269cf7b3c557adbd5d1dac3ce73d4bc7be93f.zip |
kde-frameworks/kwindowsystem: drop 5.82.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kwindowsystem')
3 files changed, 0 insertions, 122 deletions
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest index 051452ee679b..1bf2bdc0ac86 100644 --- a/kde-frameworks/kwindowsystem/Manifest +++ b/kde-frameworks/kwindowsystem/Manifest @@ -1,3 +1,2 @@ -DIST kwindowsystem-5.82.0.tar.xz 177932 BLAKE2B e3089e51821f46eb061830863bca969e5da693a815bd17db3d674912fe1c924fe2d590c982c93ec9926d381ee8488287f669745113c1a96cd5e4f3f8ac3c1297 SHA512 fd823e718e439d40e85146195d03c6868c99d62cc9495d5733157db081f29884cd9a9d11421d81c47fe4cc5661107a1b52ff55dc9e0a00565682f1d7845a2e68 DIST kwindowsystem-5.85.0.tar.xz 178256 BLAKE2B f18dbe1f56529f7500ede59bc3447d6dfd4439086dadbd59d137a21ddea01653cfdfe945f6120461f507e7007228ef2135687ba740981a37e2e9ffe1866e21d3 SHA512 517943febe93ec84d91792ece6a2ad4518c3976d4f9ae3ba631713bdb87cec72817d3231da0fa6318c93e7b6ccf4875ba1c079b3838d3d68ad28cb9c35211d43 DIST kwindowsystem-5.86.0.tar.xz 179152 BLAKE2B d765fb19f74fc3513fc012a725ae1cad1b80369e207493d7aa7f6226b00c3f3908185a47d5889d06821c2eab955b10f1781b40e8afea6814a2af9284bd978c32 SHA512 ca9097a0bee54ee12a5bad77a4c6fe0a0df126091938c43d644e6838fd9a01758ff397647d4058e088703b4c88535003d7d58863dbf8f14a745d47f0958e593a diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch deleted file mode 100644 index cfa7ab9a7988..000000000000 --- a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 374a29075694f530d2d0673e33a166c836d02a84 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 2 May 2021 12:38:58 +0200 -Subject: [PATCH] Drop Qt5Widgets dependency if KWINDOWSYSTEM_NO_WIDGETS=ON - -Use existing option to do that. Dependency remains for autotests/tests. ---- - CMakeLists.txt | 5 ++++- - KF5WindowSystemConfig.cmake.in | 5 ++++- - autotests/CMakeLists.txt | 2 +- - tests/CMakeLists.txt | 2 +- - 4 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 49eb05a..ecf98a1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,7 +48,10 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KWINDOWSYSTEM - - # Dependencies - set(REQUIRED_QT_VERSION 5.15.0) --find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Widgets) -+find_package(Qt5Gui ${REQUIRED_QT_VERSION} CONFIG REQUIRED) -+if(NOT KWINDOWSYSTEM_NO_WIDGETS) -+ find_package(Qt5Widgets ${REQUIRED_QT_VERSION} CONFIG REQUIRED) -+endif() - - if (APPLE) - cmake_find_frameworks(Carbon) -diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in -index 8267ef4..6c1b4c0 100644 ---- a/KF5WindowSystemConfig.cmake.in -+++ b/KF5WindowSystemConfig.cmake.in -@@ -1,8 +1,11 @@ - @PACKAGE_INIT@ - - include(CMakeFindDependencyMacro) --find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) -+find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) - -+if(NOT @KWINDOWSYSTEM_NO_WIDGETS@) -+find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) -+endif() - - include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ -diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt -index c1121a7..c964947 100644 ---- a/autotests/CMakeLists.txt -+++ b/autotests/CMakeLists.txt -@@ -6,7 +6,7 @@ add_definitions(-DAUTOTEST_BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}") - include(ECMMarkAsTest) - include(ECMAddTests) - --find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) -+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) - - add_subdirectory(helper) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index c0865d9..c72eb1f 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -3,7 +3,7 @@ remove_definitions(-DQT_NO_CAST_TO_ASCII) - - include(ECMMarkAsTest) - --find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) -+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) - - macro(kwindowsystem_executable_tests) - foreach(_testname ${ARGN}) --- -GitLab - diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild deleted file mode 100644 index 06682e5d7cd8..000000000000 --- a/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Framework providing access to properties and features of the window manager" -LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="nls X" - -RESTRICT+=" test" - -RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) - test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) -" -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" - -DOCS=( docs/README.kstartupinfo ) - -PATCHES=( "${FILESDIR}/${P}-no-qtwidgets.patch" ) # git master/5.83.0 - -src_configure() { - local mycmakeargs=( - -DKWINDOWSYSTEM_NO_WIDGETS=ON - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} |