commit:     811c33705dc3f9a0ad2c81ffd0096ff5e152aacb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 30 18:31:28 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun  2 16:48:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811c3370

kde-plasma/kwin: Cherry-pick 6.3 branch fixes planned for 6.3.6

Vlad Zahorodnii (4):
      x11: Add an environment variable to disable _NET_WM_SYNC_REQUEST in 
X11Window
      Map xinerama index to Output by output name
      backends/drm: Add missing null guard
      xwayland: Fix leaking normal key presses with keyboard layouts other than 
English

Xaver Hugl (11):
      backends/drm: also guard DrmOutput::cursorLayer for nullptr pipeline
      core/iccprofile: also estimate black point even if there's no luminance 
tag
      wayland/colormanagement: fix sending target luminance levels
      wayland/colormanagement: also around max_fall and max_cll
      wayland/colormanagement: compare primaries with the protocol's resolution
      plugins/colorpicker: use BPC when converting to sRGB
      plugins/colorpicker: round the result
      don't leak lcms tone curves
      wayland/xdgoutput: round the scaled output position
      backends/drm: clear the test buffer with legacy modesetting
      outputconfigurationstore: disable adaptive sync by default

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/kwin/Manifest             |   1 +
 kde-plasma/kwin/kwin-6.3.5-r1.ebuild | 154 +++++++++++++++++++++++++++++++++++
 2 files changed, 155 insertions(+)

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index a23fe3555903..88634ea3b261 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1 +1,2 @@
+DIST kwin-6.3.5-patchset-1.tar.xz 12264 BLAKE2B 
47d96f0eb6c21f62b225cc90389fcf9e92b09c081ad38114b03bc5cb91be2eb220865aa43f7c9c9e7ee8815bc40a7c469927f7216c74b79427d419a30e5edcde
 SHA512 
d0d65c79bdde31c4c32cc457c6b7eb9eb52b990ab8dfc19aac78d52a9f94d0af1701afa1aefe8e57ab38a37c8d55efd5f7714265888b4ab9dffe525e94a9b9a3
 DIST kwin-6.3.5.tar.xz 8978724 BLAKE2B 
bbe5f51d47655046930afecb0e6d8cefcdd1693be724f2bfb924abe48204836c98f26a7dbb29ee8fed7ad49bfc83387f61e8a5e7f68006328a88830adcc02965
 SHA512 
e207c31bfca59faa2f449a1e6d6f0eaca1c9e71d82fa2b801e7dbce0b3dc37ed32492af54a64c96bdc7a83fc4c3e2b0a4e7f38236498827878af5556a3c4f92f

