diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-11-19 03:03:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-19 03:03:00 +0000 |
commit | f2e359c456b051f95efc92e21299d55a302e58ed (patch) | |
tree | 9d844c8fa1373b6f4244c1cfbe55eea7cdf62701 /kde-plasma | |
parent | f9f6fa91738181ebe9aca71b75d157d8b5df5335 (diff) |
gentoo auto-resync : 19:11:2024 - 03:03:00
Diffstat (limited to 'kde-plasma')
22 files changed, 1273 insertions, 0 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz Binary files differindex c2db4d88d15f..3328c440bac8 100644 --- a/kde-plasma/Manifest.gz +++ b/kde-plasma/Manifest.gz diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index 708b395f43c0..020ad8bd5e92 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,5 +1,7 @@ DIST kwin-6.1.5.tar.xz 8503432 BLAKE2B 8cd8da89f93ac64dbb8a42e90a09a188b86762440964d4e9425a924f0349360bcf31f187fcfb66b61fca42db44f93c97f313703c5b602e873035bec86f36b0b1 SHA512 a71d1f814c948293d5552504115178f20e7450ead86c57b0fda79584f613fbc77851d1735945f7f05bf0b6b8c09cdacf53154820176d133f41ec736ae1492946 +DIST kwin-6.2.3-patchset-1.tar.xz 8668 BLAKE2B b8f9c602f94d883a72f5b688826d74504407fa68801e5b7a1689b576b0040cb6865df2d6e9ec1cd85550618f1bae82ba5ae4f40dc3a56a5301f6aae9fe360159 SHA512 0903dd7bea87e6a6ad76681b5311dd0e414d76aab9bea22eebe7ae04257539a38a4639e6a788eac25e39e0195a1b76df46774db023135e0c4a9d69b2a0effd3b DIST kwin-6.2.3.tar.xz 8557808 BLAKE2B a66c09459b6d41bb7059ae085bc89dc4d8cf08bb61eacb4ab52166863f5c4b971d56e420a295d2f638b30886ad5f2fa1f0f4a725087d0295668158523866648c SHA512 5f54de7536c0bf8c324c8f319614895e279ce888326fdd440b9ac952ea43498c65b532c03920d49605afa31665c7bcd3a66ae637f68eb9d3e1b0ec80ac8c4691 EBUILD kwin-6.1.5.ebuild 4140 BLAKE2B c584a1db6c3f94f4ed52aa28f632e51e0cd51679f3c948cc305481d2d0aecaad73c8772a6d7f1c309afb64fff772412aa33318ef60b1c8d1506dc345c78d5676 SHA512 cfabdb37724a800ae099b95dfa7c69cd0111d3a4be2691e104f56ac72559373fceded84014a6fddebd9b35b0e7a28b27edce0c6a1ae0bd8296b23150298475bd +EBUILD kwin-6.2.3-r1.ebuild 4586 BLAKE2B f41d2f59377c26f68e1bc05104bce17cefe4e727d29ea5c9f5e092eee9b904f80b5f78eefcf3e6e1bc759459892704eb61a9e761727306890b0553d807c88c9c SHA512 2b6ca5373289ea5f82cc88a20191e47e2ea2edf069c7cb6528c861277c3c1e5e21365afd309902cc53fa94b9df4881097ea522aae0971bbf6ced96e81f4b98b0 EBUILD kwin-6.2.3.ebuild 4385 BLAKE2B b95256b5c8c1854643163c117b382c790e88db6a3a8ca503669d66061368682e2703ae6899fccb5681cfcd5805b689ef6bda39da41f182af0cb3e0ac60f83dc4 SHA512 6f1706e228d4dd375b2874179b2499d42ae2657ad34cd9a714c1c9bd3386ca9d0bf1811ca4bb2586effbca12048d36396d1a33a80676f2bedcabd66ad7074936 MISC metadata.xml 677 BLAKE2B 050345f8f8f489b3cb81e112c05fddedc738c8f136d409b8754c54494a02caf5671a66dd1ecd7cfb91f24ab11210c67f78c09c928a4daf16b3512600649551c5 SHA512 5134373a0ce30f351344c07df4a68f97a15bf3bdb061ba8ff3355a42da2281d64bb506cdcb5b1dad698fc2061b4a4a92e054e08c521acb327b84f968a7d936dc diff --git a/kde-plasma/kwin/kwin-6.2.3-r1.ebuild b/kde-plasma/kwin/kwin-6.2.3-r1.ebuild new file mode 100644 index 000000000000..0d8a755086f9 --- /dev/null +++ b/kde-plasma/kwin/kwin-6.2.3-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" +PATCHSET="${P}-patchset-1" +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" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" + +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 ) + +# KDE-bugs #494930, #495537, #495400, #495325, #493934, #488941 +PATCHES=( "${WORKDIR}/${PATCHSET}" ) + +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 +} diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index 0dbc11aaa6ef..1adc9729290e 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,5 +1,8 @@ +AUX libksysguard-6.2.3-fix-piechart-text.patch 2880 BLAKE2B f38506e9cbf4c043a28865a8e2b3a6f35499ad5d55ceba636962ddf70e930280662eb2a7f4c66badf29f0bdef3e42e52001d9843b42a1cd106b0f55c8ed80336 SHA512 6e374198fb79ab473eff39bd353fe2ebed54e67d230cd56b00a441e8306fe80028e54d6a80ebd4dcdc144fb2d751541ed5b44951c4521ed95e54d21ca09996e6 +AUX libksysguard-6.2.3-fix-saving-presets.patch 1935 BLAKE2B 5b4422c5e2dfb6db05588470547c8a433a73c441e9f52f54445d4f64864b9cd20ef0b6863a9bd83e019babc8891ded017a4c37ec2c96002579be7859fe7cf7a7 SHA512 f719a8f98b12aa93d4a8aabd5770c2d00abef91c13d8b4f7f2125ac501415045da4af8c0cb1b473a14b7d777d2f457b8b55624067212441ad21bf409d147216b DIST libksysguard-6.1.5.tar.xz 306220 BLAKE2B 37f7e9c7fc1e91a0cfa4ab18b276e3d5187cb0a2a543a6a8d8d61a125cff49bcb1b73b85a1a3ea1f4079d10a94431995c5812e51198a7a12bf8f457b678b42af SHA512 d3ffec5479510241c3d006a7d0bc8ed23cd37dad84422c48bf8dad3eca62883759c2a536ffabe1bede1073144415f53cca8c2099129e96b18c8283a9e4e48140 DIST libksysguard-6.2.3.tar.xz 314808 BLAKE2B 629cb4164253a48e3b186fb2675a2c48ca6c2e65e42ef7ced131acff1a8f775d42b8ba9929adca05b62f06e73198966c2f5c89028ab97891ac90c593ec6b6573 SHA512 2dc2e51e9d4b1050d1f828dec9067e62ec5ced759334fd5286dce77fa25951d3b50fc06485e9e4dbdf5e16da9444ef24e699c752a7f11141ac5ab0e0c15b284f EBUILD libksysguard-6.1.5.ebuild 992 BLAKE2B 0c30f38181f7c6461472ad54caade3557b93ee99def6ebce16d59f107813b0bf57195007dd7cd1208959520bd643b59c63d8ae83d3fd0f2170f93c755f046a99 SHA512 b722f348e15c567f104bf8b0110fa5752a5a99b8f9774e7078a77d66be7815bfa6d1a3147104928118b77bf2bf938bf8207dca16092eebcc0625789fdb8445b0 +EBUILD libksysguard-6.2.3-r1.ebuild 1437 BLAKE2B d8be7c10962efece5e815bb7020d2d2d6ac2f7b3f2a2f1d49cae219f798e8e889408b0be630139242a5d320b8dfb9639d34977c1e8703f2930e7be2cdf65e2cd SHA512 3ae01eef56615a685eb8e6d212a6c97788422e07f73ecbe8e6668818d73e4fe5119ff4343e5f4cddd574dd0eb0a231199bc53dc5e44cbcac45668ec4d16d9b7f EBUILD libksysguard-6.2.3.ebuild 994 BLAKE2B 74cae972b9c2f9797fec25b9202ca243f45de387df1c8abd1ca021b7b7e74fd1c071967fa937e9033f76e73e303ebd13ac9bcf5443c3f775c60f0970b17326fa SHA512 146b6ddc59ff2c1a414a96345075f6fadab795bf2dbb1d0fa7971440d8050a6396a643a553626ebc4780dc53190aa2d034129488c79fc0625362055669cdb456 MISC metadata.xml 405 BLAKE2B bcb21392b01841281d5be1a06b02ad3a07d7d4b288e0b1319b8eb65a85d7aa981c9c0e055a48bf9d574eb4b067a0836721ad7d439016e6ce37d40296e09a8c0b SHA512 347c61a7551f8875a440372c42ffa4d391558645ea3e475cf5b3de4889ea774db6867c065e14884ee665eb5857d53b7ab57504368d5da2a1ea05376dac1988ed diff --git a/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-piechart-text.patch b/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-piechart-text.patch new file mode 100644 index 000000000000..cad55fa104a7 --- /dev/null +++ b/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-piechart-text.patch @@ -0,0 +1,68 @@ +From 6e164d04743823fca6392ed9cce9e75acd537a0c Mon Sep 17 00:00:00 2001 +From: Arjen Hiemstra <ahiemstra@heimr.nl> +Date: Wed, 6 Nov 2024 12:22:02 +0000 +Subject: [PATCH 1/4] faces/piechart: Use GraphicalEffects.Glow for rendering + outline of compact text + +Apparently using style Text.Outline leads to some pretty bad text +rendering. So instead use Glow from GraphicalEffects to achieve a +similar effect but one that's smoother. Unfortunately this uses +deprecated API because MultiEffect turns out to be completely unusable. + +BUG: 494495 + + +(cherry picked from commit 69c7ad2122b1c5dd6fcc3edaa8be4ec597bdfda5) + +Co-authored-by: Arjen Hiemstra <ahiemstra@heimr.nl> +--- + .../piechart/contents/ui/UsedTotalDisplay.qml | 21 +++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/faces/facepackages/piechart/contents/ui/UsedTotalDisplay.qml b/faces/facepackages/piechart/contents/ui/UsedTotalDisplay.qml +index 50242cfc..52cc787c 100644 +--- a/faces/facepackages/piechart/contents/ui/UsedTotalDisplay.qml ++++ b/faces/facepackages/piechart/contents/ui/UsedTotalDisplay.qml +@@ -8,6 +8,8 @@ import QtQuick + import QtQuick.Controls + import QtQuick.Layouts + ++import Qt5Compat.GraphicalEffects ++ + import org.kde.kirigami as Kirigami + + import org.kde.ksysguard.formatter as Formatter +@@ -87,17 +89,24 @@ Item { + fontSizeMode: Text.HorizontalFit + minimumPointSize: Kirigami.Theme.smallFont.pointSize * 0.8 + +- // When we're small the text is allowed to flow over the underlying +- // pie chart, to improve contrast we render it with an outline using +- // the inverse text color. +- style: root.constrained ? Text.Outline : Text.Normal +- styleColor: Qt.rgba(1.0 - Kirigami.Theme.textColor.r, 1.0 - Kirigami.Theme.textColor.g, 1.0 - Kirigami.Theme.textColor.b, 1.0) +- + // This slightly odd combination ensures that when the width becomes + // too small, the unit gets hidden because the text wraps but the + // wrapped part is hidden due to maximumLineCount. + wrapMode: Text.Wrap + maximumLineCount: 1 ++ ++ // When we're small we want to overlap the text onto the chart. To ++ // ensure the text remains readable, we want to have some sort of ++ // outline behind the text. Unfortunately, there is no way to ++ // achieve the visual effect we want here without using deprecated ++ // GraphicalEffects. MultiEffect is completely unusable and using ++ // `style: Text.Outline` makes the font rendering look pretty bad. ++ layer.enabled: root.constrained ++ layer.effect: Glow { ++ radius: 4 ++ spread: 0.75 ++ color: Kirigami.Theme.backgroundColor ++ } + } + + Kirigami.Separator { +-- +2.47.0 + diff --git a/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-saving-presets.patch b/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-saving-presets.patch new file mode 100644 index 000000000000..dfd4bd0dd936 --- /dev/null +++ b/kde-plasma/libksysguard/files/libksysguard-6.2.3-fix-saving-presets.patch @@ -0,0 +1,47 @@ +From 9ea3571c903db1ebe72d5091eefc052288af252f Mon Sep 17 00:00:00 2001 +From: Arjen Hiemstra <ahiemstra@heimr.nl> +Date: Thu, 7 Nov 2024 11:54:35 +0100 +Subject: [PATCH 4/4] faces: Ensure the temporary dir for a preset remains + until installed + +QTemporaryDir deletes the temporary directory when it goes out of scope. +However, installing the preset with KPackage is an asynchronous +operation that can extend beyond the current scope. This can cause the +preset data to be deleted while we're still installing. To ensure this +doesn't happen, extend the lifetime of the QTemporaryDir into the lambda +we use to handle the job finished, so that it lives at least as long as +the job. + +BUG: 485164 +--- + faces/SensorFaceController.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/faces/SensorFaceController.cpp b/faces/SensorFaceController.cpp +index 06eda200..60e6a579 100644 +--- a/faces/SensorFaceController.cpp ++++ b/faces/SensorFaceController.cpp +@@ -954,6 +954,11 @@ void SensorFaceController::savePreset() + pluginName += QString::number(suffix); + } + ++ // Important! We need to ensure the directory remains valid as long as it has ++ // not been installed yet. Since the install is asynchronous, we need to make ++ // sure that the QTemporaryDir does not go out of scope until the install is ++ // finished, so this directory will be moved into the lambda connected to the ++ // job finished signal below to ensure it lives as long as the job. + QTemporaryDir dir; + if (!dir.isValid()) { + return; +@@ -1013,7 +1018,7 @@ void SensorFaceController::savePreset() + configGroup.sync(); + + auto *job = KPackage::PackageJob::install(QStringLiteral("Plasma/Applet"), dir.path()); +- connect(job, &KJob::finished, this, [this]() { ++ connect(job, &KJob::finished, this, [this, dir = std::move(dir)]() { + d->availablePresetsModel->reload(); + }); + } +-- +2.47.0 + diff --git a/kde-plasma/libksysguard/libksysguard-6.2.3-r1.ebuild b/kde-plasma/libksysguard/libksysguard-6.2.3-r1.ebuild new file mode 100644 index 000000000000..2880a6b41ff2 --- /dev/null +++ b/kde-plasma/libksysguard/libksysguard-6.2.3-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=6.6.0 +QTMIN=6.7.2 +inherit ecm fcaps plasma.kde.org + +DESCRIPTION="Task management and system monitoring library" + +LICENSE="LGPL-2+" +SLOT="6/9" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="" + +DEPEND=" + dev-libs/libnl:3 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6[qml] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + net-libs/libpcap + sys-apps/lm-sensors:= + sys-libs/zlib +" +RDEPEND="${DEPEND} + >=dev-qt/qt5compat-${QTMIN}:6[qml] +" + +# -m 0755 to avoid suid with USE="-filecaps" +FILECAPS=( -m 0755 cap_sys_nice=ep usr/libexec/ksysguard/ksgrd_network_helper ) + +PATCHES=( + "${FILESDIR}/${P}-fix-piechart-text.patch" # KDE-bug #494495 + "${FILESDIR}/${P}-fix-saving-presets.patch" # KDE-bug #485164 +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON + ) + ecm_src_configure +} + +src_test() { + # bugs 797898, 889942: flaky test + local myctestargs=( + -E "(sensortreemodeltest)" + ) + LC_NUMERIC="C" ecm_src_test # bug 695514 +} + +pkg_postinst() { + ecm_pkg_postinst + fcaps_pkg_postinst +} diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 04702790840b..74805e4d63b0 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,7 +1,10 @@ AUX plasma-desktop-6.1.80-override-include-dirs.patch 3470 BLAKE2B 9f3c9dff718499740271045e267f2e5d929a9b23e5fe8d2481238426c262da31ed1544ddb8b235a47cac2befbe39784224bd6bf49cab9409933ea6fec41719b3 SHA512 4ae89c84ca0c90d5660746bd97cae7d433bdb52c459d94caa5705b38ec077eca5c273e334859e27dc2230d410f6c6d926450ba961934a5f331cf79060e12d912 +AUX plasma-desktop-6.2.3-panel-fix-flexible-spacer.patch 2741 BLAKE2B d9d52f034be927ba1db8751b0e293c373bd66a7ef00655a7f15c1facb0b87f528e20f27f974093375d318cf8b26053996d0eaf1297c66a4bd72d1cbb78664530 SHA512 90f944b8ec53377f965998b4107e0369347055dfc9dc42c75b755fdf944d595463483ddc3eaa0c47bcd16af0b0a3f528f37b8bca9ab870d707a0a0a84ea8b3ff +AUX plasma-desktop-6.2.3-tablet-kcm-optional.patch 3229 BLAKE2B f74fe4e69930e366911d09d7887486e7ab9c8517ecb628246833d510da7f5c114ea3c6dfd71c32c3d8f3e7c9205ece26618e077b7bac97b23ca7a1e73cec5103 SHA512 1bc677637d9eb1bc929a805362d7d8b88c5479eac0652d45b38f538702197355f58ae3f14659af93afee2d6e25236b0c8e2a5fba0da1138710dd7830aa998e22 DIST plasma-desktop-6.1.5.tar.xz 16144320 BLAKE2B 60b8ad791325e506551746790d23347c501caaa1550c470e5157e8902da07162691b30a36c53c6910d1daa32ea3e3801562d4acbf0feceaf35d72ad32662f809 SHA512 db5698874bd66be0194f868cc037af2521b924afb02a56036696504c2b3e8dec3d59ba9228203f7b0d08ffaaa36137f10081207fa79d748c5044b37063507b6f DIST plasma-desktop-6.2.3.tar.xz 16334344 BLAKE2B 4dfa7c55e6d2bedcc1a52057bc86663b014b1aff54450cc521f0cb79814c08c1bf449408b3161b32d1b157a026f80c1a96dab0aad892322754d725ae3a3b4cb9 SHA512 72e8af1b71d3ed7e22f14ec044108a5a49daa4764586549e878378f4b4ffdfde72ef83c862102571e576724748c712b40e2f6dc302dafe68eee50c401d3f7645 DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1 EBUILD plasma-desktop-6.1.5-r1.ebuild 5230 BLAKE2B 4e2a80948e6150c64e95529ba68de9107e274b5a05567bb834f621e24d9d2af9f2a4493eecf4e91f2c5638effc1e105ab40d8d9fb4b884ae79434875ce29f7d9 SHA512 f8abbeb311568051381a42b442928ddc05327cdb61c383e3a76543fa3b33a637a21cfe98a5cdff70dc80e4c22b2bf56d2bd340dc50d0588220c7e3604a35b57a +EBUILD plasma-desktop-6.2.3-r1.ebuild 5497 BLAKE2B c331d4d27ef3f398a3da037d347dce3f73328503ab45c2878deb78a49a1630856308577208a48fb7bb6aad1b8f141e11007f705e130129b128b28595b24236a7 SHA512 bbd3a1d5e152e64bd854f52d745f2d163a29c762bc41a4ad860488b5508ac08e7f1ffb47677fe58f1efcf2e7512139dff9aa0b9193e1609b21b577749cf1f0f8 EBUILD plasma-desktop-6.2.3.ebuild 5221 BLAKE2B db5dc4f8d2bd80d79164a6b376c199e3566c891a39135033be26b8a365b2023d8ec3dda70d4c18050ef15ac2af3f1f0aa154838fc8eb0b9c70b087c739ed1ac9 SHA512 29ba20714a5ee5ad2325320b95ad2485ef0c0e59b7fd10957445e1069a2cddbecb1b7a65ca0184be97da096ac0c6921a6d416256185b125ac1b0302958f08a96 MISC metadata.xml 560 BLAKE2B 04dc70f5284d8fc3e486718b5eb17ee773f90ff807828640f7ff63c0dffcc3bbe4f84600262d4f11ccb6df8d3af5e69aac1b81ddfd2a5ec50dee9bbbb5a5f656 SHA512 7a1df153e7327f1c3fcf7e5027745612bf6c7c24ceb66b71aec77ceecf43aada94f8dba7a33bac72524067845691831ec5cda411650fd9e834245d7d3dd86f0e diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-panel-fix-flexible-spacer.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-panel-fix-flexible-spacer.patch new file mode 100644 index 000000000000..185b1493102b --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-panel-fix-flexible-spacer.patch @@ -0,0 +1,70 @@ +From 8789c9c2a847d2e1c83b8de7b915cf9888e68937 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= <niccolo@venerandi.com> +Date: Thu, 7 Nov 2024 13:30:27 +0000 +Subject: [PATCH] Fill panel width/height in custom/fit content modes when + flexible spacer is in panel +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The flexible spacer should always make the panel gain its maximum +width/height; this implements that. + +BUG:495378 + + +(cherry picked from commit 7d2e16b09d391b7bc979e447d21bc8747399c55d) + +Co-authored-by: Niccolò Venerandi <niccolo@venerandi.com> +--- + containments/panel/contents/ui/main.qml | 6 ++++++ + desktoppackage/contents/views/Panel.qml | 14 ++++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml +index 2570f9f520..e69131d6a6 100644 +--- a/containments/panel/contents/ui/main.qml ++++ b/containments/panel/contents/ui/main.qml +@@ -26,6 +26,12 @@ ContainmentItem { + //BEGIN properties + Layout.preferredWidth: fixedWidth || currentLayout.implicitWidth + currentLayout.horizontalDisplacement + Layout.preferredHeight: fixedHeight || currentLayout.implicitHeight + currentLayout.verticalDisplacement ++ Layout.fillWidth: { ++ return currentLayout.children ++ .filter(child => child?.applet?.plasmoid?.pluginName === "org.kde.plasma.panelspacer") ++ .some(child => child.applet.plasmoid.configuration.expanding) ++ } ++ Layout.fillHeight: Layout.fillWidth + + property Item toolBox + property var layoutManager: LayoutManager +diff --git a/desktoppackage/contents/views/Panel.qml b/desktoppackage/contents/views/Panel.qml +index 2083123282..a4fab11699 100644 +--- a/desktoppackage/contents/views/Panel.qml ++++ b/desktoppackage/contents/views/Panel.qml +@@ -275,8 +275,22 @@ Item { + return; + } + if (verticalPanel) { ++ if (containment.Layout.fillHeight) { ++ if (panel.lengthMode == Panel.Global.Custom) { ++ return panel.maximumHeight ++ } else { ++ return panel.screenGeometry.height ++ } ++ } + return containment.Layout.preferredHeight + } else { ++ if (containment.Layout.fillWidth) { ++ if (panel.lengthMode == Panel.Global.Custom) { ++ return panel.maximumWidth ++ } else { ++ return panel.screenGeometry.width ++ } ++ } + return containment.Layout.preferredWidth + } + } +-- +GitLab + diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch new file mode 100644 index 000000000000..b0d2f512ed9e --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch @@ -0,0 +1,93 @@ +From 5296ef03a9b14a6a9324d506d04f78e61e8512f6 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 4 Nov 2024 23:15:19 +0100 +Subject: [PATCH] cmake: Add BUILD_KCM_TABLET option to conditionalise Wayland + deps + +Follow-up to 240ca31717ebed55e43ffaf6ac906dea07e9f4c6 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +(cherry picked from commit 8f0e9b4d625024469b4fbd0468e767e45b464872) +--- + CMakeLists.txt | 30 ++++++++++++++++++------------ + kcms/CMakeLists.txt | 5 ++++- + 2 files changed, 22 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f764d1ef4..8222cfaed5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,6 +40,7 @@ option(BUILD_KCM_MOUSE_KWIN_WAYLAND "Build the Mouse KCM's KWin+Wayland backend" + option(BUILD_KCM_MOUSE_X11 "Build the Mouse KCM's X11 backend" ON) + option(BUILD_KCM_TOUCHPAD_KWIN_WAYLAND "Build the Touchpad KCM's KWin+Wayland backend" ON) + option(BUILD_KCM_TOUCHPAD_X11 "Build the Touchpad KCM's X11 backend" ON) ++option(BUILD_KCM_TABLET "Build the Tablet KCM" ON) + + find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS + Quick +@@ -51,7 +52,10 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS + Core5Compat + Sql # kcms/activities + ) +-find_package(Qt6 ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WaylandClient) ++ ++if(BUILD_KCM_TABLET) ++ find_package(Qt6WaylandClient ${QT_MIN_VERSION} CONFIG REQUIRED) ++endif() + + find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS + Auth +@@ -139,17 +143,19 @@ set_package_properties(KF6QQC2DesktopStyle PROPERTIES + TYPE RUNTIME + ) + +-find_package(WaylandProtocols 1.25) +-set_package_properties(WaylandProtocols PROPERTIES +- TYPE REQUIRED +- PURPOSE "Collection of Wayland protocols that add functionality not available in the Wayland core protocol" +- URL "https://gitlab.freedesktop.org/wayland/wayland-protocols/" +-) +-find_package(Wayland 1.2) +-set_package_properties(Wayland PROPERTIES +- TYPE REQUIRED +- PURPOSE "Required for building Tablet input KCM" +-) ++if(BUILD_KCM_TABLET) ++ find_package(WaylandProtocols 1.25) ++ set_package_properties(WaylandProtocols PROPERTIES ++ TYPE REQUIRED ++ PURPOSE "Collection of Wayland protocols that add functionality not available in the Wayland core protocol" ++ URL "https://gitlab.freedesktop.org/wayland/wayland-protocols/" ++ ) ++ find_package(Wayland 1.2) ++ set_package_properties(Wayland PROPERTIES ++ TYPE REQUIRED ++ PURPOSE "Required for building Tablet input KCM" ++ ) ++endif() + + find_package(SDL2 2.0.16) + set_package_properties(SDL2 PROPERTIES +diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt +index 5b204a7c19..cea880c139 100644 +--- a/kcms/CMakeLists.txt ++++ b/kcms/CMakeLists.txt +@@ -26,7 +26,6 @@ add_subdirectory(kded) + add_subdirectory(runners) + add_subdirectory(spellchecking) + add_subdirectory(qtquicksettings) +-add_subdirectory(tablet) + add_subdirectory(touchscreen) + + add_subdirectory(workspaceoptions) +@@ -42,3 +41,7 @@ endif() + if (BUILD_KCM_TOUCHPAD_KWIN_WAYLAND OR BUILD_KCM_TOUCHPAD_X11) + add_subdirectory(touchpad) + endif() ++ ++if(BUILD_KCM_TABLET) ++ add_subdirectory(tablet) ++endif() +-- +2.47.0 + diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.2.3-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.2.3-r1.ebuild new file mode 100644 index 000000000000..b7e4dd945e2e --- /dev/null +++ b/kde-plasma/plasma-desktop/plasma-desktop-6.2.3-r1.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KFMIN=6.6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.2 +inherit ecm plasma.kde.org optfeature + +DESCRIPTION="KDE Plasma desktop" +XORGHDRS="${PN}-override-include-dirs-4" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="ibus input_devices_wacom scim screencast sdl +semantic-desktop webengine" + +RESTRICT="test" # missing selenium-webdriver-at-spi + +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras +COMMON_DEPEND=" + dev-libs/icu:= + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/attica-${KFMIN}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kded-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 + >=kde-plasma/kwin-${PVCUT}:6 + >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/plasma-activities-stats-${PVCUT}:6 + >=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?] + >=kde-plasma/plasma5support-${PVCUT}:6 + media-libs/libcanberra + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libxkbcommon + x11-libs/libxkbfile + ibus? ( + app-i18n/ibus + dev-libs/glib:2 + x11-libs/xcb-util-keysyms + ) + input_devices_wacom? ( + dev-libs/wayland + >=dev-qt/qtwayland-${QTMIN}:6 + ) + scim? ( app-i18n/scim ) + sdl? ( media-libs/libsdl2[joystick] ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 ) + webengine? ( + kde-apps/kaccounts-integration:6 + >=net-libs/accounts-qt-1.17[qt6(+)] + ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + x11-base/xorg-proto + input_devices_wacom? ( >=dev-libs/wayland-protocols-1.25 ) + test? ( + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 + >=kde-plasma/kactivitymanagerd-${PVCUT}:6 + ) +" +RDEPEND="${COMMON_DEPEND} + !<kde-plasma/kdeplasma-addons-5.25.50 + !<kde-plasma/plasma-workspace-6.0.80 + dev-libs/kirigami-addons:6 + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 + >=kde-plasma/oxygen-${PVCUT}:6 + kde-plasma/plasma-mimeapps-list + media-fonts/noto-emoji + sys-apps/util-linux + x11-apps/setxkbmap + x11-misc/xdg-user-dirs + screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) + webengine? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6(+)] ) +" +BDEPEND=" + dev-util/intltool + >=kde-frameworks/kcmutils-${KFMIN}:6 + virtual/pkgconfig + input_devices_wacom? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}/${PN}-6.1.80-override-include-dirs.patch" # downstream patch + "${FILESDIR}/${P}-tablet-kcm-optional.patch" # bug 942817 + "${FILESDIR}/${P}-panel-fix-flexible-spacer.patch" # KDE-bug 495378 +) + +src_prepare() { + ecm_src_prepare + + if ! use ibus; then + sed -e "s/XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ + -i applets/kimpanel/backend/ibus/CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if ! use scim; then + sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_KCM_MOUSE_X11=ON + -DBUILD_KCM_TOUCHPAD_X11=ON + -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged + $(cmake_use_find_package ibus GLIB2) + -DBUILD_KCM_TABLET=$(usex input_devices_wacom) + $(cmake_use_find_package sdl SDL2) + $(cmake_use_find_package semantic-desktop KF6Baloo) + $(cmake_use_find_package webengine AccountsQt6) + $(cmake_use_find_package webengine KAccounts6) + ) + + ecm_src_configure +} + +src_test() { + # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 + # test_kio_fonts needs D-Bus, bug #634166 + # lookandfeel-kcmTest is unreliable for a long time, bug #607918 + local myctestargs=( + -j1 + -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)" + ) + + ecm_src_test +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "screen reader support" "app-accessibility/orca" + fi + ecm_pkg_postinst +} diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest index ba75f201c81e..18d32be25050 100644 --- a/kde-plasma/plasma-pa/Manifest +++ b/kde-plasma/plasma-pa/Manifest @@ -1,5 +1,8 @@ +AUX plasma-pa-6.2.3-guard-activePort-against-null.patch 1433 BLAKE2B 146876560f66d83037c390bd8e8f0146fed74c82d283fa25d3efc390b12a69814a561d482444fd2b77d9abad1e436fa9bb53f4a5d9d573ec4bb8c130cac77490 SHA512 41bd7afadca84c6d11d9d0d50aa7385b6f0c693f185ef922b9e3dda91107d19e0ee1764f673db37d57895655c79e064ffeb8fb8ea7d0fb1d2682dc9cea1beda2 +AUX plasma-pa-6.2.3-kcm-fix-speaker-test-for-proaudio.patch 1818 BLAKE2B a5c2433aeffae4d273cf5b9237f69017d7f40f61aa6ce7b0561c78b8699c8790a851fcdd2620477c9346c3b4a0f617e2a8756f15a2a545f9d0b7b14abfa894ec SHA512 c576b13ac4cc5dc1a0be0cf1004528f0348e3e24de538527573cd75123ea7b68d9ef2a638347355d9e1707fe33e82fbd5c2713b4cc15e61e1aa40b5be58343f0 DIST plasma-pa-6.1.5.tar.xz 163064 BLAKE2B 91ce21182b9890bbabaff3f993dd8b15dc771a8b59d3c611f85b073b9d915aa4c83447d239fa20cd6cd65e3b91bb66ed7f0e63c0d452ec459cb15601bcc5ffc2 SHA512 c0219145c30e322bef6f8d578f2c880248175f52094d65ca5d1c49fde556137e2d1a3d5670a17d32e9d77dfc933444ddc2e30084e7dd15c77e3ad5eda1048714 DIST plasma-pa-6.2.3.tar.xz 184892 BLAKE2B 8ef3eb52cb537df497756886ca8109fdeda71f4e735ec76178d3b29feaca8f2fdc07d0569d183138e2351bf3704676e3ef22c6dcd400dd9779094892fe3ab0d5 SHA512 9a4202d6aca8b62553e074a0ee5dbea0aee834339f16d78cce6cd1ad8151e015189fe98201c3adcf5534993826f8209a05385a1a7d191b08610ede3094a758d7 EBUILD plasma-pa-6.1.5.ebuild 1189 BLAKE2B efcc3642c3f04975b8d30691a4760ec260ea789739a099fad01582d12feabdc68ccdb95cbd097e2a351c7762dfa9e712e99deb02a97d779277e1f65e8146cca4 SHA512 15d6175e67872a1c39129218af25af446141a1ee5affee9db4edd1e80de38ec5113c90a03b21e083cb1ffff109fc9c4663e9e3fb3424f9a65747b28f1fb5e812 +EBUILD plasma-pa-6.2.3-r1.ebuild 1356 BLAKE2B 3821247d4ef02ea911ffc63d438d017c01f7b4192fe9395e6182896c2713d3fd5a6afa9b4d09a0b07e2938352559d1d6c20293ec99fafc6372023227c246dd49 SHA512 94ed75e8f0c915e3281b73266edcc4e3157a6576bada2081ef88cf09238106ea58158c181e59b7c8985aface3d5ef1f8264e76867f12819b8fd5a3164f09676e EBUILD plasma-pa-6.2.3.ebuild 1191 BLAKE2B 051e004a310de50fc63222484de5a219708e49b9cac35a829c85d7e568804e75c9b59eb073ec1961b3d52719e751e990c47ac0264a1cdbe3e276582d58f1620d SHA512 7db7d16ce19e18d15b2f8244b058096399f86fba7f4869d2eb66b0f2c689453fad77104140b867018df7159ae3aa25f36fa3aa56cedb5f2c9429bf281a9bc312 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-guard-activePort-against-null.patch b/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-guard-activePort-against-null.patch new file mode 100644 index 000000000000..11759a7c9cc6 --- /dev/null +++ b/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-guard-activePort-against-null.patch @@ -0,0 +1,39 @@ +From 49925e2a9598f27a526534dc2b4b1bc0bcee639b Mon Sep 17 00:00:00 2001 +From: Harald Sitter <sitter@kde.org> +Date: Fri, 15 Nov 2024 13:36:04 +0000 +Subject: [PATCH] listitemmenu: guard activePort against null + +it's not quite obvious why ports.at(index) would return null, but it's +my best guess for why we have a crash here + +CCBUG: 496067 + + +(cherry picked from commit 23c8a3f982d5e0c8380c0870b047b251f67d179e) + +Co-authored-by: Harald Sitter <sitter@kde.org> +--- + src/qml/listitemmenu.cpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/qml/listitemmenu.cpp b/src/qml/listitemmenu.cpp +index 5196a3de..9319bd26 100644 +--- a/src/qml/listitemmenu.cpp ++++ b/src/qml/listitemmenu.cpp +@@ -333,9 +333,10 @@ QMenu *ListItemMenu::createMenu() + // Ports + const auto ports = device->ports(); + bool activePortUnavailable = false; +- if (device->activePortIndex() != static_cast<quint32>(-1)) { +- auto *activePort = static_cast<Port *>(ports.at(device->activePortIndex())); +- activePortUnavailable = activePort->availability() == Port::Unavailable; ++ if (auto index = device->activePortIndex(); index != static_cast<quint32>(-1)) { ++ if (auto activePort = ports.at(index)) { ++ activePortUnavailable = activePort->availability() == Port::Unavailable; ++ } + } + + QMap<int, Port *> availablePorts; +-- +GitLab + diff --git a/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-kcm-fix-speaker-test-for-proaudio.patch b/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-kcm-fix-speaker-test-for-proaudio.patch new file mode 100644 index 000000000000..c84e2cba02bc --- /dev/null +++ b/kde-plasma/plasma-pa/files/plasma-pa-6.2.3-kcm-fix-speaker-test-for-proaudio.patch @@ -0,0 +1,50 @@ +From 0b4a26ada8258f4d25fa5069f239f1041eefecb5 Mon Sep 17 00:00:00 2001 +From: Ismael Asensio <isma.af@gmail.com> +Date: Wed, 6 Nov 2024 17:31:17 +0000 +Subject: [PATCH] kcm: Fix speaker test layout for Pro-Audio profile + +Known audio channels (like 'front-right', `rear-left`) are assigned +rows 0 to 2 in the Grid layout so they are placed in their spatial +position around the user's avatar + +Unknown channels (those produced by the Pro Audio pipewire profile) +have no spatial info and are assigned to rows 3 and following + +The spacer items were also assigned to row 3, which collided with +those, breaking the layout. Let's give the spacers a high enough +row number so there is no collision with an already occupied cell + +BUG: 495752 +FIXED-IN: 6.2.4 + + +(cherry picked from commit 36075f9e5f8d58ad2c687b91ec9a9cbef8c59fb3) + +Co-authored-by: Ismael Asensio <isma.af@gmail.com> +--- + src/kcm/ui/main.qml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/kcm/ui/main.qml b/src/kcm/ui/main.qml +index dacaec4f..57f60c35 100644 +--- a/src/kcm/ui/main.qml ++++ b/src/kcm/ui/main.qml +@@ -468,13 +468,13 @@ KCM.ScrollViewKCM { + + // Spacers for when the left and right columns are empty + Item { +- Layout.row: 3 ++ Layout.row: 9 // So we don't override an occupied cell + Layout.column: 0 + Layout.fillWidth: true + Layout.preferredWidth: Kirigami.Units.gridUnit * 4 + } + Item { +- Layout.row: 3 ++ Layout.row: 9 // So we don't override an occupied cell + Layout.column: 2 + Layout.fillWidth: true + Layout.preferredWidth: Kirigami.Units.gridUnit * 4 +-- +GitLab + diff --git a/kde-plasma/plasma-pa/plasma-pa-6.2.3-r1.ebuild b/kde-plasma/plasma-pa/plasma-pa-6.2.3-r1.ebuild new file mode 100644 index 000000000000..46b0ae24d6ce --- /dev/null +++ b/kde-plasma/plasma-pa/plasma-pa-6.2.3-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Plasma applet for audio volume management using PulseAudio" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="" + +RESTRICT="test" # missing selenium-webdriver-at-spi + +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdeclarative-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + media-libs/libcanberra + media-libs/libpulse + >=media-libs/pulseaudio-qt-1.6.0:= +" +RDEPEND="${DEPEND} + dev-libs/kirigami-addons:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + x11-themes/sound-theme-freedesktop +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" + +PATCHES=( + "${FILESDIR}/${P}-kcm-fix-speaker-test-for-proaudio.patch" # KDE-bug #495752 + "${FILESDIR}/${P}-guard-activePort-against-null.patch" # KDE-bug #496067 +) diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index da41aa8ce599..8fffe407facf 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -6,7 +6,9 @@ AUX plasma-workspace-6.1.5-fix-systemsettings-crash.patch 1413 BLAKE2B f36b405a4 AUX plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch 1348 BLAKE2B 50a20d279325cd82ec7aa5b9dbdaa96003612e32ee7fcc421e9e1ac5017f31eb5386107f6231469faa18573cc9870fe7c02006e557278669446c6aab1791236b SHA512 6004732cae3cadc4cd1b56bc27807784a4bbd57985c550e66ab95e9c81101b9230ef408d02b2d472da7df81d942e300d90e5ae7ad2f04ccb6cabc00680bbe140 AUX plasma-workspace-6.1.5-fix-x11-logout-w-session-restore.patch 1681 BLAKE2B 5955a64aa679fd263da97f6d42c07b3c82ce44e966a6c42d2082af80cf756b5d70edc02bf3bea38656425999a73033a2b749e639afc399755ffa341d5acce8c3 SHA512 82fcfb6f3e87fc6eea3a05472fbac40a5149b41fdd3b37a21586fd752713502141ffe4a6435d0b19762c1297fd59727f2c30a6b73b232297f0835c55688be796 DIST plasma-workspace-6.1.5.tar.xz 19305196 BLAKE2B 4eb75be1404d84519fabdb148accbeb48227aebd2fadeee5c27ba37dc158685b8bf9283f41172dff86dbe07ffe47a62097f873e907dd44ada61a53b3dd1f04b8 SHA512 1b68ddb1d287733ec16900a14b56bf1dbdfb9bce0d10666c1a710612dee6cc786629ea0a924627d58f1268a9594e3bfae587d57bcd7c926bf48b8e914c5d9238 +DIST plasma-workspace-6.2.3-patchset-1.tar.xz 5100 BLAKE2B 2c37a9e5e061a2b6ed4a4280e0526cf543360ac43ae9664425b5be25769af2a4b0df849fe54e5c751ec329796c237e1942ed6b2480ff1fee2b710013129ed121 SHA512 7bde45b720996bd7403e520918819c6e47672ecf01ed8568c4f3a471025cafdf3eafffe41a6858b143d1b8ffd21c3cd60fe4e2ec303e78485958f92c17f68d55 DIST plasma-workspace-6.2.3.tar.xz 19138208 BLAKE2B 0eda191a68a61ef8fe8ba2ecfdc4cd8df7121401a1e899062e1c26ed7b15aa8717a0cd972715c0fc43c0e944cd2f88aa4cb1f35041b5dff0e59f8cd2e8c8af5b SHA512 9b1e5dec3226fa065d522ca1bbcdaa5c313340a55b3748a620b4ceb8f2ea98890c8d4407e5bc9c2e11e32b193d804aff85cc35a76a19b12fa2e8a347a4024ac6 EBUILD plasma-workspace-6.1.5-r3.ebuild 7226 BLAKE2B 252bafc34cfbdfad0a8cba450c3aea171929bc8ad7958b9bb483d168a73666e7cce3a44a9226e9b874806ed2211935ad432abb15c1196fe57537954ff222f166 SHA512 cdbd9765629e53a85ba7a44212f91bd12238062f0272a2dd198597c3d8e4e766f874fd8fa6aa4f88ba9e4d65d9c0f5e0b5bcd4795c44da82f7ef3451fbd5120a +EBUILD plasma-workspace-6.2.3-r1.ebuild 7342 BLAKE2B 2f0274547742603898c62feb3c4093e65d0beb5dbaa0f2661f4b3d35e79c44fc277613c3a22a775b0fb38a9140ca246191c367d303754c5d7937ca08c8df132c SHA512 ec5c5c9f78a6ceb76a111e76eb85e5e8f08d66c5481eb49951bd6617164fa55aa6f97d17dcc7defd1222663237a4ca081abdb89ab87c572b79e21c20b2e96d14 EBUILD plasma-workspace-6.2.3.ebuild 7169 BLAKE2B 19a0885dc1005625e5118cd502b7975e4bf28ef3249a4f66d1bb80e43c74469db84487693b784f7cab5334beba1b5ec7af0f01fb3a6938ab4b0e433b139c787f SHA512 9bce891a72d82d0de50763150e4fe9fb98d47e3d19bc8621ceade1503b2eb891e92f2cf6511fc8d16332f4c989a0dee492c9b4654052ece0aaa7ba61cd21242d MISC metadata.xml 1026 BLAKE2B 49c2bc5fdc752caf8f45ce982633df0542a008ba1ef0cc99d32b64d6cd73c237d9c98484cac16fa32210156a080e17ad365c2d4eeb81cd3e9a7dc2119b1f7395 SHA512 4cdf77f6be4ce18148936e2a7012b86c70cdcc9de8b99455b3db65a4a52990eb604082ca098cdaee5fe6762bb9d138861f687f8d5fbedb3f60eef7c7be3a42cb diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.2.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.2.3-r1.ebuild new file mode 100644 index 000000000000..acadb3cebb79 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-6.2.3-r1.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +PATCHSET="${P}-patchset-1" +KFMIN=6.6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma workspace" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="appstream +calendar +fontconfig geolocation gps +policykit +screencast +semantic-desktop systemd telemetry +wallpaper-metadata" + +REQUIRED_USE="gps? ( geolocation )" +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras +# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h +# slot op: various private QtWaylandClient headers +COMMON_DEPEND=" + dev-libs/icu:= + >=dev-libs/wayland-1.15 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,libinput,network,sql,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=dev-qt/qtpositioning-${QTMIN}:6 + >=dev-qt/qtshadertools-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qtwayland-${QTMIN}:6= + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=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/kded-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/ktexteditor-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kunitconversion-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/prison-${KFMIN}:6[qml] + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/breeze-${PVCUT}:6 + >=kde-plasma/kscreenlocker-${PVCUT}:6 + >=kde-plasma/kwayland-${PVCUT}:6 + >=kde-plasma/kwin-${PVCUT}:6 + >=kde-plasma/layer-shell-qt-${PVCUT}:6 + >=kde-plasma/libkscreen-${PVCUT}:6 + >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/plasma-activities-stats-${PVCUT}:6 + >=kde-plasma/plasma5support-${PVCUT}:6 + media-libs/libcanberra + >=media-libs/phonon-4.12.0[qt6(+)] + sci-libs/libqalculate:= + sys-apps/dbus + sys-libs/zlib + virtual/libudev:= + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXtst + x11-libs/xcb-util + appstream? ( >=dev-libs/appstream-1[qt6] ) + calendar? ( >=kde-frameworks/kholidays-${KFMIN}:6 ) + fontconfig? ( + media-libs/fontconfig + x11-libs/libXft + x11-libs/xcb-util-image + ) + geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) + gps? ( sci-geosciences/gpsd ) + policykit? ( + >=sys-auth/polkit-qt-0.175[qt6(+)] + virtual/libcrypt:= + ) + screencast? ( + >=dev-qt/qtbase-${QTMIN}:6=[opengl] + >=kde-plasma/kpipewire-${PVCUT}:6 + media-libs/libglvnd + >=media-video/pipewire-0.3:= + x11-libs/libdrm + ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 ) + systemd? ( sys-apps/systemd:= ) + telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) + wallpaper-metadata? ( kde-apps/libkexiv2:6 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.14.0 + dev-libs/qcoro[dbus] + >=dev-qt/qtbase-${QTMIN}:6[concurrent] + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) +" +RDEPEND="${COMMON_DEPEND} + !kde-plasma/libkworkspace:5 + !<kde-plasma/plasma-desktop-5.27.0:5 + !<kde-plasma/xdg-desktop-portal-kde-6.1.90 + !kde-plasma/xembed-sni-proxy:* + app-text/iso-codes + dev-libs/kirigami-addons:6 + >=dev-qt/qttools-${QTMIN}:*[qdbus] + kde-apps/kio-extras:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kquickcharts-${KFMIN}:6 + >=kde-plasma/kactivitymanagerd-${PVCUT}:6 + >=kde-plasma/kdesu-gui-${PVCUT}:* + >=kde-plasma/milou-${PVCUT}:6 + >=kde-plasma/plasma-integration-${PVCUT}:6 + >=kde-plasma/plasma-login-sessions-${PVCUT}:6 + sys-apps/dbus + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrdb + x11-apps/xsetroot + policykit? ( sys-apps/accountsservice ) +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + >=dev-util/wayland-scanner-1.19.0 + >=kde-frameworks/kcmutils-${KFMIN}:6 + virtual/pkgconfig + test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor] ) +" + +PATCHES=( + # TODO upstream: KDE-bug 432975, bug 767478 + "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" + # KDE-bugs #433059, #484838, #494463, #491130 + "${WORKDIR}/${PATCHSET}" +) + +src_prepare() { + ecm_src_prepare + + cmake_comment_add_subdirectory login-sessions + + # TODO: try to get a build switch upstreamed + if ! use screencast; then + ecm_punt_bogus_dep KPipeWire + sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if use geolocation; then + use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \ + -i dataengines/geolocation/CMakeLists.txt || die + fi + + if ! use policykit; then + cmake_run_in kcms cmake_comment_add_subdirectory users + fi + + if ! use fontconfig; then + ecm_punt_bogus_dep XCB IMAGE + sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if ! use systemd; then + sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DWITH_X11=ON # TODO: broken upstream, fix it if you can + -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged + -DGLIBC_LOCALE_GEN=$(usex policykit) + $(cmake_use_find_package appstream AppStreamQt) + $(cmake_use_find_package calendar KF6Holidays) + $(cmake_use_find_package fontconfig Fontconfig) + $(cmake_use_find_package geolocation KF6NetworkManagerQt) + $(cmake_use_find_package semantic-desktop KF6Baloo) + $(cmake_use_find_package telemetry KF6UserFeedback) + $(cmake_use_find_package wallpaper-metadata KExiv2Qt6) + ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + + # default startup and shutdown scripts + insinto /etc/xdg/plasma-workspace/env + doins "${FILESDIR}"/10-agent-startup.sh + + insinto /etc/xdg/plasma-workspace/shutdown + doins "${FILESDIR}"/10-agent-shutdown.sh + fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh +} + +pkg_postinst () { + ecm_pkg_postinst + + elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," + elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" + elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" +} diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest index 57337436296a..cde60e339fb2 100644 --- a/kde-plasma/powerdevil/Manifest +++ b/kde-plasma/powerdevil/Manifest @@ -1,5 +1,7 @@ DIST powerdevil-6.1.5.tar.xz 967780 BLAKE2B 37a0e3e7c76504d83cef695c6439ebe263497ac788af4337e4f809ffc4bbad963ac3b4c9095cc4743c69a6d6ecdc4d6d61c15fe978de434cacb0ef111b320ba6 SHA512 c606dc61a7291dd87643a8d69005e005b33a03523b85be70f7d24181e988972df62a3b7a98423273307d4e5cf127e6eb6992ba534efbb0ca37c9ff308fc8a679 +DIST powerdevil-6.2.3-patchset.tar.xz 3712 BLAKE2B 2aafe56fe4cad2e7abc7bbf9978459c103ed1342b266dbaf4628500a2a555529ac46d959512f4da0796ecc0c70844206ec0922a7fada34f647266946201677e9 SHA512 2e8ccbf70a66e7efdd89939d240591d1e9a2aab07f4f16f51292a838e2f17566e7269ec9ad3da5eb12fd85709193590d2a49f45b96fa8b26807a09967e9cb64d DIST powerdevil-6.2.3.tar.xz 1188160 BLAKE2B 79f4532fec0b9f6bf204e4cc1ce4b51385b4ad5c09dca690c7357f6be30a66ef7487645783823ac878aaed6489654ee18d93345ea1510bcbfcb633da5128cfb6 SHA512 e081ba799847154f4b732ff46dd34514149f2fd0673f356d572ffc9f46d2537b3c5133b1d4e059b1183038022e2037df104c81993571ed47c288a345ebfd123b EBUILD powerdevil-6.1.5.ebuild 1909 BLAKE2B 3ee39ffd33206bd3428b367279ea3325eae88b92972965a5f2c6b95977310dcc529689873d51a83e249f625f27c1327b536f8f411b125e03ba5d6758902f67e4 SHA512 df1205631d7ded83bd2713acbd3cee2c3054780164ba0b553413d68334ae3c1d2e25cba46a8a1068efc80f9743227494d244342225cac6bdb2be37ac6a3bd5d7 +EBUILD powerdevil-6.2.3-r1.ebuild 2546 BLAKE2B e315b2c2cbf1110181bfd2108b496099eee3a626f2b9615fa473cbddbb0ad3e21598ca43ac276fdc9dfb7ad2f889eda0b9ad3db92de7a36fa087075f84a4d3b4 SHA512 d44bba2ee50b40b033b1f48d0ce186f0b9b5d5951f38a8adee33b1923066d5cf4f0561a45d83716e30ea417b32860a3299f2f4245489e116510c5a4cd6eea48f EBUILD powerdevil-6.2.3.ebuild 2205 BLAKE2B 47b2754bff2602df8750b1e123318c1d5f9e10db1ec2861cbe581073ce96566217c851fa42f55d7d04a8d24f83751295b5ca03236972f1a504f8a9bdf39fabac SHA512 bb68731c4c6262d287d188f90dcabfb8dc5dcbbeebf0ef7a5e0af567ea7516debd2c5d360cf1c730b53e1a9cb627a0f6d61caeadbf9bfe5eb64cd3a9d96190cd MISC metadata.xml 616 BLAKE2B 99319105a84b361a62f1f10615c4eb1a0d11514e1a63b6fbd87fbca471c4a1813646021f196c1e5ca8b22f4f64c2e2c950483f9a4e6ea72380209d3be81f0600 SHA512 770b16d5d747d450e40e3a87aa190e36e6389fff03a1af7200bd02bd564ff9093b258170a4ef67a8523629d1cdde581d90ae2951e75b5e757274569a10e76f3d diff --git a/kde-plasma/powerdevil/powerdevil-6.2.3-r1.ebuild b/kde-plasma/powerdevil/powerdevil-6.2.3-r1.ebuild new file mode 100644 index 000000000000..4175d7faba0b --- /dev/null +++ b/kde-plasma/powerdevil/powerdevil-6.2.3-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +PATCHSET="${P}-patchset" +KFMIN=6.6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.2 +inherit ecm fcaps plasma.kde.org + +DESCRIPTION="Power management for KDE Plasma Shell" +HOMEPAGE="https://invent.kde.org/plasma/powerdevil" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="brightness-control" + +RESTRICT="test" # bug 926513 + +# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h +DEPEND=" + dev-libs/qcoro[dbus] + dev-libs/wayland + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + >=dev-qt/qtwayland-${QTMIN}:6= + >=kde-frameworks/kauth-${KFMIN}:6[policykit] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/libkscreen-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/plasma-workspace-${PVCUT}:6 + virtual/libudev:= + x11-libs/libxcb + brightness-control? ( app-misc/ddcutil:= ) +" +RDEPEND="${DEPEND} + !<kde-plasma/plasma-workspace-6.1.90:6 + >=dev-libs/plasma-wayland-protocols-1.14.0 + >=dev-qt/qtdeclarative-${QTMIN}:6 + sys-power/power-profiles-daemon + >=sys-power/upower-0.9.23 +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 +" + +# -m 0755 to avoid suid with USE="-filecaps" +FILECAPS=( -m 0755 cap_sys_nice=ep usr/libexec/org_kde_powerdevil ) + +PATCHES=( "${WORKDIR}/${PATCHSET}" ) # KDE-bugs #495661, #495918 + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON + $(cmake_use_find_package brightness-control DDCUtil) + ) + use test && mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_SeleniumWebDriverATSPI=ON # not packaged + ) + + ecm_src_configure +} + +src_test() { + # bug 926513 + ecm_src_test -j1 +} + +pkg_postinst() { + ecm_pkg_postinst + fcaps_pkg_postinst +} diff --git a/kde-plasma/print-manager/Manifest b/kde-plasma/print-manager/Manifest index 1b59eeb258d3..7fc3474de49d 100644 --- a/kde-plasma/print-manager/Manifest +++ b/kde-plasma/print-manager/Manifest @@ -1,5 +1,7 @@ +AUX print-manager-6.2.3-fix-abort-in-kcm-add-printer.patch 1069 BLAKE2B b1269c81f58812426bc34eba2cdfdc6af2137c1b8878e6d6d3bb3fd9609612d408d3a285658448f59395a1e8076a952ee9c99a66716a24346aead7aa67b15234 SHA512 c2c9348c07d52a8b4d7df140dd77bbfeebe34f150c25c01ac0877e0da91331206a5cd6426047513f71e7cee42831d55bef18b99ed01815c79ecd997b46537ba0 DIST print-manager-6.1.5.tar.xz 371292 BLAKE2B 140f63488f381dde409d673fac692197163efa200866311c0bb346e9dd57a57780dc3dd1a47fb950793b6bd5512e3d82ed2bae47e9476e1ece20e7dc0079b928 SHA512 0c83c5fdbd73ad47cde287ed2f3d89c735a44cce4c2d753201258183491bc9612091802bf639445a775f0b2ed7f485d7bc94d98904fb40ca11e23affbd046ceb DIST print-manager-6.2.3.tar.xz 375000 BLAKE2B dc1419fb7c7cc26a1f5c91c4587d5014efdd963a4fee309f4104123ba4b35c222ac8912d4f184a96e2c3d3b9d4dbf14d2f9ad8e1b26b57738f6e92b9e81c53aa SHA512 3bd0e91cc9f1094c2cd2052d2eaf4bf1c3cc16d096dd5b1317dcc80b012dff39123e20acb8028b54f77f75d14695f3214b081ae7ed76c2ec87feb7e93ef8c202 EBUILD print-manager-6.1.5.ebuild 1947 BLAKE2B 185325908a2529f7ad83fbe13d15a882593823c8b93b63fa17e045c2e6b6faeb7b1fc12c8ec8d5288ee42a14f02b172ca6a2b1e53cfa690eaa5a5368a94eab96 SHA512 4159866d249602a2d105843957bb5313584621013b570ceaabda88c2160ddaecef545343d7c43ac55909c8b6622dbe9375d5686914ecd58b1c6a099ffd0ced67 +EBUILD print-manager-6.2.3-r1.ebuild 2016 BLAKE2B cf05fd971734c15e80fec57905659c9cdef84ee258dff2ac58a8cdecefea859634725265f84f180e2b1f90031f36aab98187f797dfd96b7f6d81aeb3d237d6cf SHA512 c6f1429bc1795ea76cdab6817a972425610365a4f32f0b1068f55edd21b84fcf805cdb5c5fee878b545a5d00bd3f06913a31cbb0dcb48748c4b0fe7ffed4852a EBUILD print-manager-6.2.3.ebuild 1949 BLAKE2B ee830cd3973add1eb2daea5dc681820ebd4f5dfe17ccebfcc15889b3b7261ca12343d39a7272de22a40f64aa0a89289f6fd77e9ace300e230db66635edd51d26 SHA512 9226bbcf5fe337a2fc8e670090292fb667bceda20e2fab65b222658054755892c454903b4812ee12aa99a4c54490c5ce301c5954d5a8c4d5363b266f48e823a9 MISC metadata.xml 452 BLAKE2B c24b456647acd7c47efb46ef742082dd5da3a66a8686baa785172e2747113f1e1147bbb82e58db1bb312dca882352bf46b5eb1cd5cbf76fff8cc15af01b3a7f7 SHA512 9ce3f10533c3251d5b8490620b2c3d53ee79482f45d1bf74d2426487e166d613ba8eb388618e14943e6a36c9c3675dc549b573c926445ab918559ac9064055a0 diff --git a/kde-plasma/print-manager/files/print-manager-6.2.3-fix-abort-in-kcm-add-printer.patch b/kde-plasma/print-manager/files/print-manager-6.2.3-fix-abort-in-kcm-add-printer.patch new file mode 100644 index 000000000000..29eb1d1c9c24 --- /dev/null +++ b/kde-plasma/print-manager/files/print-manager-6.2.3-fix-abort-in-kcm-add-printer.patch @@ -0,0 +1,30 @@ +From 2440d1b96b7af95259867b22ba8b4ba677ef0ade Mon Sep 17 00:00:00 2001 +From: Kai Uwe Broulik <kde@privat.broulik.de> +Date: Fri, 8 Nov 2024 17:43:07 +0000 +Subject: [PATCH] DevicesModel: Register QList of QStringList to DBus + +Avoids an abort when adding a new printer from kcmshell. + + +(cherry picked from commit c80a5a0d5e59049c2007264a41228fcfbaeda58b) + +Co-authored-by: Kai Uwe Broulik <kde@privat.broulik.de> +--- + src/libkcups/DevicesModel.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libkcups/DevicesModel.cpp b/src/libkcups/DevicesModel.cpp +index 3ffc90673..8498a719e 100644 +--- a/src/libkcups/DevicesModel.cpp ++++ b/src/libkcups/DevicesModel.cpp +@@ -45,6 +45,7 @@ DevicesModel::DevicesModel(QObject *parent) + + qDBusRegisterMetaType<MapSS>(); + qDBusRegisterMetaType<MapSMapSS>(); ++ qDBusRegisterMetaType<QList<QStringList>>(); + + // Adds the other device which is meant for manual URI input + insertDevice(QLatin1String("other"), QString(), i18nc("@item", "Manual Config"), QString(), QLatin1String("other"), QString()); +-- +GitLab + diff --git a/kde-plasma/print-manager/print-manager-6.2.3-r1.ebuild b/kde-plasma/print-manager/print-manager-6.2.3-r1.ebuild new file mode 100644 index 000000000000..e47067d3d100 --- /dev/null +++ b/kde-plasma/print-manager/print-manager-6.2.3-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Manage CUPS print jobs and printers in Plasma" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="+gtk" + +DEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=net-print/cups-2.4 +" +RDEPEND="${DEPEND} + !<kde-plasma/print-manager-23.08.5-r100:5 + >=kde-frameworks/kdeclarative-${KFMIN}:6 + gtk? ( app-admin/system-config-printer ) +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" + +PATCHES=( "${FILESDIR}/${P}-fix-abort-in-kcm-add-printer.patch" ) + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + + if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then + ewarn "By switching off \"gtk\" USE flag, you have chosen to do without" + ewarn "an important, though optional, runtime dependency:" + ewarn + ewarn "app-admin/system-config-printer" + ewarn + ewarn "${PN} will work nevertheless, but is going to be less comfortable" + ewarn "and will show the following error status during runtime:" + ewarn + ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing" + ewarn "was not provided by any .service files'\"" + fi +} |