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 83A91159C9C for ; Fri, 9 Aug 2024 19:25:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A335FE2AC1; Fri, 9 Aug 2024 19:25:14 +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 5526EE2AC1 for ; Fri, 9 Aug 2024 19:25:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 48A28335D0F for ; Fri, 9 Aug 2024 19:25:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 93DFE1E9C for ; Fri, 9 Aug 2024 19:25:11 +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: <1723225903.89cfa0910b34adcabe723bba6c58b2dffd177074.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-misc/colord-kde/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch X-VCS-Directories: kde-misc/colord-kde/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 89cfa0910b34adcabe723bba6c58b2dffd177074 X-VCS-Branch: master Date: Fri, 9 Aug 2024 19:25:11 +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: c98bb0ad-cdda-455a-a018-413107557eda X-Archives-Hash: 3930dbf18e023eade089a6ea90b205a0 commit: 89cfa0910b34adcabe723bba6c58b2dffd177074 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 9 17:51:43 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 9 17:51:43 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=89cfa091 kde-misc/colord-kde: Drop unused patch Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/colord-kde-23.08.3-without_x11.patch | 61 ---------------------- 1 file changed, 61 deletions(-) diff --git a/kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch b/kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch deleted file mode 100644 index d1cfc6f108..0000000000 --- a/kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 31e125cc80497b0dc9f16abc808859ce97fd5fd1 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 26 Mar 2023 19:25:40 +0200 -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. - -X11_FOUND is set automagically so far, and 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 if the option is enabled. - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9c08b03..d491926 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,13 +47,17 @@ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPON - Widgets - ) - --find_package(X11) --set_package_properties(X11 PROPERTIES -- TYPE OPTIONAL -- PURPOSE "For colord integration on X11" --) -+option(WITHOUT_X11 "Build without colord-kded for X11 integration (skips finding X11)" OFF) -+if(NOT WITHOUT_X11) -+ find_package(X11) -+ set_package_properties(X11 PROPERTIES -+ TYPE OPTIONAL -+ PURPOSE "For colord integration on X11" -+ ) -+ set(HAVE_X11 ${X11_FOUND}) -+endif() - --if (X11_FOUND) -+if (HAVE_X11) - find_package(XCB REQUIRED COMPONENTS XCB RANDR) - if (QT_MAJOR_VERSION STREQUAL "5") - find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) -@@ -80,7 +84,7 @@ ecm_set_disabled_deprecation_versions( - KF 5.100.0) - - --if (X11_FOUND) -+if (HAVE_X11) - add_subdirectory(colord-kded) - endif() - add_subdirectory(colord-kcm) --- -GitLab -