commit:     d24dc15c304f8837da31416965263ad52bbb06be
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 08:41:51 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 17:52:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d24dc15c

kde-frameworks/kwindowsystem: Move x11-base/xorg-proto to USE=X RDEPEND

X11/Xlib.h is included in public header kkeyserver.h, xorg-proto required by
KF6WindowSystemConfig.cmake

Bug: https://bugs.gentoo.org/930142
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../{kwindowsystem-6.5.0.ebuild => kwindowsystem-6.5.0-r1.ebuild}     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-6.5.0.ebuild 
b/kde-frameworks/kwindowsystem/kwindowsystem-6.5.0-r1.ebuild
similarity index 87%
rename from kde-frameworks/kwindowsystem/kwindowsystem-6.5.0.ebuild
rename to kde-frameworks/kwindowsystem/kwindowsystem-6.5.0-r1.ebuild
index 4fa84d309148..e43f9e92b098 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-6.5.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-6.5.0-r1.ebuild
@@ -16,12 +16,15 @@ RESTRICT="test"
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
 # slot op: Uses private/qwayland*_p.h headers
+# x11-base/xorg-proto: X11/Xlib.h included in public header kkeyserver.h,
+#   req. by KF6WindowSystemConfig.cmake; see also bug #939177
 RDEPEND="
        >=dev-qt/qtbase-${QTMIN}:6[gui,wayland?]
        >=dev-qt/qtdeclarative-${QTMIN}:6
        wayland? ( >=dev-qt/qtwayland-${QTMIN}:6= )
        X? (
                >=dev-qt/qtbase-${QTMIN}:6=[gui]
+               x11-base/xorg-proto
                x11-libs/libX11
                x11-libs/libXfixes
                x11-libs/libxcb
@@ -29,7 +32,6 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
-       X? ( x11-base/xorg-proto )
        test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
        wayland? (
                dev-libs/plasma-wayland-protocols

Reply via email to