commit: 318dbfe8929b99d73a983006a8b6eedc460fdb8d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 5 12:56:03 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 5 13:08:39 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=318dbfe8
kde-frameworks/kwindowsystem: Always provide KX11Extras These functions may not be relevant outside of X11 but at least they do not require X11 libs to be present. Since revdeps do not currently hide KX11Extras use behind ifdefs just install it unconditionally for our purpose. See also: https://phabricator.kde.org/T12413 https://invent.kde.org/frameworks/kwindowsystem/-/merge_requests/72 Bug: https://bugs.gentoo.org/885525 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...wsystem-5.101.0-always-provide-KX11Extras.patch | 45 ++++++++++++++++++++++ .../kwindowsystem/kwindowsystem-5.9999.ebuild | 2 + 2 files changed, 47 insertions(+) diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-always-provide-KX11Extras.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-always-provide-KX11Extras.patch new file mode 100644 index 0000000000..94c019c82e --- /dev/null +++ b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-always-provide-KX11Extras.patch @@ -0,0 +1,45 @@ +From 9f4229d2628d882b5aa2248546ad23f2e8d280dd Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Thu, 5 Jan 2023 13:38:38 +0100 +Subject: [PATCH 2/2] Always provide KX11Extras + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + src/CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 27577ef..fb7c28e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -36,6 +36,10 @@ ecm_qt_declare_logging_category(KF5WindowSystem + EXPORT KWINDOWSYSTEM + ) + ++target_sources(KF5WindowSystem PRIVATE ++ kx11extras.cpp ++) ++ + if (KWINDOWSYSTEM_HAVE_X11) + if(NOT X11_Xfixes_LIB) + message(FATAL_ERROR "The XFixes library could not be found. Please install the development package for it.") +@@ -71,7 +75,6 @@ if (KWINDOWSYSTEM_HAVE_X11) + platforms/xcb/kxmessages.cpp + platforms/xcb/kxutils.cpp + platforms/xcb/netwm.cpp +- kx11extras.cpp + ) + + # we install kkeyserver_x11.h which needs the X11 headers available +@@ -149,7 +152,7 @@ ecm_generate_headers(KWindowSystem_HEADERS + REQUIRED_HEADERS KWindowSystem_HEADERS + ) + +-if (KWINDOWSYSTEM_HAVE_X11) ++if (TRUE) + ecm_generate_headers(KWindowSystem_HEADERS + HEADER_NAMES + KX11Extras +-- +2.39.0 + diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.9999.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.9999.ebuild index f8578f7ae5..c18624c04d 100644 --- a/kde-frameworks/kwindowsystem/kwindowsystem-5.9999.ebuild +++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.9999.ebuild @@ -34,6 +34,8 @@ PDEPEND="wayland? ( >=kde-plasma/kwayland-integration-5.25.5-r1:5 )" DOCS=( docs/README.kstartupinfo ) +PATCHES=( "${FILESDIR}/${PN}-5.101.0-always-provide-KX11Extras.patch" ) # bug 885525 + src_configure() { local mycmakeargs=( -DKWINDOWSYSTEM_NO_WIDGETS=ON
