diff options
Diffstat (limited to 'kde-plasma')
14 files changed, 585 insertions, 1 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz Binary files differindex 47f05dfe378e..1393f8b23d73 100644 --- a/kde-plasma/Manifest.gz +++ b/kde-plasma/Manifest.gz diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index 5bb13574d37e..ca5cb2a8bc42 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,8 +1,13 @@ AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86 AUX kwin-5.27.5-fix-xcbutils-nativeFloor.patch 931 BLAKE2B 301b2db3db66ded11986583810d8283bf30ed7f6b848db0232e7c91b1c7cb660eacc8f631ff31ed41df826be7d48443235dba7a125b955af968e872a7e903e32 SHA512 baf12c4f2b8a1804fc268ab3a05ff6d207b9cdb07be2faf4327ce53fd0d68f2dc032d92ef11d95cf23f1c9eed3499552c48c3034836b940fc71d1e563e2a2466 AUX kwin-5.27.5-revert-7c91c4ba.patch 2151 BLAKE2B e00b120fdd86104997b8ad8d4dbedb90c1208926e7623468cc137975124b049594467d08159f9ef130729a3221c6016498badac3f1ddcfcdcfca905ea323fbdf SHA512 3be6617d6bedcf027f2c2087a29b4e052798835846d380feab0f96f14226f088e2d175a416d50a149ed17f1a600b4b04596f7738191d4bb79bd54be26b7848c2 +AUX kwin-5.27.6-fix-crash-after-login.patch 1125 BLAKE2B 81661bf3e23f8d5945e3a9d102a78d1606d9bd5b67caff5347a5d97fc4be95dbeec53e0209fc34eca3dfa5e5094daaf2f999e6268ba93234a10157323d35e8cf SHA512 517730a335ba0bb98ecdbb187fff26e51512f5e8ad82dd03c8723ea8ea687739ce228142c5807a9cfceff0f6d00baa5ddf87251d0a74c452cbd1c9956747d1ff +AUX kwin-5.27.6-fix-crash-click-on-tooltip.patch 1158 BLAKE2B 3a342d6341f638edb243684351580f2ba1de647c22e48395b98ef3649efffcf1d31a1543a647fa4282da06192fb87a95ccc813cfc8cbd3e0de2b3355cb8ae9a6 SHA512 66e659c621ebec24bec8b8c0b35a229332b05ab3a564daa6f4d2486029004e77db868bded4c90d975f8bd13505d3d8244dbacb65145ee9279520aa25997a638f +AUX kwin-5.27.6-fix-effect-to-only-apply-behind-window.patch 5320 BLAKE2B 8a86b488ef0c050acbbbe20b4cedd09f3d66b2af024b8e03a1a1c5848b57e6f238180664293a6742f2ca1d155401b88c365e2cbaf3216d0c9f7e125e054c0871 SHA512 d9a7a7b5c32f58e80cacd34a04cd3cfb9e255c6139804c4be1405c705161a0be445f2655c96ae7cb1ab8190ca3d042d2019d7838263d7768e246ba5d9df0c1fd +AUX kwin-5.27.6-fix-locale1-use-after-free-xkb_keymap.patch 2177 BLAKE2B 803d2c960f7b013e9e5616758577b8e51c44535c8b84935bedc83e4b25d0fa27cfda4081a915f766d4e25041d51a3f6fc515d85b292bfc266da6f6a6dc7c4c69 SHA512 0da47f2e7490e31dd09f6e3c493796392ade925b26840ec193db72ddb08d78003e264a650964c9352ddcfb9082c3e92d65df972910d59838e2b38811140d7635 DIST kwin-5.27.5.tar.xz 7622688 BLAKE2B 267cd1515f2667a4b96f0ffccbced0885c602d4a5227127ba5c9a23ccd9483d5f613fbc40d39e58ca16c42103f0caf09d39b4e5387d2673bd22393519e142e8f SHA512 777bf193ad8e4440ee9866f6b725e191460c5ff4b33e3e517184568fda3aee4936be5274daa33996ae654465b477b108fee83f91e33f0db8f622de7629340de8 DIST kwin-5.27.6.tar.xz 7623016 BLAKE2B 0b16b3bffa1407351a69373e248a77d10932d30fc8fb2cfb527078cfcefff4d559a56bbbedaf3b3c082d576da6f3985f5681c8376daf0d72fca5a6bed8e14625 SHA512 86fd279ce9e82bc41fe5f0cc5f348ec97aaa9589d16cc6b99adf9c27b8cba8a67191be764d4c5e48a042368ef202d78397f756db4efd26ea822584293fdc730b EBUILD kwin-5.27.5-r2.ebuild 4374 BLAKE2B 4955984a3c3d9d2dcef56df24e9e45c691a5bba71351139295aff198adbfbd2eb1770a4fa49b3c5b37b592acdd85b79f50cdb3ff42ef0ab9d011860ae16c8227 SHA512 6c6ca17330bccf78add3b6d51fcdded1002491f619ef9937936d98cc8f8b18d87bdb92c3185b041010349986e885b2d19bbffa1ee925ea129940b189a36dc426 +EBUILD kwin-5.27.6-r1.ebuild 4517 BLAKE2B b4e3e3872f92b2149f5b488b6085ff305e8f1007e843041777da238da4236f551b03ade8f6c19a9ee1bb3257dbdb176bcd8c2170b29dd1f17cd825ea6b13cc8f SHA512 375efa25d5044679ff7b3b7e37163fb717426d0d32f5a5ea0e52996c0978b95c6ad473d1c0273b8d86b751ba2bdf8d4802f3852fb3756f7cbeae57380f4b5f16 EBUILD kwin-5.27.6.ebuild 4214 BLAKE2B 927d4e4163a3de5f577f87f7ea7ae2fdd174cd5e3348e56ec44ffd069f4f956ca79bf2335df69edcd8c1cb4af9dafb79d0e42f3bee97805da9c45b0a3f8b0145 SHA512 5a41280e46485159d22213d351e315101f13dbcba13833e1a1b832e1f088fb170ff77d764524523d30ff0a817fd4c068e8acb1d248410b07793fda288e70f979 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29 diff --git a/kde-plasma/kwin/files/kwin-5.27.6-fix-crash-after-login.patch b/kde-plasma/kwin/files/kwin-5.27.6-fix-crash-after-login.patch new file mode 100644 index 000000000000..130bcca50cdf --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.27.6-fix-crash-after-login.patch @@ -0,0 +1,36 @@ +From ed916ff21629f3e91ee987552d778b1a65d66702 Mon Sep 17 00:00:00 2001 +From: David Edmundson <kde@davidedmundson.co.uk> +Date: Sat, 17 Jun 2023 13:01:43 +0100 +Subject: [PATCH] effects: Make OpenGL context current before deleting + framebuffer + +When we delete a window we unredirect, when we unredirect, we delete the +framebuffer which requires an openGL context. + +handleWindowDeleted is the entry point from workspace events to effects +code, so it's made current here. + +BUG: 444665 +BUG: 471139 + + +(cherry picked from commit c5a29b4b66c001c49c5bcf9aa9250d8322eefbbd) +--- + src/libkwineffects/kwinoffscreeneffect.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libkwineffects/kwinoffscreeneffect.cpp b/src/libkwineffects/kwinoffscreeneffect.cpp +index 82abea675c1..d1bd2921576 100644 +--- a/src/libkwineffects/kwinoffscreeneffect.cpp ++++ b/src/libkwineffects/kwinoffscreeneffect.cpp +@@ -238,6 +238,7 @@ void OffscreenEffect::handleWindowDamaged(EffectWindow *window) + + void OffscreenEffect::handleWindowDeleted(EffectWindow *window) + { ++ effects->makeOpenGLContextCurrent(); + unredirect(window); + } + +-- +GitLab + diff --git a/kde-plasma/kwin/files/kwin-5.27.6-fix-crash-click-on-tooltip.patch b/kde-plasma/kwin/files/kwin-5.27.6-fix-crash-click-on-tooltip.patch new file mode 100644 index 000000000000..b8384cd9abed --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.27.6-fix-crash-click-on-tooltip.patch @@ -0,0 +1,34 @@ +From 21d193506851e0727860927ab289869732b06102 Mon Sep 17 00:00:00 2001 +From: Xaver Hugl <xaver.hugl@gmail.com> +Date: Wed, 21 Jun 2023 12:39:15 +0200 +Subject: [PATCH] input: don't crash if the internal handle is nullptr + +Pointer focus can stay on a closed tooltip while focus updates are blocked, +so this needs to be checked for + +BUG: 471285 + + +(cherry picked from commit c25aaa2c9fbf8ec10f1ba16fecd4b31704fdaf0c) +--- + src/input.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/input.cpp b/src/input.cpp +index b4940f123ad..d3d32020580 100644 +--- a/src/input.cpp ++++ b/src/input.cpp +@@ -1185,6 +1185,10 @@ class InternalWindowEventFilter : public InputEventFilter + return false; + } + QWindow *internal = static_cast<InternalWindow *>(input()->pointer()->focus())->handle(); ++ if (!internal) { ++ // the handle can be nullptr if the tooltip gets closed while focus updates are blocked ++ return false; ++ } + QMouseEvent mouseEvent(event->type(), + event->pos() - internal->position(), + event->globalPos(), +-- +GitLab + diff --git a/kde-plasma/kwin/files/kwin-5.27.6-fix-effect-to-only-apply-behind-window.patch b/kde-plasma/kwin/files/kwin-5.27.6-fix-effect-to-only-apply-behind-window.patch new file mode 100644 index 000000000000..b2c8c026316b --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.27.6-fix-effect-to-only-apply-behind-window.patch @@ -0,0 +1,98 @@ +From 69151896615ec272d78860b2ef42e61657f435f1 Mon Sep 17 00:00:00 2001 +From: Xaver Hugl <xaver.hugl@gmail.com> +Date: Thu, 22 Jun 2023 11:35:27 +0200 +Subject: [PATCH] plugins/backgroundcontrast,blur: ensure the effect is only + applied behind the window + +When a window is translated and/or scaled, the effect must be strictly behind the +window and never beyond it, as that is very noticeable. + +BUG: 469625 +(cherry picked from commit cd94cdaf3a04227073c3f99833139a712d195d3a) +--- + src/effects/backgroundcontrast/contrast.cpp | 22 +++++++++++++-------- + src/effects/blur/blur.cpp | 19 ++++++++++++------ + 2 files changed, 27 insertions(+), 14 deletions(-) + +diff --git a/src/effects/backgroundcontrast/contrast.cpp b/src/effects/backgroundcontrast/contrast.cpp +index 8921a481e3f..66dffd99a94 100644 +--- a/src/effects/backgroundcontrast/contrast.cpp ++++ b/src/effects/backgroundcontrast/contrast.cpp +@@ -382,25 +382,31 @@ void ContrastEffect::drawWindow(EffectWindow *w, int mask, const QRegion ®ion + const QRect screen = effects->renderTargetRect(); + QRegion shape = region & contrastRegion(w).translated(w->pos().toPoint()) & screen; + +- // let's do the evil parts - someone wants to blur behind a transformed window ++ // let's do the evil parts - someone wants to contrast behind a transformed window + const bool translated = data.xTranslation() || data.yTranslation(); + const bool scaled = data.xScale() != 1 || data.yScale() != 1; + if (scaled) { + QPoint pt = shape.boundingRect().topLeft(); + QRegion scaledShape; + for (QRect r : shape) { +- r.moveTo(pt.x() + (r.x() - pt.x()) * data.xScale() + data.xTranslation(), +- pt.y() + (r.y() - pt.y()) * data.yScale() + data.yTranslation()); +- r.setWidth(std::ceil(r.width() * data.xScale())); +- r.setHeight(std::ceil(r.height() * data.yScale())); +- scaledShape |= r; ++ const QPointF topLeft(pt.x() + (r.x() - pt.x()) * data.xScale() + data.xTranslation(), ++ pt.y() + (r.y() - pt.y()) * data.yScale() + data.yTranslation()); ++ const QPoint bottomRight(std::floor(topLeft.x() + r.width() * data.xScale()) - 1, ++ std::floor(topLeft.y() + r.height() * data.yScale()) - 1); ++ scaledShape |= QRect(QPoint(std::floor(topLeft.x()), std::floor(topLeft.y())), bottomRight); + } + shape = scaledShape & region; + + // Only translated, not scaled + } else if (translated) { +- shape = shape.translated(data.xTranslation(), data.yTranslation()); +- shape = shape & region; ++ QRegion translated; ++ for (QRect r : shape) { ++ const QRectF t = QRectF(r).translated(data.xTranslation(), data.yTranslation()); ++ const QPoint topLeft(std::ceil(t.x()), std::ceil(t.y())); ++ const QPoint bottomRight(std::floor(t.x() + t.width() - 1), std::floor(t.y() + t.height() - 1)); ++ translated |= QRect(topLeft, bottomRight); ++ } ++ shape = translated & region; + } + + if (!shape.isEmpty()) { +diff --git a/src/effects/blur/blur.cpp b/src/effects/blur/blur.cpp +index ec08e6cc968..1b6d9997c98 100644 +--- a/src/effects/blur/blur.cpp ++++ b/src/effects/blur/blur.cpp +@@ -625,17 +625,24 @@ void BlurEffect::drawWindow(EffectWindow *w, int mask, const QRegion ®ion, Wi + QPoint pt = shape.boundingRect().topLeft(); + QRegion scaledShape; + for (QRect r : shape) { +- r.moveTo(pt.x() + (r.x() - pt.x()) * data.xScale() + data.xTranslation(), +- pt.y() + (r.y() - pt.y()) * data.yScale() + data.yTranslation()); +- r.setWidth(std::ceil(r.width() * data.xScale())); +- r.setHeight(std::ceil(r.height() * data.yScale())); +- scaledShape |= r; ++ const QPointF topLeft(pt.x() + (r.x() - pt.x()) * data.xScale() + data.xTranslation(), ++ pt.y() + (r.y() - pt.y()) * data.yScale() + data.yTranslation()); ++ const QPoint bottomRight(std::floor(topLeft.x() + r.width() * data.xScale()) - 1, ++ std::floor(topLeft.y() + r.height() * data.yScale()) - 1); ++ scaledShape |= QRect(QPoint(std::floor(topLeft.x()), std::floor(topLeft.y())), bottomRight); + } + shape = scaledShape; + + // Only translated, not scaled + } else if (translated) { +- shape = shape.translated(data.xTranslation(), data.yTranslation()); ++ QRegion translated; ++ for (QRect r : shape) { ++ const QRectF t = QRectF(r).translated(data.xTranslation(), data.yTranslation()); ++ const QPoint topLeft(std::ceil(t.x()), std::ceil(t.y())); ++ const QPoint bottomRight(std::floor(t.x() + t.width() - 1), std::floor(t.y() + t.height() - 1)); ++ translated |= QRect(topLeft, bottomRight); ++ } ++ shape = translated; + } + + EffectWindow *modal = w->transientFor(); +-- +GitLab + diff --git a/kde-plasma/kwin/files/kwin-5.27.6-fix-locale1-use-after-free-xkb_keymap.patch b/kde-plasma/kwin/files/kwin-5.27.6-fix-locale1-use-after-free-xkb_keymap.patch new file mode 100644 index 000000000000..6fcd3af4cfda --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.27.6-fix-locale1-use-after-free-xkb_keymap.patch @@ -0,0 +1,57 @@ +From 2d09d7961b09693aa56a99eb3ba9680e84192936 Mon Sep 17 00:00:00 2001 +From: Aleksei Bavshin <alebastr89@gmail.com> +Date: Fri, 23 Jun 2023 03:14:09 -0700 +Subject: [PATCH] locale1: fix use-after-free in xkb_keymap creation + +qPrintable creates temporary objects that are destroyed before +`xkb_keymap_new_from_names` is called. It's highly likely that the data +we pass to xkbcommon will be overwritten by random data by that point. + +Fix that by storing values as QByteArrays just like +`Xkb::loadKeymapFromConfig` does. + + +(cherry picked from commit f70bda9f6de2d38ae3859afb3f96cad1e9c47590) +--- + src/xkb.cpp | 22 +++++++++++++++------- + 1 file changed, 15 insertions(+), 7 deletions(-) + +diff --git a/src/xkb.cpp b/src/xkb.cpp +index 4a5f72d940a..b3bb5e77252 100644 +--- a/src/xkb.cpp ++++ b/src/xkb.cpp +@@ -250,16 +250,24 @@ xkb_keymap *Xkb::loadKeymapFromLocale1() + { + OrgFreedesktopDBusPropertiesInterface locale1Properties(s_locale1Interface, "/org/freedesktop/locale1", QDBusConnection::systemBus(), this); + const QVariantMap properties = locale1Properties.GetAll(s_locale1Interface); +- const QString layouts = properties["X11Layout"].toString(); ++ ++ const QByteArray model = properties["X11Model"].toByteArray(); ++ const QByteArray layout = properties["X11Layout"].toByteArray(); ++ const QByteArray variant = properties["X11Variant"].toByteArray(); ++ const QByteArray options = properties["X11Options"].toByteArray(); ++ + xkb_rule_names ruleNames = { +- nullptr, +- qPrintable(properties["X11Model"].toString()), +- qPrintable(layouts), +- qPrintable(properties["X11Variant"].toString()), +- qPrintable(properties["X11Options"].toString()), ++ .rules = nullptr, ++ .model = model.constData(), ++ .layout = layout.constData(), ++ .variant = variant.constData(), ++ .options = options.constData(), + }; ++ + applyEnvironmentRules(ruleNames); +- m_layoutList = layouts.split(QLatin1Char(',')); ++ ++ m_layoutList = QString::fromLatin1(ruleNames.layout).split(QLatin1Char(',')); ++ + return xkb_keymap_new_from_names(m_context, &ruleNames, XKB_KEYMAP_COMPILE_NO_FLAGS); + } + +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-5.27.6-r1.ebuild b/kde-plasma/kwin/kwin-5.27.6-r1.ebuild new file mode 100644 index 000000000000..3ccb2eace546 --- /dev/null +++ b/kde-plasma/kwin/kwin-5.27.6-r1.ebuild @@ -0,0 +1,145 @@ +# 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/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput] + >=dev-qt/qtwayland-${QTMIN}:5 + >=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/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/kitemviews-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kservice-${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 + 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-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] ) + 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 + >=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-libs/plasma-wayland-protocols-1.9 + >=dev-libs/wayland-protocols-1.31 + >=dev-qt/designer-${QTMIN}:5 + >=dev-qt/qtconcurrent-${QTMIN}:5 + x11-base/xorg-proto +" +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}-fix-crash-click-on-tooltip.patch" # KDE-bug 471285 + "${FILESDIR}/${P}-fix-crash-after-login.patch" # KDE-bugs 444665, 471139 + "${FILESDIR}/${P}-fix-effect-to-only-apply-behind-window.patch" + "${FILESDIR}/${P}-fix-locale1-use-after-free-xkb_keymap.patch" # KDE-bug 469625 +) + +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\"" +} diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest index ea6de9949d32..fed57f079754 100644 --- a/kde-plasma/plasma-pa/Manifest +++ b/kde-plasma/plasma-pa/Manifest @@ -1,5 +1,8 @@ +AUX plasma-pa-5.27.6-make-setGenericVolume-keep-balance.patch 1662 BLAKE2B c58e3dbdd726dae62de8fbe3d17ef90c3dd56c7bcd424de7c69c1e47580a599e0e215e7d39d51bed4093172227ae73d49bc35109bf5b554d91340ea80be6c158 SHA512 5addd5fec230a63e3fba4b57acd4ddf82136b652d69432679b94c503c0d9a78bc623619511fe72f1c223b0341f17df1bda6ac79ee505f7dede8e8be2f77e7b64 +AUX plasma-pa-5.27.6-move-volume-logic-to-VolumeSlider.patch 3585 BLAKE2B bd93b00833c4b2c0370a8f061a303c1e6db18b4c1d6f23f0e11558dea77f4ad5350cfa351adaac992ed1607754f7f25afe1aa0de4086f6aab47491eb948c2601 SHA512 0d3c8a88b9ad5cddc2c8cafe9985665c668bfd2ecf86b639bacb62b6d9d51c155c9905b9bfe728de579958e85e65981507c87dba30b416a2c33e01751a2a9986 DIST plasma-pa-5.27.5.tar.xz 163052 BLAKE2B 63a74251348665823c6f2a08326fd21d7be716f9d0f7780f5f4fdbe8a63b684862cd360c50d790372fd33d9526a1a74e1d980ce1ff689c274aa8971153fe9a8a SHA512 7524e4bd6b5c0db4f7157f50cb89a0cc4052f33c680ebef08d0cc2e393ecf5e53d9c96e472701300c74ef7386f90f74afffec79180a080724d19445a22dfcf7f DIST plasma-pa-5.27.6.tar.xz 163288 BLAKE2B 22ffddaf60d617af18c75e77130dd353b783021c7efa766147985009235bd09a43dd9a79902cd3dde06167ef3ee917bb0530abc694a767cd40aa1c181334c39e SHA512 2d1633e96b105e7aecfd05dfe17b0dabd28e6d1f4103575fa7a006868e7d6083954ed3176bd9c5c2c0d7f0e102f91bb5296eaf8a7de5ab8baad63d8f6a23e84b EBUILD plasma-pa-5.27.5.ebuild 911 BLAKE2B f6c454a2e9b75da56c535eb593c55c2e42691a3a57257e682d96addc4f4368de1a9929372b22b32b7c56eddf95ab001d386a38807249c6c3db3e72646dd37310 SHA512 5be403af74f8f2143d1bbdd9718764e6710fc567d92e0076653a8a2310ca90b9b687bdba53d89bc2f56768a33404227819e5b50e4f1f9db3060a0d57cdcb6631 +EBUILD plasma-pa-5.27.6-r1.ebuild 1078 BLAKE2B 8e482a90f98038766c65784d96952a4ced29b28390fee11a1f8ccabf298e215a4a67f6c2ffd45504c1cfe28883708c0a09fd8b1797bea6e60ca1c271e854f65d SHA512 6403f24207e1b5da08da224a82638dd68b9bd7b54cdaebbdb4d76271f3ddc7680309dac59c1e69c578371e80ed5881cd677ce3cdd5d47e34f3ae176c3bdf1529 EBUILD plasma-pa-5.27.6.ebuild 914 BLAKE2B 0662323e66a7aee80be5c31ffdf4363a0e847ac6c18cb989bea89778d9258f5bdeb8fa2ec1e8e55147b4f2a5d34a31757ebcc28bae24e0e02774a25ca1a64464 SHA512 cf62b57407ac6d5452db19ff1837eb7c813c7cea01033e5f7f2696e3d9148cf2a4bc8f1e072266b5ba0c303dd0f1229813ebeee287754af2781b5fe739e3925a MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-plasma/plasma-pa/files/plasma-pa-5.27.6-make-setGenericVolume-keep-balance.patch b/kde-plasma/plasma-pa/files/plasma-pa-5.27.6-make-setGenericVolume-keep-balance.patch new file mode 100644 index 000000000000..2067a4fd9742 --- /dev/null +++ b/kde-plasma/plasma-pa/files/plasma-pa-5.27.6-make-setGenericVolume-keep-balance.patch @@ -0,0 +1,42 @@ +From ffe6a4f4b6f56296165cea8651f35563d168ac89 Mon Sep 17 00:00:00 2001 +From: Quinten Kock <quintenkock@gmail.com> +Date: Wed, 21 Jun 2023 20:51:11 +0200 +Subject: [PATCH] Make setGenericVolume keep balance between channels + +Previously setGenericVolume would apply the same amount of difference +on all channels, making e.g. 100%/50% -> 80%/30%. + +This commit changes it to keep the ratios equal instead, so that the +resulting volume would be 80%/40%, keeping the balance the same. + +BUG: 435840 +FIXED-IN: 5.27.7 + + +(cherry picked from commit cfe4a360f2640d7bd4e2d936804b100a299b268a) +--- + src/context.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/context.h b/src/context.h +index 3d1f7525..969fa13b 100644 +--- a/src/context.h ++++ b/src/context.h +@@ -123,9 +123,12 @@ public: + newVolume = qBound<qint64>(0, newVolume, PA_VOLUME_MAX); + pa_cvolume newCVolume = cVolume; + if (channel == -1) { // -1 all channels +- const qint64 diff = newVolume - pa_cvolume_max(&cVolume); ++ const qint64 orig = pa_cvolume_max(&cVolume); ++ const qint64 diff = newVolume - orig; + for (int i = 0; i < newCVolume.channels; ++i) { +- newCVolume.values[i] = qBound<qint64>(0, newCVolume.values[i] + diff, PA_VOLUME_MAX); ++ const qint64 channel = newCVolume.values[i]; ++ const qint64 channelDiff = orig == 0 ? diff : diff * channel / orig; ++ newCVolume.values[i] = qBound<qint64>(0, newCVolume.values[i] + channelDiff, PA_VOLUME_MAX); + } + } else { + Q_ASSERT(newCVolume.channels > channel); +-- +GitLab + diff --git a/kde-plasma/plasma-pa/files/plasma-pa-5.27.6-move-volume-logic-to-VolumeSlider.patch b/kde-plasma/plasma-pa/files/plasma-pa-5.27.6-move-volume-logic-to-VolumeSlider.patch new file mode 100644 index 000000000000..2a01651f8814 --- /dev/null +++ b/kde-plasma/plasma-pa/files/plasma-pa-5.27.6-move-volume-logic-to-VolumeSlider.patch @@ -0,0 +1,93 @@ +From 91dcf51a0cda029519c917c93f330a6ced531784 Mon Sep 17 00:00:00 2001 +From: Quinten Kock <quintenkock@gmail.com> +Date: Wed, 21 Jun 2023 21:03:15 +0200 +Subject: [PATCH] Put volume change logic centrally in VolumeSlider + +This commit puts the volume change logic in one place, to prevent +issues related to changing the volume twice. + +Without this commit there are issues such as dragging from 100%/100% to +100%/50% and then the mixer changing the volume to 50%/25%. + +I'm not sure I'm entirely happy with this, but it seems to work. + + +(cherry picked from commit fec28d12c086a13038f6c40f10d3c25bb7517660) +--- + src/kcm/package/contents/ui/DeviceListItem.qml | 18 ++---------------- + src/kcm/package/contents/ui/VolumeSlider.qml | 16 +++++++++++++++- + 2 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/src/kcm/package/contents/ui/DeviceListItem.qml b/src/kcm/package/contents/ui/DeviceListItem.qml +index 09feea71..ab0ce6f0 100644 +--- a/src/kcm/package/contents/ui/DeviceListItem.qml ++++ b/src/kcm/package/contents/ui/DeviceListItem.qml +@@ -178,12 +178,6 @@ ColumnLayout { + Layout.columnSpan: 2 + Layout.alignment: Qt.AlignVCenter + visible: !balanceButton.checked +- +- value: Volume +- onMoved: { +- Volume = value; +- Muted = (value === 0); +- } + } + + Repeater { +@@ -203,16 +197,8 @@ ColumnLayout { + Layout.fillWidth: true + + value: ChannelVolumes[index] +- onMoved: { +- delegate.pulseObject.setChannelVolume(index, value); +- +- // volumes are updated async, so we'll just assume it worked here +- let newChannelVolumes = ChannelVolumes; +- newChannelVolumes[index] = value; +- Muted = newChannelVolumes.every((volume) => { +- return volume === 0; +- }); +- } ++ ++ channel: index + } + } + } +diff --git a/src/kcm/package/contents/ui/VolumeSlider.qml b/src/kcm/package/contents/ui/VolumeSlider.qml +index c2cf0a31..fc0c4a6c 100644 +--- a/src/kcm/package/contents/ui/VolumeSlider.qml ++++ b/src/kcm/package/contents/ui/VolumeSlider.qml +@@ -19,6 +19,8 @@ RowLayout { + + property alias value: slider.value + ++ property int channel: -1 ++ + QQC2.Slider { + id: slider + +@@ -35,7 +37,19 @@ RowLayout { + onMoved: { + // Since it is not possible to use stepSize without tickmarks being displayed, force 1% steps + // Unfortunately without stepSize, it cannot snap visually whilst scrolling by changing value instead of Volume as it breaks the binding +- Volume = Math.round(value * 100 / PulseAudio.NormalVolume) * PulseAudio.NormalVolume / 100 ++ let volume = Math.round(value * 100 / PulseAudio.NormalVolume) * PulseAudio.NormalVolume / 100 ++ if (channel == -1) { ++ Volume = volume ++ Muted = volume === 0; ++ } else { ++ delegate.pulseObject.setChannelVolume(channel, volume); ++ ++ // volumes are updated async, so we'll just assume it worked here ++ let newChannelVolumes = ChannelVolumes; ++ newChannelVolumes[index] = value; ++ Muted = newChannelVolumes.every(volume => volume === 0); ++ } ++ + sliderRow.moved() + } + +-- +GitLab + diff --git a/kde-plasma/plasma-pa/plasma-pa-5.27.6-r1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.27.6-r1.ebuild new file mode 100644 index 000000000000..9128d7fa29b0 --- /dev/null +++ b/kde-plasma/plasma-pa/plasma-pa-5.27.6-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org + +DESCRIPTION="Plasma applet for audio volume management using PulseAudio" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="" + +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + media-libs/libcanberra + media-libs/libpulse +" +RDEPEND="${DEPEND} + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + x11-themes/sound-theme-freedesktop +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" + +PATCHES=( # in 5.27.7: + "${FILESDIR}/${P}-make-setGenericVolume-keep-balance.patch" # KDE-bug 435840 + "${FILESDIR}/${P}-move-volume-logic-to-VolumeSlider.patch" +) diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index ca45e956dc76..cd30d08ec0e8 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -2,8 +2,9 @@ AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099c AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678 AUX plasma-workspace-5.22.5-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd AUX plasma-workspace-5.24.80-split-libkworkspace.patch 1175 BLAKE2B 74dabcc26da223fb46bd97c2d07b5913ad51ab85a20062835dbb80b2a555129029996f99129ea9d99af76399722a404cf9baabbea48de4ab4392f068539f3c9f SHA512 95a63a106242449cdf605f943e794e07834b5d1e8fff2ad4e6a025fd68cc20fc6725ec0f0389898c4fe8c87587c7a51381b343cf116b2ff812236f0fe95ed314 +AUX plasma-workspace-5.27.6-fix-libtaskmanager-potential-leak.patch 1149 BLAKE2B 854488e19cf6c830ad06f425ad99d746c6c351ab67074d38b1187396644a5e077436e4c4af4f78352390ea4455ba2b4d5a3308160d1ac43398615ea229edad68 SHA512 2c76eebecba624d009fa83995b74154e038720f40d5a517a72b92e734c84b153999e4270f148461cb4df50c213e598ca25c84927261e8af2b7ca1736db48c43e DIST plasma-workspace-5.27.5.tar.xz 19432672 BLAKE2B 28d54f66d5999b8e44745cfa47258fdeb976b7ee4e7006e164b04f88738a9ed1442f97cdec8743b1e93e93838701743779f83b303c6f2974850468e61adf3efb SHA512 16f730b76430b7d546b5483c6b18eba1f3944f2537762a184bd3504578bcbe391ab0f2af7afb874e6907753682857629424599a12fa0393465396f0d9957158c DIST plasma-workspace-5.27.6.tar.xz 19459172 BLAKE2B d1b1a1ccb8a76149882ed49ed662a561a04963d154ada7259665f8d228af17004dfb464ee684c5c14402166261ec176e322642f736f7fd55f233d31f11bcf256 SHA512 090c65ecb1664d5e55d52ff7a11e6402a2b9bb7a31c99fe3406c2c4111aada6102aaf3f5a110c6a13223e88ee164caf209d859fcb6823b638ca42bcbb683984d EBUILD plasma-workspace-5.27.5.ebuild 6817 BLAKE2B 43a62676bcd78ada8dc0c22ccb7296d62fe1dbc465443e4840706300b65262ccd5e9b38d4c2bac6ae57a98b5af8f5a8dd5e44c5b13b57d0e6b704bc58715e609 SHA512 495ba91d2679ac153c13d5ccfbddf5f439441c5925e87fbde89f9db6420ff40e572d499b0edf70ea798d0e0cdfe6571fd32e8a143af3cf0e24e569292b1eff4e -EBUILD plasma-workspace-5.27.6.ebuild 6795 BLAKE2B db0c0551ce21f3bca853ddac1fbc6baa5d94365fd936f5a1b898ae0a3de15f9519bdfd9521e2cf30c7f560ae257b96d13432c6fc218457c50322c0ac34d1ebd0 SHA512 dfafe5b77fe7beedeaada7b81c8fa35033184fc23392ab2527bdd97c3a9b54ddd99dc381e5317999baa91412571446c3f82407042378d5a261ee95a28e1e33d6 +EBUILD plasma-workspace-5.27.6-r1.ebuild 6867 BLAKE2B acb35d9964d6c0c7a4c34895420845f0e2ba25d527cfb5e17cb15761c053fcf0dee8a56c44caa8e800dfdfdb04c28ec208bbbefa22ab43432daa915e65442dba SHA512 ed697efe654461d50acd5ef4d7434892904bd6a61d2f8be0ea39f5ca080c31d90e69a020683504fc1c8d5f924a66d836a4544d48f4fed1a182fcbe7463c77edf MISC metadata.xml 959 BLAKE2B 6513ae79e0cf24efd0bd33a16708950d36393770b51ea752c4c8c6e7ec63c7675dcf5e96dcfbb07d527ba910462b7c23afe35c55b4643ec69d1175660b245478 SHA512 8af28473216b00d4273be4bbb5d93adf8a4db79c46d9e97bd8b2822fa3920e8fc789042669bc93e6e9a6fa1c864a49fc23887be8456ea122a6d8b09e384dffbd diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.6-fix-libtaskmanager-potential-leak.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.6-fix-libtaskmanager-potential-leak.patch new file mode 100644 index 000000000000..18a11b2504e5 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.6-fix-libtaskmanager-potential-leak.patch @@ -0,0 +1,28 @@ +From 2f67e4b63d664490310e485d59fdd500b7eb0bc5 Mon Sep 17 00:00:00 2001 +From: Fushan Wen <qydwhotmail@gmail.com> +Date: Fri, 23 Jun 2023 07:55:44 +0800 +Subject: [PATCH] libtaskmanager: fix a potential leak + +Pointers in rowMap are not deleted before they are removed in rowMap. + + +(cherry picked from commit 19c0022735e74cf028daa93e36d257c804862954) +--- + libtaskmanager/taskgroupingproxymodel.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libtaskmanager/taskgroupingproxymodel.cpp b/libtaskmanager/taskgroupingproxymodel.cpp +index afdde61d97..ea68bee556 100644 +--- a/libtaskmanager/taskgroupingproxymodel.cpp ++++ b/libtaskmanager/taskgroupingproxymodel.cpp +@@ -778,6 +778,7 @@ void TaskGroupingProxyModel::setSourceModel(QAbstractItemModel *sourceModel) + connect(sourceModel, &QSortFilterProxyModel::modelReset, this, std::bind(&TaskGroupingProxyModel::Private::sourceModelReset, dd)); + connect(sourceModel, &QSortFilterProxyModel::dataChanged, this, std::bind(&TaskGroupingProxyModel::Private::sourceDataChanged, dd, _1, _2, _3)); + } else { ++ qDeleteAll(d->rowMap); + d->rowMap.clear(); + } + +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.6.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.6-r1.ebuild index 20e103e39459..b2f3659252a4 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.6.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.6-r1.ebuild @@ -161,6 +161,7 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" PATCHES=( "${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 + "${FILESDIR}/${P}-fix-libtaskmanager-potential-leak.patch" # in 5.27.7 ) src_prepare() { |