commit:     63b05f8076337c9982ec906b5300a4248c4761d8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 25 22:47:54 2026 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 25 23:18:59 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b05f80

kde-plasma/kwin: Cherry-pick patches from 6.5 branch post 6.5.5 release

Includes 2 high importance crash fixes.

Anton Golubev (1):
      outputconfigurationstore: don't select 32:9 mode for 16:9 monitor

Vlad Zahorodnii (5):
      backends/drm: Fix GraphicsBuffer double unref
      core: Add GraphicsBufferRef::reset()
      Avoid adding uninitialized windows to the attention chain
      Make Workspace::addWaylandWindow() set demanding attention state
      Evacuate initializing windows from removed virtual desktops

Xaver Hugl (4):
      backends/drm: fix the hardware cursor on GPUs without modifier support
      pointer_input: don't warp the pointer out of the window on constraint 
unlock
      plugins/screencast: close screencasts on GPU reset
      backends/drm: destroy all framebuffers before the egl context and buffer 
map

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=500748
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=513710
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=514628

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

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

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index c08ed40b5594..acc3435f406d 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,4 @@
 DIST kwin-6.5.4-patchset-1.tar.xz 6388 BLAKE2B 
1751cf185adce8db0c2e56219f3505859a69edabddd5f50b0c5c086429feef6eacab9f2c1f13ea82da064f43cdc01bb1707cea214c34d82a33de4d882cb9e478
 SHA512 
289e041883c5cbaed9f561ab94c785f5bfbde0a49c7dfce1e3c82b552ea7732304731a9180ff702d1b4de80096904833cfeb60319bdd9f1a7c4b70d0663fd7e6
 DIST kwin-6.5.4.tar.xz 8795408 BLAKE2B 
442ef9bb86cf33fc07239b80790d6fb16e0f09972ac50cb0a8707918faf788309c1aa95ac2c258c0e795a75c5247c259f7f6f627f5719a39d113cd9b8304dbfb
 SHA512 
d46125345d66fd2708b237b96419eda80f8cc8d4d953377bdc205a6cfd20c4c5e3114185a1de5e261315f5014cde7c0a0f5d097a48a23f9b8994da97155f825c
+DIST kwin-6.5.5-patchset.tar.xz 7236 BLAKE2B 
18962214dfcce9768dd968fee9367233710a7a0ccd35339180ac0a6fe4bd1bebbbb21b482936f5148697cf78b988ff5a1d0cc8c8632739f646b187199d8c7209
 SHA512 
ab22c481ec50bfd1382f4f46fe3edd5d0f522bc65f3ece0a9fa13b51e8664e2cae2c7bae92753092440c09796878926dd37d244db1d5f7337c80d44f1b50aac7
 DIST kwin-6.5.5.tar.xz 8803548 BLAKE2B 
f1c9b3bf512409df0908d7610af681a78d00f31f0a9dea48a8eea89e0105b28c421229264911a377dd56fa6ad82adbf21fcac1dd6c55b3723f744c996967a802
 SHA512 
c336a116ad3f6946aabc5ccb793cd7a4dbad75c0333ab0b487b8e1bcddd3bdf99e056346cc29359c4ff58ce5ca7ce60302d03aea5dac1885ac3f1cf2514229a0

