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 B2370158020 for ; Sat, 3 Dec 2022 10:51:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03475E0F1F; Sat, 3 Dec 2022 10:51: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 DCAD9E0F1F for ; Sat, 3 Dec 2022 10:51:13 +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 D7438341415 for ; Sat, 3 Dec 2022 10:51:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED324771 for ; Sat, 3 Dec 2022 10:51:10 +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: <1670064647.b64f3378599e8c9aa4beeb50b01153a003b5b891.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kalarm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch X-VCS-Directories: kde-apps/kalarm/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b64f3378599e8c9aa4beeb50b01153a003b5b891 X-VCS-Branch: master Date: Sat, 3 Dec 2022 10:51:10 +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: e443a543-ee98-4e17-99bc-e3f03980c487 X-Archives-Hash: 456afa70eb782b6792620ff5f684ae82 commit: b64f3378599e8c9aa4beeb50b01153a003b5b891 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 3 10:49:32 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 3 10:50:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64f3378 kde-apps/kalarm: Drop obsolete patch Signed-off-by: Andreas Sturmlechner gentoo.org> .../kalarm/files/kalarm-22.04.3-without_x11.patch | 73 ---------------------- 1 file changed, 73 deletions(-) diff --git a/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch b/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch deleted file mode 100644 index 2f904201566b..000000000000 --- a/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch +++ /dev/null @@ -1,73 +0,0 @@ -From f8646ef6db5b4d0e6add5c9a83a13707f6175b13 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 27 Nov 2021 12:59:32 +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. - -KDEPIM_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 | 17 +++++++++-------- - src/CMakeLists.txt | 2 +- - 2 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06623ad9..3446a87c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -114,18 +114,19 @@ find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) - configure_file(kalarm-version-string.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kalarm-version-string.h @ONLY) - - if (NOT APPLE) -- find_package(X11) --endif() --if (X11_FOUND) -- if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE) -- else() -- #TODO X11 on Qt6 -+ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF) -+ if (NOT WITHOUT_X11) -+ find_package(X11) -+ set(KDEPIM_HAVE_X11 ${X11_FOUND}) -+ if (X11_FOUND) -+ find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE) -+ endif() - endif() - endif() -+add_feature_info(WITHOUT_X11 ${WITHOUT_X11} "Build without X11 integration") -+ - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) - --set(KDEPIM_HAVE_X11 ${X11_FOUND}) - configure_file(src/config-kalarm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kalarm.h) - - include_directories(${kalarm_SOURCE_DIR} ${kalarm_BINARY_DIR}) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e8d70203..3aee2965 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -298,7 +298,7 @@ target_link_libraries(kalarm_bin - KF5::PimCommon - ) - --if (Qt${QT_MAJOR_VERSION}X11Extras_FOUND) -+if(KDEPIM_HAVE_X11) - target_link_libraries(kalarm_bin Qt${QT_MAJOR_VERSION}::X11Extras ${X11_X11_LIB}) - endif() - --- -2.35.1 -