commit: 2cac0f6af3b3c0572389eaeced0aca0125de7dd0 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 2 20:32:33 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Dec 2 19:39:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cac0f6a
kde-plasma/kwin: Backport 6.2 branch fixes - opengl/eglnativefence: fix file descriptor leak KDE-bug: https://bugs.kde.org/show_bug.cgi?id=496746 - 6.2.4 reg.: effects/overview: Animate if thumbnail is dropped in a heap KDE-bug: https://bugs.kde.org/show_bug.cgi?id=496646 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kwin-6.2.4-fix-file-descriptor-leak.patch | 42 ++++++ .../files/kwin-6.2.4-fix-thumbnail-animation.patch | 43 ++++++ kde-plasma/kwin/kwin-6.2.4-r1.ebuild | 156 +++++++++++++++++++++ 3 files changed, 241 insertions(+) diff --git a/kde-plasma/kwin/files/kwin-6.2.4-fix-file-descriptor-leak.patch b/kde-plasma/kwin/files/kwin-6.2.4-fix-file-descriptor-leak.patch new file mode 100644 index 000000000000..b3dc15520e16 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-6.2.4-fix-file-descriptor-leak.patch @@ -0,0 +1,42 @@ +From da1bebbb4480cfc26467ad3b31737b0df044b551 Mon Sep 17 00:00:00 2001 +From: Xaver Hugl <[email protected]> +Date: Thu, 28 Nov 2024 17:08:53 +0000 +Subject: [PATCH] opengl/eglnativefence: fix file descriptor leak + +eglCreateSyncKHR only takes ownership of the file descriptor on success; on failure +it got leaked before. + +This should fix https://crash-reports.kde.org/organizations/kde/issues/18341 + + +(cherry picked from commit 2eac8c7783ef6963662b1015c211e8a8d81414d9) + +Co-authored-by: Xaver Hugl <[email protected]> +--- + src/opengl/eglnativefence.cpp | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/opengl/eglnativefence.cpp b/src/opengl/eglnativefence.cpp +index 41f950590c6..a36fcfb5444 100644 +--- a/src/opengl/eglnativefence.cpp ++++ b/src/opengl/eglnativefence.cpp +@@ -64,9 +64,14 @@ bool EGLNativeFence::waitSync() const + EGLNativeFence EGLNativeFence::importFence(EglDisplay *display, FileDescriptor &&fd) + { + EGLint attributes[] = { +- EGL_SYNC_NATIVE_FENCE_FD_ANDROID, fd.take(), ++ EGL_SYNC_NATIVE_FENCE_FD_ANDROID, fd.get(), + EGL_NONE}; +- return EGLNativeFence(display, eglCreateSyncKHR(display->handle(), EGL_SYNC_NATIVE_FENCE_ANDROID, attributes)); ++ auto ret = eglCreateSyncKHR(display->handle(), EGL_SYNC_NATIVE_FENCE_ANDROID, attributes); ++ if (ret != EGL_NO_SYNC_KHR) { ++ // eglCreateSyncKHR takes ownership only on success ++ fd.take(); ++ } ++ return EGLNativeFence(display, ret); + } + + } // namespace KWin +-- +GitLab + diff --git a/kde-plasma/kwin/files/kwin-6.2.4-fix-thumbnail-animation.patch b/kde-plasma/kwin/files/kwin-6.2.4-fix-thumbnail-animation.patch new file mode 100644 index 000000000000..855dee8cf12a --- /dev/null +++ b/kde-plasma/kwin/files/kwin-6.2.4-fix-thumbnail-animation.patch @@ -0,0 +1,43 @@ +From c402845961fa10185d7c28a49a9b72e7581258f8 Mon Sep 17 00:00:00 2001 +From: Marco Martin <[email protected]> +Date: Tue, 26 Nov 2024 13:03:15 +0000 +Subject: [PATCH] effects/overview: Animate if the thumbnail is dropped in an + heap + +If the new position the thumbnail was dropped intersects the geometry of +an heap in any way, then execute the animation, otherwise skip it +(the case of drop on a desktop thumbnails in the overview) +previous patch attempted that but with not completely correct logic + +BUG:496646 + + +(cherry picked from commit 0e9f1e721c7b45b6b7d31a44df925483c1ec1155) + +0e9f1e72 effects/overview: Animate if the thumbnail is dropped in an heap + +Co-authored-by: Marco Martin <[email protected]> +--- + src/plugins/private/qml/WindowHeapDelegate.qml | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/plugins/private/qml/WindowHeapDelegate.qml b/src/plugins/private/qml/WindowHeapDelegate.qml +index fee45b6c643..0088f2ce981 100644 +--- a/src/plugins/private/qml/WindowHeapDelegate.qml ++++ b/src/plugins/private/qml/WindowHeapDelegate.qml +@@ -162,10 +162,8 @@ ExpoCell { + returnAnimation.restart(); + + // If we dropped on another desktop, don't make the window fly off the screen +- if (oldGlobalRect.x < heapRect.x || +- oldGlobalRect.y < heapRect.y || +- heapRect.x + heapRect.width < oldGlobalRect.x + oldGlobalRect.width || +- heapRect.y + heapRect.height < oldGlobalRect.y + oldGlobalRect.height) { ++ if ((oldGlobalRect.x < heapRect.x && heapRect.x + heapRect.width < oldGlobalRect.x + oldGlobalRect.width) || ++ (oldGlobalRect.y < heapRect.y && heapRect.y + heapRect.height < oldGlobalRect.y + oldGlobalRect.height)) { + returnAnimation.complete(); + } + } +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-6.2.4-r1.ebuild b/kde-plasma/kwin/kwin-6.2.4-r1.ebuild new file mode 100644 index 000000000000..459f12e9b1e3 --- /dev/null +++ b/kde-plasma/kwin/kwin-6.2.4-r1.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=6.6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.2 +inherit ecm fcaps plasma.kde.org + +DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="accessibility gles2-only lock screencast +shortcuts systemd" + +RESTRICT="test" + +# qtbase slot op: GuiPrivate use in tabbox +COMMON_DEPEND=" + dev-libs/libei + >=dev-libs/libinput-1.19:= + >=dev-libs/wayland-1.23.0 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsensors-${QTMIN}:6 + >=dev-qt/qtshadertools-${QTMIN}:6 + >=dev-qt/qtsvg-${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-${PVCUT}:6 + >=kde-plasma/kdecoration-${PVCUT}:6 + >=kde-plasma/kwayland-${PVCUT}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + media-libs/fontconfig + media-libs/freetype + media-libs/lcms:2 + media-libs/libcanberra + media-libs/libdisplay-info:= + media-libs/libepoxy + media-libs/libglvnd + >=media-libs/mesa-21.3[egl(+),gbm(+),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 ) + gles2-only? ( || ( + >=media-libs/mesa-24.1.0_rc1[opengl] + <media-libs/mesa-24.1.0_rc1[gles2] + ) ) + lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 ) + screencast? ( >=media-video/pipewire-0.3.65:= ) + shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}: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/libplasma-${PVCUT}:6[wayland(+)] + sys-apps/hwdata + x11-base/xwayland[libei] +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.14.0 + >=dev-libs/wayland-protocols-1.36 + >=dev-qt/qttools-${QTMIN}:6[widgets] + >=dev-qt/qtbase-${QTMIN}:6[concurrent] + >=dev-qt/qtwayland-${QTMIN}:6 + x11-base/xorg-proto + x11-libs/xcb-util-image + test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}: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=( + "${FILESDIR}/${P}-fix-thumbnail-animation.patch" # KDE-bug 496646 + "${FILESDIR}/${P}-fix-file-descriptor-leak.patch" # KDE-bug 496746 +) + +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=( + # 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() { + ecm_pkg_postinst + fcaps_pkg_postinst +}
