commit: af0d71c16dee63b1e30b89e2ff257b771f362202 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Sep 28 20:09:14 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Sep 30 09:57:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af0d71c1
kde-plasma/kwin: fix segfault in EglGbmBackend::textureForOutput Upstream commit e6b20c47ea2d3dfc38632958e0be295a0d376e1f Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kwin-5.27.8-fix-segfalt-in-EglGbmBackend.patch | 27 ++++ kde-plasma/kwin/kwin-5.27.8-r3.ebuild | 142 +++++++++++++++++++++ 2 files changed, 169 insertions(+) diff --git a/kde-plasma/kwin/files/kwin-5.27.8-fix-segfalt-in-EglGbmBackend.patch b/kde-plasma/kwin/files/kwin-5.27.8-fix-segfalt-in-EglGbmBackend.patch new file mode 100644 index 000000000000..91f42a6d58b1 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.27.8-fix-segfalt-in-EglGbmBackend.patch @@ -0,0 +1,27 @@ +From e6b20c47ea2d3dfc38632958e0be295a0d376e1f Mon Sep 17 00:00:00 2001 +From: Aki Sakurai <[email protected]> +Date: Thu, 28 Sep 2023 23:50:32 +0800 +Subject: [PATCH] fix segfault in EglGbmBackend::textureForOutput + +(cherry picked from commit 0f1da589ebc90d7436d4f6e8a418be76c10258c6) +--- + src/backends/drm/drm_egl_backend.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/backends/drm/drm_egl_backend.cpp b/src/backends/drm/drm_egl_backend.cpp +index 3b22ef21db2..d6adbe83f04 100644 +--- a/src/backends/drm/drm_egl_backend.cpp ++++ b/src/backends/drm/drm_egl_backend.cpp +@@ -214,6 +214,9 @@ OutputLayer *EglGbmBackend::primaryLayer(Output *output) + std::shared_ptr<GLTexture> EglGbmBackend::textureForOutput(Output *output) const + { + const auto drmOutput = static_cast<DrmAbstractOutput *>(output); ++ if (const auto virtualLayer = dynamic_cast<VirtualEglGbmLayer *>(drmOutput->primaryLayer())) { ++ return virtualLayer->texture(); ++ } + return static_cast<EglGbmLayer *>(drmOutput->primaryLayer())->texture(); + } + +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-5.27.8-r3.ebuild b/kde-plasma/kwin/kwin-5.27.8-r3.ebuild new file mode 100644 index 000000000000..64251666db60 --- /dev/null +++ b/kde-plasma/kwin/kwin-5.27.8-r3.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="optional" +KFMIN=5.106.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.9 +inherit ecm plasma.kde.org optfeature + +DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="accessibility caps gles2-only lock multimedia plasma screencast" + +RESTRICT="test" + +COMMON_DEPEND=" + >=dev-libs/libinput-1.19:= + >=dev-libs/wayland-1.21.0 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5[qml] + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5=[X] + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5= + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X] + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/breeze-${PVCUT}:5 + >=kde-plasma/kdecoration-${PVCUT}:5 + media-libs/fontconfig + media-libs/freetype + media-libs/lcms:2 + 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.112 + >=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:5 ) + gles2-only? ( media-libs/mesa[gles2] ) + lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:5 ) + plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 ) + screencast? ( >=media-video/pipewire-0.3:= ) +" +RDEPEND="${COMMON_DEPEND} + !kde-plasma/kwayland-server + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] + sys-apps/hwdata + x11-base/xwayland + multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.9 + >=dev-libs/wayland-protocols-1.31 + >=dev-qt/designer-${QTMIN}:5 + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5 + x11-base/xorg-proto + x11-libs/xcb-util-image + caps? ( sys-libs/libcap ) +" +BDEPEND=" + >=dev-qt/qtwaylandscanner-${QTMIN}:5 + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:5 +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" + +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" # bug 914143 + "${FILESDIR}/${P}-crashfix.patch" # KDE-bug 471562 + "${FILESDIR}/${P}-fix-segfalt-in-EglGbmBackend.patch" +) + +src_prepare() { + ecm_src_prepare + use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch" + + # TODO: try to get a build switch upstreamed + if ! use screencast; then + sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it + $(cmake_use_find_package accessibility QAccessibilityClient) + $(cmake_use_find_package caps Libcap) + -DKWIN_BUILD_SCREENLOCKER=$(usex lock) + $(cmake_use_find_package plasma KF5Runner) + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + optfeature "color management support" x11-misc/colord + elog + elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised" + elog "windows to the end of the list was changed so that it remains in the" + elog "original order. To revert to the well established behavior:" + elog + elog " - Edit ~/.config/kwinrc" + elog " - Find [TabBox] section" + elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\"" +}
