From 0d35a604a7cdc3fb7cc3f860e5b54707b16b8138 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Sun, 10 Mar 2024 01:02:36 +0100 Subject: [PATCH] 5.27.11 --- kwin.spec | 9 ++--- sources | 2 +- xdgshellwindow-fix-maxSize-constraints.patch | 38 -------------------- 3 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 xdgshellwindow-fix-maxSize-constraints.patch diff --git a/kwin.spec b/kwin.spec index dd9b3e5..e1966c1 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,8 +16,8 @@ %endif Name: kwin -Version: 5.27.10 -Release: 4%{?dist} +Version: 5.27.11 +Release: 1%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -37,8 +37,6 @@ URL: https://userbase.kde.org/KWin Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz ## upstream patches -# https://invent.kde.org/plasma/kwin/-/commit/0d59f48fbf2cbbcc71556f0ce005d939c604f2c4 -Patch0: xdgshellwindow-fix-maxSize-constraints.patch # Base BuildRequires: extra-cmake-modules @@ -364,6 +362,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Sat Mar 09 2024 Alessandro Astone - 5.27.11-1 +- 5.27.11 + * Fri Mar 1 2024 Marie Loise Nolden - 5.27.10-4 - use BuildRequires: cmake(QAccessibilityClient) for Qt5 version diff --git a/sources b/sources index 12f1839..2f46aad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.27.10.tar.xz) = f9cfbad8eb97c26417e430424bd496bfa31f9e3c6953ab68a7cff467de8ad43bc10a764f47bd0ce3afe4d27d2cd981ba949d09ab3090dfcef9e7a77b5a918f71 +SHA512 (kwin-5.27.11.tar.xz) = 8c76695f71ce67142d16ad16aed342375ae3aefa59ff2628a28003025701bc6b48999adaac79fc5ab09ec22c8d8407fc29f011fd3da6f992c36531fd6c3fc37b diff --git a/xdgshellwindow-fix-maxSize-constraints.patch b/xdgshellwindow-fix-maxSize-constraints.patch deleted file mode 100644 index 8f3dac0..0000000 --- a/xdgshellwindow-fix-maxSize-constraints.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0d59f48fbf2cbbcc71556f0ce005d939c604f2c4 Mon Sep 17 00:00:00 2001 -From: Xaver Hugl -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 -