summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-03-12 15:44:51 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2024-03-12 17:31:33 +0100
commitf007b27b70f756d74c812215e83f44ec91056194 (patch)
tree36114800fba1764f0a3168b08fcd0ac5aa5d597c
parentkde-plasma/kwayland-integration: drop 5.27.10 (diff)
downloadgentoo-f007b27b70f756d74c812215e83f44ec91056194.tar.gz
gentoo-f007b27b70f756d74c812215e83f44ec91056194.tar.bz2
gentoo-f007b27b70f756d74c812215e83f44ec91056194.zip
kde-plasma/kwin: drop 5.27.10-r2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-plasma/kwin/Manifest1
-rw-r--r--kde-plasma/kwin/files/kwin-5.27.10-backends-drm-commit-m_next-state.patch34
-rw-r--r--kde-plasma/kwin/files/kwin-5.27.10-xdgshellwindow-enforce-minSize.patch38
-rw-r--r--kde-plasma/kwin/kwin-5.27.10-r2.ebuild147
4 files changed, 0 insertions, 220 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index f98dc42a56f0..d03fe3fafdb0 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,2 @@
-DIST kwin-5.27.10.tar.xz 7634568 BLAKE2B 13da6f83e55236d7060c3f1fcf4f8e2ff5ca0351ae8c5fe6f313a4a4872430a5c049c582993d8c7817b493477f918060220b6b2ccda2baea0d44eb34767e2fc9 SHA512 f9cfbad8eb97c26417e430424bd496bfa31f9e3c6953ab68a7cff467de8ad43bc10a764f47bd0ce3afe4d27d2cd981ba949d09ab3090dfcef9e7a77b5a918f71
DIST kwin-5.27.11.tar.xz 7644856 BLAKE2B a21fa8d60418bf109b3f651f266185b1e97bdc92e7c7d7ab4b73271d91e8c2b629fd22851b3fff88d7ecd8277fdd8a70bf1c3bd93aa1e379377b86f56cfe2bd2 SHA512 8c76695f71ce67142d16ad16aed342375ae3aefa59ff2628a28003025701bc6b48999adaac79fc5ab09ec22c8d8407fc29f011fd3da6f992c36531fd6c3fc37b
DIST kwin-6.0.2.tar.xz 8833720 BLAKE2B ee02fee90870e32dcc61a5cbc3bcd2f3e146e3a0aa8c63bcd459eaf8cb35bd48aabf88a4cd6efb6325b24128d5e35c6a67aca1077f3820a061bfcb5f4a5bc467 SHA512 f6f82afe2f007a14114fbf18e0aba6859328d928d14bf5369e9f879ec24baa50a9a1084db49877067eab17ab3dae13991d507c85458b4a588086ecfb4924a8a6
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
deleted file mode 100644
index dd51fd2ae1b8..000000000000
--- a/kde-plasma/kwin/files/kwin-5.27.10-backends-drm-commit-m_next-state.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5b7183c77a2be9c3c26f9f209e783cb1a34118e0 Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@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
deleted file mode 100644
index 8f3dac004816..000000000000
--- a/kde-plasma/kwin/files/kwin-5.27.10-xdgshellwindow-enforce-minSize.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0d59f48fbf2cbbcc71556f0ce005d939c604f2c4 Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@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-r2.ebuild b/kde-plasma/kwin/kwin-5.27.10-r2.ebuild
deleted file mode 100644
index a038cad012b5..000000000000
--- a/kde-plasma/kwin/kwin-5.27.10-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2024 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 flag-o-matic 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]
- media-plugins/gst-plugins-soup:1.0
- )
-"
-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() {
- # ODR violation (bug #921558)
- filter-lto
-
- 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\""
-}