Skip to content

Commit

Permalink
kde-frameworks/kwindowsystem: 5.82.0 version bump
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed May 9, 2021
1 parent 9927b83 commit 69d5c31
Show file tree
Hide file tree
Showing 3 changed files with 122 additions and 0 deletions.
1 change: 1 addition & 0 deletions kde-frameworks/kwindowsystem/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
DIST kwindowsystem-5.80.0.tar.xz 177340 BLAKE2B 9f659368706e0b849285758f103478078f15057170397bde3aa6ab0bc27390e4eee5d7e94900302be204c5e672618b48197581cf8459b0796a2dd92ee17e8e91 SHA512 a2e928568ca4ba7e5ae904888e273c8f3e7c57661b8a32246e22330426fa2db55535b96ec7b4e74681090f15f227586d282f3f077e44bdc3e0a86c9514f6151f
DIST kwindowsystem-5.81.0.tar.xz 177724 BLAKE2B 9d22e4ca2f3aece2d85f694d381ae67db34e95794b54835dba3335237d5ce273dde2eb020038c560d0bbbd3c27e7bb92e8290976530bef7ef274451c694ac4e1 SHA512 05531784e51cf00d8f93e5fd87cd5f0b24cefd75f652ba2edac785343cf73c2e545d26ad039292a0c578a8d365346a8b6aaef9bf8e25402d341eb82ee9fcd1bd
DIST kwindowsystem-5.82.0.tar.xz 177932 BLAKE2B e3089e51821f46eb061830863bca969e5da693a815bd17db3d674912fe1c924fe2d590c982c93ec9926d381ee8488287f669745113c1a96cd5e4f3f8ac3c1297 SHA512 fd823e718e439d40e85146195d03c6868c99d62cc9495d5733157db081f29884cd9a9d11421d81c47fe4cc5661107a1b52ff55dc9e0a00565682f1d7845a2e68
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
From 374a29075694f530d2d0673e33a166c836d02a84 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[email protected]>
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

46 changes: 46 additions & 0 deletions kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# 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
}

0 comments on commit 69d5c31

Please sign in to comment.