diff --git a/kde-plasma/kwin/kwin-6.5.5-r1.ebuild 
b/kde-plasma/kwin/kwin-6.5.5-r1.ebuild
new file mode 100644
index 000000000000..78293a0c8339
--- /dev/null
+++ b/kde-plasma/kwin/kwin-6.5.5-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+# TODO: ECMGenerateQDoc
+ECM_TEST="true"
+KFMIN=6.22.0
+QTMIN=6.10.1
+inherit ecm fcaps plasma.kde.org toolchain-funcs xdg
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on 
Linux"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/kde/${P}-patchset.tar.xz";
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="accessibility gles2-only lock screencast +shortcuts systemd X"
+
+RESTRICT="test"
+
+# qtbase slot op: GuiPrivate use in tabbox, Qt6WaylandClientPrivate for 
xx-pip-v1
+# qtbase[X]: private/qtx11extras_p.h in src/helpers/killer
+COMMON_DEPEND="
+       dev-libs/libei
+       >=dev-libs/libinput-1.27:=
+       >=dev-libs/wayland-1.24.0
+       >=dev-qt/qt5compat-${QTMIN}:6[qml]
+       
>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,wayland,widgets,X]
+       >=dev-qt/qtdeclarative-${QTMIN}:6
+       >=dev-qt/qtsensors-${QTMIN}:6
+       >=dev-qt/qtsvg-${QTMIN}:6
+       >=dev-qt/qttools-${QTMIN}:6[widgets]
+       >=kde-frameworks/kauth-${KFMIN}:6
+       >=kde-frameworks/kcmutils-${KFMIN}:6
+       >=kde-frameworks/kcolorscheme-${KFMIN}:6
+       >=kde-frameworks/kconfig-${KFMIN}:6[qml]
+       >=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
+       >=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]
+       >=kde-frameworks/kxmlgui-${KFMIN}:6
+       >=kde-plasma/kdecoration-${KDE_CATV}:6
+       >=kde-plasma/knighttime-${KDE_CATV}:6
+       >=kde-plasma/kwayland-${KDE_CATV}:6
+       >=kde-plasma/plasma-activities-${KDE_CATV}:6=
+       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]
+       virtual/libudev:=
+       >=x11-libs/libdrm-2.4.118
+       >=x11-libs/libxcvt-0.1.1
+       >=x11-libs/libxkbcommon-1.5.0
+       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 )
+       systemd? ( sys-apps/systemd:= )
+       X? (
+               x11-libs/libX11
+               >=x11-libs/libxcb-1.10:=
+               x11-libs/libXi
+               x11-libs/libXres
+               x11-libs/xcb-util-cursor
+               x11-libs/xcb-util-keysyms
+               x11-libs/xcb-util-wm
+       )
+"
+RDEPEND="${COMMON_DEPEND}
+       !kde-plasma/kdeplasma-addons:5
+       >=kde-frameworks/kirigami-${KFMIN}:6
+       >=kde-frameworks/kitemmodels-${KFMIN}:6
+       >=kde-plasma/aurorae-${KDE_CATV}:6
+       >=kde-plasma/breeze-${KDE_CATV}:6
+       >=kde-plasma/libplasma-${KDE_CATV}:6
+       sys-apps/hwdata
+       X? ( >=x11-base/xwayland-23.1.0[libei] )
+"
+DEPEND="${COMMON_DEPEND}
+       >=dev-libs/plasma-wayland-protocols-1.19.0
+       >=dev-libs/wayland-protocols-1.45
+       >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+       test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) )
+       X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+       >=dev-qt/qtbase-${QTMIN}:6[wayland]
+       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}/${P}-patchset"
+       "${FILESDIR}/${P}-unused-deps.patch" # bug #965053
+)
+
+pkg_pretend() {
+       [[ ${MERGE_TYPE} != binary ]] && tc-check-min_ver gcc 14
+}
+
+pkg_setup() {
+       [[ ${MERGE_TYPE} != binary ]] && tc-check-min_ver gcc 14
+}
+
+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
+}
+
+src_configure() {
+       local mycmakeargs=(
+               # KWIN_BUILD_DECORATIONS exists, drops aurorae, breeze
+               # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still 
hard-depends on it
+               $(cmake_use_find_package accessibility QAccessibilityClient6)
+               -DKWIN_BUILD_SCREENLOCKER=$(usex lock)
+               -DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
+               -DKWIN_BUILD_X11=$(usex X)
+       )
+
+       ecm_src_configure
+}
+
+pkg_postinst() {
+       xdg_pkg_postinst
+       fcaps_pkg_postinst
+}

Reply via email to