mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
kde-plasma/kwin: drop 5.27.8-r3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST kwin-5.27.8.tar.xz 7631012 BLAKE2B 75bee4f9e13d231a92785eebd7cffcaa8bee556efbf33a731eaa1918c6c471954bc3d059c13f2e2c5f7cce83610a044c73b798bca54ae9c39fe816ae5013054b SHA512 7947d0bf85cd67b83d79580fa355e5217cd4d356b2daa94aff67c637de38625be9f949d4a1441414ba488426ce85a352c6e81d24afdda4930c7d738d575d5163
|
||||
DIST kwin-5.27.9.tar.xz 7633316 BLAKE2B 0b92d2fcbff6a303edd6b30a2c0bb22d1c9d0bc263e8688ddcd13ba03469f0ae238e47f744deece1109d3b124bbbef7cf30be8e3d1d983ff0de487cc832eb115 SHA512 64b67fbd28e6806000180534c538412778a779cc70f77528a0271c9a20d08170926c8d533a4301bdede023842b6525d892ce035d42bc671c7355e06baa8318b3
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
From bd41dd93f37df79c7e14293c26dbff5abe5e4ce4 Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Tue, 21 Mar 2023 20:31:44 +0200
|
||||
Subject: [PATCH] Drop unused kitemviews dependency
|
||||
|
||||
Seems unused. KWin compiles fine without it.
|
||||
|
||||
(cherry picked from commit 2c0acdca11dd25b0a3d5de8125c61d3523e83fbd)
|
||||
---
|
||||
CMakeLists.txt | 1 -
|
||||
src/kcms/scripts/CMakeLists.txt | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f98937161f..d49f8a9471 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -90,7 +90,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
|
||||
NewStuff
|
||||
Service
|
||||
XmlGui
|
||||
- ItemViews
|
||||
)
|
||||
|
||||
find_package(Threads)
|
||||
diff --git a/src/kcms/scripts/CMakeLists.txt b/src/kcms/scripts/CMakeLists.txt
|
||||
index 66966d6d46..fd7a368a97 100644
|
||||
--- a/src/kcms/scripts/CMakeLists.txt
|
||||
+++ b/src/kcms/scripts/CMakeLists.txt
|
||||
@@ -18,7 +18,6 @@ target_link_libraries(kcm_kwin_scripts
|
||||
KF5::NewStuffWidgets
|
||||
KF5::Package
|
||||
KF5::QuickAddons
|
||||
- KF5::ItemViews
|
||||
)
|
||||
|
||||
kpackage_install_package(package kcm_kwin_scripts kcms)
|
||||
--
|
||||
2.42.0
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From f099b206b6d8cffee1b410a51e540d3750c4a0af Mon Sep 17 00:00:00 2001
|
||||
From: Xaver Hugl <xaver.hugl@gmail.com>
|
||||
Date: Tue, 12 Sep 2023 16:23:15 +0200
|
||||
Subject: [PATCH] backends/drm: check activePending instead of active for when
|
||||
applying a new gamma ramp is allowed
|
||||
|
||||
The crtc may not be set yet in some cases
|
||||
|
||||
BUG: 471562
|
||||
(cherry picked from commit 57fae99f33aa5d092ebb82e9924fbd7fbb932fc7)
|
||||
---
|
||||
src/backends/drm/drm_output.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/backends/drm/drm_output.cpp b/src/backends/drm/drm_output.cpp
|
||||
index 558de1f7c4b..c55c4c1832f 100644
|
||||
--- a/src/backends/drm/drm_output.cpp
|
||||
+++ b/src/backends/drm/drm_output.cpp
|
||||
@@ -466,7 +466,7 @@ DrmOutputLayer *DrmOutput::primaryLayer() const
|
||||
|
||||
bool DrmOutput::setGammaRamp(const std::shared_ptr<ColorTransformation> &transformation)
|
||||
{
|
||||
- if (!m_pipeline->active()) {
|
||||
+ if (!m_pipeline->activePending()) {
|
||||
return false;
|
||||
}
|
||||
m_pipeline->setGammaRamp(transformation);
|
||||
@@ -483,7 +483,7 @@ bool DrmOutput::setGammaRamp(const std::shared_ptr<ColorTransformation> &transfo
|
||||
|
||||
bool DrmOutput::setCTM(const QMatrix3x3 &ctm)
|
||||
{
|
||||
- if (!m_pipeline->active()) {
|
||||
+ if (!m_pipeline->activePending()) {
|
||||
return false;
|
||||
}
|
||||
m_pipeline->setCTM(ctm);
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From e6b20c47ea2d3dfc38632958e0be295a0d376e1f Mon Sep 17 00:00:00 2001
|
||||
From: Aki Sakurai <kde@aki.tw>
|
||||
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
|
||||
|
||||
@@ -1,142 +0,0 @@
|
||||
# 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-plasma/plasma-activities-${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-plasma/kwayland-${KFMIN}:5
|
||||
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
|
||||
>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
|
||||
>=kde-frameworks/kxmlgui-${KFMIN}:5
|
||||
>=kde-plasma/libplasma-${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\""
|
||||
}
|
||||
Reference in New Issue
Block a user