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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 073D2158095 for ; Sat, 6 Aug 2022 07:45:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A97E2E0CAF; Sat, 6 Aug 2022 07:45:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 581D9E0CAF for ; Sat, 6 Aug 2022 07:45:05 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 481AB340DA0 for ; Sat, 6 Aug 2022 07:45:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA197584 for ; Sat, 6 Aug 2022 07:45:00 +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: <1659771104.670ad97b10d0f7fbde3f5ff14ef07f3420945da5.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/, kde-apps/yakuake/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch kde-apps/yakuake/yakuake-22.04.3.ebuild X-VCS-Directories: kde-apps/yakuake/ kde-apps/yakuake/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 670ad97b10d0f7fbde3f5ff14ef07f3420945da5 X-VCS-Branch: master Date: Sat, 6 Aug 2022 07:45:00 +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: d77a89ff-6e88-47a7-944e-de839d01e6f8 X-Archives-Hash: ff899da90064069eceb27405ab3f0069 commit: 670ad97b10d0f7fbde3f5ff14ef07f3420945da5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 27 13:51:30 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 6 07:31:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670ad97b kde-apps/yakuake: Fix build with USE -X Upstream commit 1213c6dfd34583b005d0a2dbe7876951a13361a2 Bug: https://bugs.gentoo.org/813450 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/yakuake-22.04.3-without_x11.patch | 78 ++++++++++++++++++++++ kde-apps/yakuake/yakuake-22.04.3.ebuild | 4 +- 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch b/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch new file mode 100644 index 000000000000..5daf29c35da4 --- /dev/null +++ b/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch @@ -0,0 +1,78 @@ +From 68bee7bce59bed1def66518bc254ecf7ae8985c5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 27 Nov 2021 14:49:51 +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. + +* backported to release/22.04 + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 22 ++++++++++++---------- + app/CMakeLists.txt | 6 +++--- + 2 files changed, 15 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 14f6842..0ec65b9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,16 +51,18 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED + ) + + if(NOT APPLE) +- find_package(X11) +- set(HAVE_X11 ${X11_FOUND}) +- +- if(X11_FOUND) +- find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras) +- endif(X11_FOUND) +- +- find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG) +- set(HAVE_KWAYLAND ${KF5Wayland_FOUND}) +-endif(NOT APPLE) ++ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF) ++ if(NOT WITHOUT_X11) ++ find_package(X11) ++ set(HAVE_X11 ${X11_FOUND}) ++ if(X11_FOUND) ++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras) ++ endif() ++ endif() ++ ++ find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG) ++ set(HAVE_KWAYLAND ${KF5Wayland_FOUND}) ++endif() + + add_subdirectory(app) + add_subdirectory(data) +diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt +index 69aedcd..994d36f 100644 +--- a/app/CMakeLists.txt ++++ b/app/CMakeLists.txt +@@ -63,9 +63,9 @@ target_link_libraries(yakuake + KF5::WidgetsAddons + KF5::WindowSystem) + +-if(X11_FOUND) +- target_link_libraries(yakuake Qt5::X11Extras ${X11_X11_LIB}) +-endif(X11_FOUND) ++if(HAVE_X11) ++ target_link_libraries(yakuake Qt5::X11Extras) ++endif() + + if(KF5Wayland_FOUND) + target_link_libraries(yakuake KF5::WaylandClient) +-- +2.35.1 + diff --git a/kde-apps/yakuake/yakuake-22.04.3.ebuild b/kde-apps/yakuake/yakuake-22.04.3.ebuild index 0db7a4d76d4b..556269d0a620 100644 --- a/kde-apps/yakuake/yakuake-22.04.3.ebuild +++ b/kde-apps/yakuake/yakuake-22.04.3.ebuild @@ -48,10 +48,12 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-without_x11.patch" ) + src_configure() { local mycmakeargs=( $(cmake_use_find_package absolute-position KF5Wayland) - $(cmake_use_find_package X X11) + -DWITHOUT_X11=$(usex !X) ) ecm_src_configure