commit: 4ca2ea850eba56b825a8cf70fdc78be36434858b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Aug 8 14:17:54 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Aug 8 14:21:42 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4ca2ea85
kde-frameworks/kio: Fix build with USE -X, drop obsolete DEPENDs Upstream commit c7a277e6810b74b7f664b029573beab592932421 Bug: https://bugs.gentoo.org/813450 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-frameworks/kio/files/kio-5.96.0-with_x11.patch | 72 ++++++++++++++++++++++ kde-frameworks/kio/kio-5.97.0.ebuild | 11 ++-- kde-frameworks/kio/kio-9999.ebuild | 9 +-- 3 files changed, 78 insertions(+), 14 deletions(-) diff --git a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch new file mode 100644 index 0000000000..9f87ec989a --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch @@ -0,0 +1,72 @@ +From c7a277e6810b74b7f664b029573beab592932421 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@gentoo.org> +Date: Mon, 1 Aug 2022 22:10:02 +0200 +Subject: [PATCH] Drop obsolete X11 dependency, introduce WITH_X11 option + instead + +This will only determine whether to search for Qt5X11Extras and then +set HAVE_X11 accordingly. This is a behavior change as previously it was +silently disabled if X11 was not found. + +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. + +Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org> +--- + CMakeLists.txt | 19 +++++++++---------- + src/ioslaves/http/CMakeLists.txt | 3 --- + 2 files changed, 9 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 95b5db299..c3372f7ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,17 +117,16 @@ set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of + PURPOSE "A MIT or HEIMDAL flavor of GSSAPI can be used" + ) + +-if (NOT APPLE AND NOT WIN32) +- find_package(X11) +-endif() +- +-set(HAVE_X11 ${X11_FOUND}) +-if (HAVE_X11) +- if (QT_MAJOR_VERSION STREQUAL "5") +- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) +- else() +- # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above ++if (NOT APPLE AND NOT WIN32 AND NOT ANDROID) ++ option(WITH_X11 "Build with X11 integration" ON) ++ if(WITH_X11) ++ if (QT_MAJOR_VERSION STREQUAL "5") ++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) ++ else() ++ # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above ++ endif() + endif() ++ set(HAVE_X11 ${WITH_X11}) + endif() + + find_package(ACL) +diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt +index 4fbddb4a3..689f63dd8 100644 +--- a/src/ioslaves/http/CMakeLists.txt ++++ b/src/ioslaves/http/CMakeLists.txt +@@ -3,9 +3,6 @@ include(ECMMarkNonGuiExecutable) + include(ConfigureChecks.cmake) + configure_file(config-kioslave-http.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-http.h ) + +-find_package(X11) +-set(HAVE_X11 ${X11_FOUND}) +- + if(GSSAPI_FOUND) + set(HAVE_LIBGSSAPI 1) + if(GSSAPI_FLAVOR STREQUAL "MIT") +-- +GitLab + diff --git a/kde-frameworks/kio/kio-5.97.0.ebuild b/kde-frameworks/kio/kio-5.97.0.ebuild index cc6c2eecc0..834eb3d27e 100644 --- a/kde-frameworks/kio/kio-5.97.0.ebuild +++ b/kde-frameworks/kio/kio-5.97.0.ebuild @@ -47,7 +47,7 @@ RDEPEND=" =kde-frameworks/kservice-${PVCUT}*:5 =kde-frameworks/ktextwidgets-${PVCUT}*:5 =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] =kde-frameworks/kxmlgui-${PVCUT}*:5 =kde-frameworks/solid-${PVCUT}*:5 acl? ( @@ -62,14 +62,11 @@ RDEPEND=" DEPEND="${RDEPEND} >=dev-qt/qtconcurrent-${QTMIN}:5 test? ( sys-libs/zlib ) - X? ( - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - ) " PDEPEND=">=kde-frameworks/kded-${PVCUT}:5" +PATCHES=( "${FILESDIR}/${PN}-5.96.0-with_x11.patch" ) + src_configure() { local mycmakeargs=( -DKIO_NO_PUBLIC_QTCONCURRENT=ON @@ -77,7 +74,7 @@ src_configure() { $(cmake_use_find_package handbook KF5DocTools) $(cmake_use_find_package kerberos GSSAPI) $(cmake_use_find_package kwallet KF5Wallet) - $(cmake_use_find_package X X11) + -DWITH_X11=$(usex X) ) ecm_src_configure diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild index e793c5c9e7..35ffd9161a 100644 --- a/kde-frameworks/kio/kio-9999.ebuild +++ b/kde-frameworks/kio/kio-9999.ebuild @@ -47,7 +47,7 @@ RDEPEND=" =kde-frameworks/kservice-${PVCUT}*:5 =kde-frameworks/ktextwidgets-${PVCUT}*:5 =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] =kde-frameworks/kxmlgui-${PVCUT}*:5 =kde-frameworks/solid-${PVCUT}*:5 acl? ( @@ -62,11 +62,6 @@ RDEPEND=" DEPEND="${RDEPEND} >=dev-qt/qtconcurrent-${QTMIN}:5 test? ( sys-libs/zlib ) - X? ( - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - ) " PDEPEND=">=kde-frameworks/kded-${PVCUT}:5" @@ -77,7 +72,7 @@ src_configure() { $(cmake_use_find_package handbook KF5DocTools) $(cmake_use_find_package kerberos GSSAPI) $(cmake_use_find_package kwallet KF5Wallet) - $(cmake_use_find_package X X11) + -DWITH_X11=$(usex X) ) ecm_src_configure
