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 6B671158094 for ; Mon, 1 Aug 2022 08:06:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE662E1198; Mon, 1 Aug 2022 08:06:20 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65F8AE1198 for ; Mon, 1 Aug 2022 08:06:20 +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 6B938340DF9 for ; Mon, 1 Aug 2022 08:06:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23439558 for ; Mon, 1 Aug 2022 08:06:18 +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: <1659340789.ff785331a7f8722f2ebdb9fc7cdc734ad8943b13.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/ktouch/, kde-apps/ktouch/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch kde-apps/ktouch/ktouch-22.07.80.ebuild kde-apps/ktouch/ktouch-22.08.49.9999.ebuild kde-apps/ktouch/ktouch-9999.ebuild kde-apps/ktouch/metadata.xml X-VCS-Directories: kde-apps/ktouch/ kde-apps/ktouch/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ff785331a7f8722f2ebdb9fc7cdc734ad8943b13 X-VCS-Branch: master Date: Mon, 1 Aug 2022 08:06:18 +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: aea134ec-cff1-49bb-8e35-812fc4560c03 X-Archives-Hash: ede0fa393636c5ee518bf14ce29f4269 commit: ff785331a7f8722f2ebdb9fc7cdc734ad8943b13 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 29 08:15:31 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Aug 1 07:59:49 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ff785331 kde-apps/ktouch: Fix build with USE -X Add IUSE metadata description Upstream commit d290b2a51d5aa4694ec746ce5cc9456977efde71 Bug: https://bugs.gentoo.org/813450 Signed-off-by: Andreas Sturmlechner gentoo.org> .../ktouch/files/ktouch-22.04.3-without_x11.patch | 97 ++++++++++++++++++++++ kde-apps/ktouch/ktouch-22.07.80.ebuild | 5 +- kde-apps/ktouch/ktouch-22.08.49.9999.ebuild | 5 +- kde-apps/ktouch/ktouch-9999.ebuild | 3 +- kde-apps/ktouch/metadata.xml | 3 + 5 files changed, 107 insertions(+), 6 deletions(-) diff --git a/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch b/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch new file mode 100644 index 0000000000..dbfc2d9498 --- /dev/null +++ b/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch @@ -0,0 +1,97 @@ +From d290b2a51d5aa4694ec746ce5cc9456977efde71 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 31 Jul 2022 16:17:30 +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. + +KTOUCH_BUILD_WITH_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. + +- Move the checks to root CMakeLists.txt +- Move finding Qt5X11Extras behind "NOT WITHOUT_X11" too +- x11_helper is conditional on KTOUCH_BUILD_WITH_X11 + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 18 +++++++++++++++--- + src/CMakeLists.txt | 13 +------------ + 2 files changed, 16 insertions(+), 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9ec74a5..a05231b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,9 +39,6 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS + Xml + XmlPatterns + ) +-if (QT_MAJOR_VERSION STREQUAL "5") +-find_package(Qt5X11Extras) +-endif() + find_package(Qt${QT_MAJOR_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler) + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS +@@ -62,6 +59,21 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + + + option(COMPILE_QML "Precompile QML code" OFF) ++option(WITHOUT_X11 "Build without X11 Keyboard Layout Detection (skips finding X11)" OFF) ++ ++if (NOT WITHOUT_X11) ++ find_package(X11) ++ find_package(XCB OPTIONAL_COMPONENTS XCB XKB) ++ if (QT_MAJOR_VERSION STREQUAL "5") ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG) ++ endif() ++ ++ if (Qt5X11Extras_FOUND AND X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND) ++ set(KTOUCH_BUILD_WITH_X11 TRUE) ++ endif() ++ ++ add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs Qt5X11Extras, libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb") ++endif() + + # enable QML debugging for debug builds + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index cb6f3f5..9dd2a5f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -4,15 +4,6 @@ ecm_setup_version(${RELEASE_SERVICE_VERSION} + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KTouchConfigVersion.cmake" + ) + +-find_package(X11) +-find_package(XCB OPTIONAL_COMPONENTS XCB XKB) +- +-if (Qt5X11Extras_FOUND AND X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND) +- set(KTOUCH_BUILD_WITH_X11 TRUE) +-endif() +- +-add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs Qt5X11Extras, libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb") +- + ecm_optional_add_subdirectory(schemata) + + # set include directories +@@ -137,9 +128,7 @@ set(ktouch_SRCS + undocommands/coursecommands.cpp + undocommands/coursecommands.h + undocommands/keyboardlayoutcommands.cpp +- undocommands/keyboardlayoutcommands.h +- x11_helper.cpp +- x11_helper.h) ++ undocommands/keyboardlayoutcommands.h) + + qt_add_resources(ktouch_imgs_SRCS images/images.qrc) + +-- +GitLab + diff --git a/kde-apps/ktouch/ktouch-22.07.80.ebuild b/kde-apps/ktouch/ktouch-22.07.80.ebuild index c443f79e4b..bb4128c70c 100644 --- a/kde-apps/ktouch/ktouch-22.07.80.ebuild +++ b/kde-apps/ktouch/ktouch-22.07.80.ebuild @@ -54,11 +54,12 @@ RDEPEND="${COMMON_DEPEND} >=kde-apps/kqtquickcharts-${PVCUT}:5 " +PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) + src_configure() { local mycmakeargs=( -DCOMPILE_QML=OFF - $(cmake_use_find_package X X11) - $(cmake_use_find_package X Qt5X11Extras) + -DWITHOUT_X11=$(usex !X) ) ecm_src_configure } diff --git a/kde-apps/ktouch/ktouch-22.08.49.9999.ebuild b/kde-apps/ktouch/ktouch-22.08.49.9999.ebuild index f77fc49426..ee3251fe42 100644 --- a/kde-apps/ktouch/ktouch-22.08.49.9999.ebuild +++ b/kde-apps/ktouch/ktouch-22.08.49.9999.ebuild @@ -54,11 +54,12 @@ RDEPEND="${COMMON_DEPEND} >=kde-apps/kqtquickcharts-${PVCUT}:5 " +PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) + src_configure() { local mycmakeargs=( -DCOMPILE_QML=OFF - $(cmake_use_find_package X X11) - $(cmake_use_find_package X Qt5X11Extras) + -DWITHOUT_X11=$(usex !X) ) ecm_src_configure } diff --git a/kde-apps/ktouch/ktouch-9999.ebuild b/kde-apps/ktouch/ktouch-9999.ebuild index f77fc49426..93c6bad8de 100644 --- a/kde-apps/ktouch/ktouch-9999.ebuild +++ b/kde-apps/ktouch/ktouch-9999.ebuild @@ -57,8 +57,7 @@ RDEPEND="${COMMON_DEPEND} src_configure() { local mycmakeargs=( -DCOMPILE_QML=OFF - $(cmake_use_find_package X X11) - $(cmake_use_find_package X Qt5X11Extras) + -DWITHOUT_X11=$(usex !X) ) ecm_src_configure } diff --git a/kde-apps/ktouch/metadata.xml b/kde-apps/ktouch/metadata.xml index d925f24397..6e812b0dfa 100644 --- a/kde-apps/ktouch/metadata.xml +++ b/kde-apps/ktouch/metadata.xml @@ -8,4 +8,7 @@ https://bugs.kde.org/ + + Enable support for X11 Keyboard Layout Detection +