mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
kde-plasma/plasma-workspace: drop 6.7.0
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
DIST plasma-workspace-6.6.5-patchset.tar.xz 9344 BLAKE2B 1af2b6fd2eb82ffac1af5d2c34c35d4574ec66d39172c14b2f797cf1a6ab7a06c0f983116d1498818082f4e23eb0a9b2e0de827509c0ec737e5536435e918ace SHA512 998948d79cccf6916ff6265132d5da8df02a4a55506d2add25c8ba58c12e710b11e5f6dcbde01bd598fcf75df65f0cc36d41355373392c18ac0c7a06adf595a7
|
||||
DIST plasma-workspace-6.6.5.tar.xz 19352580 BLAKE2B 9dc43a07f033b065634248ee961aa41189c59d4e27f73fbabbac8d04fe2f456bce22a3367a00a68dd29080549d0965b3b71916305fcfd1b3b8b283ce84fa2c6d SHA512 865083b9fcb6f8bbaa5a26aa01b3c8f9afe3d7640d19b4639b149ea79ec825e536aa564a479453c43b6d810468e632c10ffa178e21a88250d818ff0aa33e753a
|
||||
DIST plasma-workspace-6.7.0.tar.xz 19314584 BLAKE2B 893df7be5361eaca2a6c463d31038f33b1ef4ac09764b7e8564d93e49122348865f001f293a1cafee2872fcc70f86e1a0ba981d3c436f4e1365e6c7442727ec4 SHA512 ffef9f3c95a6581394207218edf19c5e2a5db84140c484efbfc2536a74a0f2f86621f7c8c1cda1b06f37ea3a1844944fd1fcb6cfd63e2ee3390c502519e177d0
|
||||
DIST plasma-workspace-6.7.1.tar.xz 19315900 BLAKE2B d508a92c470b68c5f1547ec2981541c0f5ece24249328967966599b2734dbd00242a580696d9dfa98e145090a2bd5534cab996964fb58ea00b79d506135b0e5e SHA512 82594e395ab870cbd552ba2ee4c4627b4d3021fe9bd256387f7d0cf29cd30681609a526cfc41b664fd03ac29e373f50aafd8751753befd87b055c02026f0eb91
|
||||
|
||||
-83
@@ -1,83 +0,0 @@
|
||||
From 90d0027e05e4a8c198fd046687eb54718233b2e7 Mon Sep 17 00:00:00 2001
|
||||
From: Kai Uwe Broulik <kde@privat.broulik.de>
|
||||
Date: Mon, 15 Jun 2026 15:39:09 +0000
|
||||
Subject: [PATCH] plasma-apply-lookandfeel: Optionally blend changes when
|
||||
changing color scheme
|
||||
|
||||
Makes it consistent with merely changing color schemes.
|
||||
|
||||
|
||||
(cherry picked from commit 7e7f2a6cb408a6c38b55ecdde27d4c42e1cb06da)
|
||||
|
||||
Co-authored-by: Kai Uwe Broulik <kde@privat.broulik.de>
|
||||
---
|
||||
kcms/lookandfeel/kcm.cpp | 2 +-
|
||||
kcms/lookandfeel/tool/lnftool.cpp | 2 +-
|
||||
libklookandfeel/klookandfeelmanager.cpp | 11 +++++++++++
|
||||
libklookandfeel/klookandfeelmanager.h | 2 ++
|
||||
4 files changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp
|
||||
index ef6d80f87e..029bfbdc11 100644
|
||||
--- a/kcms/lookandfeel/kcm.cpp
|
||||
+++ b/kcms/lookandfeel/kcm.cpp
|
||||
@@ -467,7 +467,7 @@ void KCMLookandFeel::apply()
|
||||
save();
|
||||
|
||||
if (!settings()->automaticLookAndFeel()) {
|
||||
- m_lnf->save(package, m_selectedContents);
|
||||
+ m_lnf->save(package, m_selectedContents | KLookAndFeelManager::BlendChanges);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/kcms/lookandfeel/tool/lnftool.cpp b/kcms/lookandfeel/tool/lnftool.cpp
|
||||
index 1675d1b87d..669466b21d 100644
|
||||
--- a/kcms/lookandfeel/tool/lnftool.cpp
|
||||
+++ b/kcms/lookandfeel/tool/lnftool.cpp
|
||||
@@ -96,7 +96,7 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
// By default do not modify the layout, unless explicitly specified
|
||||
- KLookAndFeelManager::Contents selection = KLookAndFeelManager::AppearanceSettings;
|
||||
+ KLookAndFeelManager::Contents selection = KLookAndFeelManager::AppearanceSettings | KLookAndFeelManager::BlendChanges;
|
||||
if (parser.isSet(_resetLayout)) {
|
||||
selection |= KLookAndFeelManager::LayoutSettings;
|
||||
}
|
||||
diff --git a/libklookandfeel/klookandfeelmanager.cpp b/libklookandfeel/klookandfeelmanager.cpp
|
||||
index 83593dfd3b..30b00e7a5e 100644
|
||||
--- a/libklookandfeel/klookandfeelmanager.cpp
|
||||
+++ b/libklookandfeel/klookandfeelmanager.cpp
|
||||
@@ -484,6 +484,17 @@ void KLookAndFeelManager::save(const KPackage::Package &package, Contents applyM
|
||||
const QString packageId = package.metadata().pluginId();
|
||||
const Contents itemsToApply = packageContents(package) & applyMask;
|
||||
|
||||
+ if (itemsToApply.testFlag(Colors) && applyMask.testFlag(BlendChanges) && m_mode == Mode::Apply) {
|
||||
+ auto msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KWin"),
|
||||
+ QStringLiteral("/org/kde/KWin/BlendChanges"),
|
||||
+ QStringLiteral("org.kde.KWin.BlendChanges"),
|
||||
+ QStringLiteral("start"));
|
||||
+ msg << 800;
|
||||
+ // This is deliberately blocking so that we ensure Kwin has processed the
|
||||
+ // animation start event before we potentially trigger client side changes
|
||||
+ QDBusConnection::sessionBus().call(msg);
|
||||
+ }
|
||||
+
|
||||
if (itemsToApply.testFlag(DesktopLayout) && m_mode == Mode::Apply) {
|
||||
QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.kde.plasmashell"),
|
||||
QStringLiteral("/PlasmaShell"),
|
||||
diff --git a/libklookandfeel/klookandfeelmanager.h b/libklookandfeel/klookandfeelmanager.h
|
||||
index 7cc51b8239..2f4b3483c9 100644
|
||||
--- a/libklookandfeel/klookandfeelmanager.h
|
||||
+++ b/libklookandfeel/klookandfeelmanager.h
|
||||
@@ -56,6 +56,8 @@ public:
|
||||
// General Flag combinations
|
||||
KWinSettings = WindowSwitcher | WindowDecoration | WindowPlacement | TitlebarLayout | BorderSize,
|
||||
AllSettings = (1 << 26) - 1,
|
||||
+ // Animate settings change (this blocks for 300ms during the animation!)
|
||||
+ BlendChanges = (1 << 30),
|
||||
};
|
||||
Q_DECLARE_FLAGS(Contents, ContentFlags)
|
||||
Q_FLAG(Contents)
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,230 +0,0 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
ECM_HANDBOOK="optional"
|
||||
ECM_TEST="forceoptional"
|
||||
KFMIN=6.26.0
|
||||
QTMIN=6.10.1
|
||||
inherit ecm plasma.kde.org xdg
|
||||
|
||||
DESCRIPTION="KDE Plasma workspace"
|
||||
|
||||
LICENSE="GPL-2" # TODO: CHECK
|
||||
SLOT="6"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
|
||||
IUSE="appstream +fontconfig flatpak +ksysguard +policykit screencast
|
||||
+semantic-desktop systemd telemetry +wallpaper-metadata +X"
|
||||
|
||||
REQUIRED_USE="fontconfig? ( X )"
|
||||
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,opengl,sql,sqlite,wayland,widgets,xml]
|
||||
>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
|
||||
>=dev-qt/qtlocation-${QTMIN}:6
|
||||
>=dev-qt/qtpositioning-${QTMIN}:6
|
||||
>=dev-qt/qtshadertools-${QTMIN}:6
|
||||
>=dev-qt/qtsvg-${QTMIN}:6
|
||||
>=kde-frameworks/karchive-${KFMIN}:6
|
||||
>=kde-frameworks/kauth-${KFMIN}:6
|
||||
>=kde-frameworks/kbookmarks-${KFMIN}:6
|
||||
>=kde-frameworks/kcmutils-${KFMIN}:6
|
||||
>=kde-frameworks/kcolorscheme-${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/kholidays-${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/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/kwallet-${KFMIN}:6
|
||||
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
|
||||
>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
|
||||
>=kde-frameworks/kxmlgui-${KFMIN}:6
|
||||
>=kde-frameworks/networkmanager-qt-${KFMIN}:6
|
||||
>=kde-frameworks/prison-${KFMIN}:6[qml]
|
||||
>=kde-frameworks/solid-${KFMIN}:6
|
||||
>=kde-plasma/breeze-${KDE_CATV}:6
|
||||
>=kde-plasma/knighttime-${KDE_CATV}:6
|
||||
>=kde-plasma/kwayland-${KDE_CATV}:6
|
||||
>=kde-plasma/kwin-${KDE_CATV}:6
|
||||
>=kde-plasma/layer-shell-qt-${KDE_CATV}:6
|
||||
>=kde-plasma/libkscreen-${KDE_CATV}:6
|
||||
>=kde-plasma/libplasma-${KDE_CATV}:6=
|
||||
>=kde-plasma/plasma-activities-${KDE_CATV}:6=
|
||||
>=kde-plasma/plasma-activities-stats-${KDE_CATV}:6
|
||||
media-libs/libcanberra
|
||||
sci-libs/libqalculate:=
|
||||
sys-apps/dbus
|
||||
virtual/zlib:=
|
||||
virtual/libudev:=
|
||||
appstream? ( >=dev-libs/appstream-1[qt6] )
|
||||
flatpak? ( sys-apps/flatpak )
|
||||
ksysguard? ( >=kde-plasma/libksysguard-${KDE_CATV}:6 )
|
||||
policykit? ( virtual/libcrypt:= )
|
||||
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
|
||||
wallpaper-metadata? ( kde-apps/libkexiv2:6 )
|
||||
X? (
|
||||
>=dev-qt/qtbase-${QTMIN}:6=[X]
|
||||
>=kde-plasma/kscreenlocker-${KDE_CATV}:6
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libX11
|
||||
x11-libs/libXau
|
||||
x11-libs/libxcb
|
||||
x11-libs/libXcursor
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXtst
|
||||
x11-libs/xcb-util
|
||||
fontconfig? (
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
x11-libs/libXft
|
||||
x11-libs/xcb-util-image
|
||||
)
|
||||
)
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/plasma-wayland-protocols-1.21.0
|
||||
dev-libs/qcoro
|
||||
>=dev-qt/qtbase-${QTMIN}:6[concurrent]
|
||||
test? ( screencast? ( >=media-video/pipewire-0.3:* ) )
|
||||
X? (
|
||||
fontconfig? ( x11-libs/libXrender )
|
||||
x11-base/xorg-proto
|
||||
)
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!kde-plasma/libkworkspace:5
|
||||
!<kde-plasma/plasma-desktop-6.6.90
|
||||
!<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-${KDE_CATV}:6
|
||||
>=kde-plasma/kdesu-gui-${KDE_CATV}:*
|
||||
>=kde-plasma/milou-${KDE_CATV}:6
|
||||
>=kde-plasma/plasma-integration-${KDE_CATV}:6
|
||||
sys-apps/dbus
|
||||
x11-apps/xmessage
|
||||
x11-apps/xprop
|
||||
x11-apps/xrdb
|
||||
policykit? ( sys-apps/accountsservice )
|
||||
screencast? ( >=media-video/pipewire-0.3:* )
|
||||
"
|
||||
BDEPEND="
|
||||
>=dev-qt/qtbase-${QTMIN}:6[wayland]
|
||||
>=dev-util/wayland-scanner-1.19.0
|
||||
>=kde-frameworks/kcmutils-${KFMIN}:6
|
||||
virtual/pkgconfig
|
||||
test? (
|
||||
>=dev-qt/qtwayland-${QTMIN}:6[compositor(+)]
|
||||
X? ( x11-misc/xdotool )
|
||||
)
|
||||
"
|
||||
PDEPEND="
|
||||
>=kde-plasma/plasma-login-sessions-${KDE_CATV}:6
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
|
||||
"${FILESDIR}/${P}-fix-plasma-apply-lookandfeel.patch" # in 6.7.1
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
ecm_src_prepare
|
||||
|
||||
cmake_comment_add_subdirectory login-sessions
|
||||
|
||||
if ! use policykit; then
|
||||
cmake_comment_add_subdirectory -f kcms 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 build switches upstreamed
|
||||
if ! use flatpak; then
|
||||
sed -e "s/^pkg_check_modules.*Flatpak/#&/" -i CMakeLists.txt || die
|
||||
fi
|
||||
if ! use systemd; then
|
||||
sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DWITH_X11=$(usex X) # remember to submit patches with bugs
|
||||
-DWITH_X11_SESSION=$(usex X)
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
|
||||
-DGLIBC_LOCALE_GEN=OFF
|
||||
-DGLIBC_LOCALE_PREGENERATED=$(usex elibc_glibc)
|
||||
$(cmake_use_find_package appstream AppStreamQt)
|
||||
$(cmake_use_find_package fontconfig Fontconfig)
|
||||
$(cmake_use_find_package fontconfig Freetype)
|
||||
$(cmake_use_find_package ksysguard KSysGuard)
|
||||
-DBUILD_CAMERAINDICATOR=$(usex screencast)
|
||||
$(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 () {
|
||||
xdg_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"
|
||||
}
|
||||
Reference in New Issue
Block a user