summaryrefslogtreecommitdiff
path: root/kde-plasma
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/Manifest.gzbin11643 -> 11643 bytes
-rw-r--r--kde-plasma/kwin/Manifest3
-rw-r--r--kde-plasma/kwin/files/kwin-6.2.4-fix-file-descriptor-leak.patch42
-rw-r--r--kde-plasma/kwin/files/kwin-6.2.4-fix-thumbnail-animation.patch43
-rw-r--r--kde-plasma/kwin/kwin-6.2.4-r1.ebuild156
5 files changed, 244 insertions, 0 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index dfe1f36d0999..615e600a51cc 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
Binary files differ
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 06c340086e0d..4c5f85f95027 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,5 @@
+AUX kwin-6.2.4-fix-file-descriptor-leak.patch 1523 BLAKE2B cb9153f00d6ba24ca70760e1f2da9f13e9f4f9bad0f62df3fc5a926dfe667b33c28b92fa79bbd79fee34b1275f80e4be4a296ba4c65fb87a7b7bf5234251ae14 SHA512 4893d374726fe4470deee872058e9e5404677f7bd98cc2adcf8f85ff394f1e3b42e96417e0f78bb888a711554f25fab0da507b5597b4f98c3ce661b7ba5d5330
+AUX kwin-6.2.4-fix-thumbnail-animation.patch 1887 BLAKE2B f257d44ea448fd1ba5cb5b8bd991da6f30fa9d60488d015eb552b503d0b1dde28c79ddea480177d9c03b35c390fa2772e598799940f4809412a6b5b803bbbdd8 SHA512 5ac58a7702f63423f4b13cf51767934b47e4912e4ac23e9696cffb43f3e0c2b108e77da57829bf79d36c8a2156cc42f0630665a8f6a7979dc8d801abd551abc5
DIST kwin-6.1.5.tar.xz 8503432 BLAKE2B 8cd8da89f93ac64dbb8a42e90a09a188b86762440964d4e9425a924f0349360bcf31f187fcfb66b61fca42db44f93c97f313703c5b602e873035bec86f36b0b1 SHA512 a71d1f814c948293d5552504115178f20e7450ead86c57b0fda79584f613fbc77851d1735945f7f05bf0b6b8c09cdacf53154820176d133f41ec736ae1492946
DIST kwin-6.2.3-patchset-2.tar.xz 10460 BLAKE2B 9b2cb40491e56481bed668b8fb835e1ca1ec84ba4eda11332c8c397768e63a557648c262a2721ab52c21290dc00992f3a85761a90593280635af63d596bdbcb7 SHA512 e2be5d524826f77d7313e2584d08e405154b9ebaf3ddeb1ccf826c9de60e497bbd3b042cec2290f242712934877c46315570ce6f4d9aa7769b8a9740312e437c
DIST kwin-6.2.3.tar.xz 8557808 BLAKE2B a66c09459b6d41bb7059ae085bc89dc4d8cf08bb61eacb4ab52166863f5c4b971d56e420a295d2f638b30886ad5f2fa1f0f4a725087d0295668158523866648c SHA512 5f54de7536c0bf8c324c8f319614895e279ce888326fdd440b9ac952ea43498c65b532c03920d49605afa31665c7bcd3a66ae637f68eb9d3e1b0ec80ac8c4691
@@ -5,5 +7,6 @@ DIST kwin-6.2.4.tar.xz 8558408 BLAKE2B 43fc3c57468ecf756305eb69414efb103db7e2439
EBUILD kwin-6.1.5.ebuild 4140 BLAKE2B c584a1db6c3f94f4ed52aa28f632e51e0cd51679f3c948cc305481d2d0aecaad73c8772a6d7f1c309afb64fff772412aa33318ef60b1c8d1506dc345c78d5676 SHA512 cfabdb37724a800ae099b95dfa7c69cd0111d3a4be2691e104f56ac72559373fceded84014a6fddebd9b35b0e7a28b27edce0c6a1ae0bd8296b23150298475bd
EBUILD kwin-6.2.3-r2.ebuild 4586 BLAKE2B 59fa06c73c1ad7038c93444f885122111c8bc64476ab45fbeed618e03333388cae02d5262d9221ba430152813c73ed5e703cee4041f3bf29af38eb160cafd2db SHA512 0de567d510380bc2982cb81ebdaf26bc6645e118504cf32760ec567d17de1aab0b63c337c39fdd38f0538a050500c0cb80127c878d42a930ebc5266aa8ce12f3
EBUILD kwin-6.2.3.ebuild 4385 BLAKE2B b95256b5c8c1854643163c117b382c790e88db6a3a8ca503669d66061368682e2703ae6899fccb5681cfcd5805b689ef6bda39da41f182af0cb3e0ac60f83dc4 SHA512 6f1706e228d4dd375b2874179b2499d42ae2657ad34cd9a714c1c9bd3386ca9d0bf1811ca4bb2586effbca12048d36396d1a33a80676f2bedcabd66ad7074936
+EBUILD kwin-6.2.4-r1.ebuild 4533 BLAKE2B 4f137a903d6ae1a2aa97f7fee421df83cbb442af234c01873875d2e63412e8f3ea28e3472d6ac8f0061d49b639f6d96b01560b464bdb57065799aa58a6750638 SHA512 82b0e26481f0479f7e89a9eec6d91f3970c224f738725e04314d6cc28c595f51eeae574183e807cd829e9c3c952e0f6dfd587d4fd7bb2104d51b41c647bf25a0
EBUILD kwin-6.2.4.ebuild 4385 BLAKE2B b95256b5c8c1854643163c117b382c790e88db6a3a8ca503669d66061368682e2703ae6899fccb5681cfcd5805b689ef6bda39da41f182af0cb3e0ac60f83dc4 SHA512 6f1706e228d4dd375b2874179b2499d42ae2657ad34cd9a714c1c9bd3386ca9d0bf1811ca4bb2586effbca12048d36396d1a33a80676f2bedcabd66ad7074936
MISC metadata.xml 677 BLAKE2B 050345f8f8f489b3cb81e112c05fddedc738c8f136d409b8754c54494a02caf5671a66dd1ecd7cfb91f24ab11210c67f78c09c928a4daf16b3512600649551c5 SHA512 5134373a0ce30f351344c07df4a68f97a15bf3bdb061ba8ff3355a42da2281d64bb506cdcb5b1dad698fc2061b4a4a92e054e08c521acb327b84f968a7d936dc
diff --git a/kde-plasma/kwin/files/kwin-6.2.4-fix-file-descriptor-leak.patch b/kde-plasma/kwin/files/kwin-6.2.4-fix-file-descriptor-leak.patch
new file mode 100644
index 000000000000..b3dc15520e16
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.2.4-fix-file-descriptor-leak.patch
@@ -0,0 +1,42 @@
+From da1bebbb4480cfc26467ad3b31737b0df044b551 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 28 Nov 2024 17:08:53 +0000
+Subject: [PATCH] opengl/eglnativefence: fix file descriptor leak
+
+eglCreateSyncKHR only takes ownership of the file descriptor on success; on failure
+it got leaked before.
+
+This should fix https://crash-reports.kde.org/organizations/kde/issues/18341
+
+
+(cherry picked from commit 2eac8c7783ef6963662b1015c211e8a8d81414d9)
+
+Co-authored-by: Xaver Hugl <xaver.hugl@gmail.com>
+---
+ src/opengl/eglnativefence.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/opengl/eglnativefence.cpp b/src/opengl/eglnativefence.cpp
+index 41f950590c6..a36fcfb5444 100644
+--- a/src/opengl/eglnativefence.cpp
++++ b/src/opengl/eglnativefence.cpp
+@@ -64,9 +64,14 @@ bool EGLNativeFence::waitSync() const
+ EGLNativeFence EGLNativeFence::importFence(EglDisplay *display, FileDescriptor &&fd)
+ {
+ EGLint attributes[] = {
+- EGL_SYNC_NATIVE_FENCE_FD_ANDROID, fd.take(),
++ EGL_SYNC_NATIVE_FENCE_FD_ANDROID, fd.get(),
+ EGL_NONE};
+- return EGLNativeFence(display, eglCreateSyncKHR(display->handle(), EGL_SYNC_NATIVE_FENCE_ANDROID, attributes));
++ auto ret = eglCreateSyncKHR(display->handle(), EGL_SYNC_NATIVE_FENCE_ANDROID, attributes);
++ if (ret != EGL_NO_SYNC_KHR) {
++ // eglCreateSyncKHR takes ownership only on success
++ fd.take();
++ }
++ return EGLNativeFence(display, ret);
+ }
+
+ } // namespace KWin
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-6.2.4-fix-thumbnail-animation.patch b/kde-plasma/kwin/files/kwin-6.2.4-fix-thumbnail-animation.patch
new file mode 100644
index 000000000000..855dee8cf12a
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.2.4-fix-thumbnail-animation.patch
@@ -0,0 +1,43 @@
+From c402845961fa10185d7c28a49a9b72e7581258f8 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Tue, 26 Nov 2024 13:03:15 +0000
+Subject: [PATCH] effects/overview: Animate if the thumbnail is dropped in an
+ heap
+
+If the new position the thumbnail was dropped intersects the geometry of
+an heap in any way, then execute the animation, otherwise skip it
+(the case of drop on a desktop thumbnails in the overview)
+previous patch attempted that but with not completely correct logic
+
+BUG:496646
+
+
+(cherry picked from commit 0e9f1e721c7b45b6b7d31a44df925483c1ec1155)
+
+0e9f1e72 effects/overview: Animate if the thumbnail is dropped in an heap
+
+Co-authored-by: Marco Martin <notmart@gmail.com>
+---
+ src/plugins/private/qml/WindowHeapDelegate.qml | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/plugins/private/qml/WindowHeapDelegate.qml b/src/plugins/private/qml/WindowHeapDelegate.qml
+index fee45b6c643..0088f2ce981 100644
+--- a/src/plugins/private/qml/WindowHeapDelegate.qml
++++ b/src/plugins/private/qml/WindowHeapDelegate.qml
+@@ -162,10 +162,8 @@ ExpoCell {
+ returnAnimation.restart();
+
+ // If we dropped on another desktop, don't make the window fly off the screen
+- if (oldGlobalRect.x < heapRect.x ||
+- oldGlobalRect.y < heapRect.y ||
+- heapRect.x + heapRect.width < oldGlobalRect.x + oldGlobalRect.width ||
+- heapRect.y + heapRect.height < oldGlobalRect.y + oldGlobalRect.height) {
++ if ((oldGlobalRect.x < heapRect.x && heapRect.x + heapRect.width < oldGlobalRect.x + oldGlobalRect.width) ||
++ (oldGlobalRect.y < heapRect.y && heapRect.y + heapRect.height < oldGlobalRect.y + oldGlobalRect.height)) {
+ returnAnimation.complete();
+ }
+ }
+--
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-6.2.4-r1.ebuild b/kde-plasma/kwin/kwin-6.2.4-r1.ebuild
new file mode 100644
index 000000000000..459f12e9b1e3
--- /dev/null
+++ b/kde-plasma/kwin/kwin-6.2.4-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.6.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm fcaps plasma.kde.org
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="accessibility gles2-only lock screencast +shortcuts systemd"
+
+RESTRICT="test"
+
+# qtbase slot op: GuiPrivate use in tabbox
+COMMON_DEPEND="
+ dev-libs/libei
+ >=dev-libs/libinput-1.19:=
+ >=dev-libs/wayland-1.23.0
+ >=dev-qt/qt5compat-${QTMIN}:6[qml]
+ >=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsensors-${QTMIN}:6
+ >=dev-qt/qtshadertools-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=kde-frameworks/kauth-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcolorscheme-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6[qml]
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kdeclarative-${KFMIN}:6
+ >=kde-frameworks/kglobalaccel-${KFMIN}:6=[X(+)]
+ >=kde-frameworks/kguiaddons-${KFMIN}:6[wayland]
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kidletime-${KFMIN}:6=[wayland]
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/kpackage-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/ksvg-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6=[wayland,X]
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-plasma/breeze-${PVCUT}:6
+ >=kde-plasma/kdecoration-${PVCUT}:6
+ >=kde-plasma/kwayland-${PVCUT}:6
+ >=kde-plasma/plasma-activities-${PVCUT}:6
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/lcms:2
+ media-libs/libcanberra
+ media-libs/libdisplay-info:=
+ 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.116
+ >=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:6 )
+ gles2-only? ( || (
+ >=media-libs/mesa-24.1.0_rc1[opengl]
+ <media-libs/mesa-24.1.0_rc1[gles2]
+ ) )
+ lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 )
+ screencast? ( >=media-video/pipewire-0.3.65:= )
+ shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-plasma/kdeplasma-addons:5
+ >=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+ || (
+ dev-qt/qtmultimedia:6[ffmpeg]
+ (
+ dev-qt/qtmultimedia:6[gstreamer]
+ media-plugins/gst-plugins-soup:1.0
+ )
+ )
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ >=kde-frameworks/kitemmodels-${KFMIN}:6
+ >=kde-plasma/libplasma-${PVCUT}:6[wayland(+)]
+ sys-apps/hwdata
+ x11-base/xwayland[libei]
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.14.0
+ >=dev-libs/wayland-protocols-1.36
+ >=dev-qt/qttools-${QTMIN}:6[widgets]
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+ >=dev-qt/qtwayland-${QTMIN}:6
+ x11-base/xorg-proto
+ x11-libs/xcb-util-image
+ test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) )
+"
+BDEPEND="
+ >=dev-qt/qtwayland-${QTMIN}:6
+ dev-util/wayland-scanner
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+"
+
+# https://bugs.gentoo.org/941628
+# -m 0755 to avoid suid with USE="-filecaps"
+FILECAPS=( -m 0755 cap_sys_nice=ep usr/bin/kwin_wayland )
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-thumbnail-animation.patch" # KDE-bug 496646
+ "${FILESDIR}/${P}-fix-file-descriptor-leak.patch" # KDE-bug 496746
+)
+
+src_prepare() {
+ ecm_src_prepare
+
+ # TODO: try to get a build switch upstreamed
+ if ! use screencast; then
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+ fi
+
+ # TODO: try to get a build switch upstreamed
+ if ! use systemd; then
+ sed -e "s/^pkg_check_modules.*libsystemd/#&/" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ # TODO: KWIN_BUILD_X11=$(usex xwayland) KWIN_BUILD_X11_BACKEND=$(usex X)
+ # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
+ $(cmake_use_find_package accessibility QAccessibilityClient6)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON
+ -DKWIN_BUILD_SCREENLOCKER=$(usex lock)
+ -DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ fcaps_pkg_postinst
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-23 00:54:23 +0000