ajout plasma-workspace modifié pour ne plus avoir de dependance avec phonon

This commit is contained in:
jeremy 2024-08-25 18:45:56 +02:00
parent b042da853d
commit 9720ef98bb
7 changed files with 468 additions and 0 deletions

View File

@ -0,0 +1,17 @@
#!/bin/sh
#
# This file is executed at Plasma shutdown.
# Uncomment the following lines to kill the agents
# that were started at session startup.
# <gnupg-2.1.x
#if [ -n "${GPG_AGENT_INFO}" ]; then
# kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
#fi
# >=gnupg-2.1.x
#gpgconf --kill gpg-agent >/dev/null 2>&1
#if [ -n "${SSH_AGENT_PID}" ]; then
# eval "$(ssh-agent -s -k)"
#fi

View File

@ -0,0 +1,58 @@
# Agents startup file
#
# This file is sourced at Plasma startup, so that
# the environment variables set here are available
# throughout the session.
#
# Uncomment the following lines to start gpg-agent
# and/or ssh-agent at Plasma startup.
# If you do so, do not forget to uncomment the respective
# lines in PLASMADIR/shutdown/agent-shutdown.sh to
# properly kill the agents when the session ends.
#
# If using gpg-agent for ssh instead of ssh-agent, a GUI pinentry program
# must be selected either with eselect pinentry or adding an entry to
# $HOME/.gnupg/gpg-agent.conf such as "pinentry-program /usr/bin/pinentry-qt".
#
# If using gnupg-2.1 or later with gpg-agent for ssh instead of ssh-agent,
# $HOME/.gnupg/gpg-agent.conf must be edited to include "enable-ssh-support".
# See bug #547544 for details of why.
#
# pinentry-curses or pinentry-tty will not work because the agent started here
# is in a different tty than where it is used, so the agent does not know where
# to request the passphrase and fails.
#GPG_AGENT=true
#SSH_AGENT=true
#SSH_AGENT=gpg # use gpg-agent for ssh instead of ssh-agent
if [ "${GPG_AGENT}" = true ]; then
if [ -x /usr/bin/gpgconf ]; then
gpgconf --launch gpg-agent >/dev/null 2>&1
if [ $? = 2 ]; then
eval "$(/usr/bin/gpg-agent --enable-ssh-support --daemon)"
fi
fi
fi
if [ "${SSH_AGENT}" = true ]; then
if [ -x /usr/bin/ssh-agent ]; then
eval "$(/usr/bin/ssh-agent -s)"
fi
elif [ "${SSH_AGENT}" = gpg ] && [ "${GPG_AGENT}" = true ]; then
if [ -e /run/user/$(id -ru)/gnupg/S.gpg-agent.ssh ]; then
export SSH_AUTH_SOCK=/run/user/$(id -ru)/gnupg/S.gpg-agent.ssh
elif [ -e "${HOME}/.gnupg/S.gpg-agent.ssh" ]; then
export SSH_AUTH_SOCK=${HOME}/.gnupg/S.gpg-agent.ssh
fi
fi
# Uncomment the following lines to start rxvt-unicode which has the ability to
# run multiple terminals in one single process, thus starting up faster and
# saving resources.
# The --opendisplay ensures that the daemon quits when the X server terminates,
# therefore we don't need matching lines in agent-shutdown.sh.
#if [ -x /usr/bin/urxvtd ]; then
# /usr/bin/urxvtd --opendisplay --fork --quiet
#fi

View File

@ -0,0 +1,39 @@
From 9a294b8a91170ed2bd5c75a65c81fee7c58839d2 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
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 <qydwhotmail@gmail.com>
---
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

View File

@ -0,0 +1,46 @@
From 1ff8f37f6a8fb47697364d56460989abbd764bbf Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
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 <qydwhotmail@gmail.com>
---
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

View File

@ -0,0 +1,36 @@
From ab80bee1724804650147a1c9485ee67ae4f42f83 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
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 <notmart@gmail.com>
---
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

View File

@ -0,0 +1,38 @@
From 84d0555e4484cde0cfd41c63047b69381e511767 Mon Sep 17 00:00:00 2001
From: Yifan Zhu <fanzhuyifan@gmail.com>
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 <fanzhuyifan@gmail.com>
---
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<QDragMoveEvent *>(e);
--
GitLab

View File

@ -0,0 +1,234 @@
# 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
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
!<kde-plasma/plasma-desktop-5.27.0:5
!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/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"
}