diff --git a/kde-plasma/kwin/kwin-6.3.5-r1.ebuild 
b/kde-plasma/kwin/kwin-6.3.5-r1.ebuild
new file mode 100644
index 000000000000..6674ff5236bf
--- /dev/null
+++ b/kde-plasma/kwin/kwin-6.3.5-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCHSET="${P}-patchset-1"
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.10.0
+QTMIN=6.8.1
+inherit ecm fcaps plasma.kde.org xdg
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on 
Linux"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz";
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="accessibility gles2-only lock screencast +shortcuts systemd"
+
+RESTRICT="test"
+
+# qtbase slot op: GuiPrivate use in tabbox
+# qtbase[X]: private/qtx11extras_p.h in src/helpers/killer
+COMMON_DEPEND="
+       dev-libs/libei
+       >=dev-libs/libinput-1.27:=
+       >=dev-libs/wayland-1.23.0
+       >=dev-qt/qt5compat-${QTMIN}:6[qml]
+       
>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets,X]
+       >=dev-qt/qtdeclarative-${QTMIN}:6
+       >=dev-qt/qtsensors-${QTMIN}:6
+       >=dev-qt/qtshadertools-${QTMIN}:6
+       >=dev-qt/qtsvg-${QTMIN}:6
+       >=dev-qt/qtwayland-${QTMIN}:6
+       >=kde-frameworks/kauth-${KFMIN}:6
+       >=kde-frameworks/kcmutils-${KFMIN}:6
+       >=kde-frameworks/kcolorscheme-${KFMIN}:6
+       >=kde-frameworks/kconfig-${KFMIN}:6[qml]
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+       >=kde-frameworks/kcoreaddons-${KFMIN}:6
+       >=kde-frameworks/kcrash-${KFMIN}:6
+       >=kde-frameworks/kdbusaddons-${KFMIN}:6
+       >=kde-frameworks/kdeclarative-${KFMIN}:6
+       >=kde-frameworks/kglobalaccel-${KFMIN}:6=[X(+)]
+       >=kde-frameworks/kguiaddons-${KFMIN}:6[wayland]
+       >=kde-frameworks/ki18n-${KFMIN}:6
+       >=kde-frameworks/kidletime-${KFMIN}:6=[wayland]
+       >=kde-frameworks/knewstuff-${KFMIN}:6
+       >=kde-frameworks/knotifications-${KFMIN}:6
+       >=kde-frameworks/kpackage-${KFMIN}:6
+       >=kde-frameworks/kservice-${KFMIN}:6
+       >=kde-frameworks/ksvg-${KFMIN}:6
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+       >=kde-frameworks/kwindowsystem-${KFMIN}:6=[wayland,X]
+       >=kde-frameworks/kxmlgui-${KFMIN}:6
+       >=kde-plasma/breeze-${KDE_CATV}:6
+       >=kde-plasma/kdecoration-${KDE_CATV}:6
+       >=kde-plasma/kwayland-${KDE_CATV}:6
+       >=kde-plasma/plasma-activities-${KDE_CATV}:6
+       media-libs/fontconfig
+       media-libs/freetype
+       media-libs/lcms:2
+       media-libs/libcanberra
+       >=media-libs/libdisplay-info-0.2.0:=
+       media-libs/libepoxy
+       media-libs/libglvnd
+       >=media-libs/mesa-24.1.0_rc1[opengl,wayland,X]
+       virtual/libudev:=
+       x11-libs/libX11
+       x11-libs/libXi
+       >=x11-libs/libdrm-2.4.116
+       >=x11-libs/libxcb-1.10:=
+       >=x11-libs/libxcvt-0.1.1
+       >=x11-libs/libxkbcommon-1.5.0
+       x11-libs/xcb-util-cursor
+       x11-libs/xcb-util-keysyms
+       x11-libs/xcb-util-wm
+       accessibility? ( media-libs/libqaccessibilityclient:6 )
+       lock? ( >=kde-plasma/kscreenlocker-${KDE_CATV}:6 )
+       screencast? ( >=media-video/pipewire-1.2.0:= )
+       shortcuts? ( >=kde-plasma/kglobalacceld-${KDE_CATV}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+       !kde-plasma/kdeplasma-addons:5
+       >=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+       || (
+               dev-qt/qtmultimedia:6[ffmpeg]
+               (
+                       dev-qt/qtmultimedia:6[gstreamer]
+                       media-plugins/gst-plugins-soup:1.0
+               )
+       )
+       >=kde-frameworks/kirigami-${KFMIN}:6
+       >=kde-frameworks/kitemmodels-${KFMIN}:6
+       >=kde-plasma/aurorae-${KDE_CATV}:6
+       >=kde-plasma/libplasma-${KDE_CATV}:6[wayland(+)]
+       sys-apps/hwdata
+       >=x11-base/xwayland-23.1.0[libei]
+"
+DEPEND="${COMMON_DEPEND}
+       >=dev-libs/plasma-wayland-protocols-1.16.0
+       >=dev-libs/wayland-protocols-1.38
+       >=dev-qt/qttools-${QTMIN}:6[widgets]
+       >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+       x11-base/xorg-proto
+       x11-libs/xcb-util-image
+       test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) )
+"
+BDEPEND="
+       >=dev-qt/qtwayland-${QTMIN}:6
+       dev-util/wayland-scanner
+       >=kde-frameworks/kcmutils-${KFMIN}:6
+"
+
+# https://bugs.gentoo.org/941628
+# -m 0755 to avoid suid with USE="-filecaps"
+FILECAPS=( -m 0755 cap_sys_nice=ep usr/bin/kwin_wayland )
+
+PATCHES=( "${WORKDIR}"/${PATCHSET} )
+
+src_prepare() {
+       ecm_src_prepare
+
+       # TODO: try to get a build switch upstreamed
+       if ! use screencast; then
+               sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt 
|| die
+       fi
+
+       # TODO: try to get a build switch upstreamed
+       if ! use systemd; then
+               sed -e "s/^pkg_check_modules.*libsystemd/#&/" -i CMakeLists.txt 
|| die
+       fi
+
+       cmake_run_in src/plugins cmake_comment_add_subdirectory kdecorations
+}
+
+src_configure() {
+       local mycmakeargs=(
+               # TODO: KWIN_BUILD_X11=$(usex xwayland) 
KWIN_BUILD_X11_BACKEND=$(usex X)
+               # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still 
hard-depends on it
+               $(cmake_use_find_package accessibility QAccessibilityClient6)
+               -DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON
+               -DKWIN_BUILD_SCREENLOCKER=$(usex lock)
+               -DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
+       )
+
+       ecm_src_configure
+}
+
+pkg_postinst() {
+       xdg_pkg_postinst
+       fcaps_pkg_postinst
+}

Reply via email to