From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A777B158094 for ; Sun, 31 Jul 2022 15:12:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5FE4E0F2D; Sun, 31 Jul 2022 15:12:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68D40E0F2D for ; Sun, 31 Jul 2022 15:12:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35FA4340BE3 for ; Sun, 31 Jul 2022 15:12:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9621C544 for ; Sun, 31 Jul 2022 15:12:03 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1659280249.de56cc11b5be214fba43b3c265aba76b4c69d280.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/konsole/files/, kde-apps/konsole/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/konsole/files/konsole-22.04.3-without_x11.patch kde-apps/konsole/konsole-22.07.80.ebuild kde-apps/konsole/konsole-22.08.49.9999.ebuild X-VCS-Directories: kde-apps/konsole/files/ kde-apps/konsole/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: de56cc11b5be214fba43b3c265aba76b4c69d280 X-VCS-Branch: master Date: Sun, 31 Jul 2022 15:12:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 974e5737-1f51-4081-97df-136575f426f3 X-Archives-Hash: a68f69a3574e2d3c7a86d76906b184bb commit: de56cc11b5be214fba43b3c265aba76b4c69d280 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 30 08:33:05 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 31 15:10:49 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=de56cc11 kde-apps/konsole: Fix build with USE -X Upstream commit 0aa39e22a2bb1bbcb8a02dfd6635ffe4d8a0bbb1 Bug: https://bugs.gentoo.org/813450 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/konsole-22.04.3-without_x11.patch | 46 ++++++++++++++++++++++ kde-apps/konsole/konsole-22.07.80.ebuild | 4 +- kde-apps/konsole/konsole-22.08.49.9999.ebuild | 4 +- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch b/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch new file mode 100644 index 0000000000..ed396fcf20 --- /dev/null +++ b/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch @@ -0,0 +1,46 @@ +From 0aa39e22a2bb1bbcb8a02dfd6635ffe4d8a0bbb1 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 27 Nov 2021 14:43:18 +0100 +Subject: [PATCH] Add CMake option to build WITHOUT_X11 + +We want to be able to build without X11 support even if some of the used +libraries may not work w/o X11 themselves yet or need to be built with +X11 support for other reverse dependencies. + +HAVE_X11 already exists and is set automagically so far, but using +-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 +as required in their cmake config. + +Introducing this option means there is no behavior change by default, +cmake will just skip finding X11 or adding unwanted features if the +option is enabled. + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 61ed70cd7..565682848 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -103,10 +103,13 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION + ) + + if(NOT APPLE) +- find_package(X11) +- set_package_properties(X11 PROPERTIES TYPE OPTIONAL) ++ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF) ++ if (NOT WITHOUT_X11) ++ find_package(X11) ++ set_package_properties(X11 PROPERTIES TYPE OPTIONAL) ++ set(HAVE_X11 ${X11_FOUND}) ++ endif() + endif() +-set(HAVE_X11 ${X11_FOUND}) + + # Check for function GETPWUID + check_symbol_exists(getpwuid "pwd.h" HAVE_GETPWUID) +-- +GitLab + diff --git a/kde-apps/konsole/konsole-22.07.80.ebuild b/kde-apps/konsole/konsole-22.07.80.ebuild index a0a71ba6f8..b2ba161347 100644 --- a/kde-apps/konsole/konsole-22.07.80.ebuild +++ b/kde-apps/konsole/konsole-22.07.80.ebuild @@ -50,9 +50,11 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) + src_configure() { local mycmakeargs=( - $(cmake_use_find_package X X11) + -DWITHOUT_X11=$(usex !X) ) ecm_src_configure diff --git a/kde-apps/konsole/konsole-22.08.49.9999.ebuild b/kde-apps/konsole/konsole-22.08.49.9999.ebuild index 059873271c..0a92af7f86 100644 --- a/kde-apps/konsole/konsole-22.08.49.9999.ebuild +++ b/kde-apps/konsole/konsole-22.08.49.9999.ebuild @@ -50,9 +50,11 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) + src_configure() { local mycmakeargs=( - $(cmake_use_find_package X X11) + -DWITHOUT_X11=$(usex !X) ) ecm_src_configure