summaryrefslogtreecommitdiff
path: root/kde-plasma/kwin
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/kwin')
-rw-r--r--kde-plasma/kwin/Manifest5
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.6-drm-fix-blob-updating.patch38
-rw-r--r--kde-plasma/kwin/files/kwin-5.25.4-drm-fix-blob-updating.patch38
-rw-r--r--kde-plasma/kwin/kwin-5.24.6-r2.ebuild139
-rw-r--r--kde-plasma/kwin/kwin-5.25.4-r1.ebuild (renamed from kde-plasma/kwin/kwin-5.25.4.ebuild)4
5 files changed, 222 insertions, 2 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 036ef0c7df26..187cc93da099 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,8 +1,11 @@
AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
+AUX kwin-5.24.6-drm-fix-blob-updating.patch 1096 BLAKE2B 1d9492147732110b9835ff25d7ee3c24eaf9ec145676b95782a94a3972b4766686f1a8b591f272250c8dc4958b686b510cec9ad21db7c39801d02150f7f4dc0a SHA512 d451ac0371e1c467a9f7033faccebfe29adc82977dcbddfd892eca5913ef8df22f7bc0addab42f36e39467d71022c7862e0b33e39f1f800347ddf21d3265b6a1
AUX kwin-5.24.6-emit-rowsChanged.patch 999 BLAKE2B ed3519679b81e56a4c52e7d20b91516cefeaa4c4cdb432795edeb9fb8f98aba0ec720662966a2b9ff764ec3bf5126ab2aafe08a209dac826b30dc0139737cc6b SHA512 f6b865aededd119fed69b19d994604179de0ac69efbbefc300872a396125bb3acd635b2784dd54ab961d517b5752e2520c7e2c701263abbc47c3ca3335d44bb3
AUX kwin-5.24.6-fix-color-picker.patch 1952 BLAKE2B 36409ce88f6a0ec2a9b561ed33134db8d10c9a1e3f2e936d7a4375d9eef2f6f41c64a3c584187ef8b0e7cbd2b91f0f3248f462bf5093a17108f27722bbdf7afd SHA512 77cc88b24baaadbcd0737a8bd2a8b14f5f2b4f5bd7348553c67d406032ba886720b448691ba9c99c12e1da41f5af31752955caaa43f2f75064816ca4f739b105
+AUX kwin-5.25.4-drm-fix-blob-updating.patch 1096 BLAKE2B e0d4980bb08e5b1469df84a5682eab739f99f86fdcbffb6577f9cfdffd815c32f58cb7b891c2305c7ddce20fa5456524061f51f3084a77e6d64d0ff81ddc79fb SHA512 54cfcc6f72151787c7b22efb629dfbbd8e5af1b05567071b3aa2f11caf3c65295127e5fa1529763157971f6d707c4078c28d9cddd5bb0f244b774f20a734e08c
DIST kwin-5.24.6.tar.xz 6464412 BLAKE2B e3dabbac99cb1ad4eab9995987b6070d2ae0c7d24b8745edad51d573f955783ef4dfafa91ef686a9325659b7ff32282f8448c4beca90b8ad357d83d210964008 SHA512 582464134046c672f9dd798a5485eb2ea93c71676ad20aebda60d978d459104e74fe1283cb0e16968216faf53827dc3e47d669d4c977e0fb7a5a4bb408f77eeb
DIST kwin-5.25.4.tar.xz 6639040 BLAKE2B d2160b7e9bedb77ed50033eee9e901edf962c3b6c2b6d0c4e5b19651a1a466c4e5868a2b66dc6b2b00f73381661a59fc9da317fc9cda48488b57ee86f7543f7f SHA512 14ffb4ea0eb069811803253b8abb7737eecb5c121c99c477c1b085a80812eae10d9e2012e3343b326f1a3258a2854d1f8b138dad2f31e548835b9bf09769c0fd
EBUILD kwin-5.24.6-r1.ebuild 4126 BLAKE2B 4f12925511011887954c13882f644182eb24dbbe9c39d58974be95565afdfa48b8d770f382b614a7a45439cdce8c1c2229ed2b486aa4c7724a8c352bfd87a7f6 SHA512 79bba7223739f8b61744feaead7eca554d526e0d1c8e84e61c2f1f73d05c645767221ecd77a6e292f0c9bb97da9734faaeafb01c92aa51e2d5cafb25d6c724c1
-EBUILD kwin-5.25.4.ebuild 4181 BLAKE2B eef592139d6af524533aa989206225cd5cfe0c8c82d99188b4af762630e9b0557923fbf114f10fe944ac35d657a35d7bb1103689f55ec747dfefe14a18f9f58c SHA512 1ac7e4dc4227204bc5a3fe082dcf4487712c0d97a669f8dc14856d493681f54e16fb33a652cebf70fe9abed9d0449002cc478896dd6ada5e03c94bd25ead25df
+EBUILD kwin-5.24.6-r2.ebuild 4197 BLAKE2B 612d968998bf813f24a41a7f6a3375a45a357f30aa54e159a55b38f963592d920809c664ee103ea516bccc01792a15d427cd576779252d411977338e3dec149a SHA512 53301d5bea61c3c60768e6437566ed6df528880c54eb879a91b53f12699fc11e29ec3a3dd4c700ad1c44044d9533e08446a11e282d18472ed22c928e70a194f8
+EBUILD kwin-5.25.4-r1.ebuild 4261 BLAKE2B 54cac57cf5022ed700f94cae73463a29b3bf12ae08f0e652fff1189b94b6560f332805f764eebab661b62a504f9c455df1b217e1e4aa21f2f9c98b4495cdf051 SHA512 4188247aba43f8b37dff1aa7dad6becad7ae5e94e457d29ed1070c2520157ef321891d9fa9b3117d37f85c621b0f2e132ff7df84df06f68bea190d54ff86c5dc
MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/files/kwin-5.24.6-drm-fix-blob-updating.patch b/kde-plasma/kwin/files/kwin-5.24.6-drm-fix-blob-updating.patch
new file mode 100644
index 000000000000..45d231a70f1b
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.6-drm-fix-blob-updating.patch
@@ -0,0 +1,38 @@
+From 3af37c8a29af36eb773b0684237d61b2bd6b81f9 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 4 Aug 2022 15:36:26 +0200
+Subject: [PATCH] backends/drm: fix blob updating
+
+Two things about the code were wrong:
+1. m_current is used in updateBlob() but was only updated afterwards
+2. the assumption that the property having the same ID means it has the
+same blob contents is not always true
+
+BUG: 449285
+
+
+(cherry picked from commit 97939ceae864aef2f50e117496f548555877b4ea)
+---
+ src/backends/drm/drm_property.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/backends/drm/drm_property.cpp b/src/backends/drm/drm_property.cpp
+index 8ab0dc0e5a..b2a2deda12 100644
+--- a/src/backends/drm/drm_property.cpp
++++ b/src/backends/drm/drm_property.cpp
+@@ -112,10 +112,8 @@ bool DrmProperty::needsCommit() const
+
+ void DrmProperty::setCurrent(uint64_t value)
+ {
+- if (m_current != value) {
+- updateBlob();
+- m_current = value;
+- }
++ m_current = value;
++ updateBlob();
+ }
+
+ uint64_t DrmProperty::current() const
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.25.4-drm-fix-blob-updating.patch b/kde-plasma/kwin/files/kwin-5.25.4-drm-fix-blob-updating.patch
new file mode 100644
index 000000000000..282913620c7b
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.25.4-drm-fix-blob-updating.patch
@@ -0,0 +1,38 @@
+From 9a81567777f94e2e6c1a121f1d86dd2bdea83adf Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 4 Aug 2022 15:36:26 +0200
+Subject: [PATCH] backends/drm: fix blob updating
+
+Two things about the code were wrong:
+1. m_current is used in updateBlob() but was only updated afterwards
+2. the assumption that the property having the same ID means it has the
+same blob contents is not always true
+
+BUG: 449285
+
+
+(cherry picked from commit 97939ceae864aef2f50e117496f548555877b4ea)
+---
+ src/backends/drm/drm_property.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/backends/drm/drm_property.cpp b/src/backends/drm/drm_property.cpp
+index c9f7718abd..cee80d043a 100644
+--- a/src/backends/drm/drm_property.cpp
++++ b/src/backends/drm/drm_property.cpp
+@@ -112,10 +112,8 @@ bool DrmProperty::needsCommit() const
+
+ void DrmProperty::setCurrent(uint64_t value)
+ {
+- if (m_current != value) {
+- updateBlob();
+- m_current = value;
+- }
++ m_current = value;
++ updateBlob();
+ }
+
+ uint64_t DrmProperty::current() const
+--
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.24.6-r2.ebuild b/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
new file mode 100644
index 000000000000..bb3d86644b6b
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.92.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+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 multimedia plasma screencast"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=dev-libs/libinput-1.19
+ >=dev-libs/wayland-1.2
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
+ >=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/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=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/kiconthemes-${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/ktextwidgets-${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
+ >=kde-plasma/kscreenlocker-${PVCUT}:5
+ >=kde-plasma/kwayland-server-${PVCUT}:5
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/lcms:2
+ media-libs/libepoxy
+ >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
+ virtual/libudev:=
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libdrm
+ >=x11-libs/libxcb-1.10
+ >=x11-libs/libxkbcommon-0.7.0
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-wm
+ accessibility? ( media-libs/libqaccessibilityclient:5 )
+ caps? ( sys-libs/libcap )
+ gles2-only? ( media-libs/mesa[gles2] )
+ plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+ screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=dev-qt/qtvirtualkeyboard-${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-qt/designer-${QTMIN}:5
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+ test? (
+ dev-libs/plasma-wayland-protocols
+ >=dev-libs/wayland-protocols-1.19
+ )
+"
+BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+ "${FILESDIR}/${P}-emit-rowsChanged.patch"
+ "${FILESDIR}/${P}-fix-color-picker.patch" # KDE-bug 454974
+ "${FILESDIR}/${P}-drm-fix-blob-updating.patch" # KDE-bug 449285
+)
+
+src_prepare() {
+ ecm_src_prepare
+ use multimedia || eapply "${FILESDIR}/${PN}-5.21.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=(
+ $(cmake_use_find_package accessibility QAccessibilityClient)
+ $(cmake_use_find_package caps Libcap)
+ $(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\""
+}
diff --git a/kde-plasma/kwin/kwin-5.25.4.ebuild b/kde-plasma/kwin/kwin-5.25.4-r1.ebuild
index cbcf91423b84..44b1802e9117 100644
--- a/kde-plasma/kwin/kwin-5.25.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.25.4-r1.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND="
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5=
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5=[X]
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kidletime-${KFMIN}:5=
>=kde-frameworks/kitemviews-${KFMIN}:5
@@ -102,6 +102,8 @@ BDEPEND="
"
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+PATCHES=( "${FILESDIR}/${P}-drm-fix-blob-updating.patch" ) # KDE-bug 449285
+
src_prepare() {
ecm_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"