diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-09-25 05:24:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-25 05:24:31 +0100 |
commit | 4eda0fe5576868e6c7f97b51aa1c279ff8cd320c (patch) | |
tree | c0397a47938edbcb6e46e34fe4f0defa3e4db920 /kde-plasma/plasma-workspace | |
parent | b914cf9afa036a8ab23e8cb4cf7df1acd4a1bd44 (diff) |
gentoo auto-resync : 25:09:2023 - 05:24:31
Diffstat (limited to 'kde-plasma/plasma-workspace')
3 files changed, 315 insertions, 0 deletions
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 07fefe2f69e7..6f32cf3796da 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -2,9 +2,11 @@ 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.8-plasmacalendarintegration-holidayregion.patch 3194 BLAKE2B 5828fbc7d20880cc1a0582c144c76735b3b80ca06dc7e4c5ee3cb71c4d1d7962265eb166ba4cc0de5b6563cbffb0a847218dec265321604af97c8dac88556c5b SHA512 88e652e20c4e3e07b0eec585436c4d1f42f165db957653b52d298f93ff24689392e407cdd90f98ba213e8afca2a912e297e0c159f4830f5b2c0c79069b60ddcc DIST plasma-workspace-5.27.7-patchset-1.tar.xz 2816 BLAKE2B 167142839927092b35d52407c81522d6eddfd49f563df2312512fd465f2959c4d7f97a6bdf2ea2cecaa575c84f219d7e418cfff89adfd1af92289a7b3a61d102 SHA512 2db99d64dd806a4193983a0dc17208b6c477dda065b58b03801ea32faf38815c692d326518fdffa0949aa107a447cd9cd043d9e53b3ad13eca723829ee8adfdc DIST plasma-workspace-5.27.7.tar.xz 19465984 BLAKE2B e6b1a4aac29798f6aa2f18b1877d00e33ae6e8ca2daa5999b34a1d29bc149c870486f2e4021e6308d7e848df3a0af83f2bc0298f1def4100f17e4b69c6a7a0ae SHA512 7359d087cb94280ed0c191b0328b8aa2ec42460a6eb057a06bae0de3abcfa8e3cd7c374b47a4b1d08b56fc292892bac4c0f501527574e2c799c3d4c87591892f DIST plasma-workspace-5.27.8.tar.xz 19465764 BLAKE2B 61ac21353482ad7eea4de975be83755d4feed2ff1bb188f4b1b8e333c8aac8469691017c1c394eec90fdbd8cc44ad1015dccc0cb74fae5a249ee6c832b02b05b SHA512 d75da7d8cea3124f921813643ebda333376d3cc2ecbe2aaeee86e54a828e6a9767fa84b76991cfe282efdbf583abebee4a0bfe54a6b590c184ceb3d2995e9fcb EBUILD plasma-workspace-5.27.7-r1.ebuild 6915 BLAKE2B a3cccb2ffde51200228be42954ad1a6a21bfb0d1b3679a4569ff903faab64c72f40fbd1e0444de45bd4fb4fa3826839d8a6a1847b6472e337ba30a14c928137f SHA512 cbfa349e835e016e800d6374fe9b3b5d82f9aff61a8accf9fc867c23ac36daaf7f05d1040037f18c806c739786caedb7db1cc20651c10cb65a948a1e25b42acf +EBUILD plasma-workspace-5.27.8-r1.ebuild 7009 BLAKE2B 23820c95635a77c3f6000ad0dc187094a77826c821793d3da1ec2179f35c800185e48a3f1fc5703174a390cdde1388ba3bec79cc1c3cc448aeae92029994ad48 SHA512 ded5d0efbe79e20363e4aac987e72b99933554c2cbfe95427bd08bf3ba4a13e7a9cdf735bcb80dbb7d94f8e1087e59bfa05a5350e6374d133f088e0fc103c383 EBUILD plasma-workspace-5.27.8.ebuild 6926 BLAKE2B db6edc7cad54259d3be0b8dce64312a0788437dce1667c53820692c0755ad5e315f3b6d28ac2b96ab8ea0402d1ca59215215a91854fcd49080e0f54149576b1e SHA512 37f66d3fd3b8641af2988ca14d85b3c0efce3436f221e55bcf31c930d68e719abc553e6f9798caa953f989f6e0b8b61f1f9616aad88cede58104ea0ed2f0037a MISC metadata.xml 959 BLAKE2B 6513ae79e0cf24efd0bd33a16708950d36393770b51ea752c4c8c6e7ec63c7675dcf5e96dcfbb07d527ba910462b7c23afe35c55b4643ec69d1175660b245478 SHA512 8af28473216b00d4273be4bbb5d93adf8a4db79c46d9e97bd8b2822fa3920e8fc789042669bc93e6e9a6fa1c864a49fc23887be8456ea122a6d8b09e384dffbd diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.8-plasmacalendarintegration-holidayregion.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.8-plasmacalendarintegration-holidayregion.patch new file mode 100644 index 000000000000..d9fc57716763 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.8-plasmacalendarintegration-holidayregion.patch @@ -0,0 +1,81 @@ +From 51dcf82db5990dde9cf3e6b3132dfff2c129bee5 Mon Sep 17 00:00:00 2001 +From: Eugene Popov <popov895@ukr.net> +Date: Thu, 21 Sep 2023 10:31:48 +0000 +Subject: [PATCH] [plasmacalendarintegration] Fix selected regions are randomly + reset to default + +Check whether we are reading the selected regions from the group we need. + +BUG: 472483 +FIXED-IN: 5.27.9 + +(cherry picked from commit 72444337c24dac114765ff28768bd55f7e5018c5) +--- + plasmacalendarintegration/holidaysevents.cpp | 19 +++++++++---------- + plasmacalendarintegration/holidaysevents.h | 1 - + 2 files changed, 9 insertions(+), 11 deletions(-) + +diff --git a/plasmacalendarintegration/holidaysevents.cpp b/plasmacalendarintegration/holidaysevents.cpp +index 1e632a602e..605c1bd214 100644 +--- a/plasmacalendarintegration/holidaysevents.cpp ++++ b/plasmacalendarintegration/holidaysevents.cpp +@@ -7,18 +7,19 @@ + #include "holidaysevents.h" + + #include <KConfigGroup> +-#include <QDebug> + + HolidaysEventsPlugin::HolidaysEventsPlugin(QObject *parent) + : CalendarEvents::CalendarEventsPlugin(parent) + { +- KSharedConfig::Ptr m_config = KSharedConfig::openConfig(QStringLiteral("plasma_calendar_holiday_regions")); +- const KConfigGroup regionsConfig = m_config->group("General"); +- updateSettings(regionsConfig); ++ KSharedConfig::Ptr config = KSharedConfig::openConfig(QStringLiteral("plasma_calendar_holiday_regions"), KConfig::NoGlobals); ++ updateSettings(config->group("General")); + +- m_configWatcher = KConfigWatcher::create(m_config); +- connect(m_configWatcher.get(), &KConfigWatcher::configChanged, this, [this](const KConfigGroup &config) { +- updateSettings(config); ++ m_configWatcher = KConfigWatcher::create(config); ++ connect(m_configWatcher.get(), &KConfigWatcher::configChanged, this, [this](const KConfigGroup &configGroup) { ++ if (configGroup.name() != QLatin1String("General")) { ++ return; ++ } ++ updateSettings(configGroup); + loadEventsForDateRange(m_lastStartDate, m_lastEndDate); + }); + } +@@ -35,9 +36,7 @@ void HolidaysEventsPlugin::loadEventsForDateRange(const QDate &startDate, const + return; + } + +- m_lastData.clear(); + QMultiHash<QDate, CalendarEvents::EventData> data; +- + for (KHolidays::HolidayRegion *region : qAsConst(m_regions)) { + const KHolidays::Holiday::List holidays = region->rawHolidays(startDate, endDate); + +@@ -61,7 +60,7 @@ void HolidaysEventsPlugin::loadEventsForDateRange(const QDate &startDate, const + m_lastEndDate = endDate; + m_lastData = data; + +- Q_EMIT dataReady(data); ++ Q_EMIT dataReady(m_lastData); + } + + void HolidaysEventsPlugin::updateSettings(const KConfigGroup ®ionsConfig) +diff --git a/plasmacalendarintegration/holidaysevents.h b/plasmacalendarintegration/holidaysevents.h +index 93067049f8..1658d9d122 100644 +--- a/plasmacalendarintegration/holidaysevents.h ++++ b/plasmacalendarintegration/holidaysevents.h +@@ -32,6 +32,5 @@ private: + QDate m_lastEndDate; + QList<KHolidays::HolidayRegion *> m_regions; + QMultiHash<QDate, CalendarEvents::EventData> m_lastData; +- KSharedConfig::Ptr m_config; + KConfigWatcher::Ptr m_configWatcher; + }; +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.8-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.8-r1.ebuild new file mode 100644 index 000000000000..ed47ad95dff2 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.8-r1.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KFMIN=5.106.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.9 +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 +wallpaper-metadata" + +REQUIRED_USE="gps? ( geolocation )" +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras +# slot op: various private QtWaylandClient headers +COMMON_DEPEND=" + dev-libs/icu:= + >=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/kcmutils-${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/kparts-${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[X] + >=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 + 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? ( + sys-auth/polkit-qt + virtual/libcrypt:= + ) + screencast? ( + >=dev-qt/qtgui-${QTMIN}:5=[egl] + >=kde-plasma/kpipewire-${PVCUT}:5 + media-libs/libglvnd + >=media-video/pipewire-0.3:= + x11-libs/libdrm + ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) + telemetry? ( dev-libs/kuserfeedback:5 ) + wallpaper-metadata? ( kde-apps/libkexiv2:5 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.6.0 + >=dev-libs/wayland-protocols-1.31 + >=dev-qt/qtconcurrent-${QTMIN}:5 + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) +" +RDEPEND="${COMMON_DEPEND} + !<kde-plasma/breeze-5.22.90:5 + !<kde-plasma/plasma-desktop-5.27.0:5 + 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 + policykit? ( sys-apps/accountsservice ) +" +BDEPEND=" + >=dev-qt/qtwaylandscanner-${QTMIN}:5 + >=dev-util/wayland-scanner-1.19.0 + >=kde-frameworks/kcmutils-${KFMIN}: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}-plasmacalendarintegration-holidayregion.patch" # KDE-bug 472483 +) + +src_prepare() { + ecm_src_prepare + + cmake_comment_add_subdirectory libkworkspace + # delete colliding libkworkspace translations + find po -type f -name "*po" -and -name "libkworkspace*" -delete || die + + # 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 +} + +src_configure() { + local mycmakeargs=( + -DBUILD_xembed-sni-proxy=OFF + -DGLIBC_LOCALE_GEN=$(usex policykit) + $(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) + $(cmake_use_find_package wallpaper-metadata KF5KExiv2) + ) + + 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" +} |