diff options
Diffstat (limited to 'kde-plasma/kwin')
-rw-r--r-- | kde-plasma/kwin/Manifest | 4 | ||||
-rw-r--r-- | kde-plasma/kwin/files/kwin-6.2.4-fix-file-descriptor-leak.patch | 42 | ||||
-rw-r--r-- | kde-plasma/kwin/files/kwin-6.2.4-fix-thumbnail-animation.patch | 43 | ||||
-rw-r--r-- | kde-plasma/kwin/kwin-6.2.4-r1.ebuild | 156 |
4 files changed, 0 insertions, 245 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index 9256fffb05df..e9472227002f 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,7 +1,3 @@ -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.2.4.tar.xz 8558408 BLAKE2B 43fc3c57468ecf756305eb69414efb103db7e2439822fde8f5930e631566ed7210614796fa71c9567d14c3d991b333badaba91e58e34e57e64eaf789836dbaf8 SHA512 53d542b0e4a0f7981842fbcf984fad594b3cd99be3b26033ff7bf3bfebaeeb1ca9034aa7139db4305899c279e4e8d0b389248950ed37b539ee53fc59a90f4b3c DIST kwin-6.2.5.tar.xz 8563352 BLAKE2B 9a1ac80c337722d6a6411c338ac31f14f542f6d84505cc65c66e1ceedea2b88cbc9dabba68c42acf5dbace28b62e04cadc09a010a7972bc5ceb22d79344033fe SHA512 06a78d41003f2fb676f3cadca21a1e26a0006b78dcd9188c09d92fbc45f934aa9e923a69013b1cb496396d924a1848feb136d3016d64e14eca9cc525743b095b -EBUILD kwin-6.2.4-r1.ebuild 4531 BLAKE2B 89ea289e59573870ebe0fc4622d67886fc04043c9e89d2945dcfa524edadc49f6b8f7ea6de35fb3a7e5ee6653a88a876030d7fce9ecb508cf30aeb6dba308aa7 SHA512 28f22399766150287ac93e82a959784f3a4131e1c75be4b1d7b6f0e0a742e48b93de726eb3e93a68994a4515fb36f35085a1482bd9b1f2c8356785261834c6be EBUILD kwin-6.2.5.ebuild 4338 BLAKE2B 7d9ee1ed1aa206230a23efdbb00a9a12b3094ee803bc5dabc74baf5dfdfa325f56a93194e2ecb24863266271973ef3bb011d4fd4acaf595f445f5a4edba5a184 SHA512 044f0f5e4336069826772e335264d5968a620acad76fe73f8d9debe88bf51ac87ed5e980286a3089aaa17c99ef677c88fb7fd6ca7906455470d560eb8a5ea285 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 deleted file mode 100644 index b3dc15520e16..000000000000 --- a/kde-plasma/kwin/files/kwin-6.2.4-fix-file-descriptor-leak.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index 855dee8cf12a..000000000000 --- a/kde-plasma/kwin/files/kwin-6.2.4-fix-thumbnail-animation.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index f46ffd0a293f..000000000000 --- a/kde-plasma/kwin/kwin-6.2.4-r1.ebuild +++ /dev/null @@ -1,156 +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="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 -} |