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 7D472158094 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 B8750E0F38; 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 40DBAE0F2D 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 F30A03408A6 for ; Sun, 31 Jul 2022 15:12:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8185546A 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: <1659280153.f4ca7e64ce2ed768bb1ff43d6a0ae9f2a7f8d330.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kio-extras/files/, kde-apps/kio-extras/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kio-extras/files/kio-extras-22.04.3-without_x11.patch kde-apps/kio-extras/kio-extras-22.07.80.ebuild kde-apps/kio-extras/kio-extras-22.08.49.9999.ebuild X-VCS-Directories: kde-apps/kio-extras/files/ kde-apps/kio-extras/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f4ca7e64ce2ed768bb1ff43d6a0ae9f2a7f8d330 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: f48112fc-2a40-4daf-ac3a-10647ff88269 X-Archives-Hash: 601a0b4c2921d51789a99ead8ced0a16 commit: f4ca7e64ce2ed768bb1ff43d6a0ae9f2a7f8d330 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jul 28 19:23:36 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 31 15:09:13 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4ca7e64 kde-apps/kio-extras: Fix build with USE -X Upstream commit b8dda4b3129f42323e1f6ccb37c16cb62a740d39 Bug: https://bugs.gentoo.org/813450 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/kio-extras-22.04.3-without_x11.patch | 62 ++++++++++++++++++++++ kde-apps/kio-extras/kio-extras-22.07.80.ebuild | 4 +- .../kio-extras/kio-extras-22.08.49.9999.ebuild | 4 +- 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/kde-apps/kio-extras/files/kio-extras-22.04.3-without_x11.patch b/kde-apps/kio-extras/files/kio-extras-22.04.3-without_x11.patch new file mode 100644 index 0000000000..4c97ab5187 --- /dev/null +++ b/kde-apps/kio-extras/files/kio-extras-22.04.3-without_x11.patch @@ -0,0 +1,62 @@ +From b8dda4b3129f42323e1f6ccb37c16cb62a740d39 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 27 Nov 2021 14:07: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. + +-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 +as required in their cmake config, also X11_FOUND could be set by +cascading cmake dependencies. + +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 +--- + thumbnail/CMakeLists.txt | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/thumbnail/CMakeLists.txt b/thumbnail/CMakeLists.txt +index f6f38992d..ee322a1bf 100644 +--- a/thumbnail/CMakeLists.txt ++++ b/thumbnail/CMakeLists.txt +@@ -21,13 +21,16 @@ set_package_properties(libappimage PROPERTIES + PURPOSE "Provides support for AppImage thumbnails" + ) + +-find_package(X11) +-set_package_properties(X11 PROPERTIES +- DESCRIPTION "X11 libraries" +- URL "https://www.x.org" +- TYPE OPTIONAL +- PURPOSE "Provides support for XCursor thumbnails" +-) ++option(WITHOUT_X11 "Build without support for XCursor thumbnails (disables finding X11)" OFF) ++if (NOT WITHOUT_X11) ++ find_package(X11) ++ set_package_properties(X11 PROPERTIES ++ DESCRIPTION "X11 libraries" ++ URL "https://www.x.org" ++ TYPE OPTIONAL ++ PURPOSE "Provides support for XCursor thumbnails" ++ ) ++endif() + + find_package(Taglib 1.11) + set_package_properties(Taglib PROPERTIES +@@ -210,7 +213,7 @@ endif() + + ########### next target ############### + +-if(X11_Xcursor_FOUND) ++if(X11_Xcursor_FOUND AND NOT WITHOUT_X11) + + add_library(cursorthumbnail MODULE cursorcreator.cpp cursorcreatorplugin.cpp) + +-- +GitLab + diff --git a/kde-apps/kio-extras/kio-extras-22.07.80.ebuild b/kde-apps/kio-extras/kio-extras-22.07.80.ebuild index e6f3cbd701..5b21318900 100644 --- a/kde-apps/kio-extras/kio-extras-22.07.80.ebuild +++ b/kde-apps/kio-extras/kio-extras-22.07.80.ebuild @@ -70,6 +70,8 @@ RDEPEND="${DEPEND} " BDEPEND="man? ( dev-util/gperf )" +PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) + src_configure() { local mycmakeargs=( $(cmake_use_find_package activities KF5Activities) @@ -83,7 +85,7 @@ src_configure() { $(cmake_use_find_package samba Samba) $(cmake_use_find_package sftp libssh) $(cmake_use_find_package taglib Taglib) - $(cmake_use_find_package X X11) + -DWITHOUT_X11=$(usex !X) ) use samba && mycmakeargs+=( -DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff diff --git a/kde-apps/kio-extras/kio-extras-22.08.49.9999.ebuild b/kde-apps/kio-extras/kio-extras-22.08.49.9999.ebuild index dbdf736e08..fd4e30eb56 100644 --- a/kde-apps/kio-extras/kio-extras-22.08.49.9999.ebuild +++ b/kde-apps/kio-extras/kio-extras-22.08.49.9999.ebuild @@ -70,6 +70,8 @@ RDEPEND="${DEPEND} " BDEPEND="man? ( dev-util/gperf )" +PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) + src_configure() { local mycmakeargs=( $(cmake_use_find_package activities KF5Activities) @@ -83,7 +85,7 @@ src_configure() { $(cmake_use_find_package samba Samba) $(cmake_use_find_package sftp libssh) $(cmake_use_find_package taglib Taglib) - $(cmake_use_find_package X X11) + -DWITHOUT_X11=$(usex !X) ) use samba && mycmakeargs+=( -DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff