commit: 36940d9b0d476a5523d3de8af04d16d3f3e95e5b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Dec 16 08:58:24 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Dec 16 09:09:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36940d9b
kde-plasma/kwin: Backport crash and freeze fixes xdgshellwindow: make maxSize always >= minSize by enforcing the same minimum KDE-bug: https://bugs.kde.org/show_bug.cgi?id=478269 backends/drm: commit m_next state properly KDE-bug: https://bugs.kde.org/show_bug.cgi?id=477451 Bug: https://bugs.gentoo.org/919763 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...-5.27.10-backends-drm-commit-m_next-state.patch | 34 +++++ ...in-5.27.10-xdgshellwindow-enforce-minSize.patch | 38 ++++++ kde-plasma/kwin/kwin-5.27.10-r1.ebuild | 141 +++++++++++++++++++++ 3 files changed, 213 insertions(+) diff --git a/kde-plasma/kwin/files/kwin-5.27.10-backends-drm-commit-m_next-state.patch b/kde-plasma/kwin/files/kwin-5.27.10-backends-drm-commit-m_next-state.patch new file mode 100644 index 000000000000..dd51fd2ae1b8 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.27.10-backends-drm-commit-m_next-state.patch @@ -0,0 +1,34 @@ +From 5b7183c77a2be9c3c26f9f209e783cb1a34118e0 Mon Sep 17 00:00:00 2001 +From: Xaver Hugl <xaver.h...@gmail.com> +Date: Thu, 7 Dec 2023 14:40:40 +0100 +Subject: [PATCH] backends/drm: commit m_next state properly + +Without this, atomic test failures might restore state that's out of date. + +BUG: 477451 +--- + src/backends/drm/drm_pipeline.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/backends/drm/drm_pipeline.cpp b/src/backends/drm/drm_pipeline.cpp +index e0e0b2f0195..84ee4d16557 100644 +--- a/src/backends/drm/drm_pipeline.cpp ++++ b/src/backends/drm/drm_pipeline.cpp +@@ -433,13 +433,12 @@ void DrmPipeline::atomicCommitSuccessful() + m_pending.crtc->cursorPlane()->commit(); + } + } +- m_current = m_pending; ++ m_current = m_next = m_pending; + } + + void DrmPipeline::atomicModesetSuccessful() + { + atomicCommitSuccessful(); +- m_pending.needsModeset = false; + if (activePending()) { + pageFlipped(std::chrono::steady_clock::now().time_since_epoch()); + } +-- +GitLab + diff --git a/kde-plasma/kwin/files/kwin-5.27.10-xdgshellwindow-enforce-minSize.patch b/kde-plasma/kwin/files/kwin-5.27.10-xdgshellwindow-enforce-minSize.patch new file mode 100644 index 000000000000..8f3dac004816 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.27.10-xdgshellwindow-enforce-minSize.patch @@ -0,0 +1,38 @@ +From 0d59f48fbf2cbbcc71556f0ce005d939c604f2c4 Mon Sep 17 00:00:00 2001 +From: Xaver Hugl <xaver.h...@gmail.com> +Date: Mon, 11 Dec 2023 18:06:31 +0100 +Subject: [PATCH] xdgshellwindow: make maxSize always >= minSize by enforcing + the same minimum + +BUG: 478269 + + +(cherry picked from commit d228dc173a24bc27a895d4924936a1d91d7c25b9) +--- + src/xdgshellwindow.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/xdgshellwindow.cpp b/src/xdgshellwindow.cpp +index 29d8623cac3..525481f00dd 100644 +--- a/src/xdgshellwindow.cpp ++++ b/src/xdgshellwindow.cpp +@@ -601,12 +601,14 @@ MaximizeMode XdgToplevelWindow::requestedMaximizeMode() const + QSizeF XdgToplevelWindow::minSize() const + { + const int enforcedMinimum = m_nextDecoration ? 150 : 20; +- return rules()->checkMinSize(QSize(std::max(enforcedMinimum, m_shellSurface->minimumSize().width()), std::max(enforcedMinimum, m_shellSurface->minimumSize().height()))); ++ return rules()->checkMinSize(m_shellSurface->minimumSize()).expandedTo(QSizeF(enforcedMinimum, enforcedMinimum)); + } + + QSizeF XdgToplevelWindow::maxSize() const + { +- return rules()->checkMaxSize(m_shellSurface->maximumSize()); ++ // enforce the same minimum as for minSize, so that maxSize is always bigger than minSize ++ const int enforcedMinimum = m_nextDecoration ? 150 : 20; ++ return rules()->checkMaxSize(m_shellSurface->maximumSize()).expandedTo(QSizeF(enforcedMinimum, enforcedMinimum)); + } + + bool XdgToplevelWindow::isFullScreen() const +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-5.27.10-r1.ebuild b/kde-plasma/kwin/kwin-5.27.10-r1.ebuild new file mode 100644 index 000000000000..1611692d886b --- /dev/null +++ b/kde-plasma/kwin/kwin-5.27.10-r1.ebuild @@ -0,0 +1,141 @@ +# 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=[accessibility,egl,gles2-only=,libinput] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}: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/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X] + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-plasma/breeze-${PVCUT}:5 + >=kde-plasma/kdecoration-${PVCUT}:5 + >=kde-plasma/kwayland-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}: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}:*" + +PATCHES=( + "${FILESDIR}/${P}-xdgshellwindow-enforce-minSize.patch" # KDE-bug 478269 + "${FILESDIR}/${P}-backends-drm-commit-m_next-state.patch" # KDE-bug 477451 +) + +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\"" +}
