diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-09-09 10:40:04 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-09 10:40:04 +0100 |
commit | b426a5cef3f0ebe3389686a1c145a834d3a1e120 (patch) | |
tree | eee77f741af6979f620416c573e5203eab81c9c3 /kde-plasma/plasma-workspace | |
parent | 97b176c73aa78bd33234884388e3978f520161c3 (diff) |
gentoo auto-resync : 09:09:2022 - 10:40:04
Diffstat (limited to 'kde-plasma/plasma-workspace')
3 files changed, 247 insertions, 0 deletions
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 6467e5ba0152..a5622e46bd4f 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -3,8 +3,10 @@ AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95c3fd99c551ec7512054460d8ba04c265e56c2ee53d968c7885929724c81df2895eeae8609a5a0a4c28839461429579f56bcbde4dcaa5646e15b SHA512 c41d2c56170914a309c9765a58a6cccaf4a9afae937ce762387590f3b2ccf59969b5873f702986369c4c3118c74d314f8b68916bfabce5e7379b3cb27daebb50 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.25.5-widgetexplorer-recurse-containments.patch 1438 BLAKE2B d33271c8fafe0e7b14205009d541f6d7bba98e405a47f0d5c85fc60028d093a4e8b135dac122a18bc78288ed43d489adef6e66ff53e4ddc2098f74a1525126e6 SHA512 7f623ca5d8a184cb31af5039e49ac0a8a6a35cc9ada2959d2ae38fb2e4e1aafc44d3e684740a9d0c97b00e92af858b2ab374c2d5c793b17dac2e4808239dd0e0 DIST plasma-workspace-5.24.6.tar.xz 18500752 BLAKE2B 1e469e91e8f1828f0b819aaa03f2918fa7df551786d7bbc963c7b4f7078719e9655176c5ddeea262175c36b14ba360e143e182dad78e369f833338ef147af06a SHA512 4e49f59d565e0b84951122155158966a54c05a6999ff99503bfff667c780fac6cfc076326f0cac7d53629bfc1d81599b30e919848168f6beb79a4dc7cf7c5560 DIST plasma-workspace-5.25.5.tar.xz 18638932 BLAKE2B f83aabf84b775c0bf9d1e60db03f94400e3363fa8f45767bdc471706682cda7323fae4948cffa156188cc7ed2d30d05349a385dd370ef941c16464ddddf8fa01 SHA512 0c6cf5104b584b34a8bcb45d57069fed3b25e871fccf1bfefd47d8fc1b595867c1c4f0fcfcc0e07847534e1e77ce8ed1f3be1ac6cb7eea8669a9c7649c8466cb EBUILD plasma-workspace-5.24.6.ebuild 6504 BLAKE2B 70a8668b7062c419bc5b671f0e0359c590f5a340d2289b0688d24b3f5dac135ea3788863873a304c3c43ee38576424a29fe0dfe2ba60629cd63669b9606c379f SHA512 9d611f6ae062daac80f4d4f9fdeb8535ac5f567b9215797a4eba33e23fd808c3c61ab8b3956a4199e6b46635f766cd7f9bdb7cf20edb4907bb37746f5e54b51e +EBUILD plasma-workspace-5.25.5-r1.ebuild 6660 BLAKE2B f9899dcc6d36575998b4af8b2d11a2bc99deec57925ea2730c486205bc9f766a4822c00877dcbfe9daf82d50b1107d42a6c2e8b979d89d8d00c26436e230cddc SHA512 aa63a16f5d4fbf43333e2719979f92feb974d58bbedc814f725179136f64af3e9af3a927cd78f2abeae42a7e219f0021c95b2e31403bfaf073ae362dbac9feaa EBUILD plasma-workspace-5.25.5.ebuild 6524 BLAKE2B ba5197b5dd4dda61f530756ebc4ead20877713cdf3b3f7153b2d606d5cc5161048cf2f0260ce47fcb673c729d8ddd107fb8dabf5bca56dff28d53d81bdf56cff SHA512 c5afb8237aa46a9123eec26ceca711d33b691b6ce2bb064a79fabae5db195ce9ba907b49b77f3c0151f6b206ee04dca4ba57e762088dc03493eb8f1beaafd41c MISC metadata.xml 726 BLAKE2B ee1a0b82d5852d7c68784107563ccf0245d26cfcc1c2f2bb4cef243b7ab9a0925c0cbe848f387ebe7928ea68cb50c9c267203c00535b716bdb1c7c56eb4cbcff SHA512 f7ffe99faf800f559dcd966c7f3f72523484a851870fcf9cead18b878f1089bc33a6d20fc682c2c45db012b1e908618bdfdb4590816554245c11dbb9baf10100 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-widgetexplorer-recurse-containments.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-widgetexplorer-recurse-containments.patch new file mode 100644 index 000000000000..1efe75b9b41d --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-widgetexplorer-recurse-containments.patch @@ -0,0 +1,26 @@ +https://invent.kde.org/plasma/plasma-workspace/-/commit/c7ba560ccaac5e469cb2d6bf66c39e1acf967454 +https://mail.kde.org/pipermail/distributions/2022-September/001287.html + +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 21 Aug 2022 16:33:50 +0200 +Subject: [PATCH] [widgetexplorer] Don't recurse into applet's containments + +The intention of this code appears to be finding system tray applets, since the systemtray is a containment within another applet/containment + +However the code causes an infinit recursion since we are calling addContainment on the same containment again + +The recursion also is unnecessary since corona->containments() already lists the system tray containment, so we don't need to find it by recursing through the panel's children +--- a/components/shellprivate/widgetexplorer/widgetexplorer.cpp ++++ b/components/shellprivate/widgetexplorer/widgetexplorer.cpp +@@ -280,10 +280,6 @@ void WidgetExplorerPrivate::addContainment(Containment *containment) + + foreach (Applet *applet, containment->applets()) { + if (applet->pluginMetaData().isValid()) { +- Containment *childContainment = applet->property("containment").value<Containment *>(); +- if (childContainment) { +- addContainment(childContainment); +- } + runningApplets[applet->pluginMetaData().pluginId()]++; + } else { + qDebug() << "Invalid plugin metadata. :("; +GitLab diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r1.ebuild new file mode 100644 index 000000000000..2fac44d7b28b --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r1.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KFMIN=5.95.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.5 +VIRTUALX_REQUIRED="test" +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma workspace" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="appstream +calendar +fontconfig geolocation gps +policykit +screencast +semantic-desktop telemetry" + +REQUIRED_USE="gps? ( geolocation )" +RESTRICT="test" + +# slot op: various private QtWaylandClient headers +COMMON_DEPEND=" + >=dev-libs/wayland-1.15 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5= + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kded-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kpeople-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktexteditor-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kunitconversion-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/prison-${KFMIN}:5[qml] + >=kde-frameworks/solid-${KFMIN}:5 + >=kde-plasma/breeze-${PVCUT}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + >=kde-plasma/kwin-${PVCUT}:5 + >=kde-plasma/layer-shell-qt-${PVCUT}:5 + >=kde-plasma/libkscreen-${PVCUT}:5 + >=kde-plasma/libksysguard-${PVCUT}:5 + >=kde-plasma/libkworkspace-${PVCUT}:5 + >=media-libs/phonon-4.11.0 + sci-libs/libqalculate:= + sys-libs/zlib + 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 + x11-libs/xcb-util-image + appstream? ( dev-libs/appstream[qt5] ) + calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) + fontconfig? ( + >=dev-qt/qtprintsupport-${QTMIN}:5 + media-libs/fontconfig + x11-libs/libXft + x11-libs/xcb-util-image + ) + geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) + gps? ( sci-geosciences/gpsd ) + policykit? ( virtual/libcrypt:= ) + screencast? ( + >=dev-qt/qtgui-${QTMIN}:5=[egl] + media-libs/libglvnd + >=media-video/pipewire-0.3:= + x11-libs/libdrm + ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) + telemetry? ( dev-libs/kuserfeedback:5 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.6.0 + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-util/wayland-scanner-1.19.0 + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) + test? ( >=dev-libs/wayland-protocols-1.24 ) +" +RDEPEND="${COMMON_DEPEND} + app-text/iso-codes + >=dev-qt/qdbus-${QTMIN}:* + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtpaths-${QTMIN}:5 + >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + kde-apps/kio-extras:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-plasma/milou-${PVCUT}:5 + >=kde-plasma/plasma-integration-${PVCUT}:5 + sys-apps/dbus + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrdb + x11-apps/xsetroot + !<kde-plasma/breeze-5.22.90:5 + !<kde-plasma/plasma-desktop-5.23.90:5 + policykit? ( sys-apps/accountsservice ) +" +BDEPEND=" + >=dev-qt/qtwaylandscanner-${QTMIN}:5 + virtual/pkgconfig +" +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}-widgetexplorer-recurse-containments.patch" # https://mail.kde.org/pipermail/distributions/2022-September/001287.html +) + +src_prepare() { + ecm_src_prepare + + cmake_comment_add_subdirectory libkworkspace + # delete colliding libkworkspace translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find po -type f -name "*po" -and -name "libkworkspace*" -delete || die + fi + + # 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 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 +} + +src_configure() { + local mycmakeargs=( + -DBUILD_xembed-sni-proxy=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON + $(cmake_use_find_package appstream AppStreamQt) + $(cmake_use_find_package calendar KF5Holidays) + $(cmake_use_find_package fontconfig Fontconfig) + $(cmake_use_find_package geolocation KF5NetworkManagerQt) + $(cmake_use_find_package semantic-desktop KF5Baloo) + $(cmake_use_find_package telemetry KUserFeedback) + ) + + 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" +} |