From be8708090362c01c6111c4b76f1e395c14d86e00 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 13 Aug 2024 11:06:03 +0100 Subject: gentoo auto-resync : 13:08:2024 - 11:06:03 --- kde-plasma/Manifest.gz | Bin 11483 -> 11484 bytes kde-plasma/plasma-workspace/Manifest | 6 +- ...sma-workspace-6.1.4-fix-mediacontroller-1.patch | 39 ++++ ...sma-workspace-6.1.4-fix-mediacontroller-2.patch | 46 ++++ .../plasma-workspace-6.1.4-fix-svg-images.patch | 36 ++++ ...rkspace-6.1.4-restart-unhide-timer-on-dnd.patch | 38 ++++ .../plasma-workspace-6.1.4-r1.ebuild | 235 +++++++++++++++++++++ .../plasma-workspace/plasma-workspace-6.1.4.ebuild | 230 -------------------- 8 files changed, 399 insertions(+), 231 deletions(-) create mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-1.patch create mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-2.patch create mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-svg-images.patch create mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch create mode 100644 kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r1.ebuild delete mode 100644 kde-plasma/plasma-workspace/plasma-workspace-6.1.4.ebuild (limited to 'kde-plasma') diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz index f033bd0b23de..81c25899f8ed 100644 Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 7bd7182df70e..466f9e8c7461 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -3,8 +3,12 @@ AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e 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.11.1-fix-writing-iceauthority-file.patch 2591 BLAKE2B c901b06d037750accab60f8edbd139578da1ed6514da8d49192aa05682c4b2a795663723f870519dbf15aada6367415e75030d0ec8754af54cb17a4d7823a11f SHA512 70b2e76a4b88586b3efb78f7833bcd72a71d2210023e5451d5c9f911c5ba5e8ec8be39c63d1765dd93842f5c0916427d1629d88205fba6d342a8a4aabfe31544 +AUX plasma-workspace-6.1.4-fix-mediacontroller-1.patch 1373 BLAKE2B eaf2d564cfc8c430d06d5897a98c45acdbbaf0753b761a4e06eeb9ac70f5bea3afb85f0c64fc18bdf7abfb7d20f3b8a8e648d9097ac7433eba517e70b1d96ad6 SHA512 ca2a3843430f3bd407a5cf87145ca84fc411f88f51271ad120c38eb18dabb3ac738b5bb27d50a69183f1c23c0c056e2e3763443747b4865207f2f38aac8ab48f +AUX plasma-workspace-6.1.4-fix-mediacontroller-2.patch 1987 BLAKE2B 8870c3a21575b64d47ca62f2488e1f6c9b0724105e0089c9b8e7d95653797bdad29ffa7422dad7395efdf03b2e6e6854ecc4b23c0c61c93d17ee626879b85fd6 SHA512 b44c7f3b0f216c6279627db5b4a59ff8167fc4583bca85978252d38f5878c976ca995b52ac4581cf0d07aafef9e21c2c440baed9dee912beba2d38fb63d1b484 +AUX plasma-workspace-6.1.4-fix-svg-images.patch 1275 BLAKE2B d47e2a77c33cd03429b7a9704f0e3102ea22d0feee339a48653038e3ab6bbcf7ae00faed9608e275d4697bd3eecab1748883ed0ef648fee4a28964b8c6174925 SHA512 c34c138037fc76306aa51d26a48c20796ad524cae973e7d403194a84e4f2a987b6b7bf8c788fa9c7da6250e3d2517f8c72a5c9c62556c0c496e74bd703f3f973 +AUX plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch 1068 BLAKE2B 2f593499840a799e7683e599c2150f8c7e8f485b1ccb03c853915a4ec6cef1a9953f2d7b95bfac5a8b701d32c637b24201562d82aaaa3dc84450b1eb22f5aa10 SHA512 7d70cdbb370dbefe3721eb57ac66943db29f574401c5a47ec8c6ed897d928bb5e2d8f9e3bb608574c9e73f367d3f6db7dc85bf7f07dcd88be3b04b5336eb3981 DIST plasma-workspace-5.27.11.1.tar.xz 19490624 BLAKE2B eef62c13407073aea855878b0e8a109b2ea4532e9bffe97903e7163747b56ac01d881d9649c6a4d220a569e6fcaa9e7fb34996c8bb9a3f0abd5f6fa2e73abc47 SHA512 72bb17ba874be28ed15eb8536caa00cf0fb7777ad76728107ea8baa6216c5655a595d1364ec146f4c33b876c239c249bada9f75e3b0604d29de5f06bd327d006 DIST plasma-workspace-6.1.4.tar.xz 19294480 BLAKE2B c0ebf51f6f67f43a09dcffe40fae7114b6234719e56053f36600999e289eb42e5d2ca281da0259fa0c60f5b3a3cfef4a8bb912f48cbf05eefc60fb5bc48193ec SHA512 c7ac27c60e75998e2cc6abb96004ce2abd84b7a7978de4fc256bf06892fca818595e2a5dd505768bcce9be4103ccecbb34d82761c0f7be45a402ca6173e90f05 EBUILD plasma-workspace-5.27.11.1-r1.ebuild 7049 BLAKE2B 9aa8f728e227338b85a7f351e47f73fa83844c4228644883d801d5da3965b430b8cfd57cfa4ad17acabf9535bb57e8c33da58ca9fca6b098ef414ebb96c879a7 SHA512 a81b272671b6f5eed5173dd3378e34534522dfec5aac040b4d2a1ff45bf0db2200fcbaccf7b6319be026a566af7aac92daa6fd2ee43aba57949e579b7233cda8 -EBUILD plasma-workspace-6.1.4.ebuild 6924 BLAKE2B 9e6f18f03b88c267d6b1e09918849c5299831632d5e71b3b936962604669ebc016b572723ceca2dd8a1e54de59885c73a68edca1bb356e461e4648dcb62ab3a0 SHA512 7bd7bf0895b7c38ffdd60d334c94563cbc6d74bd347ebdc98cc06ffdf22c80a2e0af12ed3485492d9f7399baa088882e91c49f6443426ac47e383e69878520d2 +EBUILD plasma-workspace-6.1.4-r1.ebuild 7170 BLAKE2B 3130711fca1fc8d22e507ecc5657dd1b3c91876d791454e6e3a7a258845b87f2ba9439dcdbd4eda8c5db90ae6c0fe19d578316552e09ce208afd9cb7b978169c SHA512 77753201eaa1d971cef7731080d1b10068f81bdc9e3eb9f1472c17212db88cce3095c74e1ad871f91da30aaf68bdbf925c6116c28d0d927b49ee020e11138ecb MISC metadata.xml 1026 BLAKE2B 49c2bc5fdc752caf8f45ce982633df0542a008ba1ef0cc99d32b64d6cd73c237d9c98484cac16fa32210156a080e17ad365c2d4eeb81cd3e9a7dc2119b1f7395 SHA512 4cdf77f6be4ce18148936e2a7012b86c70cdcc9de8b99455b3db65a4a52990eb604082ca098cdaee5fe6762bb9d138861f687f8d5fbedb3f60eef7c7be3a42cb diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-1.patch new file mode 100644 index 000000000000..2cf7c959d996 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-1.patch @@ -0,0 +1,39 @@ +From 9a294b8a91170ed2bd5c75a65c81fee7c58839d2 Mon Sep 17 00:00:00 2001 +From: Fushan Wen +Date: Fri, 9 Aug 2024 00:57:00 +0000 +Subject: [PATCH] applets/mediacontroller: use Play/Pause to control players + +Some players don't report updated CanPlay or CanPause properties to +MPRIS, which is a problem for PlayPause() as it requires the player can +play and pause at the same time. Use Play/Pause to work around it. + +CCBUG: 490569 + + +(cherry picked from commit c5edc144665a0d814a908ae6a120a288f7965d7d) + +Co-authored-by: Fushan Wen +--- + applets/mediacontroller/package/contents/ui/main.qml | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/applets/mediacontroller/package/contents/ui/main.qml b/applets/mediacontroller/package/contents/ui/main.qml +index 885c972ae71..fa09d2a86c4 100644 +--- a/applets/mediacontroller/package/contents/ui/main.qml ++++ b/applets/mediacontroller/package/contents/ui/main.qml +@@ -174,7 +174,11 @@ PlasmoidItem { + mpris2Model.currentPlayer.Pause(); + } + function togglePlaying() { +- mpris2Model.currentPlayer.PlayPause(); ++ if (root.isPlaying) { ++ mpris2Model.currentPlayer.Pause(); ++ } else { ++ mpris2Model.currentPlayer.Play(); ++ } + } + function stop() { + mpris2Model.currentPlayer.Stop(); +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-2.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-2.patch new file mode 100644 index 000000000000..e7bc079b6577 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-2.patch @@ -0,0 +1,46 @@ +From 1ff8f37f6a8fb47697364d56460989abbd764bbf Mon Sep 17 00:00:00 2001 +From: Fushan Wen +Date: Fri, 9 Aug 2024 00:57:31 +0000 +Subject: [PATCH] libkmpris: refresh player when track list changes + +For some players when the current track list changes, it doesn't emit +all changed properties for org.mpris.MediaPlayer2.Player. This adds a +check for the track list so when the track list changes, the player +information is refreshed. + +BUG: 490569 +FIXED-IN: 6.1.5 + + +(cherry picked from commit 627f5418409f2e362fb83f6fdb6f427221460a0c) + +Co-authored-by: Fushan Wen +--- + libkmpris/playercontainer.cpp | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/libkmpris/playercontainer.cpp b/libkmpris/playercontainer.cpp +index f48103d507d..c8d37efae5e 100644 +--- a/libkmpris/playercontainer.cpp ++++ b/libkmpris/playercontainer.cpp +@@ -711,15 +711,11 @@ void PlayerContainer::onGetPropsFinished(QDBusPendingCallWatcher *watcher) + + void PlayerContainer::onPropertiesChanged(const QString &interfaceName, const QVariantMap &changedProperties, const QStringList &invalidatedProperties) + { +- if (interfaceName != QLatin1String("org.mpris.MediaPlayer2.Player") && interfaceName != QLatin1String("org.mpris.MediaPlayer2")) { +- // org.mpris.MediaPlayer2.TrackList is ignored for now +- return; +- } +- if (!invalidatedProperties.empty()) { ++ if (!invalidatedProperties.empty() || interfaceName == u"org.mpris.MediaPlayer2.TrackList") { + disconnect(m_propsIface, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged, this, &PlayerContainer::onPropertiesChanged); + disconnect(m_playerIface, &OrgMprisMediaPlayer2PlayerInterface::Seeked, this, &PlayerContainer::onSeeked); + refresh(); +- } else { ++ } else if (interfaceName == u"org.mpris.MediaPlayer2.Player" || interfaceName == u"org.mpris.MediaPlayer2") [[likely]] { + updateFromMap(changedProperties); + } + } +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-svg-images.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-svg-images.patch new file mode 100644 index 000000000000..612dfb871a37 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-svg-images.patch @@ -0,0 +1,36 @@ +From ab80bee1724804650147a1c9485ee67ae4f42f83 Mon Sep 17 00:00:00 2001 +From: Marco Martin +Date: Mon, 12 Aug 2024 18:56:04 +0000 +Subject: [PATCH] Fix svg images + +Image delegate needs to be loaded also for ScalableImage + +BUG:491369 + + +(cherry picked from commit 1c6e817a476e76970437faa7fef1dbdc5d3be082) + +1c6e817a Fix svg images + +Co-authored-by: Marco Martin +--- + wallpapers/image/imagepackage/contents/ui/ImageStackView.qml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml b/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml +index 70545d8814e..bbf64138a4b 100644 +--- a/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml ++++ b/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml +@@ -43,7 +43,8 @@ QQC2.StackView { + + function createBackgroundComponent() { + switch (mediaProxy.backgroundType) { +- case Wallpaper.BackgroundType.Image: { ++ case Wallpaper.BackgroundType.Image: ++ case Wallpaper.BackgroundType.VectorImage: { + if (!staticImageComponent) { + staticImageComponent = Qt.createComponent("mediacomponent/StaticImageComponent.qml"); + } +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch new file mode 100644 index 000000000000..a10a9a84078e --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch @@ -0,0 +1,38 @@ +From 84d0555e4484cde0cfd41c63047b69381e511767 Mon Sep 17 00:00:00 2001 +From: Yifan Zhu +Date: Wed, 7 Aug 2024 17:12:02 +0000 +Subject: [PATCH] shell/panelview: restart unhide timer on drag leave + +Otherwise the autohide and dodge windows panels don't rehide when +leaving them during drag and drop. + +CCBUG: 450579 + + +(cherry picked from commit 72e963100eb630771a9f2b7ce57375a7ddc0f59f) + +Co-authored-by: Yifan Zhu +--- + shell/panelview.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/shell/panelview.cpp b/shell/panelview.cpp +index 095315a8c85..5a88764cf3c 100644 +--- a/shell/panelview.cpp ++++ b/shell/panelview.cpp +@@ -1194,8 +1194,11 @@ bool PanelView::event(QEvent *e) + } + break; + } +- // DragLeave just works + case QEvent::DragLeave: ++ m_containsMouse = false; ++ if (edgeActivated()) { ++ m_unhideTimer.start(); ++ } + break; + case QEvent::DragMove: { + QDragMoveEvent *de = static_cast(e); +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r1.ebuild new file mode 100644 index 000000000000..8ac01b010e74 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r1.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KFMIN=6.5.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma workspace" + +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/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-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.13.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 + !=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/milou-${PVCUT}:6 + >=kde-plasma/plasma-integration-${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] ) +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" + +PATCHES=( + # TODO upstream: KDE-bug 432975, bug 767478 + "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" + # upstream Plasma/6.1 branch (fixed in 6.1.5) + "${FILESDIR}/${P}-restart-unhide-timer-on-dnd.patch" # KDE-bug 450579 + "${FILESDIR}"/${P}-fix-mediacontroller-{1,2}.patch # KDE-bug 490569 + "${FILESDIR}/${P}-fix-svg-images.patch" # KDE-bug 491369 +) + +src_prepare() { + ecm_src_prepare + + # 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 + -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/plasma-workspace/plasma-workspace-6.1.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.4.ebuild deleted file mode 100644 index a26c9eed669b..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-6.1.4.ebuild +++ /dev/null @@ -1,230 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -KFMIN=6.3.0 -PVCUT=$(ver_cut 1-3) -QTMIN=6.7.1 -inherit ecm plasma.kde.org - -DESCRIPTION="KDE Plasma workspace" - -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/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-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.13.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 - !=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/milou-${PVCUT}:6 - >=kde-plasma/plasma-integration-${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] ) -" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" - -PATCHES=( - "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 -) - -src_prepare() { - ecm_src_prepare - - # 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 - -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" -} -- cgit v1.2.3