diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2023-01-15 11:56:12 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-01-15 14:04:27 +0100 |
| commit | 4605040ed2f455bdef18e3bc5b2401a2445d6e28 (patch) | |
| tree | bf8caf90be695ba22a216d60b914ba295cbf2ec4 /kde-frameworks | |
| parent | dev-util/schroot: add link to upstream PR for resize patch (diff) | |
| download | gentoo-4605040ed2f455bdef18e3bc5b2401a2445d6e28.tar.gz gentoo-4605040ed2f455bdef18e3bc5b2401a2445d6e28.tar.bz2 gentoo-4605040ed2f455bdef18e3bc5b2401a2445d6e28.zip | |
kde-frameworks/kwindowsystem: Revert "Always provide KX11Extras"
An ill-fated attempt after all.
Bug: https://bugs.gentoo.org/885525
Closes: https://bugs.gentoo.org/890871
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks')
| -rw-r--r-- | kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-always-provide-KX11Extras.patch | 45 | ||||
| -rw-r--r-- | kde-frameworks/kwindowsystem/kwindowsystem-5.102.0-r1.ebuild (renamed from kde-frameworks/kwindowsystem/kwindowsystem-5.102.0.ebuild) | 2 |
2 files changed, 0 insertions, 47 deletions
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 deleted file mode 100644 index 94c019c82e5b..000000000000 --- a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-always-provide-KX11Extras.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9f4229d2628d882b5aa2248546ad23f2e8d280dd Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Thu, 5 Jan 2023 13:38:38 +0100 -Subject: [PATCH 2/2] Always provide KX11Extras - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - 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.102.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.102.0-r1.ebuild index 87045dd4e1d0..0b3f7a48a882 100644 --- a/kde-frameworks/kwindowsystem/kwindowsystem-5.102.0.ebuild +++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.102.0-r1.ebuild @@ -34,8 +34,6 @@ 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 |