* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2022-05-17 19:02 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2022-05-17 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 4a9df068d846b2e6c60ccef203a71a92eb6fd9e5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 18:36:47 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 17 19:01:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9df068
kde-plasma/plasma-workspace: Backport several 5.24.6 fixes
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 40 ++++
...cker-refresh-RootModel-on-session-backend.patch | 92 +++++++++
...ystemtray-prefer-IconName-over-IconPixmap.patch | 137 +++++++++++++
...asmashell-crash-on-panel-w-systray-remove.patch | 34 ++++
...ms-desktoptheme-detect-installed-styles-1.patch | 41 ++++
...ms-desktoptheme-detect-installed-styles-2.patch | 72 +++++++
...sddm-theme-KeyboardButton-fix-layout-name.patch | 39 ++++
...s-image-fix-missing-folder-action-buttons.patch | 30 +++
.../plasma-workspace-5.24.5-r1.ebuild | 226 +++++++++++++++++++++
9 files changed, 711 insertions(+)
--git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch
new file mode 100644
index 000000000000..d61877300d27
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch
@@ -0,0 +1,40 @@
+From 4d3f99558cff95259590e70dfbf854a479f772ce Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Wed, 4 May 2022 10:45:52 -0600
+Subject: [PATCH 2/8] applets/appmenu: fix top-level menu text coloration
+
+28537cf3ff3cd9210f7568f40334ac3a2c9bed18 made the color dynamic, but
+neglected to respect the Plasma color scheme, if any. This causes
+problems with Plasma themes that have their own colors and don't
+respect the systemwide color scheme, such as Breeze Twilight.
+
+Fix it by using the appropriate colors from the PlasmaCore color scheme
+object, not the systemwide object provided by Qt.
+
+BUG: 453348
+FIXED-IN: 5.24.6
+
+
+(cherry picked from commit 19d9bc7e395d8c6e007afdc3b3b5c11a7d02190e)
+---
+ applets/appmenu/package/contents/ui/MenuDelegate.qml | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/applets/appmenu/package/contents/ui/MenuDelegate.qml b/applets/appmenu/package/contents/ui/MenuDelegate.qml
+index 441e99016..afb37589a 100644
+--- a/applets/appmenu/package/contents/ui/MenuDelegate.qml
++++ b/applets/appmenu/package/contents/ui/MenuDelegate.qml
+@@ -66,9 +66,6 @@ AbstractButton {
+
+ contentItem: PC3.Label {
+ text: controlRoot.Kirigami.MnemonicData.richTextLabel
+- // Kirigami.Theme.highlightedTextColor returns different colors
+- // depending on window focus, which does not apply to this applet
+- // instead, we use palette.highlightedText here, which returns consistent result
+- color: background.state == MenuDelegate.State.Rest ? palette.windowText : palette.highlightedText
++ color: background.state == MenuDelegate.State.Rest ? PlasmaCore.Theme.textColor : PlasmaCore.Theme.highlightedTextColor
+ }
+ }
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch
new file mode 100644
index 000000000000..8cffd8d372ed
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch
@@ -0,0 +1,92 @@
+From d0340868619c26de5892f8bd095456dc5a32d0ce Mon Sep 17 00:00:00 2001
+From: Amy Rose <amy@fluff.tech>
+Date: Tue, 17 May 2022 07:38:03 +0000
+Subject: [PATCH 8/8] applets/kicker: refresh RootModel on session backend
+ state change
+
+BUG: 427530
+
+Hunting this one down since mid-March...
+
+In "native" Plasma containments like the panel, desktop, and plasmawindowed, the `LogindSessionBackend` in `libkworkspace` enters the "Ready" state nearly instantly, before any signals can even be attached. In other containments like Latte Dock and plasmoidviewer, however, the initialization takes some time to complete (unsure why). RootModel was not watching or waiting to check what the session backend's state was, resulting in validity checks being done too soon and never checked again.
+
+
+(cherry picked from commit 2cc819f39bcce9ca83ab3767c42beb1e500e55b1)
+---
+ applets/kicker/plugin/rootmodel.cpp | 1 +
+ applets/kicker/plugin/systementry.cpp | 1 +
+ applets/kicker/plugin/systementry.h | 1 +
+ applets/kicker/plugin/systemmodel.cpp | 2 ++
+ applets/kicker/plugin/systemmodel.h | 3 +++
+ 5 files changed, 8 insertions(+)
+
+diff --git a/applets/kicker/plugin/rootmodel.cpp b/applets/kicker/plugin/rootmodel.cpp
+index 4ec323683..837108744 100644
+--- a/applets/kicker/plugin/rootmodel.cpp
++++ b/applets/kicker/plugin/rootmodel.cpp
+@@ -449,6 +449,7 @@ void RootModel::refresh()
+ }
+
+ m_systemModel = new SystemModel(this);
++ QObject::connect(m_systemModel, &SystemModel::sessionManagementStateChanged, this, &RootModel::refresh);
+
+ if (m_showPowerSession) {
+ m_entryList << new GroupEntry(this, i18n("Power / Session"), QStringLiteral("system-log-out"), m_systemModel);
+diff --git a/applets/kicker/plugin/systementry.cpp b/applets/kicker/plugin/systementry.cpp
+index fdd86ece3..939e2119e 100644
+--- a/applets/kicker/plugin/systementry.cpp
++++ b/applets/kicker/plugin/systementry.cpp
+@@ -79,6 +79,7 @@ void SystemEntry::refresh()
+ {
+ if (!s_sessionManagement) {
+ s_sessionManagement = new SessionManagement();
++ QObject::connect(s_sessionManagement, &SessionManagement::stateChanged, this, &SystemEntry::sessionManagementStateChanged);
+ }
+
+ bool valid = false;
+diff --git a/applets/kicker/plugin/systementry.h b/applets/kicker/plugin/systementry.h
+index a0a258024..981a3a5f5 100644
+--- a/applets/kicker/plugin/systementry.h
++++ b/applets/kicker/plugin/systementry.h
+@@ -54,6 +54,7 @@ public:
+
+ Q_SIGNALS:
+ void isValidChanged() const;
++ void sessionManagementStateChanged();
+
+ private Q_SLOTS:
+ void refresh();
+diff --git a/applets/kicker/plugin/systemmodel.cpp b/applets/kicker/plugin/systemmodel.cpp
+index 656bbdc4e..844f80d09 100644
+--- a/applets/kicker/plugin/systemmodel.cpp
++++ b/applets/kicker/plugin/systemmodel.cpp
+@@ -92,10 +92,12 @@ void SystemModel::populate()
+
+ auto addIfValid = [=](const SystemEntry::Action action) {
+ SystemEntry *entry = new SystemEntry(this, action);
++ QObject::connect(entry, &SystemEntry::sessionManagementStateChanged, this, &SystemModel::sessionManagementStateChanged);
+
+ if (entry->isValid()) {
+ m_entries << entry;
+ }
++
+ QObject::connect(entry, &SystemEntry::isValidChanged, this, &AbstractModel::refresh, Qt::UniqueConnection);
+ };
+
+diff --git a/applets/kicker/plugin/systemmodel.h b/applets/kicker/plugin/systemmodel.h
+index cd9048de1..29ae9e428 100644
+--- a/applets/kicker/plugin/systemmodel.h
++++ b/applets/kicker/plugin/systemmodel.h
+@@ -25,6 +25,9 @@ public:
+
+ Q_INVOKABLE bool trigger(int row, const QString &actionId, const QVariant &argument) override;
+
++Q_SIGNALS:
++ void sessionManagementStateChanged();
++
+ protected Q_SLOTS:
+ void refresh() override;
+
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch
new file mode 100644
index 000000000000..0ac8ed788ade
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch
@@ -0,0 +1,137 @@
+From ea2833e4dd7114f8bf22a322a26c6c05ebf767f2 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Mon, 25 Apr 2022 21:58:58 +0300
+Subject: [PATCH 3/8] applets/systemtray: Prefer IconName over IconPixmap
+
+In case both IconName and IconPixmap are provided, the system tray
+applet is going to prefer the pixmap.
+
+That can create a dark icon on dark background bug because plasma can't
+recolor pixmaps.
+
+The SNI spec recommends visualizations to prefer icons over pixmaps:
+
+> An icon can either be identified by its Freedesktop-compliant icon
+> name, carried by this property of by the icon data itself, carried by
+> the property IconPixmap. Visualizations are encouraged to prefer icon
+> names over icon pixmaps if both are available (FIXME: still not very
+> defined: could e the pixmap used as fallback if an icon name is not found?)
+
+BUG: 418996
+
+- Unset iconName when icon can't be loaded
+- no code duplication
+(cherry picked from commit 7363d0e0f3c1a447e6264e92762735bd33da2682)
+---
+ .../systemtray/statusnotifieritemsource.cpp | 82 ++++++++-----------
+ 1 file changed, 33 insertions(+), 49 deletions(-)
+
+diff --git a/applets/systemtray/statusnotifieritemsource.cpp b/applets/systemtray/statusnotifieritemsource.cpp
+index f67845e42..731aecadc 100644
+--- a/applets/systemtray/statusnotifieritemsource.cpp
++++ b/applets/systemtray/statusnotifieritemsource.cpp
+@@ -286,68 +286,52 @@ void StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call)
+ QIcon overlay;
+ QStringList overlayNames;
+
+- // Icon
++ // Overlay icon
+ {
+- KDbusImageVector image;
+- QIcon icon;
+- QString iconName;
+-
+- properties[QStringLiteral("OverlayIconPixmap")].value<QDBusArgument>() >> image;
+- if (image.isEmpty()) {
+- QString iconName = properties[QStringLiteral("OverlayIconName")].toString();
+- m_overlayIconName = iconName;
+- if (!iconName.isEmpty()) {
++ m_overlayIconName = QString();
++
++ const QString iconName = properties[QStringLiteral("OverlayIconName")].toString();
++ if (!iconName.isEmpty()) {
++ overlay = QIcon(new KIconEngine(iconName, iconLoader()));
++ if (!overlay.isNull()) {
++ m_overlayIconName = iconName;
+ overlayNames << iconName;
+- overlay = QIcon(new KIconEngine(iconName, iconLoader()));
+ }
+- } else {
+- overlay = imageVectorToPixmap(image);
+ }
++ if (overlay.isNull()) {
++ KDbusImageVector image;
++ properties[QStringLiteral("OverlayIconPixmap")].value<QDBusArgument>() >> image;
++ if (!image.isEmpty()) {
++ overlay = imageVectorToPixmap(image);
++ }
++ }
++ }
+
+- properties[QStringLiteral("IconPixmap")].value<QDBusArgument>() >> image;
+- if (image.isEmpty()) {
+- iconName = properties[QStringLiteral("IconName")].toString();
+- if (!iconName.isEmpty()) {
+- icon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames));
+-
+- if (overlayNames.isEmpty() && !overlay.isNull()) {
++ auto loadIcon = [this, &properties, &overlay, &overlayNames](const QString &iconKey, const QString &pixmapKey) -> std::tuple<QIcon, QString> {
++ const QString iconName = properties[iconKey].toString();
++ if (!iconName.isEmpty()) {
++ QIcon icon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames));
++ if (!icon.isNull()) {
++ if (!overlay.isNull() && overlayNames.isEmpty()) {
+ overlayIcon(&icon, &overlay);
+ }
++ return {icon, iconName};
+ }
+- } else {
+- icon = imageVectorToPixmap(image);
++ }
++ KDbusImageVector image;
++ properties[pixmapKey].value<QDBusArgument>() >> image;
++ if (!image.isEmpty()) {
++ QIcon icon = imageVectorToPixmap(image);
+ if (!icon.isNull() && !overlay.isNull()) {
+ overlayIcon(&icon, &overlay);
+ }
++ return {icon, QString()};
+ }
+- m_icon = icon;
+- m_iconName = iconName;
+- }
++ return {};
++ };
+
+- // Attention icon
+- {
+- KDbusImageVector image;
+- QIcon attentionIcon;
+-
+- properties[QStringLiteral("AttentionIconPixmap")].value<QDBusArgument>() >> image;
+- if (image.isEmpty()) {
+- QString iconName = properties[QStringLiteral("AttentionIconName")].toString();
+- m_attentionIconName = iconName;
+- if (!iconName.isEmpty()) {
+- attentionIcon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames));
+-
+- if (overlayNames.isEmpty() && !overlay.isNull()) {
+- overlayIcon(&attentionIcon, &overlay);
+- }
+- }
+- } else {
+- attentionIcon = imageVectorToPixmap(image);
+- if (!attentionIcon.isNull() && !overlay.isNull()) {
+- overlayIcon(&attentionIcon, &overlay);
+- }
+- }
+- m_attentionIcon = attentionIcon;
+- }
++ std::tie(m_icon, m_iconName) = loadIcon(QStringLiteral("IconName"), QStringLiteral("IconPixmap"));
++ std::tie(m_attentionIcon, m_attentionIconName) = loadIcon(QStringLiteral("AttentionIconName"), QStringLiteral("AttentionIconPixmap"));
+
+ // ToolTip
+ {
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch
new file mode 100644
index 000000000000..609ab0f011cd
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch
@@ -0,0 +1,34 @@
+From 7795e5fb4f7e2a79e15a9e5711149f71144e73c9 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 13 May 2022 14:43:44 +0800
+Subject: [PATCH 5/8] applets/systemtray: disconnect KConfigLoader signal when
+ instance is about to be deleted
+
+When an applet is about to be deleted, it will save its config
+automatically, but in this case the system tray doesn't need to load the
+config again.
+
+BUG: 453726
+
+
+(cherry picked from commit 6da91d053b4f142277d60db4a1a17eded9249d11)
+---
+ applets/systemtray/systemtray.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp
+index 3b7f688a6..0d889b3f0 100644
+--- a/applets/systemtray/systemtray.cpp
++++ b/applets/systemtray/systemtray.cpp
+@@ -40,6 +40,8 @@ SystemTray::SystemTray(QObject *parent, const KPluginMetaData &data, const QVari
+
+ SystemTray::~SystemTray()
+ {
++ // When the applet is about to be deleted, delete now to avoid calling loadConfig()
++ delete m_settings;
+ }
+
+ void SystemTray::init()
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch
new file mode 100644
index 000000000000..57477173acbb
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch
@@ -0,0 +1,41 @@
+From 1a966d3fb979cf0f0080c805aed248ee77978800 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Mon, 16 May 2022 16:18:00 +0800
+Subject: [PATCH 6/8] kcms/desktoptheme: find metadata.json when loading
+ ThemesModel
+
+Before this commit ThemesModel only finds metadata.desktop, but after
+KF5.94, the default theme metadata files have been ported to json format.
+
+BUG: 453830
+
+
+(cherry picked from commit 10aa9bb8dca91e92e3009ed57613d43d610da63e)
+---
+ kcms/desktoptheme/themesmodel.cpp | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp
+index 6f0ecf4e3..296951742 100644
+--- a/kcms/desktoptheme/themesmodel.cpp
++++ b/kcms/desktoptheme/themesmodel.cpp
+@@ -155,7 +155,15 @@ void ThemesModel::load()
+ const QDir cd(ppath);
+ const QStringList &entries = cd.entryList(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot);
+ for (const QString &pack : entries) {
+- const QString _metadata = ppath + QLatin1Char('/') + pack + QStringLiteral("/metadata.desktop");
++ const QString prefix = QStringLiteral("%1%2%3%4metadata.").arg(ppath, QDir::separator(), pack, QDir::separator());
++
++ QString _metadata = QStringLiteral("%1json").arg(prefix);
++ if (QFile::exists(_metadata)) {
++ themes << _metadata;
++ continue;
++ }
++
++ _metadata = QStringLiteral("%1desktop").arg(prefix);
+ if (QFile::exists(_metadata)) {
+ themes << _metadata;
+ }
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch
new file mode 100644
index 000000000000..2a379c707efe
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch
@@ -0,0 +1,72 @@
+From c602c52578da1331d2466ff9803c7e0b9287c24c Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Mon, 16 May 2022 14:49:46 +0200
+Subject: [PATCH 7/8] kcms/desktoptheme: Fix reading of metadata in ThemesModel
+
+We can not use KConfig to read the desktop file.
+
+CCBUG: 453830
+
+
+(cherry picked from commit 43ae993da35bb408b4fabb5c4514feff97628e0d)
+---
+ kcms/desktoptheme/themesmodel.cpp | 27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp
+index 296951742..ce3cac14b 100644
+--- a/kcms/desktoptheme/themesmodel.cpp
++++ b/kcms/desktoptheme/themesmodel.cpp
+@@ -16,6 +16,7 @@
+
+ #include <KColorScheme>
+ #include <KDesktopFile>
++#include <KPluginMetaData>
+
+ #include <KConfigGroup>
+ #include <KSharedConfig>
+@@ -176,15 +177,25 @@ void ThemesModel::load()
+ int themeNameSepIndex = themeRoot.lastIndexOf(QLatin1Char('/'), -1);
+ const QString packageName = themeRoot.right(themeRoot.length() - themeNameSepIndex - 1);
+
+- KDesktopFile df(theme);
++ QString name;
++ QString comment;
+
+- if (df.noDisplay()) {
+- continue;
+- }
++ if (theme.endsWith(QLatin1String(".json"))) {
++ KPluginMetaData data = KPluginMetaData::fromJsonFile(theme);
++ name = data.name();
++ comment = data.description();
++ } else {
++ KDesktopFile df(theme);
+
+- QString name = df.readName();
+- if (name.isEmpty()) {
+- name = packageName;
++ if (df.noDisplay()) {
++ continue;
++ }
++
++ name = df.readName();
++ if (name.isEmpty()) {
++ name = packageName;
++ }
++ comment = df.readComment();
+ }
+ const bool isLocal = QFileInfo(theme).isWritable();
+ bool hasPluginName = std::any_of(m_data.begin(), m_data.end(), [&](const ThemesModelData &item) {
+@@ -205,7 +216,7 @@ void ThemesModel::load()
+ type = LightTheme;
+ }
+ }
+- ThemesModelData item{name, packageName, df.readComment(), type, isLocal, false};
++ ThemesModelData item{name, packageName, comment, type, isLocal, false};
+ m_data.append(item);
+ }
+ }
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch
new file mode 100644
index 000000000000..594efe7df172
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch
@@ -0,0 +1,39 @@
+From e2b631d43528c3e41d53c8a359b6129c616bc271 Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Sat, 30 Apr 2022 03:20:11 +0300
+Subject: [PATCH 1/8] [sddm-theme] KeyboardButton: Fix layout name not being
+ shown
+
+It used to cause an error like this:
+
+ [03:21:31.246] (WW) GREETER: file:///usr/share/sddm/themes/breeze/KeyboardButton.qml:19: TypeError: Cannot read property 'shortName' of null
+
+(cherry picked from commit 2e9020ca6c1d55842a4b014623f0d88697972000)
+---
+ sddm-theme/KeyboardButton.qml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/sddm-theme/KeyboardButton.qml b/sddm-theme/KeyboardButton.qml
+index d5d5a446c..712096d87 100644
+--- a/sddm-theme/KeyboardButton.qml
++++ b/sddm-theme/KeyboardButton.qml
+@@ -10,7 +10,7 @@ PlasmaComponents.ToolButton {
+
+ property int currentIndex: -1
+
+- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName)
++ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", keyboard.layouts[currentIndex].shortName)
+ implicitWidth: minimumWidth
+
+ visible: menu.items.length > 1
+@@ -27,7 +27,6 @@ PlasmaComponents.ToolButton {
+ onObjectRemoved: keyboardMenu.removeItem( object )
+ delegate: QQC.MenuItem {
+ text: modelData.longName
+- property string shortName: modelData.shortName
+ onTriggered: {
+ keyboard.currentLayout = model.index
+ }
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch
new file mode 100644
index 000000000000..d09b60ce6ce4
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch
@@ -0,0 +1,30 @@
+From dd8f1b5e302717c84f6a05af36c621122ead6d99 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 6 May 2022 21:36:09 +0800
+Subject: [PATCH 4/8] wallpapers/image: Fix missing folder action buttons
+
+The width of the action area needs to be substracted in contentItem's
+width.
+
+Also use `Kirigami.Units.gridUnit * 4` because `overlayWidth` was
+introduced in Frameworks 5.94, and people using Plasma 5.24 may have an
+older Frameworks version.
+---
+ wallpapers/image/imagepackage/contents/ui/config.qml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/wallpapers/image/imagepackage/contents/ui/config.qml b/wallpapers/image/imagepackage/contents/ui/config.qml
+index 97f9f81a5..7bb675f23 100644
+--- a/wallpapers/image/imagepackage/contents/ui/config.qml
++++ b/wallpapers/image/imagepackage/contents/ui/config.qml
+@@ -331,6 +331,7 @@ ColumnLayout {
+ // Don't need a highlight or hover effects
+ hoverEnabled: false
+ contentItem: Kirigami.BasicListItem {
++ width: slidePathsView.width - (parent.hasOwnProperty("overlayWidth") ? overlayWidth : Kirigami.Units.gridUnit * 4)
+ // Don't need a highlight or hover effects
+ hoverEnabled: false
+ separatorVisible: false
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
new file mode 100644
index 000000000000..9fa47cdd5c54
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~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 )
+"
+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.21.5-split-libkworkspace.patch # downstream
+ "${FILESDIR}"/${PN}-5.22.5-krunner-cwd-at-home.patch # TODO upstream: KDE-bug 432975, bug 767478
+ "${FILESDIR}"/${P}-sddm-theme-KeyboardButton-fix-layout-name.patch
+ "${FILESDIR}"/${P}-applets-appmenu-fix-top-level-menu-text-coloration.patch # KDE-bug 453348
+ "${FILESDIR}"/${P}-applets-systemtray-prefer-IconName-over-IconPixmap.patch # KDE-bug 418996
+ "${FILESDIR}"/${P}-wallpapers-image-fix-missing-folder-action-buttons.patch
+ "${FILESDIR}"/${P}-fix-plasmashell-crash-on-panel-w-systray-remove.patch # KDE-bug 453726
+ "${FILESDIR}"/${P}-kcms-desktoptheme-detect-installed-styles-{1,2}.patch # KDE-bug 453830
+ "${FILESDIR}"/${P}-applets-kicker-refresh-RootModel-on-session-backend.patch # KDE-bug 427530
+)
+
+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
+
+ ecm_punt_kf_module Su
+}
+
+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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2024-10-07 22:12 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2024-10-07 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 307d11d726c673e0b6c52d59ff849c63421154b4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 7 21:26:11 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 7 22:09:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=307d11d7
kde-plasma/plasma-workspace: Fix plasma-browser-integration-host crashes
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=488653
Closes: https://bugs.gentoo.org/941139
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...workspace-6.1.5-fix-p-b-i-wayland-crashes.patch | 36 ++++
.../plasma-workspace-6.1.5-r3.ebuild | 234 +++++++++++++++++++++
2 files changed, 270 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-p-b-i-wayland-crashes.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-p-b-i-wayland-crashes.patch
new file mode 100644
index 000000000000..ce519c0e9b7e
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-p-b-i-wayland-crashes.patch
@@ -0,0 +1,36 @@
+From 5751ca2b246b1d43886da13a57539df43793ac8f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven@kde.org>
+Date: Sat, 14 Sep 2024 14:02:26 +0200
+Subject: [PATCH] libtaskmanager/waylandtasksmodel: disconnect from
+ parentWindowChanged in dtor
+
+As windows destruction might happen in any order, destruction of parent window of
+of transient ones will trigger their parentWindowChanged event.
+
+BUG: 488653
+(cherry picked from commit 561646763d994288d771b0efaa9b2a3e45e810fa)
+---
+ libtaskmanager/waylandtasksmodel.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libtaskmanager/waylandtasksmodel.cpp b/libtaskmanager/waylandtasksmodel.cpp
+index 4081b16edf2..85778bc6d59 100644
+--- a/libtaskmanager/waylandtasksmodel.cpp
++++ b/libtaskmanager/waylandtasksmodel.cpp
+@@ -845,7 +845,12 @@ WaylandTasksModel::WaylandTasksModel(QObject *parent)
+ d->init();
+ }
+
+-WaylandTasksModel::~WaylandTasksModel() = default;
++WaylandTasksModel::~WaylandTasksModel()
++{
++ for (auto &window : d->windows) {
++ QObject::disconnect(window.get(), &PlasmaWindow::parentWindowChanged, this, nullptr);
++ }
++}
+
+ QVariant WaylandTasksModel::data(const QModelIndex &index, int role) const
+ {
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r3.ebuild
new file mode 100644
index 000000000000..6ec12c5515aa
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r3.ebuild
@@ -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
+ >=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
+ !<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/kdesu-gui-${PVCUT}:*
+ >=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] )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+ "${FILESDIR}/${P}-fix-wayland-session-restore-saving.patch" # KDE-bug 436318
+ "${FILESDIR}/${P}-fix-x11-logout-w-session-restore.patch" # bug 938925, KDE-bug 488853
+ "${FILESDIR}/${P}-fix-systemsettings-crash.patch" # KDE-bug 486922
+ "${FILESDIR}/${P}-fix-p-b-i-wayland-crashes.patch" # in 6.2; KDE-bug 488653
+)
+
+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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2024-10-07 18:02 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2024-10-07 18:02 UTC (permalink / raw
To: gentoo-commits
commit: a792c7c091e759ad348151b863427cfcbb15ed2d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 7 16:04:24 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 7 18:01:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a792c7c0
kde-plasma/plasma-workspace: drop 6.1.4-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
...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 ---------------------
6 files changed, 395 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 2590c4ecff33..378548fa8eba 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-6.1.4.tar.xz 19294480 BLAKE2B c0ebf51f6f67f43a09dcffe40fae7114b6234719e56053f36600999e289eb42e5d2ca281da0259fa0c60f5b3a3cfef4a8bb912f48cbf05eefc60fb5bc48193ec SHA512 c7ac27c60e75998e2cc6abb96004ce2abd84b7a7978de4fc256bf06892fca818595e2a5dd505768bcce9be4103ccecbb34d82761c0f7be45a402ca6173e90f05
DIST plasma-workspace-6.1.5.tar.xz 19305196 BLAKE2B 4eb75be1404d84519fabdb148accbeb48227aebd2fadeee5c27ba37dc158685b8bf9283f41172dff86dbe07ffe47a62097f873e907dd44ada61a53b3dd1f04b8 SHA512 1b68ddb1d287733ec16900a14b56bf1dbdfb9bce0d10666c1a710612dee6cc786629ea0a924627d58f1268a9594e3bfae587d57bcd7c926bf48b8e914c5d9238
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
deleted file mode 100644
index 2cf7c959d996..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
-
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
deleted file mode 100644
index e7bc079b6577..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
-
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
deleted file mode 100644
index 612dfb871a37..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-svg-images.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
-
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
deleted file mode 100644
index a10a9a84078e..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-
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
deleted file mode 100644
index 736d633f9d19..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r1.ebuild
+++ /dev/null
@@ -1,235 +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.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
- !<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"
-}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2024-09-20 17:11 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2024-09-20 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 0f286d339c6912c9af2b648bba9bb512d370842b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 16:52:12 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 17:11:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f286d33
kde-plasma/plasma-workspace: Fix X11 logout w/ Session Restore enabled
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=488853
Closes: https://bugs.gentoo.org/938925
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ce-6.1.5-fix-x11-logout-w-session-restore.patch | 45 ++++
.../plasma-workspace-6.1.5-r2.ebuild | 232 +++++++++++++++++++++
2 files changed, 277 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-x11-logout-w-session-restore.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-x11-logout-w-session-restore.patch
new file mode 100644
index 000000000000..052ff52bba38
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-x11-logout-w-session-restore.patch
@@ -0,0 +1,45 @@
+From 9bd2dcc8a785d977cdf67a7cbb467423803e3327 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 20 Sep 2024 14:36:11 +0200
+Subject: [PATCH] startkde: Disable session management in our session
+ management
+
+We have two types of session restore, ksmserver for ICE clients and a
+small fallback app that runs after ksmserver for any stragglers.
+
+This fallback app is a gui application, as such it will try and connect
+to ksmserver. This isn't useful and can cause a block.
+
+BUG: 488853
+---
+ startkde/session-restore/restore.cpp | 1 +
+ startkde/session-restore/save.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/startkde/session-restore/restore.cpp b/startkde/session-restore/restore.cpp
+index 2d86215a6f..aecc179139 100644
+--- a/startkde/session-restore/restore.cpp
++++ b/startkde/session-restore/restore.cpp
+@@ -22,6 +22,7 @@ using namespace Qt::StringLiterals;
+
+ int main(int argc, char *argv[])
+ {
++ QCoreApplication::setAttribute(Qt::AA_DisableSessionManager);
+ QGuiApplication a(argc, argv);
+ a.setDesktopSettingsAware(false);
+ a.setApplicationName(u"plasmasessionrestore"_s);
+diff --git a/startkde/session-restore/save.cpp b/startkde/session-restore/save.cpp
+index a2a0fb2086..5e1473ed0b 100644
+--- a/startkde/session-restore/save.cpp
++++ b/startkde/session-restore/save.cpp
+@@ -29,6 +29,7 @@ using namespace Qt::StringLiterals;
+
+ int main(int argc, char *argv[])
+ {
++ QCoreApplication::setAttribute(Qt::AA_DisableSessionManager);
+ QGuiApplication::setDesktopFileName(u"plasma-fallback-session-save"_s);
+ QGuiApplication a(argc, argv);
+ a.setApplicationName(u"plasmasessionrestore"_s);
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild
new file mode 100644
index 000000000000..317637695d40
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild
@@ -0,0 +1,232 @@
+# 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
+ !<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/kdesu-gui-${PVCUT}:*
+ >=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] )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+ "${FILESDIR}/${P}-fix-wayland-session-restore-saving.patch" # KDE-bug 436318
+ "${FILESDIR}/${P}-fix-x11-logout-w-session-restore.patch" # bug 938925, KDE-bug 488853
+)
+
+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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2024-08-12 20:16 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2024-08-12 20:16 UTC (permalink / raw
To: gentoo-commits
commit: c14898232f396019f7c882ed0df560cb72d64f77
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 20:44:16 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 20:16:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1489823
kde-plasma/plasma-workspace: Backport 3 fixes from 6.1.5
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=450579
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=490569
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=491369
Set KFMIN=6.5.0 to be in sync with kde-plasma/kwin-6.1.4-r1.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...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 +++++++++++++++++++++
5 files changed, 394 insertions(+)
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 <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
+
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 <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
+
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 <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
+
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 <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
+
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
+ !<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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2024-06-05 18:57 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2024-06-05 18:57 UTC (permalink / raw
To: gentoo-commits
commit: c1c8413a508c5484dd0d65f8f84862251576da6a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 18:50:45 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 18:57:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c8413a
kde-plasma/plasma-workspace: Fix writing ICEAuthority file
KDE-bug: https://bugs.kde.org/487912
Bug: https://bugs.gentoo.org/933435
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...e-5.27.11.1-fix-writing-iceauthority-file.patch | 66 ++++++
.../plasma-workspace-5.27.11.1-r1.ebuild | 234 +++++++++++++++++++++
2 files changed, 300 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch
new file mode 100644
index 000000000000..ed1b67bbd85f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch
@@ -0,0 +1,66 @@
+From 1181acfe30557d6646511df8d98d82589878a570 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Tue, 4 Jun 2024 12:18:11 +0000
+Subject: [PATCH] Fix writing ICEAuthority file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 9398f6cf8933055b31506ba155aef2fc2b3561d7 "Remove iceauth
+dependency" introduced two bugs:
+
+1) "fp" is never closed, so the generated auth data stays buffered in
+ memory for some indeterminate time and the file stays empty on disk.
+ This completely breaks authentication and thus also session restore.
+
+2) Checking the return value of IceWriteAuthFileEntry() is inverted (the
+ function returns non-zero on success), so warnings are printed iff
+ everything goes well.
+
+BUG: 487912
+
+
+(cherry picked from commit 0dcf34458d99b07a3d9054ae0c86c656e0dfa7aa)
+
+Co-authored-by: Tomáš Trnka <tomastrnka@gmx.com>
+---
+ ksmserver/server.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
+index f88de40dba4..bba6b13ffae 100644
+--- a/ksmserver/server.cpp
++++ b/ksmserver/server.cpp
+@@ -333,7 +333,7 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry *
+ file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1");
+ file_entry->auth_data = strdup((*authDataEntries)[i].auth_data);
+ file_entry->auth_data_length = MAGIC_COOKIE_LEN;
+- if (IceWriteAuthFileEntry(fp, file_entry) != 0) {
++ if (IceWriteAuthFileEntry(fp, file_entry) == 0) {
+ qWarning("Failed to write ice auth file entry");
+ }
+ IceFreeAuthFileEntry(file_entry);
+@@ -357,7 +357,7 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry *
+ file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1");
+ file_entry->auth_data = strdup((*authDataEntries)[i + 1].auth_data);
+ file_entry->auth_data_length = MAGIC_COOKIE_LEN;
+- if (IceWriteAuthFileEntry(fp, file_entry) != 0) {
++ if (IceWriteAuthFileEntry(fp, file_entry) == 0) {
+ qWarning("Failed to write xsmp ice auth file entry");
+ }
+ IceFreeAuthFileEntry(file_entry);
+@@ -366,6 +366,11 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry *
+ IceSetPaAuthData(2, &(*authDataEntries)[i]);
+ }
+
++ if (fclose(fp) != 0) {
++ qWarning() << "Could not close ICEAuthority file";
++ return 0;
++ }
++
+ return (1);
+ }
+
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild
new file mode 100644
index 000000000000..2f283485e222
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild
@@ -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=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/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/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/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+ >=kde-frameworks/kxmlgui-${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/kwayland-${KFMIN}: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
+ >=kde-plasma/libplasma-${KFMIN}:5
+ >=kde-plasma/plasma-activities-${KFMIN}:5
+ >=kde-plasma/plasma-activities-stats-${KFMIN}:5
+ >=media-libs/phonon-4.11.0[qt5(+)]
+ 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-1[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[qt5(+)]
+ 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? ( kde-frameworks/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/qtquickcontrols-${QTMIN}:5[widgets]
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ || (
+ kde-apps/kio-extras-kf5:5
+ kde-apps/kio-extras:5
+ )
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-plasma/kactivitymanagerd-${PVCUT}: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}:*"
+
+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}-fix-writing-iceauthority-file.patch" # bug 933435, KDE-bug 487912
+)
+
+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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2023-09-24 21:47 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2023-09-24 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 88dcc5ac440303a19de568a02ca144613a9cc8b0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 18:56:57 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 21:46:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88dcc5ac
kde-plasma/plasma-workspace: Fix calendar displaying default region
instead of the selected one.
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=472483
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...8-plasmacalendarintegration-holidayregion.patch | 81 +++++++
.../plasma-workspace-5.27.8-r1.ebuild | 232 +++++++++++++++++++++
2 files changed, 313 insertions(+)
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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2023-06-27 11:25 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2023-06-27 11:25 UTC (permalink / raw
To: gentoo-commits
commit: 1d11065d625e334b5e5f4aea7e10991def61497f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 07:38:15 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 11:25:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d11065d
kde-plasma/plasma-workspace: libtaskmanager: fix a potential leak
Upstream commit 19c0022735e74cf028daa93e36d257c804862954
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...-5.27.6-fix-libtaskmanager-potential-leak.patch | 28 +++
.../plasma-workspace-5.27.6-r1.ebuild | 229 +++++++++++++++++++++
2 files changed, 257 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.6-fix-libtaskmanager-potential-leak.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.6-fix-libtaskmanager-potential-leak.patch
new file mode 100644
index 000000000000..18a11b2504e5
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.6-fix-libtaskmanager-potential-leak.patch
@@ -0,0 +1,28 @@
+From 2f67e4b63d664490310e485d59fdd500b7eb0bc5 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 23 Jun 2023 07:55:44 +0800
+Subject: [PATCH] libtaskmanager: fix a potential leak
+
+Pointers in rowMap are not deleted before they are removed in rowMap.
+
+
+(cherry picked from commit 19c0022735e74cf028daa93e36d257c804862954)
+---
+ libtaskmanager/taskgroupingproxymodel.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libtaskmanager/taskgroupingproxymodel.cpp b/libtaskmanager/taskgroupingproxymodel.cpp
+index afdde61d97..ea68bee556 100644
+--- a/libtaskmanager/taskgroupingproxymodel.cpp
++++ b/libtaskmanager/taskgroupingproxymodel.cpp
+@@ -778,6 +778,7 @@ void TaskGroupingProxyModel::setSourceModel(QAbstractItemModel *sourceModel)
+ connect(sourceModel, &QSortFilterProxyModel::modelReset, this, std::bind(&TaskGroupingProxyModel::Private::sourceModelReset, dd));
+ connect(sourceModel, &QSortFilterProxyModel::dataChanged, this, std::bind(&TaskGroupingProxyModel::Private::sourceDataChanged, dd, _1, _2, _3));
+ } else {
++ qDeleteAll(d->rowMap);
+ d->rowMap.clear();
+ }
+
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.6-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.6-r1.ebuild
new file mode 100644
index 000000000000..b2f3659252a4
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.6-r1.ebuild
@@ -0,0 +1,229 @@
+# 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/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[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}-fix-libtaskmanager-potential-leak.patch" # in 5.27.7
+)
+
+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)
+ )
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2023-04-10 18:35 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2023-04-10 18:35 UTC (permalink / raw
To: gentoo-commits
commit: b9e122254eaaa3db6a4874c927a4fd2b074fc5c9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 8 22:40:15 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 18:23:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e12225
kde-plasma/plasma-workspace: drop 5.27.3-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
.../files/plasma-workspace-5.27.3-cmake.patch | 37 ----
...space-5.27.3-dashboard-skip-task-switcher.patch | 33 ---
...pace-5.27.3-nightcolor-fix-timing-strings.patch | 52 -----
.../plasma-workspace-5.27.3-r1.ebuild | 232 ---------------------
5 files changed, 355 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 959576c3c5ec..25888a987361 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,4 +1,3 @@
DIST plasma-workspace-5.26.5.tar.xz 17470516 BLAKE2B 4809ad1ec93e4e6d27b17197457b76f5971ea6c74ac64f64e68ecfe828068f7f33af69bdd03411a4cd0cf8fb26080ebf9c85741eacc0e53d6b782af4eabb4b8a SHA512 9fb840d3f36e1cb25126a715d5599bf89680b0c3ff2a674f07f83246dc15358e15c7e31565d39570e33f6b4d3292822d5fdde05e4795f2eef13e1a0ff2f1c687
-DIST plasma-workspace-5.27.3.tar.xz 18642372 BLAKE2B f77a8c87e3ea89f63b6c796232258d8d82613aea63de038dc7c64ad6b26df4817dcf6c7430cc51a2edf3ea9fa1c4b7c300ced505922a8346c3169ab32fd23b4a SHA512 132db99ff1a81778be928c87f59557cac40547f7ffc92f1738ea1fb575db150590a43838a3a2871e001a7e2975ce91399febfb948e444d2bd42e8a55700af96f
DIST plasma-workspace-5.27.4.1-patchset-1.tar.xz 3496 BLAKE2B 1be7d6eee007225bf7df3dbcff7fc5757d89501920a2b5a3f567c21bb86754aa96b0cebd6ac95c065b3b3f8724f7381ae8349e1b4471538ccbdf5eccefb90936 SHA512 f99099e8645a085a510aafef9793f2ecbd7216aff5f11fac95695a73cd772cbeebe53361435ead1becde84e326c121db657535c0295a225383706b36d88e3c32
DIST plasma-workspace-5.27.4.1.tar.xz 19405228 BLAKE2B 06e92e7c6f81c9c0dc7e2ffc7abbc5b4e121cdfd9adcceffc56464be2890cbccb4d1a25e1f298b080288ec4f87b783cdfaabccfb7dcee469c5defeeb23e4c172 SHA512 f79acb3129d7119937ecec227ebab1b50becc084b1563c1e72aa624502e8f337bd9c825d018d8080bcfcacab3cb53667005e92aa24d0cad9f25a298b1db19ae0
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch
deleted file mode 100644
index e151a214dc4e..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3f81a6559cd48d8735a7b0e7ca7cedac92db8cc8 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 23 Mar 2023 09:32:09 +0100
-Subject: [PATCH] Find PkgConfig before first call to pkg_check_modules
-
-Follow-up to a0d707014150786ba2e508c144b2bc6b8ad8f316
-
-For some reason this would fail only when disabling Fontconfig.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 556e017d8..c05e7275e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,6 +76,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
- PURPOSE "Needed for the File Search runner."
- )
-
-+find_package(PkgConfig REQUIRED)
- pkg_check_modules(QALCULATE libqalculate>2.0 REQUIRED IMPORTED_TARGET)
-
- find_package(KWinDBusInterface CONFIG REQUIRED)
-@@ -151,7 +152,6 @@ else()
- set(HAVE_XFIXES 0)
- endif()
-
--find_package(PkgConfig REQUIRED)
- pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
- add_feature_info(PipeWire PipeWire_FOUND "Required for Wayland screencasting")
-
---
-2.40.0
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-dashboard-skip-task-switcher.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-dashboard-skip-task-switcher.patch
deleted file mode 100644
index 2ebb9aa09fd6..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-dashboard-skip-task-switcher.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 29eb56d4d16c9a5544ba2b1da2369a9ed3190bb7 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 5 Feb 2023 16:49:04 +0100
-Subject: [PATCH] [dashboard] Skip task switcher
-
-CCBUG: 465303
-(cherry picked from commit 813dcc46c125fbdff4a208a23cec0ae1363f7cd8)
----
- applets/kicker/plugin/dashboardwindow.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/applets/kicker/plugin/dashboardwindow.cpp b/applets/kicker/plugin/dashboardwindow.cpp
-index fc6baedcb8..ac7522aab8 100644
---- a/applets/kicker/plugin/dashboardwindow.cpp
-+++ b/applets/kicker/plugin/dashboardwindow.cpp
-@@ -124,12 +124,12 @@ bool DashboardWindow::event(QEvent *event)
- if (event->type() == QEvent::Expose) {
- // FIXME TODO: We can remove this once we depend on Qt 5.6.1+.
- // See: https://bugreports.qt.io/browse/QTBUG-26978
-- KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
-+ KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
- } else if (event->type() == QEvent::PlatformSurface) {
- const QPlatformSurfaceEvent *pSEvent = static_cast<QPlatformSurfaceEvent *>(event);
-
- if (pSEvent->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) {
-- KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
-+ KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
- }
- } else if (event->type() == QEvent::Show) {
- updateTheme();
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-nightcolor-fix-timing-strings.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-nightcolor-fix-timing-strings.patch
deleted file mode 100644
index 9230e2b2354f..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-nightcolor-fix-timing-strings.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 32982eff1abe7653f96f746cc15c0d6d1bbbb249 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 14 Mar 2023 14:29:54 -0600
-Subject: [PATCH] kcms/nightcolor: fix timing strings with narrow window widths
-
-These labels lived in an item that had `anchors.centerIn: parent` set on
-it, which makes it have no maximum width and it can overflow. Clearly it
-was the intent to avoid that, because all the child items had their
-properties set up correctly for it.
-
-To fix this, instead anchor to the parent's size and center the
-contents, and then make the parent fill the available width.
-
-Resolves https://invent.kde.org/plasma/plasma-mobile/-/issues/244
-
-
-(cherry picked from commit 16a243c88b6f5e36ec4d3f9108f2e967b4e97ad8)
----
- kcms/nightcolor/package/contents/ui/main.qml | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/kcms/nightcolor/package/contents/ui/main.qml b/kcms/nightcolor/package/contents/ui/main.qml
-index 60605b3180..c37cc0ea9a 100644
---- a/kcms/nightcolor/package/contents/ui/main.qml
-+++ b/kcms/nightcolor/package/contents/ui/main.qml
-@@ -406,7 +406,7 @@ KCM.SimpleKCM {
- visible: kcm.nightColorSettings.mode === NightColorMode.Automatic || kcm.nightColorSettings.mode === NightColorMode.Location
- && kcm.nightColorSettings.active
- Layout.topMargin: Kirigami.Units.largeSpacing * 4
-- Layout.alignment: Qt.AlignHCenter
-+ Layout.fillWidth: true
-
- Kirigami.LoadingPlaceholder {
- visible: kcm.nightColorSettings.active && kcm.nightColorSettings.mode === NightColorMode.Automatic && (!locator || !root.doneLocating)
-@@ -416,9 +416,13 @@ KCM.SimpleKCM {
-
- TimingsView {
- id: timings
-+ anchors {
-+ top: parent.top
-+ left: parent.left
-+ right: parent.right
-+ }
- visible: kcm.nightColorSettings.mode === NightColorMode.Location ||
- (kcm.nightColorSettings.mode === NightColorMode.Automatic && root.doneLocating) && kcm.nightColorSettings.active
-- anchors.centerIn: parent
- enabled: kcm.nightColorSettings.active
- latitude: kcm.nightColorSettings.mode === NightColorMode.Automatic
- && (locator !== undefined) ? locator.latitude : kcm.nightColorSettings.latitudeFixed
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild
deleted file mode 100644
index f228665007ac..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# 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.102.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.7
-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 +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/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[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}-dashboard-skip-task-switcher.patch" # KDE-bug 465303
- "${FILESDIR}/${P}-nightcolor-fix-timing-strings.patch"
- "${FILESDIR}/${P}-cmake.patch" # bug 902797
-)
-
-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)
- )
-
- 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"
-}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2023-03-23 8:39 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2023-03-23 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 6c1679c37a015b3aff52c786d2cff6adb3e82e92
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 08:38:18 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 08:39:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1679c3
kde-plasma/plasma-workspace: Fix cmake
Closes: https://bugs.gentoo.org/902797
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-workspace-5.27.3-cmake.patch | 37 ++++++++++++++++++++++
.../plasma-workspace-5.27.3-r1.ebuild | 1 +
2 files changed, 38 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch
new file mode 100644
index 000000000000..e151a214dc4e
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch
@@ -0,0 +1,37 @@
+From 3f81a6559cd48d8735a7b0e7ca7cedac92db8cc8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 23 Mar 2023 09:32:09 +0100
+Subject: [PATCH] Find PkgConfig before first call to pkg_check_modules
+
+Follow-up to a0d707014150786ba2e508c144b2bc6b8ad8f316
+
+For some reason this would fail only when disabling Fontconfig.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 556e017d8..c05e7275e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,6 +76,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
+ PURPOSE "Needed for the File Search runner."
+ )
+
++find_package(PkgConfig REQUIRED)
+ pkg_check_modules(QALCULATE libqalculate>2.0 REQUIRED IMPORTED_TARGET)
+
+ find_package(KWinDBusInterface CONFIG REQUIRED)
+@@ -151,7 +152,6 @@ else()
+ set(HAVE_XFIXES 0)
+ endif()
+
+-find_package(PkgConfig REQUIRED)
+ pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
+ add_feature_info(PipeWire PipeWire_FOUND "Required for Wayland screencasting")
+
+--
+2.40.0
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild
index b62e1cf969f0..f228665007ac 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild
@@ -164,6 +164,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
"${FILESDIR}/${P}-dashboard-skip-task-switcher.patch" # KDE-bug 465303
"${FILESDIR}/${P}-nightcolor-fix-timing-strings.patch"
+ "${FILESDIR}/${P}-cmake.patch" # bug 902797
)
src_prepare() {
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2023-02-01 9:47 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2023-02-01 9:47 UTC (permalink / raw
To: gentoo-commits
commit: 54e164077a2805c816cc73d1db94af629fec2efe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 08:32:33 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 09:26:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e16407
kde-plasma/plasma-workspace: drop 5.25.5-r5
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
....25.5-delay-ksplash-until-after-env-setup.patch | 82 --------
.../plasma-workspace-5.25.5-fix-setpassword.patch | 39 ----
...5-fonts-honor-and-present-system-defaults.patch | 55 -----
...sma-workspace-5.25.5-geolocation-deadlock.patch | 194 -----------------
.../plasma-workspace-5.25.5-layout-save.patch | 33 ---
.../plasma-workspace-5.25.5-lock-layout.patch | 113 ----------
...ace-5.25.5-prevent-panel-go-out-of-screen.patch | 25 ---
.../files/plasma-workspace-5.25.5-relayout.patch | 22 --
...a-workspace-5.25.5-systray-double-destroy.patch | 24 ---
....25.5-widgetexplorer-recurse-containments.patch | 26 ---
.../plasma-workspace-5.25.5-r5.ebuild | 229 ---------------------
12 files changed, 843 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index e52db83c3114..1d9403c158d7 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-workspace-5.25.5.tar.xz 18638932 BLAKE2B f83aabf84b775c0bf9d1e60db03f94400e3363fa8f45767bdc471706682cda7323fae4948cffa156188cc7ed2d30d05349a385dd370ef941c16464ddddf8fa01 SHA512 0c6cf5104b584b34a8bcb45d57069fed3b25e871fccf1bfefd47d8fc1b595867c1c4f0fcfcc0e07847534e1e77ce8ed1f3be1ac6cb7eea8669a9c7649c8466cb
DIST plasma-workspace-5.26.5.tar.xz 17470516 BLAKE2B 4809ad1ec93e4e6d27b17197457b76f5971ea6c74ac64f64e68ecfe828068f7f33af69bdd03411a4cd0cf8fb26080ebf9c85741eacc0e53d6b782af4eabb4b8a SHA512 9fb840d3f36e1cb25126a715d5599bf89680b0c3ff2a674f07f83246dc15358e15c7e31565d39570e33f6b4d3292822d5fdde05e4795f2eef13e1a0ff2f1c687
DIST plasma-workspace-5.26.90.tar.xz 18481828 BLAKE2B 1594718737ae9f7be98a6e06b691e61bb519cf73755af01ce0a5a1b58a2172a9003974e2a85d0c000edf579139e6ef9a8800d071167812522f492f6b17de7479 SHA512 ecd3a107496e7a6d1a9e9093118f9cf4e1a8746140302e201dc48ba896b5b7d51e4dfa13bd87c3a7e8548221c978470d0635fe1221205a412b66e5c585a634ac
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-delay-ksplash-until-after-env-setup.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-delay-ksplash-until-after-env-setup.patch
deleted file mode 100644
index 9fcea5a32cbe..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-delay-ksplash-until-after-env-setup.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 536ba654e43741a18d2b71ee519f1daefeaa7ffd Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Sat, 4 Jun 2022 18:15:10 +0800
-Subject: [PATCH 1/2] startkde: `Q_UNUSED` ksplash
-
-Variable 'ksplash' is assigned a value that is never used. (CWE-563)
-
-(cherry picked from commit 6bebf9a7e636d6655ede49ce48d33f2254ac75f0)
----
- startkde/startplasma-x11.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
-index 817de3511..a80c515fc 100644
---- a/startkde/startplasma-x11.cpp
-+++ b/startkde/startplasma-x11.cpp
-@@ -59,6 +59,7 @@ int main(int argc, char **argv)
-
- setupCursor(false);
- QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash());
-+ Q_UNUSED(ksplash)
-
- runEnvironmentScripts();
-
---
-2.37.3
-
-
-From 5e54fbd0b351e43cb68c193bf684dd8cdbd11210 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 13 Sep 2022 13:54:04 +0200
-Subject: [PATCH 2/2] delay ksplash until after env is set up
-
-otherwise we can dbus invoke with the wrong environment. specifically
-this happens with the latest qtbase changes that introduced color
-picking support on wayland. when we start a qguiapplication with
-incomplete environment that dbus invokes the xdg-portal system and that
-in turn has an incomplete environment resulting in theming and the likes
-not properly applying because the portal doesn't know that it runs
-inside a plasma session.
-
-https://invent.kde.org/qt/qt/qtbase/-/commit/2dc083df009a45c5dacfea27b0affeb85b01f847
-
-BUG: 458865
-(cherry picked from commit 9bf0e56da84de5e9bd2b3ff28bdb2cb1af6de91e)
-
-asturmlechner 2022-09-14: Backported to Plasma/5.25 branch
----
- startkde/startplasma-x11.cpp | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
-index a80c515fc..d1722771b 100644
---- a/startkde/startplasma-x11.cpp
-+++ b/startkde/startplasma-x11.cpp
-@@ -57,10 +57,6 @@ int main(int argc, char **argv)
- }
- }
-
-- setupCursor(false);
-- QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash());
-- Q_UNUSED(ksplash)
--
- runEnvironmentScripts();
-
- out << "startkde: Starting up...\n";
-@@ -80,6 +76,12 @@ int main(int argc, char **argv)
- // variables (e.g. LANG and LC_*)
- importSystemdEnvrionment();
-
-+ // NOTE: Do not start QGuiApplications before setting up the environment. We'd be at risk of dbus invoking other
-+ // processes with an incomplete environment.
-+ setupCursor(false);
-+ QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash());
-+ Q_UNUSED(ksplash)
-+
- if (!startPlasmaSession(false))
- return 1;
-
---
-2.37.3
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fix-setpassword.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fix-setpassword.patch
deleted file mode 100644
index 7351b8808819..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fix-setpassword.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 84dcfc45b9a354827b9bbf6ae58902d04e8fe915 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Wed, 28 Sep 2022 11:33:33 +0200
-Subject: [PATCH] set setInteractiveAuthorizationAllowed on SetPassword call
-
-is important that the setpasswod call uses interactive authorization,
-otherwise will be denied, unless the user had been modified beforehand
-so an authorization was already granted
-
-BUG:459309
----
- kcms/users/src/user.cpp | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/kcms/users/src/user.cpp b/kcms/users/src/user.cpp
-index 020ebee097..87745582c5 100644
---- a/kcms/users/src/user.cpp
-+++ b/kcms/users/src/user.cpp
-@@ -217,9 +217,14 @@ void User::setPassword(const QString &password)
- {
- // Blocking because we need to wait for the password to be changed before we
- // can ask the user about also possibly changing their KWallet password
-- auto invocation = m_dbusIface->SetPassword(saltPassword(password), QString());
-- invocation.waitForFinished();
-- if (!invocation.isError()) {
-+
-+ auto mc = QDBusMessage::createMethodCall(m_dbusIface->service(), m_dbusIface->path(), m_dbusIface->interface(), "SetPassword");
-+ mc.setArguments({saltPassword(password), QString()});
-+ mc.setInteractiveAuthorizationAllowed(true);
-+ auto message = QDBusConnection::systemBus().call(mc);
-+
-+ // Not an error or invalid message
-+ if (message.type() == QDBusMessage::ReplyMessage) {
- Q_EMIT passwordSuccessfullyChanged();
- }
- }
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch
deleted file mode 100644
index 4e2b579646fc..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From dc24b7c1c4e2c9dfb74090f716da029e44e209ff Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Mon, 19 Sep 2022 12:39:54 +0200
-Subject: [PATCH] fonts: honor & present system defaults
-
-previously we'd pretend that a missing value meant our "plasma-ish"
-defaults would apply but that is utterly false. when no hitting is set,
-no hinting is set. this can happen when the system default fontconfigs
-don't set up any hinting.
-
-BUG: 416140
-
-
-(cherry picked from commit 5dd8cc919f54bf28152a80e1fa6f3f649ea4e47a)
----
- kcms/fonts/fontsaasettings.cpp | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/kcms/fonts/fontsaasettings.cpp b/kcms/fonts/fontsaasettings.cpp
-index a7159b0e63..e7192aa89d 100644
---- a/kcms/fonts/fontsaasettings.cpp
-+++ b/kcms/fonts/fontsaasettings.cpp
-@@ -1,5 +1,6 @@
- /*
- SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>
-+ SPDX-FileCopyrightText: 2022 Harald Sitter <sitter@kde.org>
-
- SPDX-License-Identifier: GPL-2.0-or-later
- */
-@@ -211,18 +212,18 @@ public:
- // sub pixel
- KXftConfig::SubPixel::Type spType = KXftConfig::SubPixel::NotSet;
- xft.getSubPixelType(spType);
-- // if it is not set, we set it to rgb
-+ // if it is not set, we have no subpixel hinting
- if (spType == KXftConfig::SubPixel::NotSet) {
-- spType = KXftConfig::SubPixel::Rgb;
-+ spType = KXftConfig::SubPixel::None;
- }
- setSubPixel(spType);
-
- // hinting
- KXftConfig::Hint::Style hStyle = KXftConfig::Hint::NotSet;
- xft.getHintStyle(hStyle);
-- // if it is not set, we set it to slight hinting
-+ // if it is not set, we have no hinting
- if (hStyle == KXftConfig::Hint::NotSet) {
-- hStyle = KXftConfig::Hint::Slight;
-+ hStyle = KXftConfig::Hint::None;
- }
- setHinting(hStyle);
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-geolocation-deadlock.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-geolocation-deadlock.patch
deleted file mode 100644
index 70bd28419472..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-geolocation-deadlock.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-https://invent.kde.org/plasma/plasma-workspace/-/commit/d693026676cc6bf2b7c23e9ff4b620679cf15d10
-
-From d693026676cc6bf2b7c23e9ff4b620679cf15d10 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 15 Aug 2022 18:36:56 +0200
-Subject: [PATCH] [dataengines/geolocation] Port from KIO::http_post to
- QNetworkAccessManager
-
-Not only does this slightly simplify the code, it also avoids a deadlock in kded when automatic proxy detection is enabled
-
-BUG: 449984
-
-BUG: 457341
-(cherry picked from commit 98cadd48c21c89b81fdeb3499a557a6551a09d8a)
----
- dataengines/geolocation/CMakeLists.txt | 2 +-
- dataengines/geolocation/location_ip.cpp | 84 ++++++++++---------------
- 2 files changed, 35 insertions(+), 51 deletions(-)
-
-diff --git a/dataengines/geolocation/CMakeLists.txt b/dataengines/geolocation/CMakeLists.txt
-index 175687bd4d..6ae707643c 100644
---- a/dataengines/geolocation/CMakeLists.txt
-+++ b/dataengines/geolocation/CMakeLists.txt
-@@ -36,7 +36,7 @@ target_link_libraries(plasma_engine_geolocation
- kcoreaddons_add_plugin(plasma-geolocation-ip SOURCES location_ip.cpp INSTALL_NAMESPACE plasma/geolocationprovider)
- ecm_qt_declare_logging_category(plasma-geolocation-ip HEADER geolocdebug.h IDENTIFIER DATAENGINE_GEOLOCATION CATEGORY_NAME org.kde.plasma.dataengine.geolocation)
- target_compile_definitions(plasma-geolocation-ip PRIVATE -DQT_NO_KEYWORDS)
--target_link_libraries(plasma-geolocation-ip plasma-geolocation-interface KF5::KIOCore KF5::NetworkManagerQt)
-+target_link_libraries(plasma-geolocation-ip plasma-geolocation-interface KF5::NetworkManagerQt)
-
- pkg_check_modules(LIBGPS libgps IMPORTED_TARGET)
-
-diff --git a/dataengines/geolocation/location_ip.cpp b/dataengines/geolocation/location_ip.cpp
-index 27b530810c..3c5a202b89 100644
---- a/dataengines/geolocation/location_ip.cpp
-+++ b/dataengines/geolocation/location_ip.cpp
-@@ -12,15 +12,14 @@
-
- #include "location_ip.h"
- #include "geolocdebug.h"
--#include <KIO/Job>
--#include <KIO/TransferJob>
--#include <KJob>
- #include <KSharedConfig>
- #include <NetworkManagerQt/Manager>
- #include <NetworkManagerQt/WirelessDevice>
- #include <QJsonArray>
- #include <QJsonDocument>
- #include <QJsonObject>
-+#include <QNetworkAccessManager>
-+#include <QNetworkReply>
- #include <QUrl>
-
- class Ip::Private : public QObject
-@@ -30,19 +29,21 @@ public:
- Private(Ip *q)
- : q(q)
- {
-+ m_nam.setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
-+ m_nam.setStrictTransportSecurityEnabled(true);
-+ m_nam.enableStrictTransportSecurityStore(true,
-+ QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1String("/plasmashell/hsts/"));
- }
-
-- void readGeoLocation(KJob *job)
-+ void readGeoLocation(QNetworkReply *reply)
- {
- m_geoLocationResolved = true;
-- if (job && job->error()) {
-- qCCritical(DATAENGINE_GEOLOCATION) << "error: " << job->errorString();
-- m_geoLocationPayload.clear();
-+ if (reply->error()) {
-+ qCCritical(DATAENGINE_GEOLOCATION) << "error: " << reply->errorString();
- checkUpdateData();
- return;
- }
-- const QJsonObject json = QJsonDocument::fromJson(m_geoLocationPayload).object();
-- m_geoLocationPayload.clear();
-+ const QJsonObject json = QJsonDocument::fromJson(reply->readAll()).object();
-
- auto accuracyIt = json.find(QStringLiteral("accuracy"));
- if (accuracyIt != json.end()) {
-@@ -62,52 +63,28 @@ public:
-
- void clear()
- {
-- m_geoLocationPayload.clear();
-- m_countryPayload.clear();
- m_countryResolved = false;
- m_geoLocationResolved = false;
- m_data.clear();
- }
-
-- void geoLocationData(KIO::Job *job, const QByteArray &data)
-- {
-- Q_UNUSED(job)
--
-- if (data.isEmpty()) {
-- return;
-- }
-- m_geoLocationPayload.append(data);
-- }
--
-- void countryData(KIO::Job *job, const QByteArray &data)
-- {
-- Q_UNUSED(job)
--
-- if (data.isEmpty()) {
-- return;
-- }
-- m_countryPayload.append(data);
-- }
--
-- void readCountry(KJob *job)
-+ void readCountry(QNetworkReply *reply)
- {
- m_countryResolved = true;
-- if (job && job->error()) {
-- qCCritical(DATAENGINE_GEOLOCATION) << "error: " << job->errorString();
-- m_countryPayload.clear();
-+ if (reply->error()) {
-+ qCCritical(DATAENGINE_GEOLOCATION) << "error: " << reply->errorString();
- checkUpdateData();
- return;
- }
-
-- const QJsonObject json = QJsonDocument::fromJson(m_countryPayload).object();
-- m_countryPayload.clear();
-+ const QJsonObject json = QJsonDocument::fromJson(reply->readAll()).object();
-
- m_data[QStringLiteral("country")] = json.value(QStringLiteral("country_name")).toString();
- m_data[QStringLiteral("country code")] = json.value(QStringLiteral("country_code")).toString();
-+
- checkUpdateData();
- }
-
--private:
- void checkUpdateData()
- {
- if (!m_countryResolved || !m_geoLocationResolved) {
-@@ -117,11 +94,10 @@ private:
- }
-
- Ip *q;
-- QByteArray m_geoLocationPayload;
-- QByteArray m_countryPayload;
- bool m_countryResolved = false;
- bool m_geoLocationResolved = false;
- Plasma::DataEngine::Data m_data;
-+ QNetworkAccessManager m_nam;
- };
-
- Ip::Ip(QObject *parent, const QVariantList &args)
-@@ -176,18 +152,26 @@ void Ip::update()
- }
- const QByteArray postData = QJsonDocument(request).toJson(QJsonDocument::Compact);
- const QString apiKey = QStringLiteral("60e8eae6-3988-4ada-ad48-2cfddddf216b");
-- KIO::TransferJob *datajob =
-- KIO::http_post(QUrl(QStringLiteral("https://location.services.mozilla.com/v1/geolocate?key=%1").arg(apiKey)), postData, KIO::HideProgressInfo);
-- datajob->addMetaData(QStringLiteral("content-type"), QStringLiteral("application/json"));
-
- qCDebug(DATAENGINE_GEOLOCATION) << "Fetching https://location.services.mozilla.com/v1/geolocate";
-- connect(datajob, &KIO::TransferJob::data, d, &Ip::Private::geoLocationData);
-- connect(datajob, &KIO::TransferJob::result, d, &Ip::Private::readGeoLocation);
--
-- datajob = KIO::http_post(QUrl(QStringLiteral("https://location.services.mozilla.com/v1/country?key=%1").arg(apiKey)), postData, KIO::HideProgressInfo);
-- datajob->addMetaData(QStringLiteral("content-type"), QStringLiteral("application/json"));
-- connect(datajob, &KIO::TransferJob::data, d, &Ip::Private::countryData);
-- connect(datajob, &KIO::TransferJob::result, d, &Ip::Private::readCountry);
-+ QNetworkRequest locationRequest(QUrl(QStringLiteral("https://location.services.mozilla.com/v1/geolocate?key=%1").arg(apiKey)));
-+ locationRequest.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/json"));
-+ QNetworkReply *locationReply = d->m_nam.post(locationRequest, postData);
-+
-+ connect(locationReply, &QNetworkReply::finished, this, [this, locationReply] {
-+ locationReply->deleteLater();
-+ d->readGeoLocation(locationReply);
-+ });
-+
-+ qCDebug(DATAENGINE_GEOLOCATION) << "Fetching https://location.services.mozilla.com/v1/country";
-+ QNetworkRequest countryRequest(QUrl(QStringLiteral("https://location.services.mozilla.com/v1/country?key=%1").arg(apiKey)));
-+ countryRequest.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/json"));
-+ QNetworkReply *countryReply = d->m_nam.post(countryRequest, postData);
-+
-+ connect(countryReply, &QNetworkReply::finished, this, [this, countryReply] {
-+ countryReply->deleteLater();
-+ d->readCountry(countryReply);
-+ });
- }
-
- K_PLUGIN_CLASS_WITH_JSON(Ip, "plasma-geolocation-ip.json")
---
-GitLab
-
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-layout-save.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-layout-save.patch
deleted file mode 100644
index ed298549128a..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-layout-save.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://invent.kde.org/plasma/plasma-workspace/-/commit/b983f1c758552346083ffe0b3d47173b487ae426
-
-From b983f1c758552346083ffe0b3d47173b487ae426 Mon Sep 17 00:00:00 2001
-From: Aaron Rainbolt <arraybolt3@gmail.com>
-Date: Wed, 19 Oct 2022 14:16:26 -0500
-Subject: [PATCH] Save layout immediately after a resolution change triggered
- relayout
-
-(cherry picked from commit f33cd92fbfb765299018bddc2a86ac5326731231)
----
- components/containmentlayoutmanager/appletslayout.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/components/containmentlayoutmanager/appletslayout.cpp b/components/containmentlayoutmanager/appletslayout.cpp
-index 70970e8919..c3e957cbd9 100644
---- a/components/containmentlayoutmanager/appletslayout.cpp
-+++ b/components/containmentlayoutmanager/appletslayout.cpp
-@@ -80,6 +80,11 @@ AppletsLayout::AppletsLayout(QQuickItem *parent)
- } else if (!m_geometryBeforeResolutionChange.isEmpty()) {
- m_layoutManager->layoutGeometryChanged(newGeom, m_geometryBeforeResolutionChange);
- m_geometryBeforeResolutionChange = QRectF();
-+
-+ // If the user doesn't move a widget after this is done, the widget positions won't be saved and they will be in the wrong
-+ // places on next login, so save them now.
-+
-+ save();
- }
- }
- m_layoutChanges = NoChange;
---
-GitLab
-
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-lock-layout.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-lock-layout.patch
deleted file mode 100644
index 422b22a678dd..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-lock-layout.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-https://invent.kde.org/plasma/plasma-workspace/-/commit/0a01c8910309fb9f289fe0aa58492e106d154548
-
-From 0a01c8910309fb9f289fe0aa58492e106d154548 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Sun, 25 Sep 2022 16:47:31 -0500
-Subject: [PATCH] Introduce a lock that blocks relayouts and config writes
-
-The resize of the layout area can happen either by screen resolution
-change or available screen area change (a panel appears or is resized)
-This is not an atomic operation, as width and height are usually set in
-2 different operations, and even worse the layout area is resized to
- match the available one with an animation, so many intermediate resizes
-that should never cause a relayout happen.
-In normal operation an event compression timer limits the actual
-relayouts to hopefully one, but if the system is really slowed down
-(for instance, startup) the timer may expire and cause relayouts in
-non useful sizes, losing the needed configuration
-In combination with
-
-The lock blocks all relayout and config writes when the size of the
-layout area doesn't correspond to corona availablescreenrect, which are
-the only "settled" cases.
-
-BUG:413645
---- a/components/containmentlayoutmanager/appletslayout.cpp
-+++ b/components/containmentlayoutmanager/appletslayout.cpp
-@@ -56,9 +56,10 @@ AppletsLayout::AppletsLayout(QQuickItem *parent)
- connect(m_layoutChangeTimer, &QTimer::timeout, this, [this]() {
- // We can't assume m_containment to be valid: if we load in a plasmoid that can run also
- // in "applet" mode, m_containment will never be valid
-- if (!m_containment) {
-+ if (!m_containment || width() <= 0 || height() <= 0 || m_relayoutLock) {
- return;
- }
-+
- const QString &serializedConfig = m_containment->config().readEntry(m_configKey, "");
- if ((m_layoutChanges & ConfigKeyChange) && !serializedConfig.isEmpty()) {
- if (!m_configKey.isEmpty() && m_containment) {
-@@ -169,6 +170,27 @@ void AppletsLayout::setFallbackConfigKey(const QString &key)
- Q_EMIT fallbackConfigKeyChanged();
- }
-
-+bool AppletsLayout::relayoutLock() const
-+{
-+ return m_relayoutLock;
-+}
-+
-+void AppletsLayout::setRelayoutLock(bool lock)
-+{
-+ if (lock == m_relayoutLock) {
-+ return;
-+ }
-+
-+ m_relayoutLock = lock;
-+
-+ if (!lock && m_layoutChanges != NoChange) {
-+ m_layoutChangeTimer->start();
-+ }
-+
-+ Q_EMIT relayoutLockChanged();
-+}
-+
-+
- QJSValue AppletsLayout::acceptsAppletCallback() const
- {
- return m_acceptsAppletCallback;
-@@ -468,7 +490,7 @@ void AppletsLayout::geometryChanged(const QRectF &newGeometry, const QRectF &old
- }
-
- // Only do a layouting procedure if we received a valid size
-- if (!newGeometry.isEmpty()) {
-+ if (!newGeometry.isEmpty() && newGeometry != oldGeometry) {
- m_layoutChanges |= SizeChange;
- m_layoutChangeTimer->start();
- }
---- a/components/containmentlayoutmanager/appletslayout.h
-+++ b/components/containmentlayoutmanager/appletslayout.h
-@@ -39,6 +39,8 @@ class AppletsLayout : public QQuickItem
- // from the screen size and plasma starts on an "unexpected" size
- Q_PROPERTY(QString fallbackConfigKey READ fallbackConfigKey WRITE setFallbackConfigKey NOTIFY fallbackConfigKeyChanged)
-
-+ Q_PROPERTY(bool relayoutLock READ relayoutLock WRITE setRelayoutLock NOTIFY relayoutLockChanged)
-+
- Q_PROPERTY(PlasmaQuick::AppletQuickItem *containment READ containment WRITE setContainment NOTIFY containmentChanged)
-
- Q_PROPERTY(QJSValue acceptsAppletCallback READ acceptsAppletCallback WRITE setAcceptsAppletCallback NOTIFY acceptsAppletCallbackChanged)
-@@ -103,6 +105,9 @@ public:
- QString fallbackConfigKey() const;
- void setFallbackConfigKey(const QString &key);
-
-+ bool relayoutLock() const;
-+ void setRelayoutLock(bool lock);
-+
- PlasmaQuick::AppletQuickItem *containment() const;
- void setContainment(PlasmaQuick::AppletQuickItem *containment);
-
-@@ -162,6 +167,7 @@ Q_SIGNALS:
-
- void configKeyChanged();
- void fallbackConfigKeyChanged();
-+ void relayoutLockChanged();
- void containmentChanged();
- void minimumItemWidthChanged();
- void minimumItemHeightChanged();
-@@ -226,6 +232,7 @@ private:
- QPointF m_mouseDownPosition = QPoint(-1, -1);
- bool m_mouseDownWasEditMode = false;
- bool m_editMode = false;
-+ bool m_relayoutLock = false;
- };
-
- Q_DECLARE_OPERATORS_FOR_FLAGS(AppletsLayout::LayoutChanges)
-GitLab
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
deleted file mode 100644
index ef94ed3afa00..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9c7ac7061c5c85d63875eaee70793ba04334c1d0 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Fri, 16 Sep 2022 14:34:27 +0000
-Subject: [PATCH] Revert "Revert "Prevent panel going out of screen
- boundaries""
-
-This reverts commit 17774bc4c673294a7c8a6e80660d83cce1ba8891
-
-There is still a known culprit (duplicate display names) so the hack shouldn't be reverted.
-
-CCBUG: 353975
-CCBUG: 438114
---- a/shell/panelview.cpp
-+++ b/shell/panelview.cpp
-@@ -859,6 +859,9 @@ void PanelView::moveEvent(QMoveEvent *ev)
- updateEnabledBorders();
- m_strutsTimer.start(STRUTSTIMERDELAY);
- PlasmaQuick::ContainmentView::moveEvent(ev);
-+ if (m_screenToFollow && !m_screenToFollow->geometry().contains(geometry())) {
-+ positionPanel();
-+ }
- }
-
- void PanelView::keyPressEvent(QKeyEvent *event)
-GitLab
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-relayout.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-relayout.patch
deleted file mode 100644
index efd211c26de4..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-relayout.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://invent.kde.org/plasma/plasma-workspace/-/commit/f30431c9ed0bb70506cbc72ea337323660a0dc14
-
-From f30431c9ed0bb70506cbc72ea337323660a0dc14 Mon Sep 17 00:00:00 2001
-From: Aaron Rainbolt <arraybolt3@gmail.com>
-Date: Wed, 19 Oct 2022 14:15:16 -0500
-Subject: [PATCH] Remove unnecessary heuristic relayout function call
-
-(cherry picked from commit c344410a061862dd4802581a1ac3b9a09758ace0)
---- a/components/containmentlayoutmanager/appletslayout.cpp
-+++ b/components/containmentlayoutmanager/appletslayout.cpp
-@@ -80,10 +80,6 @@ AppletsLayout::AppletsLayout(QQuickItem *parent)
- } else if (!m_geometryBeforeResolutionChange.isEmpty()) {
- m_layoutManager->layoutGeometryChanged(newGeom, m_geometryBeforeResolutionChange);
- m_geometryBeforeResolutionChange = QRectF();
--
-- // Heuristically relayout items only when the plasma startup is fully completed
-- } else {
-- polish();
- }
- }
- m_layoutChanges = NoChange;
-GitLab
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-systray-double-destroy.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-systray-double-destroy.patch
deleted file mode 100644
index 3719f2dcae7a..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-systray-double-destroy.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://invent.kde.org/plasma/plasma-workspace/-/commit/432d7c4b51c5a1f17af327d770266b3fe81e5ae5
-
-From 432d7c4b51c5a1f17af327d770266b3fe81e5ae5 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Tue, 27 Sep 2022 18:04:51 +0200
-Subject: [PATCH] [applets/systemtray] Don't manually destroy innerContainment
-
-It's already destroyed by the corona
-
-BUG: 420245
-(cherry picked from commit 7baa4c221e45f161adf4e00d4cf0e36d6436e90c)
---- a/applets/systemtray/container/systemtraycontainer.cpp
-+++ b/applets/systemtray/container/systemtraycontainer.cpp
-@@ -20,9 +20,6 @@ SystemTrayContainer::SystemTrayContainer(QObject *parent, const KPluginMetaData
-
- SystemTrayContainer::~SystemTrayContainer()
- {
-- if (destroyed()) {
-- m_innerContainment->destroy();
-- }
- }
-
- void SystemTrayContainer::init()
-GitLab
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
deleted file mode 100644
index 1efe75b9b41d..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-widgetexplorer-recurse-containments.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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-r5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r5.ebuild
deleted file mode 100644
index c642d1cafc2d..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r5.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# 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.99.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/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/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
- "${FILESDIR}/${P}-delay-ksplash-until-after-env-setup.patch" # KDE-bug 458865 w/ Qt 5.15.6
- "${FILESDIR}/${P}-fonts-honor-and-present-system-defaults.patch" # KDE-bug 416140
- "${FILESDIR}/${P}-prevent-panel-go-out-of-screen.patch" # git master and Plasma/5.24 branch double revert
- "${FILESDIR}/${P}-fix-setpassword.patch" # Plasma/5.25 branch, KDE-bug 459309
- "${FILESDIR}/${P}-systray-double-destroy.patch" # Plasma/5.24 branch, KDE-bug 420245
- "${FILESDIR}/${P}-geolocation-deadlock.patch" # Plasma/5.24 branch, KDE-bug 449984, KDE-bug 457341
- "${FILESDIR}/${P}-lock-layout.patch" # Plasma/5.24 branch, KDE-bug 413645
- "${FILESDIR}/${P}-relayout.patch" # Plasma/5.24 branch
- "${FILESDIR}/${P}-layout-save.patch" # Plasma/5.24 branch
-)
-
-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"
-}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2022-11-30 1:44 Sam James
0 siblings, 0 replies; 44+ messages in thread
From: Sam James @ 2022-11-30 1:44 UTC (permalink / raw
To: gentoo-commits
commit: 1fde9bdcfb26c7bb0ae09d9954106108a203bd36
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 09:18:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 01:42:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fde9bdc
kde-plasma/plasma-workspace: backport upstream fixes for 5.25.5
Upstream commit: 432d7c4b51c5a1f17af327d770266b3fe81e5ae5
Upstream commit: d693026676cc6bf2b7c23e9ff4b620679cf15d10
Upstream commit: 0a01c8910309fb9f289fe0aa58492e106d154548
Upstream commit: f30431c9ed0bb70506cbc72ea337323660a0dc14
Upstream commit: b983f1c758552346083ffe0b3d47173b487ae426
KDE-bug: https://bugs.kde.org/420245
KDE-bug: https://bugs.kde.org/449984
KDE-bug: https://bugs.kde.org/457341
KDE-bug: https://bugs.kde.org/413645
Bug: https://bugs.gentoo.org/883289
Signed-off-by: Sam James <sam <AT> gentoo.org>
...sma-workspace-5.25.5-geolocation-deadlock.patch | 194 +++++++++++++++++
.../plasma-workspace-5.25.5-layout-save.patch | 33 +++
.../plasma-workspace-5.25.5-lock-layout.patch | 113 ++++++++++
...ace-5.25.5-prevent-panel-go-out-of-screen.patch | 8 -
.../files/plasma-workspace-5.25.5-relayout.patch | 22 ++
...a-workspace-5.25.5-systray-double-destroy.patch | 24 +++
.../plasma-workspace-5.25.5-r5.ebuild | 229 +++++++++++++++++++++
7 files changed, 615 insertions(+), 8 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-geolocation-deadlock.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-geolocation-deadlock.patch
new file mode 100644
index 000000000000..70bd28419472
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-geolocation-deadlock.patch
@@ -0,0 +1,194 @@
+https://invent.kde.org/plasma/plasma-workspace/-/commit/d693026676cc6bf2b7c23e9ff4b620679cf15d10
+
+From d693026676cc6bf2b7c23e9ff4b620679cf15d10 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 15 Aug 2022 18:36:56 +0200
+Subject: [PATCH] [dataengines/geolocation] Port from KIO::http_post to
+ QNetworkAccessManager
+
+Not only does this slightly simplify the code, it also avoids a deadlock in kded when automatic proxy detection is enabled
+
+BUG: 449984
+
+BUG: 457341
+(cherry picked from commit 98cadd48c21c89b81fdeb3499a557a6551a09d8a)
+---
+ dataengines/geolocation/CMakeLists.txt | 2 +-
+ dataengines/geolocation/location_ip.cpp | 84 ++++++++++---------------
+ 2 files changed, 35 insertions(+), 51 deletions(-)
+
+diff --git a/dataengines/geolocation/CMakeLists.txt b/dataengines/geolocation/CMakeLists.txt
+index 175687bd4d..6ae707643c 100644
+--- a/dataengines/geolocation/CMakeLists.txt
++++ b/dataengines/geolocation/CMakeLists.txt
+@@ -36,7 +36,7 @@ target_link_libraries(plasma_engine_geolocation
+ kcoreaddons_add_plugin(plasma-geolocation-ip SOURCES location_ip.cpp INSTALL_NAMESPACE plasma/geolocationprovider)
+ ecm_qt_declare_logging_category(plasma-geolocation-ip HEADER geolocdebug.h IDENTIFIER DATAENGINE_GEOLOCATION CATEGORY_NAME org.kde.plasma.dataengine.geolocation)
+ target_compile_definitions(plasma-geolocation-ip PRIVATE -DQT_NO_KEYWORDS)
+-target_link_libraries(plasma-geolocation-ip plasma-geolocation-interface KF5::KIOCore KF5::NetworkManagerQt)
++target_link_libraries(plasma-geolocation-ip plasma-geolocation-interface KF5::NetworkManagerQt)
+
+ pkg_check_modules(LIBGPS libgps IMPORTED_TARGET)
+
+diff --git a/dataengines/geolocation/location_ip.cpp b/dataengines/geolocation/location_ip.cpp
+index 27b530810c..3c5a202b89 100644
+--- a/dataengines/geolocation/location_ip.cpp
++++ b/dataengines/geolocation/location_ip.cpp
+@@ -12,15 +12,14 @@
+
+ #include "location_ip.h"
+ #include "geolocdebug.h"
+-#include <KIO/Job>
+-#include <KIO/TransferJob>
+-#include <KJob>
+ #include <KSharedConfig>
+ #include <NetworkManagerQt/Manager>
+ #include <NetworkManagerQt/WirelessDevice>
+ #include <QJsonArray>
+ #include <QJsonDocument>
+ #include <QJsonObject>
++#include <QNetworkAccessManager>
++#include <QNetworkReply>
+ #include <QUrl>
+
+ class Ip::Private : public QObject
+@@ -30,19 +29,21 @@ public:
+ Private(Ip *q)
+ : q(q)
+ {
++ m_nam.setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
++ m_nam.setStrictTransportSecurityEnabled(true);
++ m_nam.enableStrictTransportSecurityStore(true,
++ QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1String("/plasmashell/hsts/"));
+ }
+
+- void readGeoLocation(KJob *job)
++ void readGeoLocation(QNetworkReply *reply)
+ {
+ m_geoLocationResolved = true;
+- if (job && job->error()) {
+- qCCritical(DATAENGINE_GEOLOCATION) << "error: " << job->errorString();
+- m_geoLocationPayload.clear();
++ if (reply->error()) {
++ qCCritical(DATAENGINE_GEOLOCATION) << "error: " << reply->errorString();
+ checkUpdateData();
+ return;
+ }
+- const QJsonObject json = QJsonDocument::fromJson(m_geoLocationPayload).object();
+- m_geoLocationPayload.clear();
++ const QJsonObject json = QJsonDocument::fromJson(reply->readAll()).object();
+
+ auto accuracyIt = json.find(QStringLiteral("accuracy"));
+ if (accuracyIt != json.end()) {
+@@ -62,52 +63,28 @@ public:
+
+ void clear()
+ {
+- m_geoLocationPayload.clear();
+- m_countryPayload.clear();
+ m_countryResolved = false;
+ m_geoLocationResolved = false;
+ m_data.clear();
+ }
+
+- void geoLocationData(KIO::Job *job, const QByteArray &data)
+- {
+- Q_UNUSED(job)
+-
+- if (data.isEmpty()) {
+- return;
+- }
+- m_geoLocationPayload.append(data);
+- }
+-
+- void countryData(KIO::Job *job, const QByteArray &data)
+- {
+- Q_UNUSED(job)
+-
+- if (data.isEmpty()) {
+- return;
+- }
+- m_countryPayload.append(data);
+- }
+-
+- void readCountry(KJob *job)
++ void readCountry(QNetworkReply *reply)
+ {
+ m_countryResolved = true;
+- if (job && job->error()) {
+- qCCritical(DATAENGINE_GEOLOCATION) << "error: " << job->errorString();
+- m_countryPayload.clear();
++ if (reply->error()) {
++ qCCritical(DATAENGINE_GEOLOCATION) << "error: " << reply->errorString();
+ checkUpdateData();
+ return;
+ }
+
+- const QJsonObject json = QJsonDocument::fromJson(m_countryPayload).object();
+- m_countryPayload.clear();
++ const QJsonObject json = QJsonDocument::fromJson(reply->readAll()).object();
+
+ m_data[QStringLiteral("country")] = json.value(QStringLiteral("country_name")).toString();
+ m_data[QStringLiteral("country code")] = json.value(QStringLiteral("country_code")).toString();
++
+ checkUpdateData();
+ }
+
+-private:
+ void checkUpdateData()
+ {
+ if (!m_countryResolved || !m_geoLocationResolved) {
+@@ -117,11 +94,10 @@ private:
+ }
+
+ Ip *q;
+- QByteArray m_geoLocationPayload;
+- QByteArray m_countryPayload;
+ bool m_countryResolved = false;
+ bool m_geoLocationResolved = false;
+ Plasma::DataEngine::Data m_data;
++ QNetworkAccessManager m_nam;
+ };
+
+ Ip::Ip(QObject *parent, const QVariantList &args)
+@@ -176,18 +152,26 @@ void Ip::update()
+ }
+ const QByteArray postData = QJsonDocument(request).toJson(QJsonDocument::Compact);
+ const QString apiKey = QStringLiteral("60e8eae6-3988-4ada-ad48-2cfddddf216b");
+- KIO::TransferJob *datajob =
+- KIO::http_post(QUrl(QStringLiteral("https://location.services.mozilla.com/v1/geolocate?key=%1").arg(apiKey)), postData, KIO::HideProgressInfo);
+- datajob->addMetaData(QStringLiteral("content-type"), QStringLiteral("application/json"));
+
+ qCDebug(DATAENGINE_GEOLOCATION) << "Fetching https://location.services.mozilla.com/v1/geolocate";
+- connect(datajob, &KIO::TransferJob::data, d, &Ip::Private::geoLocationData);
+- connect(datajob, &KIO::TransferJob::result, d, &Ip::Private::readGeoLocation);
+-
+- datajob = KIO::http_post(QUrl(QStringLiteral("https://location.services.mozilla.com/v1/country?key=%1").arg(apiKey)), postData, KIO::HideProgressInfo);
+- datajob->addMetaData(QStringLiteral("content-type"), QStringLiteral("application/json"));
+- connect(datajob, &KIO::TransferJob::data, d, &Ip::Private::countryData);
+- connect(datajob, &KIO::TransferJob::result, d, &Ip::Private::readCountry);
++ QNetworkRequest locationRequest(QUrl(QStringLiteral("https://location.services.mozilla.com/v1/geolocate?key=%1").arg(apiKey)));
++ locationRequest.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/json"));
++ QNetworkReply *locationReply = d->m_nam.post(locationRequest, postData);
++
++ connect(locationReply, &QNetworkReply::finished, this, [this, locationReply] {
++ locationReply->deleteLater();
++ d->readGeoLocation(locationReply);
++ });
++
++ qCDebug(DATAENGINE_GEOLOCATION) << "Fetching https://location.services.mozilla.com/v1/country";
++ QNetworkRequest countryRequest(QUrl(QStringLiteral("https://location.services.mozilla.com/v1/country?key=%1").arg(apiKey)));
++ countryRequest.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/json"));
++ QNetworkReply *countryReply = d->m_nam.post(countryRequest, postData);
++
++ connect(countryReply, &QNetworkReply::finished, this, [this, countryReply] {
++ countryReply->deleteLater();
++ d->readCountry(countryReply);
++ });
+ }
+
+ K_PLUGIN_CLASS_WITH_JSON(Ip, "plasma-geolocation-ip.json")
+--
+GitLab
+
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-layout-save.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-layout-save.patch
new file mode 100644
index 000000000000..ed298549128a
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-layout-save.patch
@@ -0,0 +1,33 @@
+https://invent.kde.org/plasma/plasma-workspace/-/commit/b983f1c758552346083ffe0b3d47173b487ae426
+
+From b983f1c758552346083ffe0b3d47173b487ae426 Mon Sep 17 00:00:00 2001
+From: Aaron Rainbolt <arraybolt3@gmail.com>
+Date: Wed, 19 Oct 2022 14:16:26 -0500
+Subject: [PATCH] Save layout immediately after a resolution change triggered
+ relayout
+
+(cherry picked from commit f33cd92fbfb765299018bddc2a86ac5326731231)
+---
+ components/containmentlayoutmanager/appletslayout.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/components/containmentlayoutmanager/appletslayout.cpp b/components/containmentlayoutmanager/appletslayout.cpp
+index 70970e8919..c3e957cbd9 100644
+--- a/components/containmentlayoutmanager/appletslayout.cpp
++++ b/components/containmentlayoutmanager/appletslayout.cpp
+@@ -80,6 +80,11 @@ AppletsLayout::AppletsLayout(QQuickItem *parent)
+ } else if (!m_geometryBeforeResolutionChange.isEmpty()) {
+ m_layoutManager->layoutGeometryChanged(newGeom, m_geometryBeforeResolutionChange);
+ m_geometryBeforeResolutionChange = QRectF();
++
++ // If the user doesn't move a widget after this is done, the widget positions won't be saved and they will be in the wrong
++ // places on next login, so save them now.
++
++ save();
+ }
+ }
+ m_layoutChanges = NoChange;
+--
+GitLab
+
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-lock-layout.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-lock-layout.patch
new file mode 100644
index 000000000000..422b22a678dd
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-lock-layout.patch
@@ -0,0 +1,113 @@
+https://invent.kde.org/plasma/plasma-workspace/-/commit/0a01c8910309fb9f289fe0aa58492e106d154548
+
+From 0a01c8910309fb9f289fe0aa58492e106d154548 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Sun, 25 Sep 2022 16:47:31 -0500
+Subject: [PATCH] Introduce a lock that blocks relayouts and config writes
+
+The resize of the layout area can happen either by screen resolution
+change or available screen area change (a panel appears or is resized)
+This is not an atomic operation, as width and height are usually set in
+2 different operations, and even worse the layout area is resized to
+ match the available one with an animation, so many intermediate resizes
+that should never cause a relayout happen.
+In normal operation an event compression timer limits the actual
+relayouts to hopefully one, but if the system is really slowed down
+(for instance, startup) the timer may expire and cause relayouts in
+non useful sizes, losing the needed configuration
+In combination with
+
+The lock blocks all relayout and config writes when the size of the
+layout area doesn't correspond to corona availablescreenrect, which are
+the only "settled" cases.
+
+BUG:413645
+--- a/components/containmentlayoutmanager/appletslayout.cpp
++++ b/components/containmentlayoutmanager/appletslayout.cpp
+@@ -56,9 +56,10 @@ AppletsLayout::AppletsLayout(QQuickItem *parent)
+ connect(m_layoutChangeTimer, &QTimer::timeout, this, [this]() {
+ // We can't assume m_containment to be valid: if we load in a plasmoid that can run also
+ // in "applet" mode, m_containment will never be valid
+- if (!m_containment) {
++ if (!m_containment || width() <= 0 || height() <= 0 || m_relayoutLock) {
+ return;
+ }
++
+ const QString &serializedConfig = m_containment->config().readEntry(m_configKey, "");
+ if ((m_layoutChanges & ConfigKeyChange) && !serializedConfig.isEmpty()) {
+ if (!m_configKey.isEmpty() && m_containment) {
+@@ -169,6 +170,27 @@ void AppletsLayout::setFallbackConfigKey(const QString &key)
+ Q_EMIT fallbackConfigKeyChanged();
+ }
+
++bool AppletsLayout::relayoutLock() const
++{
++ return m_relayoutLock;
++}
++
++void AppletsLayout::setRelayoutLock(bool lock)
++{
++ if (lock == m_relayoutLock) {
++ return;
++ }
++
++ m_relayoutLock = lock;
++
++ if (!lock && m_layoutChanges != NoChange) {
++ m_layoutChangeTimer->start();
++ }
++
++ Q_EMIT relayoutLockChanged();
++}
++
++
+ QJSValue AppletsLayout::acceptsAppletCallback() const
+ {
+ return m_acceptsAppletCallback;
+@@ -468,7 +490,7 @@ void AppletsLayout::geometryChanged(const QRectF &newGeometry, const QRectF &old
+ }
+
+ // Only do a layouting procedure if we received a valid size
+- if (!newGeometry.isEmpty()) {
++ if (!newGeometry.isEmpty() && newGeometry != oldGeometry) {
+ m_layoutChanges |= SizeChange;
+ m_layoutChangeTimer->start();
+ }
+--- a/components/containmentlayoutmanager/appletslayout.h
++++ b/components/containmentlayoutmanager/appletslayout.h
+@@ -39,6 +39,8 @@ class AppletsLayout : public QQuickItem
+ // from the screen size and plasma starts on an "unexpected" size
+ Q_PROPERTY(QString fallbackConfigKey READ fallbackConfigKey WRITE setFallbackConfigKey NOTIFY fallbackConfigKeyChanged)
+
++ Q_PROPERTY(bool relayoutLock READ relayoutLock WRITE setRelayoutLock NOTIFY relayoutLockChanged)
++
+ Q_PROPERTY(PlasmaQuick::AppletQuickItem *containment READ containment WRITE setContainment NOTIFY containmentChanged)
+
+ Q_PROPERTY(QJSValue acceptsAppletCallback READ acceptsAppletCallback WRITE setAcceptsAppletCallback NOTIFY acceptsAppletCallbackChanged)
+@@ -103,6 +105,9 @@ public:
+ QString fallbackConfigKey() const;
+ void setFallbackConfigKey(const QString &key);
+
++ bool relayoutLock() const;
++ void setRelayoutLock(bool lock);
++
+ PlasmaQuick::AppletQuickItem *containment() const;
+ void setContainment(PlasmaQuick::AppletQuickItem *containment);
+
+@@ -162,6 +167,7 @@ Q_SIGNALS:
+
+ void configKeyChanged();
+ void fallbackConfigKeyChanged();
++ void relayoutLockChanged();
+ void containmentChanged();
+ void minimumItemWidthChanged();
+ void minimumItemHeightChanged();
+@@ -226,6 +232,7 @@ private:
+ QPointF m_mouseDownPosition = QPoint(-1, -1);
+ bool m_mouseDownWasEditMode = false;
+ bool m_editMode = false;
++ bool m_relayoutLock = false;
+ };
+
+ Q_DECLARE_OPERATORS_FOR_FLAGS(AppletsLayout::LayoutChanges)
+GitLab
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
index 457470f0807c..ef94ed3afa00 100644
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
@@ -10,12 +10,6 @@ There is still a known culprit (duplicate display names) so the hack shouldn't b
CCBUG: 353975
CCBUG: 438114
----
- shell/panelview.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/shell/panelview.cpp b/shell/panelview.cpp
-index b5c87bbf71..4be1e26ca4 100644
--- a/shell/panelview.cpp
+++ b/shell/panelview.cpp
@@ -859,6 +859,9 @@ void PanelView::moveEvent(QMoveEvent *ev)
@@ -28,6 +22,4 @@ index b5c87bbf71..4be1e26ca4 100644
}
void PanelView::keyPressEvent(QKeyEvent *event)
---
GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-relayout.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-relayout.patch
new file mode 100644
index 000000000000..efd211c26de4
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-relayout.patch
@@ -0,0 +1,22 @@
+https://invent.kde.org/plasma/plasma-workspace/-/commit/f30431c9ed0bb70506cbc72ea337323660a0dc14
+
+From f30431c9ed0bb70506cbc72ea337323660a0dc14 Mon Sep 17 00:00:00 2001
+From: Aaron Rainbolt <arraybolt3@gmail.com>
+Date: Wed, 19 Oct 2022 14:15:16 -0500
+Subject: [PATCH] Remove unnecessary heuristic relayout function call
+
+(cherry picked from commit c344410a061862dd4802581a1ac3b9a09758ace0)
+--- a/components/containmentlayoutmanager/appletslayout.cpp
++++ b/components/containmentlayoutmanager/appletslayout.cpp
+@@ -80,10 +80,6 @@ AppletsLayout::AppletsLayout(QQuickItem *parent)
+ } else if (!m_geometryBeforeResolutionChange.isEmpty()) {
+ m_layoutManager->layoutGeometryChanged(newGeom, m_geometryBeforeResolutionChange);
+ m_geometryBeforeResolutionChange = QRectF();
+-
+- // Heuristically relayout items only when the plasma startup is fully completed
+- } else {
+- polish();
+ }
+ }
+ m_layoutChanges = NoChange;
+GitLab
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-systray-double-destroy.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-systray-double-destroy.patch
new file mode 100644
index 000000000000..3719f2dcae7a
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-systray-double-destroy.patch
@@ -0,0 +1,24 @@
+https://invent.kde.org/plasma/plasma-workspace/-/commit/432d7c4b51c5a1f17af327d770266b3fe81e5ae5
+
+From 432d7c4b51c5a1f17af327d770266b3fe81e5ae5 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Tue, 27 Sep 2022 18:04:51 +0200
+Subject: [PATCH] [applets/systemtray] Don't manually destroy innerContainment
+
+It's already destroyed by the corona
+
+BUG: 420245
+(cherry picked from commit 7baa4c221e45f161adf4e00d4cf0e36d6436e90c)
+--- a/applets/systemtray/container/systemtraycontainer.cpp
++++ b/applets/systemtray/container/systemtraycontainer.cpp
+@@ -20,9 +20,6 @@ SystemTrayContainer::SystemTrayContainer(QObject *parent, const KPluginMetaData
+
+ SystemTrayContainer::~SystemTrayContainer()
+ {
+- if (destroyed()) {
+- m_innerContainment->destroy();
+- }
+ }
+
+ void SystemTrayContainer::init()
+GitLab
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r5.ebuild
new file mode 100644
index 000000000000..973ec86a90e6
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r5.ebuild
@@ -0,0 +1,229 @@
+# 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.99.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/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/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
+ "${FILESDIR}/${P}-delay-ksplash-until-after-env-setup.patch" # KDE-bug 458865 w/ Qt 5.15.6
+ "${FILESDIR}/${P}-fonts-honor-and-present-system-defaults.patch" # KDE-bug 416140
+ "${FILESDIR}/${P}-prevent-panel-go-out-of-screen.patch" # git master and Plasma/5.24 branch double revert
+ "${FILESDIR}/${P}-fix-setpassword.patch" # Plasma/5.25 branch, KDE-bug 459309
+ "${FILESDIR}/${P}-systray-double-destroy.patch" # Plasma/5.24 branch, KDE-bug 420245
+ "${FILESDIR}/${P}-geolocation-deadlock.patch" # Plasma/5.24 branch, KDE-bug 449984, KDE-bug 457341
+ "${FILESDIR}/${P}-lock-layout.patch" # Plasma/5.24 branch, KDE-bug 413645
+ "${FILESDIR}/${P}-relayout.patch" # Plasma/5.24 branch
+ "${FILESDIR}/${P}-layout-save.patch" # Plasma/5.24 branch
+)
+
+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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2022-10-03 8:43 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2022-10-03 8:43 UTC (permalink / raw
To: gentoo-commits
commit: 3a8bca8abe04d5c1d5747bd53c172ede35ff0adb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 3 07:56:54 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 3 08:43:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a8bca8a
kde-plasma/plasma-workspace: Fix user KCM unable to change user password
Upstream commit 84dcfc45b9a354827b9bbf6ae58902d04e8fe915
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-workspace-5.25.5-fix-setpassword.patch | 39 ++++
.../plasma-workspace-5.25.5-r4.ebuild | 224 +++++++++++++++++++++
2 files changed, 263 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fix-setpassword.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fix-setpassword.patch
new file mode 100644
index 000000000000..7351b8808819
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fix-setpassword.patch
@@ -0,0 +1,39 @@
+From 84dcfc45b9a354827b9bbf6ae58902d04e8fe915 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Wed, 28 Sep 2022 11:33:33 +0200
+Subject: [PATCH] set setInteractiveAuthorizationAllowed on SetPassword call
+
+is important that the setpasswod call uses interactive authorization,
+otherwise will be denied, unless the user had been modified beforehand
+so an authorization was already granted
+
+BUG:459309
+---
+ kcms/users/src/user.cpp | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/kcms/users/src/user.cpp b/kcms/users/src/user.cpp
+index 020ebee097..87745582c5 100644
+--- a/kcms/users/src/user.cpp
++++ b/kcms/users/src/user.cpp
+@@ -217,9 +217,14 @@ void User::setPassword(const QString &password)
+ {
+ // Blocking because we need to wait for the password to be changed before we
+ // can ask the user about also possibly changing their KWallet password
+- auto invocation = m_dbusIface->SetPassword(saltPassword(password), QString());
+- invocation.waitForFinished();
+- if (!invocation.isError()) {
++
++ auto mc = QDBusMessage::createMethodCall(m_dbusIface->service(), m_dbusIface->path(), m_dbusIface->interface(), "SetPassword");
++ mc.setArguments({saltPassword(password), QString()});
++ mc.setInteractiveAuthorizationAllowed(true);
++ auto message = QDBusConnection::systemBus().call(mc);
++
++ // Not an error or invalid message
++ if (message.type() == QDBusMessage::ReplyMessage) {
+ Q_EMIT passwordSuccessfullyChanged();
+ }
+ }
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r4.ebuild
new file mode 100644
index 000000000000..dbb6d6add84f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r4.ebuild
@@ -0,0 +1,224 @@
+# 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/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/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
+ "${FILESDIR}/${P}-delay-ksplash-until-after-env-setup.patch" # KDE-bug 458865 w/ Qt 5.15.6
+ "${FILESDIR}/${P}-fonts-honor-and-present-system-defaults.patch" # KDE-bug 416140
+ "${FILESDIR}/${P}-prevent-panel-go-out-of-screen.patch" # git master and Plasma/5.24 branch double revert
+ "${FILESDIR}/${P}-fix-setpassword.patch" # Plasma/5.25 branch, KDE-bug 459309
+)
+
+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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2022-09-14 11:59 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2022-09-14 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 6114a64b23157311ebadb1e053bc4485088a69fd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 10:32:57 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 11:58:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6114a64b
kde-plasma/plasma-workspace: Delay ksplash until after env is set up
Upstream commit 9bf0e56da84de5e9bd2b3ff28bdb2cb1af6de91e
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=458865
Bug: https://bugs.gentoo.org/868909
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
....25.5-delay-ksplash-until-after-env-setup.patch | 82 ++++++++
.../plasma-workspace-5.25.5-r2.ebuild | 220 +++++++++++++++++++++
2 files changed, 302 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-delay-ksplash-until-after-env-setup.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-delay-ksplash-until-after-env-setup.patch
new file mode 100644
index 000000000000..9fcea5a32cbe
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-delay-ksplash-until-after-env-setup.patch
@@ -0,0 +1,82 @@
+From 536ba654e43741a18d2b71ee519f1daefeaa7ffd Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Sat, 4 Jun 2022 18:15:10 +0800
+Subject: [PATCH 1/2] startkde: `Q_UNUSED` ksplash
+
+Variable 'ksplash' is assigned a value that is never used. (CWE-563)
+
+(cherry picked from commit 6bebf9a7e636d6655ede49ce48d33f2254ac75f0)
+---
+ startkde/startplasma-x11.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
+index 817de3511..a80c515fc 100644
+--- a/startkde/startplasma-x11.cpp
++++ b/startkde/startplasma-x11.cpp
+@@ -59,6 +59,7 @@ int main(int argc, char **argv)
+
+ setupCursor(false);
+ QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash());
++ Q_UNUSED(ksplash)
+
+ runEnvironmentScripts();
+
+--
+2.37.3
+
+
+From 5e54fbd0b351e43cb68c193bf684dd8cdbd11210 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Tue, 13 Sep 2022 13:54:04 +0200
+Subject: [PATCH 2/2] delay ksplash until after env is set up
+
+otherwise we can dbus invoke with the wrong environment. specifically
+this happens with the latest qtbase changes that introduced color
+picking support on wayland. when we start a qguiapplication with
+incomplete environment that dbus invokes the xdg-portal system and that
+in turn has an incomplete environment resulting in theming and the likes
+not properly applying because the portal doesn't know that it runs
+inside a plasma session.
+
+https://invent.kde.org/qt/qt/qtbase/-/commit/2dc083df009a45c5dacfea27b0affeb85b01f847
+
+BUG: 458865
+(cherry picked from commit 9bf0e56da84de5e9bd2b3ff28bdb2cb1af6de91e)
+
+asturmlechner 2022-09-14: Backported to Plasma/5.25 branch
+---
+ startkde/startplasma-x11.cpp | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
+index a80c515fc..d1722771b 100644
+--- a/startkde/startplasma-x11.cpp
++++ b/startkde/startplasma-x11.cpp
+@@ -57,10 +57,6 @@ int main(int argc, char **argv)
+ }
+ }
+
+- setupCursor(false);
+- QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash());
+- Q_UNUSED(ksplash)
+-
+ runEnvironmentScripts();
+
+ out << "startkde: Starting up...\n";
+@@ -80,6 +76,12 @@ int main(int argc, char **argv)
+ // variables (e.g. LANG and LC_*)
+ importSystemdEnvrionment();
+
++ // NOTE: Do not start QGuiApplications before setting up the environment. We'd be at risk of dbus invoking other
++ // processes with an incomplete environment.
++ setupCursor(false);
++ QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash());
++ Q_UNUSED(ksplash)
++
+ if (!startPlasmaSession(false))
+ return 1;
+
+--
+2.37.3
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r2.ebuild
new file mode 100644
index 000000000000..809aabe37bf7
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r2.ebuild
@@ -0,0 +1,220 @@
+# 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
+ "${FILESDIR}/${P}-delay-ksplash-until-after-env-setup.patch" # KDE-bug 458865 w/ Qt 5.15.6
+)
+
+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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2022-09-09 7:34 Sam James
0 siblings, 0 replies; 44+ messages in thread
From: Sam James @ 2022-09-09 7:34 UTC (permalink / raw
To: gentoo-commits
commit: bb911d4fbed9273f6c10b2107077492a19f5fdbd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 9 07:30:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 07:34:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb911d4f
kde-plasma/plasma-workspace: backport widgetexplorer patch
As requested by upstream at
https://mail.kde.org/pipermail/distributions/2022-September/001287.html.
Signed-off-by: Sam James <sam <AT> gentoo.org>
....25.5-widgetexplorer-recurse-containments.patch | 26 +++
.../plasma-workspace-5.25.5-r1.ebuild | 219 +++++++++++++++++++++
2 files changed, 245 insertions(+)
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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2022-06-14 12:44 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2022-06-14 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 3e0106251755e61c56d3ce814af84d97121f2e08
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 08:24:01 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 12:43:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e010625
kde-plasma/plasma-workspace: 5.25.0 version bump
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 +
...sma-workspace-5.24.80-split-libkworkspace.patch | 37 ++++
.../plasma-workspace-5.25.0.ebuild | 218 +++++++++++++++++++++
3 files changed, 256 insertions(+)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 1ba2f05fc00f..f8a5f3c03a33 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1 +1,2 @@
DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
+DIST plasma-workspace-5.25.0.tar.xz 18568884 BLAKE2B 5390a62d336a6cfc6179bc20b546966a11ce583e0737d4a131a993056d0e9987648046e8d5f6664a38689525b61be73deb55dac1fb2b22c36cbac3c50a097800 SHA512 0d52ab01752421e8056db666640e4c8fc31070a6a7704f78e8087f6b32fe22290da54ff830bb59870dcd7e007bd6798859358e163e4ed334d4f31041a3b743c8
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
new file mode 100644
index 000000000000..e605473e3546
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
@@ -0,0 +1,37 @@
+From 19bbdcf391ea51c4798c770e87c7eada24f252b8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 21 Feb 2022 12:24:56 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ec5f0893..b022a20b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,6 +78,7 @@ set_package_properties(Qalculate PROPERTIES DESCRIPTION "Qalculate Library"
+ )
+
+ find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(LibKWorkspace 5.21.5)
+
+ find_package(KF5Screen CONFIG REQUIRED)
+ find_package(KScreenLocker 5.13.80 REQUIRED)
+@@ -233,7 +234,10 @@ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma
+ if(KF5DocTools_FOUND)
+ add_subdirectory(doc)
+ endif()
+-add_subdirectory(libkworkspace)
++if(NOT LibKWorkspace_FOUND)
++ message(STATUS "System LibKWorkspace not found, using bundled.")
++ add_subdirectory(libkworkspace)
++endif()
+ add_subdirectory(libdbusmenuqt)
+ add_subdirectory(appmenu)
+
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.0.ebuild
new file mode 100644
index 000000000000..1852deaa7514
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.0.ebuild
@@ -0,0 +1,218 @@
+# 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.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~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
+)
+
+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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2022-02-06 21:17 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2022-02-06 21:17 UTC (permalink / raw
To: gentoo-commits
commit: c23324df98b0e94a198c2fad530c3a470dcb39f7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 6 20:14:07 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 6 21:16:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23324df
kde-plasma/plasma-workspace: Fix kcmfontinst/wallpaperplugin ProvidersUrl
See also:
https://mail.kde.org/pipermail/distributions/2022-February/001124.html
https://mail.kde.org/pipermail/distributions/2022-February/001129.html
https://mail.kde.org/pipermail/distributions/2022-February/001133.html
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...space-5.23.5-fix-kcmfontinst-ProvidersUrl.patch | 28 +++++++++++++++++++++
...e-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch | 29 ++++++++++++++++++++++
....5.ebuild => plasma-workspace-5.23.5-r1.ebuild} | 4 +++
...0.ebuild => plasma-workspace-5.23.90-r1.ebuild} | 4 +++
4 files changed, 65 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch
new file mode 100644
index 000000000000..e546f46d6b7f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch
@@ -0,0 +1,28 @@
+From 8c11f207e2bbf0f98488de7066bd3698705f20e1 Mon Sep 17 00:00:00 2001
+From: Ben Cooksley <bcooksley@kde.org>
+Date: Mon, 7 Feb 2022 06:44:47 +1300
+Subject: [PATCH] Use the correct endpoint for this - hosted by a CDN and
+ therefore capable of handling much greater volumes of traffic.
+
+CCMAIL: plasma-devel@kde.org
+CCMAIL: distributions@kde.org
+---
+ kcms/kfontinst/kcmfontinst/kfontinst.knsrc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcms/kfontinst/kcmfontinst/kfontinst.knsrc b/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
+index deaf1e08f..932bc8802 100644
+--- a/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
++++ b/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
+@@ -41,7 +41,7 @@ Name[vi]=Phông chữ
+ Name[x-test]=xxFontsxx
+ Name[zh_CN]=字体
+
+-ProvidersUrl=https://distribute.kde.org/khotnewstuff/fonts-providers.xml
++ProvidersUrl=https://cdn.kde.org/khotnewstuff/v1/fonts-providers.xml
+ Categories=KDE-Look.org Fonts
+ TargetDir=kfontinst
+ Uncompress=archive
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch
new file mode 100644
index 000000000000..3bf9315facfc
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch
@@ -0,0 +1,29 @@
+From b49a102074087e6680f330fcf61cebdeeac306b7 Mon Sep 17 00:00:00 2001
+From: Ben Cooksley <bcooksley@kde.org>
+Date: Mon, 7 Feb 2022 06:25:33 +1300
+Subject: [PATCH] Purge all references to download.kde.org, replacing them with
+ the correct endpoint of autoconfig.kde.org.
+
+CCMAIL: plasma-devel@kde.org
+CCMAIL: distributions@kde.org
+(cherry picked from commit 1ab87dbf43bb51f21e2cd9e0188cb482a541734b)
+---
+ components/shellprivate/wallpaperplugin.knsrc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/shellprivate/wallpaperplugin.knsrc b/components/shellprivate/wallpaperplugin.knsrc
+index 1495b6e27..3ed59f75d 100644
+--- a/components/shellprivate/wallpaperplugin.knsrc
++++ b/components/shellprivate/wallpaperplugin.knsrc
+@@ -42,7 +42,7 @@ Name[x-test]=xxWallpaper Pluginsxx
+ Name[zh_CN]=壁纸插件
+ Name[zh_TW]=桌布外掛程式
+
+-ProvidersUrl=https://download.kde.org/ocs/providers.xml
++ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
+ Categories=Plasma Wallpaper Plugin
+ StandardResource=tmp
+ Uncompress=kpackage
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild
similarity index 96%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild
index 204a23153bd8..ad412dd4223b 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild
@@ -150,6 +150,10 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
PATCHES=(
"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+ # https://mail.kde.org/pipermail/distributions/2022-February/001129.html
+ "${FILESDIR}/${P}-fix-wallpaperplugin-ProvidersUrl.patch"
+ # https://mail.kde.org/pipermail/distributions/2022-February/001133.html
+ "${FILESDIR}/${P}-fix-kcmfontinst-ProvidersUrl.patch"
)
src_prepare() {
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.90.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.90-r1.ebuild
similarity index 95%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.23.90.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.23.90-r1.ebuild
index dbfb0482e579..668bab11a619 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.90.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.90-r1.ebuild
@@ -151,6 +151,10 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
PATCHES=(
"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+ # https://mail.kde.org/pipermail/distributions/2022-February/001129.html
+ "${FILESDIR}/${PN}-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch"
+ # https://mail.kde.org/pipermail/distributions/2022-February/001133.html
+ "${FILESDIR}/${PN}-5.23.5-fix-kcmfontinst-ProvidersUrl.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2021-12-14 9:28 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2021-12-14 9:28 UTC (permalink / raw
To: gentoo-commits
commit: ac85383c329f008b1ab5695b419c909f698d882c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 13:57:40 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 14 09:23:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac85383c
kde-plasma/plasma-workspace: drop 5.22.5*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
...orkspace-5.22.5-fix-hotplug-notifications.patch | 33 ----
...ace-5.22.5-fix-powermanagement-inhibition.patch | 35 ----
.../plasma-workspace-5.22.5-gpsd-3.23.1.patch | 30 ---
...asma-workspace-5.22.5-krunner-cwd-at-home.patch | 30 ---
.../plasma-workspace-5.22.5-r3.ebuild | 210 ---------------------
6 files changed, 339 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index b47676d433af..c2bc7f7d3791 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch
deleted file mode 100644
index e7cd0627a269..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 61e2ea2323ae63c5805c87353701ba6fb722205a Mon Sep 17 00:00:00 2001
-From: Fabio Bas <fabio.bas@officineinformatiche.net>
-Date: Fri, 3 Sep 2021 19:23:12 +0200
-Subject: [PATCH] Update solid connectedSources when a new source gets added by
- hotplug BUG: 438874
-
----
- applets/devicenotifier/package/contents/ui/devicenotifier.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/devicenotifier/package/contents/ui/devicenotifier.qml b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-index a1dc20b83..404ae95e6 100644
---- a/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-+++ b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-@@ -75,6 +75,7 @@ Item {
- onSourceAdded: {
- disconnectSource(source);
- connectSource(source);
-+ sdSource.connectedSources = sources
- }
- onSourceRemoved: {
- disconnectSource(source);
-@@ -98,7 +99,6 @@ Item {
- PlasmaCore.DataSource {
- id: sdSource
- engine: "soliddevice"
-- connectedSources: hpSource.sources
- interval: 0
- property string last
- onSourceAdded: {
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch
deleted file mode 100644
index 13e4bf256d3e..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6379d1ec8d4a1fce141280eead930a6cdd9282d1 Mon Sep 17 00:00:00 2001
-From: Peifeng Yu <7437103@gmail.com>
-Date: Mon, 6 Sep 2021 05:24:15 +0000
-Subject: [PATCH] Call UnInhibit with correct signature in powermanagement
- dataengine
-
----
- dataengines/powermanagement/powermanagementjob.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dataengines/powermanagement/powermanagementjob.cpp b/dataengines/powermanagement/powermanagementjob.cpp
-index 90051cf33..dc7883d10 100644
---- a/dataengines/powermanagement/powermanagementjob.cpp
-+++ b/dataengines/powermanagement/powermanagementjob.cpp
-@@ -104,7 +104,7 @@ void PowerManagementJob::start()
- QStringLiteral("/org/freedesktop/PowerManagement/Inhibit"),
- QStringLiteral("org.freedesktop.PowerManagement.Inhibit"),
- QStringLiteral("UnInhibit"));
-- msg << parameters().value(QStringLiteral("cookie")).toInt();
-+ msg << parameters().value(QStringLiteral("cookie")).toUInt();
- QDBusReply<void> reply = QDBusConnection::sessionBus().call(msg);
- setResult(reply.isValid());
- return;
-@@ -122,7 +122,7 @@ void PowerManagementJob::start()
- QStringLiteral("/ScreenSaver"),
- QStringLiteral("org.freedesktop.ScreenSaver"),
- QStringLiteral("UnInhibit"));
-- msg << parameters().value(QStringLiteral("cookie")).toInt();
-+ msg << parameters().value(QStringLiteral("cookie")).toUInt();
- QDBusReply<uint> reply = QDBusConnection::sessionBus().call(msg);
- setResult(reply.isValid());
- return;
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch
deleted file mode 100644
index cb35751d446f..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e6cab5d96f7b51a5cf4be3d93a7e2d4fee1cddae Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Thu, 23 Sep 2021 19:29:05 +0300
-Subject: [PATCH] Fix build with gpsd 3.23.1
-
-STATUS_NO_FIX was renamed to STATUS_UNK.
-
-https://gitlab.com/gpsd/gpsd/-/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427
----
- dataengines/geolocation/location_gps.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
-index 858059ada..ec9ec14ae 100644
---- a/dataengines/geolocation/location_gps.cpp
-+++ b/dataengines/geolocation/location_gps.cpp
-@@ -52,7 +52,9 @@ void Gpsd::run()
- #else
- if (m_gpsdata->online) {
- #endif
--#if GPSD_API_MAJOR_VERSION >= 10
-+#if defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without bumping API version
-+ if (m_gpsdata->fix.status != STATUS_UNK) {
-+#elif GPSD_API_MAJOR_VERSION >= 10
- if (m_gpsdata->fix.status != STATUS_NO_FIX) {
- #else
- if (m_gpsdata->status != STATUS_NO_FIX) {
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
deleted file mode 100644
index 27db136c2949..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Commit 7ca34e0baa7fa65efc929eee5b6b0c3d2104db8e already reverted one
-change that caused the cwd of all apps spawned by krunner to
-erroneously be set to the root dir.
-
-That regressions is back so it's more robust to fix in within krunner.
-
-Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
----
- krunner/main.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/krunner/main.cpp b/krunner/main.cpp
-index 4593687ca..fa4a62ac4 100644
---- a/krunner/main.cpp
-+++ b/krunner/main.cpp
-@@ -12,6 +12,7 @@
- #include <QDBusConnection>
- #include <QDBusMessage>
- #include <QDebug>
-+#include <QDir>
- #include <QQuickWindow>
- #include <QSessionManager>
- #include <QUrl>
-@@ -112,5 +113,6 @@ int main(int argc, char **argv)
- }
- });
-
-+ QDir::setCurrent(QDir::homePath());
- return app.exec();
- }
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r3.ebuild
deleted file mode 100644
index 0848eaec5896..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r3.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-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
- 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] )
- calculator? ( sci-libs/libqalculate:= )
- 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 )
- 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.1.1
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-util/wayland-scanner-1.19.0
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:5
- >=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/kdesu-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- sys-apps/dbus
- !<kde-plasma/plasma-desktop-5.21.90:5
-"
-BDEPEND="virtual/pkgconfig"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
- "${FILESDIR}/${P}-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
- "${FILESDIR}/${P}-fix-powermanagement-inhibition.patch" # KDE-bug 433675
- "${FILESDIR}/${P}-fix-hotplug-notifications.patch" # KDE-bug 438874, bug 814284
- "${FILESDIR}/${P}-gpsd-3.23.1.patch"
-)
-
-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
-
- # KDE-bug: 433730
- use calculator ||
- cmake_run_in runners cmake_comment_add_subdirectory calculator
-}
-
-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)
- )
-
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
- 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"
-}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2021-12-10 14:58 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2021-12-10 14:58 UTC (permalink / raw
To: gentoo-commits
commit: 772507bcfc6fe0a19f039491f52f9e028cfbb776
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 10 14:26:33 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 10 14:58:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772507bc
kde-plasma/plasma-workspace: Fix klipper bugs, systemsettings crash
Upstream commit c8b8c8dd389ae381831fdd23f354617f48f3edd4
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=446441
Upstream commit beb34e3d9781c7728260d486a835c52be21a6d83
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=444365
Upstream commit a8b613505e326dd047707e0a0e4d6f5ecc4a9baa
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439797
Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
....4-fix-klipper-actions-content-truncation.patch | 33 ++++
...orkspace-5.23.4-fix-klipper-use-full-text.patch | 34 ++++
...workspace-5.23.4-fix-systemsettings-crash.patch | 31 +++
.../plasma-workspace-5.23.4-r1.ebuild | 213 +++++++++++++++++++++
4 files changed, 311 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
new file mode 100644
index 000000000000..1153c9f006f1
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
@@ -0,0 +1,33 @@
+From beb34e3d9781c7728260d486a835c52be21a6d83 Mon Sep 17 00:00:00 2001
+From: ValdikSS ValdikSS <iam@valdikss.org.ru>
+Date: Sun, 5 Dec 2021 15:46:00 +0300
+Subject: [PATCH] Fix Klipper Actions content truncation
+
+Commit f9669af2 introduced a regression with Klipper Actions: it used
+truncated text as a source for the action, which resulted in truncated
+output.
+
+BUG: 444365
+
+
+(cherry picked from commit 49365857623f7e986013bee7d3160594d2272fe2)
+---
+ klipper/urlgrabber.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
+index fb7c0d0a2..185a6a5d6 100644
+--- a/klipper/urlgrabber.cpp
++++ b/klipper/urlgrabber.cpp
+@@ -245,7 +245,7 @@ void URLGrabber::execute(const ClipAction *action, int cmdIdx) const
+ ClipCommand command = action->command(cmdIdx);
+
+ if (command.isEnabled) {
+- QString text(m_myClipItem->text());
++ QString text(m_myClipItem->mimeData()->text());
+ if (m_stripWhiteSpace) {
+ text = text.trimmed();
+ }
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
new file mode 100644
index 000000000000..29640f8262e6
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
@@ -0,0 +1,34 @@
+From c8b8c8dd389ae381831fdd23f354617f48f3edd4 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Sun, 5 Dec 2021 08:26:45 +0000
+Subject: [PATCH] [klipper] Use full text for DBus return values
+
+In a recent commit HistoryItem::text() became the visual representation
+of the mimedata; often a truncated string.
+
+mimeData()->text() always returns the full value.
+
+BUG: 446441
+
+
+(cherry picked from commit 2db375f6a71cb730e1e099f9ff17ef7092850d9d)
+---
+ klipper/klipper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
+index b090a2409..3b12d1f95 100644
+--- a/klipper/klipper.cpp
++++ b/klipper/klipper.cpp
+@@ -838,7 +838,7 @@ QString Klipper::getClipboardHistoryItem(int i)
+ if (item) {
+ do {
+ if (i-- == 0) {
+- return item->text();
++ return item->mimeData()->text();
+ }
+ item = history()->find(item->next_uuid());
+ } while (item != history()->first());
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
new file mode 100644
index 000000000000..d46f33486785
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
@@ -0,0 +1,31 @@
+From a8b613505e326dd047707e0a0e4d6f5ecc4a9baa Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Wed, 8 Dec 2021 18:25:36 +0100
+Subject: [PATCH] lookandfeel: Add missing check if list of files is empty
+
+BUG: 439797
+
+
+(cherry picked from commit d168d2a50366c528dab65415cd4f6e82afdfb645)
+---
+ kcms/lookandfeel/kcm.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp
+index 75ce19197..349761aad 100644
+--- a/kcms/lookandfeel/kcm.cpp
++++ b/kcms/lookandfeel/kcm.cpp
+@@ -123,7 +123,9 @@ void KCMLookandFeel::knsEntryChanged(KNSCore::EntryWrapper *wrapper)
+ if (entry.status() == KNS3::Entry::Deleted && !entry.uninstalledFiles().isEmpty()) {
+ removeItemFromModel();
+ } else if (entry.status() == KNS3::Entry::Installed && !entry.installedFiles().isEmpty()) {
+- removeItemFromModel(); // In case we updated it we don't want to have it in twice
++ if (!entry.uninstalledFiles().isEmpty()) {
++ removeItemFromModel(); // In case we updated it we don't want to have it in twice
++ }
+ KPackage::Package pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
+ pkg.setPath(entry.installedFiles().constFirst());
+ addKPackageToModel(pkg);
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild
new file mode 100644
index 000000000000..d53818417079
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calculator +calendar +fontconfig geolocation gps 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
+ 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] )
+ calculator? ( sci-libs/libqalculate:= )
+ 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 )
+ 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.1.1
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-util/wayland-scanner-1.19.0
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=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/kdesu-${KFMIN}: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.21.90:5
+"
+BDEPEND="virtual/pkgconfig"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
+ "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+ # 5.23 branch
+ "${FILESDIR}"/${P}-fix-klipper-use-full-text.patch # KDE-bug 446441
+ "${FILESDIR}"/${P}-fix-klipper-actions-content-truncation.patch # KDE-bug 444365
+ "${FILESDIR}"/${P}-fix-systemsettings-crash.patch # KDE-bug 439797
+)
+
+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
+
+ # KDE-bug: 433730
+ use calculator ||
+ cmake_run_in runners cmake_comment_add_subdirectory calculator
+}
+
+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)
+ )
+
+ use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2021-11-30 14:33 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2021-11-30 14:33 UTC (permalink / raw
To: gentoo-commits
commit: e049a8de6a38f3027fbcf0b84bd5be53c840c1a3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 30 14:20:21 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 14:32:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e049a8de
kde-plasma/plasma-workspace: drop 5.23.3*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
...earchrunner-emit-DBus-error-when-disabled.patch | 75 --------
...systemtray-check-if-service-already-added.patch | 41 ----
...pace-5.23.3-systemtray-fix-race-condition.patch | 54 ------
.../plasma-workspace-5.23.3-r2.ebuild | 212 ---------------------
5 files changed, 383 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index d16cc13a2fe9..b47676d433af 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.23.3.tar.xz 9006500 BLAKE2B 651780480736ae0478b059e8dcff40d5411310693d3b0b24b9a8a5c442c45c555e69a99c3e0f20d82a4e0dc3a099537c172589e17afa2b34c68d314164913e73 SHA512 34f8835d35063b582b12b343475474b2c7b338ecef148871f28348fe73f2b1ea36d938553c8e97fd108ce441cbb7c97b450590b186c788608c9cf29c82d8c786
DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch
deleted file mode 100644
index be4b6e51b3e2..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From afff43effadd78ab682ecf4c6c9919bdcbbedbcd Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Fri, 12 Nov 2021 11:10:15 +0100
-Subject: [PATCH] baloosearchruner: Emit DBus error when baloo is disabled
-
-Otherwise we exit and KRunner runner into a long timeout.
-
-By making this a dedicated DBus error KRunner can also know, that this
-runner can not be started. Consequently making new attempts to query
-this runner can be prevented.
-
-Because the runner is DBus-Activated, we can not exit the process, otherwise other
-processes (like the search in the app launcher) will have the same issue with the timeout.
-BUG: 445342
-
-
-(cherry picked from commit fa5ac3fe3421a0077d9d80f52b89536daa732afa)
----
- runners/baloo/baloosearchrunner.cpp | 14 ++++++++++----
- runners/baloo/baloosearchrunner.h | 2 +-
- 2 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp
-index 08f24b362..768709cee 100644
---- a/runners/baloo/baloosearchrunner.cpp
-+++ b/runners/baloo/baloosearchrunner.cpp
-@@ -31,10 +31,6 @@ static const QString s_openParentDirId = QStringLiteral("openParentDir");
-
- int main(int argc, char **argv)
- {
-- Baloo::IndexerConfig config;
-- if (!config.fileIndexingEnabled()) {
-- return -1;
-- }
- QCoreApplication::setAttribute(Qt::AA_DisableSessionManager);
- QApplication::setQuitOnLastWindowClosed(false);
- QApplication app(argc, argv); // KRun needs widgets for error message boxes
-@@ -60,11 +56,21 @@ SearchRunner::~SearchRunner()
-
- RemoteActions SearchRunner::Actions()
- {
-+ Baloo::IndexerConfig config;
-+ if (!config.fileIndexingEnabled()) {
-+ sendErrorReply(QDBusError::ErrorType::NotSupported);
-+ }
- return RemoteActions({RemoteAction{s_openParentDirId, i18n("Open Containing Folder"), QStringLiteral("document-open-folder")}});
- }
-
- RemoteMatches SearchRunner::Match(const QString &searchTerm)
- {
-+ Baloo::IndexerConfig config;
-+ if (!config.fileIndexingEnabled()) {
-+ sendErrorReply(QDBusError::ErrorType::NotSupported);
-+ return {};
-+ }
-+
- // Do not try to show results for queries starting with =
- // this should trigger the calculator, but the AdvancedQueryParser::parse method
- // in baloo interpreted it as an operator, BUG 345134
-diff --git a/runners/baloo/baloosearchrunner.h b/runners/baloo/baloosearchrunner.h
-index 5006c9ae3..4836769c9 100644
---- a/runners/baloo/baloosearchrunner.h
-+++ b/runners/baloo/baloosearchrunner.h
-@@ -14,7 +14,7 @@
- #include "dbusutils_p.h"
- #include <KRunner/QueryMatch>
-
--class SearchRunner : public QObject
-+class SearchRunner : public QObject, protected QDBusContext
- {
- Q_OBJECT
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch
deleted file mode 100644
index 6258b66f6e70..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 931a5441746daf10d9476409f347263719ef6c63 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Mon, 1 Nov 2021 22:17:53 +0800
-Subject: [PATCH] systemtray: Check if a service is already added before
- processing QDBusReply
-
-Due to async nature of QDBusPendingReply, services could be already
-registered by QDBusServiceWatcher when the pending reply takes a long
-time to finish, so it's possible that QDBusServiceWatcher::serviceRegistered
-signal is emitted before the pending reply emits QDBusPendingCallWatcher::finished,
-which will make the same service added twice and crash plasmashell.
-
-We need to check if a service is already added in m_sniServices before
-processing registered items in QDBusReply.
-
-BUG: 443961
-
-
-(cherry picked from commit c0b8f6871e75bbc268165844ad5780f13a5f88ac)
----
- applets/systemtray/statusnotifieritemhost.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/applets/systemtray/statusnotifieritemhost.cpp b/applets/systemtray/statusnotifieritemhost.cpp
-index c17eedd6c..4108b2b82 100644
---- a/applets/systemtray/statusnotifieritemhost.cpp
-+++ b/applets/systemtray/statusnotifieritemhost.cpp
-@@ -101,7 +101,9 @@ void StatusNotifierItemHost::registerWatcher(const QString &service)
- QDBusReply<QDBusVariant> reply = *watcher;
- QStringList registeredItems = reply.value().variant().toStringList();
- foreach (const QString &service, registeredItems) {
-- addSNIService(service);
-+ if (!m_sniServices.contains(service)) { // due to async nature of this call, service may be already there
-+ addSNIService(service);
-+ }
- }
- });
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch
deleted file mode 100644
index bbe9a152c608..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a9fba8b5416dd3b130045ccac40e5412714563ea Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Sat, 20 Nov 2021 21:04:06 +0800
-Subject: [PATCH] systemtray: Connect to StatusNotifierWatcher before
- initializing QDBusPendingReply
-
-This fixes a race condition.
-
-
-(cherry picked from commit 644588739e617cfde8ee097dff4a72cc08c421aa)
----
- applets/systemtray/statusnotifieritemhost.cpp | 19 +++++++++----------
- 1 file changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/applets/systemtray/statusnotifieritemhost.cpp b/applets/systemtray/statusnotifieritemhost.cpp
-index 4108b2b82..117c29f17 100644
---- a/applets/systemtray/statusnotifieritemhost.cpp
-+++ b/applets/systemtray/statusnotifieritemhost.cpp
-@@ -93,6 +93,15 @@ void StatusNotifierItemHost::registerWatcher(const QString &service)
- m_statusNotifierWatcher->path(),
- m_statusNotifierWatcher->connection());
-
-+ connect(m_statusNotifierWatcher,
-+ &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemRegistered,
-+ this,
-+ &StatusNotifierItemHost::serviceRegistered);
-+ connect(m_statusNotifierWatcher,
-+ &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemUnregistered,
-+ this,
-+ &StatusNotifierItemHost::serviceUnregistered);
-+
- QDBusPendingReply<QDBusVariant> pendingItems = propetriesIface.Get(m_statusNotifierWatcher->interface(), "RegisteredStatusNotifierItems");
-
- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingItems, this);
-@@ -106,16 +115,6 @@ void StatusNotifierItemHost::registerWatcher(const QString &service)
- }
- }
- });
--
-- connect(m_statusNotifierWatcher,
-- &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemRegistered,
-- this,
-- &StatusNotifierItemHost::serviceRegistered);
-- connect(m_statusNotifierWatcher,
-- &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemUnregistered,
-- this,
-- &StatusNotifierItemHost::serviceUnregistered);
--
- } else {
- delete m_statusNotifierWatcher;
- m_statusNotifierWatcher = nullptr;
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild
deleted file mode 100644
index 9d9161b72295..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps 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
- 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] )
- calculator? ( sci-libs/libqalculate:= )
- 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 )
- 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.1.1
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-util/wayland-scanner-1.19.0
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:5
- >=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/kdesu-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- sys-apps/dbus
- !<kde-plasma/breeze-5.22.90:5
- !<kde-plasma/plasma-desktop-5.21.90:5
-"
-BDEPEND="virtual/pkgconfig"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
- "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
- "${FILESDIR}/${P}-baloosearchrunner-emit-DBus-error-when-disabled.patch" # KDE-bug 445342
- "${FILESDIR}/${P}-systemtray-check-if-service-already-added.patch" # KDE-bug 443961
- "${FILESDIR}/${P}-systemtray-fix-race-condition.patch"
-)
-
-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
-
- # KDE-bug: 433730
- use calculator ||
- cmake_run_in runners cmake_comment_add_subdirectory calculator
-}
-
-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)
- )
-
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
- 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"
-}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2021-11-23 14:59 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2021-11-23 14:59 UTC (permalink / raw
To: gentoo-commits
commit: 4f6eef277f8cb6faac8f0c75e7f8260599ed453f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 17:11:27 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 14:59:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6eef27
kde-plasma/plasma-workspace: baloosearchruner: Emit DBus error
...when baloo is disabled
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=445342
Upstream commit afff43effadd78ab682ecf4c6c9919bdcbbedbcd
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...earchrunner-emit-DBus-error-when-disabled.patch | 75 ++++++++
.../plasma-workspace-5.23.3-r2.ebuild | 210 +++++++++++++++++++++
2 files changed, 285 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch
new file mode 100644
index 000000000000..be4b6e51b3e2
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch
@@ -0,0 +1,75 @@
+From afff43effadd78ab682ecf4c6c9919bdcbbedbcd Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Fri, 12 Nov 2021 11:10:15 +0100
+Subject: [PATCH] baloosearchruner: Emit DBus error when baloo is disabled
+
+Otherwise we exit and KRunner runner into a long timeout.
+
+By making this a dedicated DBus error KRunner can also know, that this
+runner can not be started. Consequently making new attempts to query
+this runner can be prevented.
+
+Because the runner is DBus-Activated, we can not exit the process, otherwise other
+processes (like the search in the app launcher) will have the same issue with the timeout.
+BUG: 445342
+
+
+(cherry picked from commit fa5ac3fe3421a0077d9d80f52b89536daa732afa)
+---
+ runners/baloo/baloosearchrunner.cpp | 14 ++++++++++----
+ runners/baloo/baloosearchrunner.h | 2 +-
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp
+index 08f24b362..768709cee 100644
+--- a/runners/baloo/baloosearchrunner.cpp
++++ b/runners/baloo/baloosearchrunner.cpp
+@@ -31,10 +31,6 @@ static const QString s_openParentDirId = QStringLiteral("openParentDir");
+
+ int main(int argc, char **argv)
+ {
+- Baloo::IndexerConfig config;
+- if (!config.fileIndexingEnabled()) {
+- return -1;
+- }
+ QCoreApplication::setAttribute(Qt::AA_DisableSessionManager);
+ QApplication::setQuitOnLastWindowClosed(false);
+ QApplication app(argc, argv); // KRun needs widgets for error message boxes
+@@ -60,11 +56,21 @@ SearchRunner::~SearchRunner()
+
+ RemoteActions SearchRunner::Actions()
+ {
++ Baloo::IndexerConfig config;
++ if (!config.fileIndexingEnabled()) {
++ sendErrorReply(QDBusError::ErrorType::NotSupported);
++ }
+ return RemoteActions({RemoteAction{s_openParentDirId, i18n("Open Containing Folder"), QStringLiteral("document-open-folder")}});
+ }
+
+ RemoteMatches SearchRunner::Match(const QString &searchTerm)
+ {
++ Baloo::IndexerConfig config;
++ if (!config.fileIndexingEnabled()) {
++ sendErrorReply(QDBusError::ErrorType::NotSupported);
++ return {};
++ }
++
+ // Do not try to show results for queries starting with =
+ // this should trigger the calculator, but the AdvancedQueryParser::parse method
+ // in baloo interpreted it as an operator, BUG 345134
+diff --git a/runners/baloo/baloosearchrunner.h b/runners/baloo/baloosearchrunner.h
+index 5006c9ae3..4836769c9 100644
+--- a/runners/baloo/baloosearchrunner.h
++++ b/runners/baloo/baloosearchrunner.h
+@@ -14,7 +14,7 @@
+ #include "dbusutils_p.h"
+ #include <KRunner/QueryMatch>
+
+-class SearchRunner : public QObject
++class SearchRunner : public QObject, protected QDBusContext
+ {
+ Q_OBJECT
+
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild
new file mode 100644
index 000000000000..5bc9e1a28269
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calculator +calendar +fontconfig geolocation gps 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
+ 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] )
+ calculator? ( sci-libs/libqalculate:= )
+ 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 )
+ 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.1.1
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-util/wayland-scanner-1.19.0
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=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/kdesu-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ sys-apps/dbus
+ !<kde-plasma/breeze-5.22.90:5
+ !<kde-plasma/plasma-desktop-5.21.90:5
+"
+BDEPEND="virtual/pkgconfig"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
+ "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+ "${FILESDIR}/${P}-baloosearchrunner-emit-DBus-error-when-disabled.patch" # KDE-bug 445342
+)
+
+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
+
+ # KDE-bug: 433730
+ use calculator ||
+ cmake_run_in runners cmake_comment_add_subdirectory calculator
+}
+
+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)
+ )
+
+ use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2021-09-22 21:59 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2021-09-22 21:59 UTC (permalink / raw
To: gentoo-commits
commit: 61988d92de81544b00167a289258360b61c7261e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 20:53:47 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 21:59:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61988d92
kde-plasma/plasma-workspace: Fix krunner cwd, device notifications
krunner starts applications with cwd "/" with init system other than systemd
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=432975
Disk & Devices applet doesn't show removable devices after eject and reconnect
Upstream commit 61e2ea2323ae63c5805c87353701ba6fb722205a
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=438874
Thanks-to: Eric F. Garioud <eric-f.garioud <AT> wanadoo.fr>
Thanks-to: Andrea Arcangeli <aarcange <AT> redhat.com>
Bug: https://bugs.gentoo.org/767478
Bug: https://bugs.gentoo.org/814284
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...orkspace-5.22.5-fix-hotplug-notifications.patch | 33 ++++
...asma-workspace-5.22.5-krunner-cwd-at-home.patch | 30 +++
.../plasma-workspace-5.22.5-r2.ebuild | 210 +++++++++++++++++++++
3 files changed, 273 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch
new file mode 100644
index 00000000000..e7cd0627a26
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch
@@ -0,0 +1,33 @@
+From 61e2ea2323ae63c5805c87353701ba6fb722205a Mon Sep 17 00:00:00 2001
+From: Fabio Bas <fabio.bas@officineinformatiche.net>
+Date: Fri, 3 Sep 2021 19:23:12 +0200
+Subject: [PATCH] Update solid connectedSources when a new source gets added by
+ hotplug BUG: 438874
+
+---
+ applets/devicenotifier/package/contents/ui/devicenotifier.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/devicenotifier/package/contents/ui/devicenotifier.qml b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
+index a1dc20b83..404ae95e6 100644
+--- a/applets/devicenotifier/package/contents/ui/devicenotifier.qml
++++ b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
+@@ -75,6 +75,7 @@ Item {
+ onSourceAdded: {
+ disconnectSource(source);
+ connectSource(source);
++ sdSource.connectedSources = sources
+ }
+ onSourceRemoved: {
+ disconnectSource(source);
+@@ -98,7 +99,6 @@ Item {
+ PlasmaCore.DataSource {
+ id: sdSource
+ engine: "soliddevice"
+- connectedSources: hpSource.sources
+ interval: 0
+ property string last
+ onSourceAdded: {
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
new file mode 100644
index 00000000000..27db136c294
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
@@ -0,0 +1,30 @@
+Commit 7ca34e0baa7fa65efc929eee5b6b0c3d2104db8e already reverted one
+change that caused the cwd of all apps spawned by krunner to
+erroneously be set to the root dir.
+
+That regressions is back so it's more robust to fix in within krunner.
+
+Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
+---
+ krunner/main.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/krunner/main.cpp b/krunner/main.cpp
+index 4593687ca..fa4a62ac4 100644
+--- a/krunner/main.cpp
++++ b/krunner/main.cpp
+@@ -12,6 +12,7 @@
+ #include <QDBusConnection>
+ #include <QDBusMessage>
+ #include <QDebug>
++#include <QDir>
+ #include <QQuickWindow>
+ #include <QSessionManager>
+ #include <QUrl>
+@@ -112,5 +113,6 @@ int main(int argc, char **argv)
+ }
+ });
+
++ QDir::setCurrent(QDir::homePath());
+ return app.exec();
+ }
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
new file mode 100644
index 00000000000..2a5454791b8
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.82.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
++semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+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
+ 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] )
+ calculator? ( sci-libs/libqalculate:= )
+ 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 )
+ 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.1.1
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-util/wayland-scanner-1.19.0
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=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/kdesu-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !<kde-plasma/plasma-desktop-5.21.90:5
+"
+BDEPEND="virtual/pkgconfig"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
+ "${FILESDIR}/${P}-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+ "${FILESDIR}/${P}-fix-powermanagement-inhibition.patch" # KDE-bug 433675
+ "${FILESDIR}/${P}-fix-hotplug-notifications.patch" # KDE-bug 438874, bug 814284
+)
+
+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
+
+ # KDE-bug: 433730
+ use calculator ||
+ cmake_run_in runners cmake_comment_add_subdirectory calculator
+}
+
+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)
+ )
+
+ use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2021-09-16 11:14 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2021-09-16 11:14 UTC (permalink / raw
To: gentoo-commits
commit: 16e3445cf4f8d159317df5a3abfb6c489af2c5b7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 11:59:38 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 11:09:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e3445c
kde-plasma/plasma-workspace: drop 5.21.5*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
.../plasma-workspace-5.21.5-FindFontconfig.cmake | 96 ------
...asma-workspace-5.21.5-dangerous-shortcuts.patch | 45 ---
...-workspace-5.21.5-revert-activate-krunner.patch | 56 ---
...workspace-5.21.5-transparency-panelConfig.patch | 27 --
.../plasma-workspace-5.21.5-transparency.patch | 376 ---------------------
.../plasma-workspace-5.21.5.ebuild | 214 ------------
7 files changed, 815 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 013d9857393..0039ae12111 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-FindFontconfig.cmake b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-FindFontconfig.cmake
deleted file mode 100644
index db5f18300ed..00000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-FindFontconfig.cmake
+++ /dev/null
@@ -1,96 +0,0 @@
-# SPDX-FileCopyrightText: 2006, 2007 Laurent Montel <montel@kde.org>
-# SPDX-FileCopyrightText: 2018 Volker Krause <vkrause@kde.org>
-#
-# SPDX-License-Identifier: BSD-3-Clause
-
-#[=======================================================================[.rst:
-FindFontconfig
---------------
-
-Try to find Fontconfig.
-Once done this will define the following variables:
-
-``Fontconfig_FOUND``
- True if Fontconfig is available
-``Fontconfig_INCLUDE_DIRS``
- The include directory to use for the Fontconfig headers
-``Fontconfig_LIBRARIES``
- The Fontconfig libraries for linking
-``Fontconfig_DEFINITIONS``
- Compiler switches required for using Fontconfig
-``Fontconfig_VERSION``
- The version of Fontconfig that has been found
-
-If ``Fontconfig_FOUND`` is TRUE, it will also define the following
-imported target:
-
-``Fontconfig::Fontconfig``
-
-Since 5.57.0.
-#]=======================================================================]
-
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_FONTCONFIG QUIET fontconfig)
-
-set(Fontconfig_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER})
-
-find_path(Fontconfig_INCLUDE_DIRS fontconfig/fontconfig.h
- PATHS
- ${PC_FONTCONFIG_INCLUDE_DIRS}
- /usr/X11/include
-)
-
-find_library(Fontconfig_LIBRARIES NAMES fontconfig
- PATHS
- ${PC_FONTCONFIG_LIBRARY_DIRS}
-)
-
-set(Fontconfig_VERSION ${PC_FONTCONFIG_VERSION})
-if (NOT Fontconfig_VERSION)
- find_file(Fontconfig_VERSION_HEADER
- NAMES "fontconfig/fontconfig.h"
- HINTS ${Fontconfig_INCLUDE_DIRS}
- )
- mark_as_advanced(Fontconfig_VERSION_HEADER)
- if (Fontconfig_VERSION_HEADER)
- file(READ ${Fontconfig_VERSION_HEADER} _fontconfig_version_header_content)
- string(REGEX MATCH "#define FC_MAJOR[ \t]+[0-9]+" Fontconfig_MAJOR_VERSION_MATCH ${_fontconfig_version_header_content})
- string(REGEX MATCH "#define FC_MINOR[ \t]+[0-9]+" Fontconfig_MINOR_VERSION_MATCH ${_fontconfig_version_header_content})
- string(REGEX MATCH "#define FC_REVISION[ \t]+[0-9]+" Fontconfig_PATCH_VERSION_MATCH ${_fontconfig_version_header_content})
- string(REGEX REPLACE ".*FC_MAJOR[ \t]+(.*)" "\\1" Fontconfig_MAJOR_VERSION ${Fontconfig_MAJOR_VERSION_MATCH})
- string(REGEX REPLACE ".*FC_MINOR[ \t]+(.*)" "\\1" Fontconfig_MINOR_VERSION ${Fontconfig_MINOR_VERSION_MATCH})
- string(REGEX REPLACE ".*FC_REVISION[ \t]+(.*)" "\\1" Fontconfig_PATCH_VERSION ${Fontconfig_PATCH_VERSION_MATCH})
- set(Fontconfig_VERSION "${Fontconfig_MAJOR_VERSION}.${Fontconfig_MINOR_VERSION}.${Fontconfig_PATCH_VERSION}")
- endif()
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Fontconfig
- FOUND_VAR Fontconfig_FOUND
- REQUIRED_VARS Fontconfig_LIBRARIES Fontconfig_INCLUDE_DIRS
- VERSION_VAR Fontconfig_VERSION
-)
-mark_as_advanced(Fontconfig_LIBRARIES Fontconfig_INCLUDE_DIRS)
-
-if(Fontconfig_FOUND AND NOT TARGET Fontconfig::Fontconfig)
- add_library(Fontconfig::Fontconfig UNKNOWN IMPORTED)
- set_target_properties(Fontconfig::Fontconfig PROPERTIES
- IMPORTED_LOCATION "${Fontconfig_LIBRARIES}"
- INTERFACE_INCLUDE_DIRECTORIES "${Fontconfig_INCLUDE_DIRS}"
- INTERFACE_COMPILER_DEFINITIONS "${Fontconfig_DEFINITIONS}"
- )
-endif()
-
-# backward compatibility, remove in kf6
-set(FONTCONFIG_INCLUDE_DIR "${Fontconfig_INCLUDE_DIRS}")
-set(FONTCONFIG_LIBRARIES "${Fontconfig_LIBRARIES}")
-set(FONTCONFIG_DEFINITIONS "${Fontconfig_DEFINITIONS}")
-mark_as_advanced(FONTCONFIG_INCLUDE_DIR FONTCONFIG_LIBRARIES FONTCONFIG_DEFINITIONS)
-
-include(FeatureSummary)
-set_package_properties(Fontconfig PROPERTIES
- URL "https://www.fontconfig.org/"
- DESCRIPTION "Fontconfig is a library for configuring and customizing font access"
-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch
deleted file mode 100644
index f04bb866d5d..00000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e8e17c5ef8734fa56a78405e32277568e4e1095e Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Thu, 22 Apr 2021 08:38:18 -0600
-Subject: [PATCH] [ksmserver] Remove default shortcuts for "Without
- Confirmation" actions
-
-These actions bypass the user setting for whether or not to show the
-logout screen and always log out/reboot/etc. immediately. Because they
-have default keyboard shortcuts, they can be triggered by accident and
-cause unexpected logouts/reboots/etc.
-
-BUG: 435954
-FIXED-IN: 5.22
----
- ksmserver/server.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
-index ac9da9f09..6f3179fb9 100644
---- a/ksmserver/server.cpp
-+++ b/ksmserver/server.cpp
-@@ -880,17 +880,17 @@ void KSMServer::setupShortcuts()
-
- a = actionCollection->addAction(QStringLiteral("Log Out Without Confirmation"));
- a->setText(i18n("Log Out Without Confirmation"));
-- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_Delete);
-+ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence());
- connect(a, &QAction::triggered, this, &KSMServer::logoutWithoutConfirmation);
-
- a = actionCollection->addAction(QStringLiteral("Halt Without Confirmation"));
- a->setText(i18n("Halt Without Confirmation"));
-- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown);
-+ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence());
- connect(a, &QAction::triggered, this, &KSMServer::haltWithoutConfirmation);
-
- a = actionCollection->addAction(QStringLiteral("Reboot Without Confirmation"));
- a->setText(i18n("Reboot Without Confirmation"));
-- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageUp);
-+ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence());
- connect(a, &QAction::triggered, this, &KSMServer::rebootWithoutConfirmation);
- }
- }
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch
deleted file mode 100644
index c2637286da1..00000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9bdae154bb3711b0220d0a8a685b2329f487d1f2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 15 Feb 2021 17:35:19 +0100
-Subject: [PATCH] Revert "Activate KRunner instead of running the binary"
-
-Causes applications to be started with cwd "/".
-
-See also: https://bugs.gentoo.org/767478
-
-This reverts commit 0e575a20ef36532b5b40a40ea30f915976942477.
----
- krunner/CMakeLists.txt | 3 ++-
- krunner/{krunner.desktop => krunner.desktop.cmake} | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
- rename krunner/{krunner.desktop => krunner.desktop.cmake} (94%)
-
-diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt
-index 07d27c1dc..8e1f2e3bd 100644
---- a/krunner/CMakeLists.txt
-+++ b/krunner/CMakeLists.txt
-@@ -31,7 +31,8 @@ target_compile_definitions(krunner PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}
- install(TARGETS krunner ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
-
--install(FILES krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel)
-+configure_file(krunner.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop @ONLY)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel)
-
- set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KRunnerAppDBusInterface")
- configure_package_config_file(KRunnerAppDBusInterfaceConfig.cmake.in
-diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop.cmake
-similarity index 94%
-rename from krunner/krunner.desktop
-rename to krunner/krunner.desktop.cmake
-index 7a0398696..c4c8c9d92 100644
---- a/krunner/krunner.desktop
-+++ b/krunner/krunner.desktop.cmake
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.toggleDisplay
-+Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
- Name=KRunner
- Name[ar]=مشغّل.ك
- Name[ast]=KRunner
-@@ -60,7 +60,7 @@ Actions=RunClipboard
- X-KDE-Wayland-Interfaces=org_kde_plasma_window_management
-
- [Desktop Action RunClipboard]
--Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.displayWithClipboardContents
-+Exec=krunner -c
- Name=Run command on clipboard contents
- Name[az]=Əmri, mübadilə buferindən başlatmaq
- Name[ca]=Executa una ordre al contingut del porta-retalls
---
-2.31.1
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch
deleted file mode 100644
index fb7993e6db7..00000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1cf02aad96bfe650a1f4d1465ae15234205fb061 Mon Sep 17 00:00:00 2001
-From: Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
-Date: Mon, 26 Apr 2021 18:47:51 +0000
-Subject: [PATCH] Load panelOpacity from config parent, not from config
-
-BUG: 434285
-FIXED-IN: 5.22
----
- shell/panelview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/shell/panelview.cpp b/shell/panelview.cpp
-index 5ed743024..4533e856f 100644
---- a/shell/panelview.cpp
-+++ b/shell/panelview.cpp
-@@ -633,7 +633,7 @@ void PanelView::restore()
- // the place for this config key is changed in Plasma 5.9
- // Do NOT use readConfigValueWithFallBack
- setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel)));
-- setOpacityMode((OpacityMode)readConfigValueWithFallBack("panelOpacity", PanelView::OpacityMode::Adaptive));
-+ setOpacityMode((OpacityMode)config().parent().readEntry<int>("panelOpacity", configDefaults().parent().readEntry<int>("panelOpacity", PanelView::OpacityMode::Adaptive)));
- m_initCompleted = true;
- resizePanel();
- positionPanel();
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch
deleted file mode 100644
index 1a925a137ce..00000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch
+++ /dev/null
@@ -1,376 +0,0 @@
-From 7db8d5ee551f30576588d31470fe287b6ad2adcd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= <niccolo@venerandi.com>
-Date: Mon, 1 Mar 2021 22:14:43 +0000
-Subject: [PATCH] Add support for adaptive opacity panels
-
-Co-authored-by: Jan Blackquill <uhhadd@gmail.com>
----
- libtaskmanager/taskfilterproxymodel.cpp | 26 ++++++++++++++++++
- libtaskmanager/taskfilterproxymodel.h | 19 ++++++++++++++
- libtaskmanager/tasksmodel.cpp | 11 ++++++++
- libtaskmanager/tasksmodel.h | 19 ++++++++++++++
- shell/panelconfigview.cpp | 11 ++++++++
- shell/panelconfigview.h | 5 ++++
- shell/panelview.cpp | 35 +++++++++++++++++++++++++
- shell/panelview.h | 28 ++++++++++++++++++++
- 8 files changed, 154 insertions(+)
-
-diff --git a/libtaskmanager/taskfilterproxymodel.cpp b/libtaskmanager/taskfilterproxymodel.cpp
-index 37a3076fd..6bb27537a 100644
---- a/libtaskmanager/taskfilterproxymodel.cpp
-+++ b/libtaskmanager/taskfilterproxymodel.cpp
-@@ -40,6 +40,7 @@ public:
- bool filterByScreen = false;
- bool filterByActivity = false;
- bool filterNotMinimized = false;
-+ bool filterNotMaximized = false;
- bool filterSkipTaskbar = true;
- bool filterSkipPager = false;
-
-@@ -185,6 +186,22 @@ void TaskFilterProxyModel::setFilterNotMinimized(bool filter)
- }
- }
-
-+bool TaskFilterProxyModel::filterNotMaximized() const
-+{
-+ return d->filterNotMaximized;
-+}
-+
-+void TaskFilterProxyModel::setFilterNotMaximized(bool filter)
-+{
-+ if (d->filterNotMaximized != filter) {
-+ d->filterNotMaximized = filter;
-+
-+ invalidateFilter();
-+
-+ emit filterNotMaximizedChanged();
-+ }
-+}
-+
- bool TaskFilterProxyModel::filterSkipTaskbar() const
- {
- return d->filterSkipTaskbar;
-@@ -301,6 +318,15 @@ bool TaskFilterProxyModel::acceptsRow(int sourceRow) const
- }
- }
-
-+ // Filter not maximized.
-+ if (d->filterNotMaximized) {
-+ bool isMaximized = sourceIdx.data(AbstractTasksModel::IsMaximized).toBool();
-+
-+ if (!isMaximized) {
-+ return false;
-+ }
-+ }
-+
- return true;
- }
-
-diff --git a/libtaskmanager/taskfilterproxymodel.h b/libtaskmanager/taskfilterproxymodel.h
-index 7ad2cb9ce..88ba3adab 100644
---- a/libtaskmanager/taskfilterproxymodel.h
-+++ b/libtaskmanager/taskfilterproxymodel.h
-@@ -52,6 +52,7 @@ class TASKMANAGER_EXPORT TaskFilterProxyModel : public QSortFilterProxyModel, pu
- Q_PROPERTY(bool filterByScreen READ filterByScreen WRITE setFilterByScreen NOTIFY filterByScreenChanged)
- Q_PROPERTY(bool filterByActivity READ filterByActivity WRITE setFilterByActivity NOTIFY filterByActivityChanged)
- Q_PROPERTY(bool filterNotMinimized READ filterNotMinimized WRITE setFilterNotMinimized NOTIFY filterNotMinimizedChanged)
-+ Q_PROPERTY(bool filterNotMaximized READ filterNotMaximized WRITE setFilterNotMaximized NOTIFY filterNotMaximizedChanged)
- Q_PROPERTY(bool filterSkipTaskbar READ filterSkipTaskbar WRITE setFilterSkipTaskbar NOTIFY filterSkipTaskbarChanged)
- Q_PROPERTY(bool filterSkipPager READ filterSkipPager WRITE setFilterSkipPager NOTIFY filterSkipPagerChanged)
-
-@@ -212,6 +213,23 @@ public:
- **/
- void setFilterNotMinimized(bool filter);
-
-+ /**
-+ * Whether non-maximized tasks should be filtered. Defaults to
-+ * @c false.
-+ *
-+ * @see setFilterNotMaximized
-+ * @returns @c true if non-maximized tasks should be filtered.
-+ **/
-+ bool filterNotMaximized() const;
-+
-+ /**
-+ * Set whether non-maximized tasks should be filtered.
-+ *
-+ * @see filterNotMaximized
-+ * @param filter Whether non-maximized tasks should be filtered.
-+ **/
-+ void setFilterNotMaximized(bool filter);
-+
- /**
- * Whether tasks which should be omitted from 'task bars' should be
- * filtered. Defaults to @c true.
-@@ -285,6 +303,7 @@ Q_SIGNALS:
- void filterByScreenChanged() const;
- void filterByActivityChanged() const;
- void filterNotMinimizedChanged() const;
-+ void filterNotMaximizedChanged() const;
- void filterSkipTaskbarChanged() const;
- void filterSkipPagerChanged() const;
- void demandingAttentionSkipsFiltersChanged() const;
-diff --git a/libtaskmanager/tasksmodel.cpp b/libtaskmanager/tasksmodel.cpp
-index c6e66926b..11eb53fdf 100644
---- a/libtaskmanager/tasksmodel.cpp
-+++ b/libtaskmanager/tasksmodel.cpp
-@@ -302,6 +302,7 @@ void TasksModel::Private::initModels()
- QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterByScreenChanged, q, &TasksModel::filterByScreenChanged);
- QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterByActivityChanged, q, &TasksModel::filterByActivityChanged);
- QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterNotMinimizedChanged, q, &TasksModel::filterNotMinimizedChanged);
-+ QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterNotMaximizedChanged, q, &TasksModel::filterNotMaximizedChanged);
-
- groupingProxyModel = new TaskGroupingProxyModel(q);
- groupingProxyModel->setSourceModel(filterProxyModel);
-@@ -1152,6 +1153,16 @@ void TasksModel::setFilterNotMinimized(bool filter)
- d->filterProxyModel->setFilterNotMinimized(filter);
- }
-
-+bool TasksModel::filterNotMaximized() const
-+{
-+ return d->filterProxyModel->filterNotMaximized();
-+}
-+
-+void TasksModel::setFilterNotMaximized(bool filter)
-+{
-+ d->filterProxyModel->setFilterNotMaximized(filter);
-+}
-+
- TasksModel::SortMode TasksModel::sortMode() const
- {
- return d->sortMode;
-diff --git a/libtaskmanager/tasksmodel.h b/libtaskmanager/tasksmodel.h
-index 18e3d9bb4..8c84012d0 100644
---- a/libtaskmanager/tasksmodel.h
-+++ b/libtaskmanager/tasksmodel.h
-@@ -73,6 +73,7 @@ class TASKMANAGER_EXPORT TasksModel : public QSortFilterProxyModel, public Abstr
- Q_PROPERTY(bool filterByScreen READ filterByScreen WRITE setFilterByScreen NOTIFY filterByScreenChanged)
- Q_PROPERTY(bool filterByActivity READ filterByActivity WRITE setFilterByActivity NOTIFY filterByActivityChanged)
- Q_PROPERTY(bool filterNotMinimized READ filterNotMinimized WRITE setFilterNotMinimized NOTIFY filterNotMinimizedChanged)
-+ Q_PROPERTY(bool filterNotMaximized READ filterNotMaximized WRITE setFilterNotMaximized NOTIFY filterNotMaximized)
-
- Q_PROPERTY(SortMode sortMode READ sortMode WRITE setSortMode NOTIFY sortModeChanged)
- Q_PROPERTY(bool separateLaunchers READ separateLaunchers WRITE setSeparateLaunchers NOTIFY separateLaunchersChanged)
-@@ -295,6 +296,23 @@ public:
- **/
- void setFilterNotMinimized(bool filter);
-
-+ /**
-+ * Whether non-maximized tasks should be filtered. Defaults to
-+ * @c false.
-+ *
-+ * @see setFilterNotMaximized
-+ * @returns @c true if non-maximized tasks should be filtered.
-+ **/
-+ bool filterNotMaximized() const;
-+
-+ /**
-+ * Set whether non-maximized tasks should be filtered.
-+ *
-+ * @see filterNotMaximized
-+ * @param filter Whether non-maximized tasks should be filtered.
-+ **/
-+ void setFilterNotMaximized(bool filter);
-+
- /**
- * The sort mode used in sorting tasks. Defaults to SortAlpha.
- *
-@@ -848,6 +866,7 @@ Q_SIGNALS:
- void filterByScreenChanged() const;
- void filterByActivityChanged() const;
- void filterNotMinimizedChanged() const;
-+ void filterNotMaximizedChanged() const;
- void sortModeChanged() const;
- void separateLaunchersChanged() const;
- void launchInPlaceChanged() const;
-diff --git a/shell/panelconfigview.cpp b/shell/panelconfigview.cpp
-index a331c0bb2..5637f3233 100644
---- a/shell/panelconfigview.cpp
-+++ b/shell/panelconfigview.cpp
-@@ -289,6 +289,17 @@ PanelView::VisibilityMode PanelConfigView::visibilityMode() const
- return m_panelView->visibilityMode();
- }
-
-+void PanelConfigView::setOpacityMode(PanelView::OpacityMode mode)
-+{
-+ m_panelView->setOpacityMode(mode);
-+ emit opacityModeChanged();
-+}
-+
-+PanelView::OpacityMode PanelConfigView::opacityMode() const
-+{
-+ return m_panelView->opacityMode();
-+}
-+
- Plasma::FrameSvg::EnabledBorders PanelConfigView::enabledBorders() const
- {
- return m_enabledBorders;
-diff --git a/shell/panelconfigview.h b/shell/panelconfigview.h
-index 8e0abd314..db2af6bf9 100644
---- a/shell/panelconfigview.h
-+++ b/shell/panelconfigview.h
-@@ -51,6 +51,7 @@ class PanelConfigView : public PlasmaQuick::ConfigView
- {
- Q_OBJECT
- Q_PROPERTY(PanelView::VisibilityMode visibilityMode READ visibilityMode WRITE setVisibilityMode NOTIFY visibilityModeChanged)
-+ Q_PROPERTY(PanelView::OpacityMode opacityMode READ opacityMode WRITE setOpacityMode NOTIFY opacityModeChanged)
- Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged)
-
- public:
-@@ -62,6 +63,9 @@ public:
- PanelView::VisibilityMode visibilityMode() const;
- void setVisibilityMode(PanelView::VisibilityMode mode);
-
-+ PanelView::OpacityMode opacityMode() const;
-+ void setOpacityMode(PanelView::OpacityMode mode);
-+
- Plasma::FrameSvg::EnabledBorders enabledBorders() const;
-
- protected:
-@@ -84,6 +88,7 @@ private Q_SLOTS:
-
- Q_SIGNALS:
- void visibilityModeChanged();
-+ void opacityModeChanged();
- void enabledBordersChanged();
-
- private:
-diff --git a/shell/panelview.cpp b/shell/panelview.cpp
-index 4654a7a72..a699cc84c 100644
---- a/shell/panelview.cpp
-+++ b/shell/panelview.cpp
-@@ -64,6 +64,7 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent
- , m_alignment(Qt::AlignLeft)
- , m_corona(corona)
- , m_visibilityMode(NormalPanel)
-+ , m_opacityMode(Adaptive)
- , m_backgroundHints(Plasma::Types::StandardBackground)
- , m_shellSurface(nullptr)
- {
-@@ -76,8 +77,10 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent
- setClearBeforeRendering(true);
- setColor(QColor(Qt::transparent));
- setFlags(Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
-+ updateAdaptiveOpacityEnabled();
-
- connect(&m_theme, &Plasma::Theme::themeChanged, this, &PanelView::updateMask);
-+ connect(&m_theme, &Plasma::Theme::themeChanged, this, &PanelView::updateAdaptiveOpacityEnabled);
- connect(this, &PanelView::backgroundHintsChanged, this, &PanelView::updateMask);
- connect(this, &PanelView::backgroundHintsChanged, this, &PanelView::updateEnabledBorders);
- // TODO: add finished/componentComplete signal to QuickViewSharedEngine,
-@@ -405,6 +408,37 @@ PanelView::VisibilityMode PanelView::visibilityMode() const
- return m_visibilityMode;
- }
-
-+PanelView::OpacityMode PanelView::opacityMode() const
-+{
-+ if (!m_theme.adaptiveTransparencyEnabled()) {
-+ return PanelView::Translucent;
-+ }
-+ return m_opacityMode;
-+}
-+
-+bool PanelView::adaptiveOpacityEnabled()
-+{
-+ return m_theme.adaptiveTransparencyEnabled();
-+}
-+
-+void PanelView::setOpacityMode(PanelView::OpacityMode mode)
-+{
-+ if (m_opacityMode != mode) {
-+ m_opacityMode = mode;
-+ if (config().isValid() && config().parent().isValid()) {
-+ config().parent().writeEntry("panelOpacity", (int)mode);
-+ m_corona->requestApplicationConfigSync();
-+ }
-+ emit opacityModeChanged();
-+ }
-+}
-+
-+void PanelView::updateAdaptiveOpacityEnabled()
-+{
-+ emit opacityModeChanged();
-+ emit adaptiveOpacityEnabledChanged();
-+}
-+
- void PanelView::positionPanel()
- {
- if (!containment()) {
-@@ -599,6 +633,7 @@ void PanelView::restore()
- // the place for this config key is changed in Plasma 5.9
- // Do NOT use readConfigValueWithFallBack
- setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel)));
-+ setOpacityMode((OpacityMode)readConfigValueWithFallBack("panelOpacity", PanelView::OpacityMode::Adaptive));
- m_initCompleted = true;
- resizePanel();
- positionPanel();
-diff --git a/shell/panelview.h b/shell/panelview.h
-index 60e4d446e..c312d4907 100644
---- a/shell/panelview.h
-+++ b/shell/panelview.h
-@@ -100,6 +100,18 @@ class PanelView : public PlasmaQuick::ContainmentView
- */
- Q_PROPERTY(VisibilityMode visibilityMode READ visibilityMode WRITE setVisibilityMode NOTIFY visibilityModeChanged)
-
-+ /**
-+ * Property that determines how a panel's opacity behaves.
-+ *
-+ * @see OpacityMode
-+ */
-+ Q_PROPERTY(OpacityMode opacityMode READ opacityMode WRITE setOpacityMode NOTIFY opacityModeChanged)
-+
-+ /**
-+ /* Property that determines whether adaptive opacity is used.
-+ */
-+ Q_PROPERTY(bool adaptiveOpacityEnabled READ adaptiveOpacityEnabled NOTIFY adaptiveOpacityEnabledChanged)
-+
- public:
- enum VisibilityMode {
- NormalPanel = 0, /** default, always visible panel, the windowmanager reserves a places for it */
-@@ -109,6 +121,14 @@ public:
- };
- Q_ENUM(VisibilityMode)
-
-+ /** Enumeration of possible opacity modes. */
-+ enum OpacityMode {
-+ Adaptive = 0, /** The panel will change opacity depending on the presence of a maximized window */
-+ Opaque, /** The panel will always be opaque */
-+ Translucent /** The panel will always be translucent */
-+ };
-+ Q_ENUM(OpacityMode)
-+
- explicit PanelView(ShellCorona *corona, QScreen *targetScreen = nullptr, QWindow *parent = nullptr);
- ~PanelView() override;
-
-@@ -147,6 +167,11 @@ public:
- VisibilityMode visibilityMode() const;
- void setVisibilityMode(PanelView::VisibilityMode mode);
-
-+ PanelView::OpacityMode opacityMode() const;
-+ bool adaptiveOpacityEnabled();
-+ void setOpacityMode(PanelView::OpacityMode mode);
-+ void updateAdaptiveOpacityEnabled();
-+
- /**
- * @returns the geometry of the panel given a distance
- */
-@@ -185,6 +210,8 @@ Q_SIGNALS:
- // QWindow does not have a property for screen. Adding this property requires re-implementing the signal
- void screenToFollowChanged(QScreen *screen);
- void visibilityModeChanged();
-+ void opacityModeChanged();
-+ void adaptiveOpacityEnabledChanged();
-
- protected Q_SLOTS:
- /**
-@@ -235,6 +262,7 @@ private:
- ShellCorona *m_corona;
- QTimer m_strutsTimer;
- VisibilityMode m_visibilityMode;
-+ OpacityMode m_opacityMode;
- Plasma::Theme m_theme;
- QTimer m_positionPaneltimer;
- QTimer m_unhideTimer;
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
deleted file mode 100644
index 22adfc762f4..00000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop systemd telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT+=" test"
-
-COMMON_DEPEND="
- >=dev-libs/wayland-1.15
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5=[jpeg]
- >=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/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/kdelibs4support-${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/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/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/libkscreen-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=media-libs/phonon-4.11.0
- 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] )
- calculator? ( sci-libs/libqalculate:= )
- calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
- fontconfig? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- x11-libs/xcb-util-image
- )
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- screencast? (
- >=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.1.1
- >=dev-qt/qtconcurrent-${QTMIN}:5
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:5
- >=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-19.04.3:5
- >=kde-frameworks/kdesu-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-plasma/ksysguard-${PVCUT}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- systemd? ( sys-apps/dbus[user-session] )
- !systemd? ( sys-apps/dbus )
- !<kde-plasma/plasma-desktop-5.19.80:5
-"
-BDEPEND="virtual/pkgconfig"
-PDEPEND="
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-split-libkworkspace.patch" # downstream patch
- "${FILESDIR}/${P}-revert-activate-krunner.patch" # bug 767478
- "${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202
- "${FILESDIR}/${P}-transparency-panelConfig.patch" # KDE-bug 434285
- "${FILESDIR}/${P}-dangerous-shortcuts.patch" # KDE-bug 435954
-)
-
-src_prepare() {
- rm po/ta/kcm_autostart.po || die # spurious file
-
- 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
-
- # KDE-bug: 433730
- use calculator ||
- cmake_run_in runners cmake_comment_add_subdirectory calculator
-
- cp "${FILESDIR}"/${P}-FindFontconfig.cmake cmake/FindFontconfig.cmake || die # bug 813041
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- $(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)
- )
-
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
- 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
-
- # Clean up pre-5.17.4 dirs
- rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
-
- 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"
-}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2021-05-29 21:19 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2021-05-29 21:19 UTC (permalink / raw
To: gentoo-commits
commit: 1a411a00178fe8cc700103aa860003d099acc14c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 20:49:39 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 29 21:16:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a411a00
kde-plasma/plasma-workspace: Rebase split-libkworkspace.patch
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...asma-workspace-5.21.5-split-libkworkspace.patch | 33 ++++++++++++++++++++++
.../plasma-workspace-5.21.5.ebuild | 2 +-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch
new file mode 100644
index 00000000000..c96c0ba623d
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch
@@ -0,0 +1,33 @@
+From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 22 Oct 2018 10:35:10 +0200
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ CMakeLists.txt | 6 +++-
+ 1 file changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 67f82cfb7..88a8c09b4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,6 +73,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
+
+ find_package(KF5TextEditor)
+ find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(LibKWorkspace 5.21.5)
+
+ find_package(KF5Screen CONFIG REQUIRED)
+ find_package(KScreenLocker 5.13.80 REQUIRED)
+@@ -214,7 +215,10 @@ query_qmake(QtBinariesDir QT_INSTALL_BINS)
+ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma" FALSE)
+
+ add_subdirectory(doc)
+-add_subdirectory(libkworkspace)
++if(NOT LibKWorkspace_FOUND)
++ message(STATUS "System LibKWorkspace not found, using bundled.")
++ add_subdirectory(libkworkspace)
++endif()
+ add_subdirectory(libdbusmenuqt)
+ add_subdirectory(appmenu)
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
index 35b280c763a..6e92371027f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
@@ -144,7 +144,7 @@ PDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${P}-split-libkworkspace.patch" # downstream patch
"${FILESDIR}/${P}-revert-activate-krunner.patch" # bug 767478
"${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202
"${FILESDIR}/${P}-transparency-panelConfig.patch" # KDE-bug 434285
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2021-02-05 10:12 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2021-02-05 10:12 UTC (permalink / raw
To: gentoo-commits
commit: 57de3a3d0b6ba43351d08ea5a83e8d9203477a49
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 5 10:05:23 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 5 10:12:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57de3a3d
kde-plasma/plasma-workspace: Fix krunner regression to use cwd "~"
Reported-by: Andrea <andrea <AT> cpushare.com>
Tested-by: Marquel (in #plasma), but also myself
Closes: https://bugs.gentoo.org/767478
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...-workspace-5.20.5-revert-activate-krunner.patch | 56 ++++++
.../plasma-workspace-5.20.5-r4.ebuild | 209 +++++++++++++++++++++
2 files changed, 265 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-revert-activate-krunner.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-revert-activate-krunner.patch
new file mode 100644
index 00000000000..37f3ae7ece4
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-revert-activate-krunner.patch
@@ -0,0 +1,56 @@
+From e350342bfc42f7803c58dafea0c0ad190507430b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 2 Feb 2021 13:28:06 +0100
+Subject: [PATCH] Revert "Activate KRunner instead of running the binary"
+
+Causes applications to be started with cwd "/".
+
+See also: https://bugs.gentoo.org/767478
+
+This reverts commit 0e575a20ef36532b5b40a40ea30f915976942477.
+---
+ krunner/CMakeLists.txt | 3 ++-
+ krunner/{krunner.desktop => krunner.desktop.cmake} | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+ rename krunner/{krunner.desktop => krunner.desktop.cmake} (94%)
+
+diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt
+index 59d50e464..02b2c5731 100644
+--- a/krunner/CMakeLists.txt
++++ b/krunner/CMakeLists.txt
+@@ -31,7 +31,8 @@ target_compile_definitions(krunner PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}
+ install(TARGETS krunner ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
+
+-install(FILES krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel)
++configure_file(krunner.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop @ONLY)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel)
+
+ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KRunnerAppDBusInterface")
+ configure_package_config_file(KRunnerAppDBusInterfaceConfig.cmake.in
+diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop.cmake
+similarity index 94%
+rename from krunner/krunner.desktop
+rename to krunner/krunner.desktop.cmake
+index 85c91dbad..457daaaa7 100644
+--- a/krunner/krunner.desktop
++++ b/krunner/krunner.desktop.cmake
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.display
++Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
+ Name=KRunner
+ Name[ar]=مشغّل.ك
+ Name[ast]=KRunner
+@@ -59,7 +59,7 @@ Actions=RunClipboard
+ X-KDE-Wayland-Interfaces=org_kde_plasma_window_management
+
+ [Desktop Action RunClipboard]
+-Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.displayWithClipboardContents
++Exec=krunner -c
+ Name=Run command on clipboard contents
+ Name[az]=Əmri, mübadilə buferindən başlatmaq
+ Name[ca]=Executa una ordre al contingut del porta-retalls
+--
+2.30.0
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild
new file mode 100644
index 00000000000..7c9a6156b56
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT+=" test"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+ >=dev-libs/wayland-1.15
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+ >=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/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/kdelibs4support-${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/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/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/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ >=media-libs/phonon-4.11.0
+ 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? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ qalculate? ( sci-libs/libqalculate:= )
+ screencast? (
+ >=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.1.1
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=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-19.04.3:5
+ >=kde-frameworks/kdesu-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-plasma/ksysguard-${PVCUT}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !<kde-plasma/plasma-desktop-5.19.80:5
+"
+PDEPEND="
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${P}-avoid-render-invisible-contents.patch" # KDE-Bug 347772
+ "${FILESDIR}/${P}-fix-wake-screensaver-mode-w-keypress.patch" # KDE-Bug 431286
+ "${FILESDIR}/${P}-fix-crash-on-screen-changes.patch" # KDE-Bug 425711
+ "${FILESDIR}/${P}-fix-digitalclock-agenda-view.patch" # KDE-Bug 431433
+ "${FILESDIR}/${P}-wayland-fix-XKB-variable-setup.patch"
+ "${FILESDIR}/${P}-revert-activate-krunner.patch" # bug 767478
+)
+
+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
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ $(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 qalculate Qalculate)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ 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
+
+ # Clean up pre-5.17.4 dirs
+ rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2021-01-23 22:45 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2021-01-23 22:45 UTC (permalink / raw
To: gentoo-commits
commit: 22a2e16852a80b3a9a4a633fc0dbb853e41bdb9c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 22:34:11 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 22:45:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a2e168
kde-plasma/plasma-workspace: Fix wake existing screensaver w/ keypress
Upstream commit 13057013d55ae19e76d29b9edc96510e52da2a7a
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=431286
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...20.5-fix-wake-screensaver-mode-w-keypress.patch | 67 +++++++
.../plasma-workspace-5.20.5-r3.ebuild | 208 +++++++++++++++++++++
2 files changed, 275 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch
new file mode 100644
index 00000000000..8d2c0ddfbdb
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch
@@ -0,0 +1,67 @@
+From 13057013d55ae19e76d29b9edc96510e52da2a7a Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 8 Jan 2021 12:40:07 +0000
+Subject: [PATCH] [lookandfeel] Fix wake existing screensaver mode with key
+ presses
+
+In commit 45e0a722fb85bb5d1ab8bef92080e934254b13aa we changed the focus
+on the textfield with the intention of fixing the cusor blinking.
+
+This had the unfortunate side effect of breaking waking out of the
+screensaver mode with just the keyboard.
+
+That screensaver mode was bound to:
+```
+property bool blockUI: mainBlock.mainPasswordBox.text.length > 0
+```
+for that to change, we need to have focus.
+
+Instead this patches cursor blinking more explicity.
+
+Doing it only in the lock screen (as opposed to the toolkit) makes sense
+as this only happens due to somewhat unusual usage inside the
+lockscreen.
+
+BUG: 431286
+
+
+(cherry picked from commit 2cbd7e4c70d0592d16cdaf58ed43effe4a716aa4)
+---
+ lookandfeel/contents/lockscreen/LockScreenUi.qml | 3 ---
+ lookandfeel/contents/lockscreen/MainBlock.qml | 6 ++++++
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
+index d2f8a2b7d..c4f9e8a45 100644
+--- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
++++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
+@@ -229,9 +229,6 @@ PlasmaCore.ColorScope {
+
+ // this isn't implicit, otherwise items still get processed for the scenegraph
+ visible: opacity > 0
+- // changing enabled will toggle if an item can have activeFocus, which otherwise
+- //keeps the text cursor blinking even when invisble
+- enabled: visible
+
+ initialItem: MainBlock {
+ id: mainBlock
+diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/contents/lockscreen/MainBlock.qml
+index 4bd5df0e5..e8f5ced47 100644
+--- a/lookandfeel/contents/lockscreen/MainBlock.qml
++++ b/lookandfeel/contents/lockscreen/MainBlock.qml
+@@ -66,6 +66,12 @@ SessionManagementScreen {
+ enabled: !authenticator.graceLocked
+ revealPasswordButtonShown: true
+
++ // In Qt this is implicitly active based on focus rather than visibility
++ // in any other application having a focussed invisible object would be weird
++ // but here we are using to wake out of screensaver mode
++ // We need to explicitly disable cursor flashing to avoid unnecessary renders
++ cursorVisible: visible
++
+ onAccepted: {
+ if (lockScreenUiVisible) {
+ startLogin();
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r3.ebuild
new file mode 100644
index 00000000000..09b187567c3
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r3.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT+=" test"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+ >=dev-libs/wayland-1.15
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+ >=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/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/kdelibs4support-${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/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/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/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ >=media-libs/phonon-4.11.0
+ 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? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ qalculate? ( sci-libs/libqalculate:= )
+ screencast? (
+ >=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.1.1
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=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-19.04.3:5
+ >=kde-frameworks/kdesu-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-plasma/ksysguard-${PVCUT}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !<kde-plasma/plasma-desktop-5.19.80:5
+"
+PDEPEND="
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${P}-avoid-render-invisible-contents.patch" # KDE-Bug 347772
+ "${FILESDIR}/${P}-fix-wake-screensaver-mode-w-keypress.patch" # KDE-Bug 431286
+ "${FILESDIR}/${P}-fix-crash-on-screen-changes.patch" # KDE-Bug 425711
+ "${FILESDIR}/${P}-fix-digitalclock-agenda-view.patch" # KDE-Bug 431433
+ "${FILESDIR}/${P}-wayland-fix-XKB-variable-setup.patch"
+)
+
+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
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ $(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 qalculate Qalculate)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ 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
+
+ # Clean up pre-5.17.4 dirs
+ rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2021-01-15 18:33 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2021-01-15 18:33 UTC (permalink / raw
To: gentoo-commits
commit: dde7b805506c71a7e86e08ce4303b9764f5c1f87
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 18:24:47 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 18:32:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde7b805
kde-plasma/plasma-workspace: Fix runtime crashes and runaway process
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=347772
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=425711
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ce-5.20.5-avoid-render-invisible-contents.patch | 38 ++++
...kspace-5.20.5-fix-crash-on-screen-changes.patch | 63 +++++++
.../plasma-workspace-5.20.5-r1.ebuild | 206 +++++++++++++++++++++
3 files changed, 307 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch
new file mode 100644
index 00000000000..effea7fdc8e
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch
@@ -0,0 +1,38 @@
+From 45e0a722fb85bb5d1ab8bef92080e934254b13aa Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 7 Jan 2021 13:36:29 +0000
+Subject: [PATCH] [lookandfeel] Avoid rendering invisible contents
+
+An opacity of 0 but still visible still results in nodes in the
+scenegraph, which is wasteful. This is shown in gammaray with some
+warnings.
+
+Enabled is also bound to visible as if a text field has focus it still
+animates the cursor icon even if inivisble, producing wakeups.
+
+BUG: 347772
+FIXED-IN: 5.21
+---
+ lookandfeel/contents/lockscreen/LockScreenUi.qml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
+index a2eba8e6d..83564fc0a 100644
+--- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
++++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
+@@ -228,6 +228,12 @@ PlasmaCore.ColorScope {
+ height: lockScreenRoot.height + units.gridUnit * 3
+ focus: true //StackView is an implicit focus scope, so we need to give this focus so the item inside will have it
+
++ // this isn't implicit, otherwise items still get processed for the scenegraph
++ visible: opacity > 0
++ // changing enabled will toggle if an item can have activeFocus, which otherwise
++ //keeps the text cursor blinking even when invisble
++ enabled: visible
++
+ initialItem: MainBlock {
+ id: mainBlock
+ lockScreenUiVisible: lockScreenRoot.uiVisible
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch
new file mode 100644
index 00000000000..58f3a50c491
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch
@@ -0,0 +1,63 @@
+From fa2bafea8f0cd9fac0864ac23f23c955d5f15b73 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Tue, 5 Jan 2021 23:57:19 +0000
+Subject: [PATCH] [panel] Fix crash on screen changes
+
+There is an error handling path when we fetch the relevant config()
+
+```
+KConfigGroup PanelView::panelConfig(...
+{
+ if (!containment || !screen) {
+ return KConfigGroup();
+ }
+```
+
+which we indiscrimiately call parent() on.
+
+This patch guards that case, which is presumably screen being
+temporarily null.
+
+This code is also Plasma 5.8 compatibility fallback, so arguably we
+could get rid of it.
+
+BUG: 425711
+---
+ shell/panelview.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index 28e86d2d3..991364e97 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -561,7 +561,8 @@ void PanelView::resizePanel()
+
+ void PanelView::restore()
+ {
+- if (!containment()) {
++ KConfigGroup panelConfig = config();
++ if (!panelConfig.isValid()) {
+ return;
+ }
+
+@@ -572,7 +573,7 @@ void PanelView::restore()
+ //but if fails read it from the resolution dependent one as
+ //the place for this config key is changed in Plasma 5.9
+ //Do NOT use readConfigValueWithFallBack
+- setAlignment((Qt::Alignment)config().parent().readEntry<int>("alignment", config().readEntry<int>("alignment", m_alignment)));
++ setAlignment((Qt::Alignment)panelConfig.parent().readEntry<int>("alignment", panelConfig.readEntry<int>("alignment", m_alignment)));
+
+ // All the other values are read from screen independent values,
+ // but fallback on the screen independent section, as is the only place
+@@ -599,7 +600,7 @@ void PanelView::restore()
+ //but if fails read it from the resolution dependent one as
+ //the place for this config key is changed in Plasma 5.9
+ //Do NOT use readConfigValueWithFallBack
+- setVisibilityMode((VisibilityMode)config().parent().readEntry<int>("panelVisibility", config().readEntry<int>("panelVisibility", (int)NormalPanel)));
++ setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel)));
+ m_initCompleted = true;
+ resizePanel();
+ positionPanel();
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r1.ebuild
new file mode 100644
index 00000000000..765312b060b
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+ >=dev-libs/wayland-1.15
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+ >=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/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/kdelibs4support-${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/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/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/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ >=media-libs/phonon-4.11.0
+ 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? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ qalculate? ( sci-libs/libqalculate:= )
+ screencast? (
+ >=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.1.1
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=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-19.04.3:5
+ >=kde-frameworks/kdesu-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-plasma/ksysguard-${PVCUT}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !<kde-plasma/plasma-desktop-5.19.80:5
+"
+PDEPEND="
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${P}-avoid-render-invisible-contents.patch" # KDE-Bug 347772
+ "${FILESDIR}/${P}-fix-crash-on-screen-changes.patch" # KDE-Bug 425711
+)
+
+RESTRICT+=" test"
+
+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
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ $(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 qalculate Qalculate)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ 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
+
+ # Clean up pre-5.17.4 dirs
+ rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2020-10-04 16:07 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2020-10-04 16:07 UTC (permalink / raw
To: gentoo-commits
commit: e3bb321ee05ee82cfdb08e27c6c59240d38d2ef6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 12:32:32 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 15:54:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3bb321e
kde-plasma/plasma-workspace: Fix crash when scrolling on wallpaper
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=427106
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...-5.19.5-guard-against-no-virtual-desktops.patch | 46 +++++
.../plasma-workspace-5.19.5-r2.ebuild | 224 +++++++++++++++++++++
2 files changed, 270 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch
new file mode 100644
index 00000000000..21e33531590
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch
@@ -0,0 +1,46 @@
+From 5cb38daedbfa5ef26a47d82d197c96230a004b0f Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 30 Sep 2020 08:56:16 +0000
+Subject: [PATCH] [containmentactions] Guard against having no virtual desktops
+
+It can apparently happen that virtual desktops is empty at a given point
+in time. Potentially due to other bugs on the system.
+
+Calls to desktopIds.at(N) will fail.
+
+BUG: 427106
+
+
+(cherry picked from commit 2441c82a2a92535ccc0a9643715427eb362c98e8)
+---
+ containmentactions/switchdesktop/desktop.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/containmentactions/switchdesktop/desktop.cpp b/containmentactions/switchdesktop/desktop.cpp
+index 809543a49..dda78c584 100644
+--- a/containmentactions/switchdesktop/desktop.cpp
++++ b/containmentactions/switchdesktop/desktop.cpp
+@@ -85,6 +85,10 @@ void SwitchDesktop::switchTo()
+ void SwitchDesktop::performNextAction()
+ {
+ const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds();
++ if (desktopIds.isEmpty()) {
++ return;
++ }
++
+ const QVariant ¤tDesktop = m_virtualDesktopInfo->currentDesktop();
+ const int currentDesktopIndex = desktopIds.indexOf(currentDesktop);
+
+@@ -100,6 +104,9 @@ void SwitchDesktop::performNextAction()
+ void SwitchDesktop::performPreviousAction()
+ {
+ const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds();
++ if (desktopIds.isEmpty()) {
++ return;
++ }
+ const QVariant ¤tDesktop = m_virtualDesktopInfo->currentDesktop();
+ const int currentDesktopIndex = desktopIds.indexOf(currentDesktop);
+
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
new file mode 100644
index 00000000000..54a55759142
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5[jpeg]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${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/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/kdelibs4support-${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/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/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/solid-${KFMIN}:5
+ >=kde-plasma/kscreenlocker-${PVCUT}:5
+ >=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ >=media-libs/phonon-4.11.0
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ 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 )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ qalculate? ( sci-libs/libqalculate:= )
+ qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+ telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=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-19.04.3:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-frameworks/kdesu-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-plasma/ksysguard-${PVCUT}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !<kde-plasma/plasma-desktop-5.16.80:5
+"
+PDEPEND="
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+ "${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392
+ "${FILESDIR}/${P}-login-button-size.patch"
+ "${FILESDIR}/${P}-guard-against-no-virtual-desktops.patch" # KDE-Bug #427106
+)
+
+RESTRICT+=" test"
+
+pkg_setup() {
+ ecm_pkg_setup
+
+ local md5
+ local srcfile=/etc/plasma/XX/10-agent-XX.sh
+ local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
+
+ if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
+ md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
+ if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
+ elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
+ elog "Copying to ${newdir}/env/10-agent-startup.sh..."
+ cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
+ fi
+ fi
+
+ if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
+ md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
+ if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
+ elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
+ elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
+ cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
+ fi
+ fi
+}
+
+src_prepare() {
+ ecm_src_prepare
+
+ if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
+ cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
+ fi
+ if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
+ cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
+ fi
+
+ 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
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package calendar KF5Holidays)
+ $(cmake_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake_use_find_package qalculate Qalculate)
+ $(cmake_use_find_package qrcode KF5Prison)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # default startup and shutdown scripts
+ insinto /etc/xdg/plasma-workspace/env
+ doins "${T}"/10-agent-startup.sh
+
+ insinto /etc/xdg/plasma-workspace/shutdown
+ doins "${T}"/10-agent-shutdown.sh
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ # Clean up pre-5.17.4 scripts
+ if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
+ rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
+ elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
+ fi
+ if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
+ rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
+ elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+ fi
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2020-07-28 15:37 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2020-07-28 15:37 UTC (permalink / raw
To: gentoo-commits
commit: 4aafa6d0e1b8ae09efdfa7a93129e3ce668948d7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 15:30:14 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 15:37:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aafa6d0
kde-plasma/plasma-workspace: drop 5.19.3*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
...fix-broken-env-vars-for-detailed-settings.patch | 62 ------
.../plasma-workspace-5.19.3-r1.ebuild | 222 ---------------------
3 files changed, 285 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 0331710b8bd..514c4868ea7 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-DIST plasma-workspace-5.19.3.tar.xz 5676896 BLAKE2B 1ccd0f5be74056ed04eb368958847e9fa4bed92a295db62f6d48f2c0d0750fb3ced1f71c27be0052c0732e8aada7e6a2212cce20da500d5de8a4e8df78c9442a SHA512 c29d3c674d197b25644200c11c602ac5b3ec2289d12e09139a404225c224a4da039db645b42ba0692588bd03c85fa7b11c2ff3c3cd4a07485cdac19a4dca0754
DIST plasma-workspace-5.19.4.tar.xz 5677192 BLAKE2B 5a336a85aaacc63965de4e63ad827363ba7f6aa1ec0ca84fa4cc1ed225ff577b9806c69ed683d05f4d1d10b890ddd45ea9692568aab4be5cfe93706d0a4a3428 SHA512 ee17e3fe80a643cbfecea9b0d261cc8dcdf263f87c4d4926703f20089ae9e937f9fe54fe1e9d6a5fe19bc1d564aa00090296c87be3dae68ee3edd5f0e75a3d0a
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.3-revert-fix-broken-env-vars-for-detailed-settings.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.3-revert-fix-broken-env-vars-for-detailed-settings.patch
deleted file mode 100644
index 44c29a2f091..00000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.3-revert-fix-broken-env-vars-for-detailed-settings.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 76028ecdbd9a060b375c1cc53c6ae9ab9276cb28 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 9 Jul 2020 19:46:02 +0200
-Subject: [PATCH] Revert "Fix broken ENV variables for detailed settings"
-
-This reverts commit edc64d04a1e569d7032c41e6ee0ebf59833c26f2.
----
- startkde/startplasma.cpp | 31 ++++++++++---------------------
- 1 file changed, 10 insertions(+), 21 deletions(-)
-
-diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index b2dba900d..a055d5635 100644
---- a/startkde/startplasma.cpp
-+++ b/startkde/startplasma.cpp
-@@ -128,27 +128,11 @@ void runStartupConfig()
- KConfig config(QStringLiteral("plasma-localerc"));
- KConfigGroup formatsConfig = KConfigGroup(&config, "Formats");
-
-- // In case we don't have a value in the config file, but in the ENV variables, write it
-- if (!formatsConfig.hasKey("LANG") && !qEnvironmentVariableIsEmpty("LANG")) {
-- formatsConfig.writeEntry("LANG", qgetenv("LANG"));
-- formatsConfig.sync();
-- }
--
-- const auto explicitLCValues = { "LANG", "LC_COLLATE", "LC_CTYPE" };
-- const auto detailedLCValues = { "LC_NUMERIC", "LC_TIME", "LC_MONETARY", "LC_MEASUREMENT" };
-- const QString lcLang = formatsConfig.readEntry("LANG");
-- const bool useDetailed = formatsConfig.readEntry("useDetailed", false);
--
-- // These values have to explicitly set
-- for (auto lc : explicitLCValues) {
-- const QString value = formatsConfig.readEntry(lc);
-- if (!value.isEmpty()) {
-- qputenv(lc, value.toUtf8());
-- }
-- }
-- // If we have the "Detailed Settings" checkbox unchecked we want to use the value from the LANG entry
-- for (auto lc : detailedLCValues) {
-- const QString value = useDetailed ? formatsConfig.readEntry(lc) : lcLang;
-+ const auto lcValues = {
-+ "LANG", "LC_NUMERIC", "LC_TIME", "LC_MONETARY", "LC_MEASUREMENT", "LC_COLLATE", "LC_CTYPE"
-+ };
-+ for (auto lc : lcValues) {
-+ const QString value = formatsConfig.readEntry(lc, QString());
- if (!value.isEmpty()) {
- qputenv(lc, value.toUtf8());
- }
-@@ -159,6 +143,11 @@ void runStartupConfig()
- if (!value.isEmpty()) {
- qputenv("LANGUAGE", value.toUtf8());
- }
-+
-+ if (!formatsConfig.hasKey("LANG") && !qEnvironmentVariableIsEmpty("LANG")) {
-+ formatsConfig.writeEntry("LANG", qgetenv("LANG"));
-+ formatsConfig.sync();
-+ }
- }
-
- void setupCursor(bool wayland)
---
-2.27.0
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.3-r1.ebuild
deleted file mode 100644
index ca003e21c46..00000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.3-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5[jpeg]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${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/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/kdelibs4support-${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/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/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/solid-${KFMIN}:5
- >=kde-plasma/kscreenlocker-${PVCUT}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- media-libs/phonon[qt5(+)]
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- 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 )
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- qalculate? ( sci-libs/libqalculate:= )
- qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/qtconcurrent-${QTMIN}:5
- x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:5
- >=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-19.04.3:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-frameworks/kdesu-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-plasma/ksysguard-${PVCUT}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- systemd? ( sys-apps/dbus[user-session] )
- !systemd? ( sys-apps/dbus )
- !<kde-plasma/plasma-desktop-5.16.80:5
-"
-PDEPEND="
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
- "${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
- "${FILESDIR}/${P}-revert-fix-broken-env-vars-for-detailed-settings.patch" # KDE-Bug #423995
-)
-
-RESTRICT+=" test"
-
-pkg_setup() {
- ecm_pkg_setup
-
- local md5
- local srcfile=/etc/plasma/XX/10-agent-XX.sh
- local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
-
- if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
- md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
- if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
- elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
- elog "Copying to ${newdir}/env/10-agent-startup.sh..."
- cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
- fi
- fi
-
- if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
- md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
- if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
- elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
- elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
- cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
- fi
- fi
-}
-
-src_prepare() {
- ecm_src_prepare
-
- if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
- cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
- fi
- if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
- cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
- fi
-
- 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
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- $(cmake_use_find_package appstream AppStreamQt)
- $(cmake_use_find_package calendar KF5Holidays)
- $(cmake_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake_use_find_package qalculate Qalculate)
- $(cmake_use_find_package qrcode KF5Prison)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # default startup and shutdown scripts
- insinto /etc/xdg/plasma-workspace/env
- doins "${T}"/10-agent-startup.sh
-
- insinto /etc/xdg/plasma-workspace/shutdown
- doins "${T}"/10-agent-shutdown.sh
- fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
- ecm_pkg_postinst
-
- # Clean up pre-5.17.4 scripts
- if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
- rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
- elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
- fi
- if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
- rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
- elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
- fi
-
- 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"
-}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2020-07-09 17:52 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2020-07-09 17:52 UTC (permalink / raw
To: gentoo-commits
commit: bcd69d48c62d56c48c5ac42d3c6026305b52f988
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 9 17:50:12 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 9 17:51:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd69d48
kde-plasma/plasma-workspace: Fix Plasma overriding system locales
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=423995
See also: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/100
Reported-by: Till Schäfer <till2.schaefer <AT> uni-dortmund.de>
Closes: https://bugs.gentoo.org/731738
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...fix-broken-env-vars-for-detailed-settings.patch | 62 ++++++
.../plasma-workspace-5.19.3-r1.ebuild | 222 +++++++++++++++++++++
2 files changed, 284 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.3-revert-fix-broken-env-vars-for-detailed-settings.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.3-revert-fix-broken-env-vars-for-detailed-settings.patch
new file mode 100644
index 00000000000..44c29a2f091
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.3-revert-fix-broken-env-vars-for-detailed-settings.patch
@@ -0,0 +1,62 @@
+From 76028ecdbd9a060b375c1cc53c6ae9ab9276cb28 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 9 Jul 2020 19:46:02 +0200
+Subject: [PATCH] Revert "Fix broken ENV variables for detailed settings"
+
+This reverts commit edc64d04a1e569d7032c41e6ee0ebf59833c26f2.
+---
+ startkde/startplasma.cpp | 31 ++++++++++---------------------
+ 1 file changed, 10 insertions(+), 21 deletions(-)
+
+diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
+index b2dba900d..a055d5635 100644
+--- a/startkde/startplasma.cpp
++++ b/startkde/startplasma.cpp
+@@ -128,27 +128,11 @@ void runStartupConfig()
+ KConfig config(QStringLiteral("plasma-localerc"));
+ KConfigGroup formatsConfig = KConfigGroup(&config, "Formats");
+
+- // In case we don't have a value in the config file, but in the ENV variables, write it
+- if (!formatsConfig.hasKey("LANG") && !qEnvironmentVariableIsEmpty("LANG")) {
+- formatsConfig.writeEntry("LANG", qgetenv("LANG"));
+- formatsConfig.sync();
+- }
+-
+- const auto explicitLCValues = { "LANG", "LC_COLLATE", "LC_CTYPE" };
+- const auto detailedLCValues = { "LC_NUMERIC", "LC_TIME", "LC_MONETARY", "LC_MEASUREMENT" };
+- const QString lcLang = formatsConfig.readEntry("LANG");
+- const bool useDetailed = formatsConfig.readEntry("useDetailed", false);
+-
+- // These values have to explicitly set
+- for (auto lc : explicitLCValues) {
+- const QString value = formatsConfig.readEntry(lc);
+- if (!value.isEmpty()) {
+- qputenv(lc, value.toUtf8());
+- }
+- }
+- // If we have the "Detailed Settings" checkbox unchecked we want to use the value from the LANG entry
+- for (auto lc : detailedLCValues) {
+- const QString value = useDetailed ? formatsConfig.readEntry(lc) : lcLang;
++ const auto lcValues = {
++ "LANG", "LC_NUMERIC", "LC_TIME", "LC_MONETARY", "LC_MEASUREMENT", "LC_COLLATE", "LC_CTYPE"
++ };
++ for (auto lc : lcValues) {
++ const QString value = formatsConfig.readEntry(lc, QString());
+ if (!value.isEmpty()) {
+ qputenv(lc, value.toUtf8());
+ }
+@@ -159,6 +143,11 @@ void runStartupConfig()
+ if (!value.isEmpty()) {
+ qputenv("LANGUAGE", value.toUtf8());
+ }
++
++ if (!formatsConfig.hasKey("LANG") && !qEnvironmentVariableIsEmpty("LANG")) {
++ formatsConfig.writeEntry("LANG", qgetenv("LANG"));
++ formatsConfig.sync();
++ }
+ }
+
+ void setupCursor(bool wayland)
+--
+2.27.0
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.3-r1.ebuild
new file mode 100644
index 00000000000..2ffe458b17b
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.3-r1.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5[jpeg]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${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/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/kdelibs4support-${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/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/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/solid-${KFMIN}:5
+ >=kde-plasma/kscreenlocker-${PVCUT}:5
+ >=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ media-libs/phonon[qt5(+)]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ 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 )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ qalculate? ( sci-libs/libqalculate:= )
+ qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+ telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=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-19.04.3:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-frameworks/kdesu-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-plasma/ksysguard-${PVCUT}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !<kde-plasma/plasma-desktop-5.16.80:5
+"
+PDEPEND="
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+ "${FILESDIR}/${P}-revert-fix-broken-env-vars-for-detailed-settings.patch" # KDE-Bug #423995
+)
+
+RESTRICT+=" test"
+
+pkg_setup() {
+ ecm_pkg_setup
+
+ local md5
+ local srcfile=/etc/plasma/XX/10-agent-XX.sh
+ local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
+
+ if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
+ md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
+ if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
+ elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
+ elog "Copying to ${newdir}/env/10-agent-startup.sh..."
+ cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
+ fi
+ fi
+
+ if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
+ md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
+ if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
+ elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
+ elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
+ cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
+ fi
+ fi
+}
+
+src_prepare() {
+ ecm_src_prepare
+
+ if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
+ cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
+ fi
+ if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
+ cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
+ fi
+
+ 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
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package calendar KF5Holidays)
+ $(cmake_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake_use_find_package qalculate Qalculate)
+ $(cmake_use_find_package qrcode KF5Prison)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # default startup and shutdown scripts
+ insinto /etc/xdg/plasma-workspace/env
+ doins "${T}"/10-agent-startup.sh
+
+ insinto /etc/xdg/plasma-workspace/shutdown
+ doins "${T}"/10-agent-shutdown.sh
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ # Clean up pre-5.17.4 scripts
+ if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
+ rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
+ elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
+ fi
+ if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
+ rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
+ elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+ fi
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2020-06-23 13:49 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2020-06-23 13:49 UTC (permalink / raw
To: gentoo-commits
commit: ea5a3c2e6e5933a8fbf6e0ad5212a78d69aca65f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 21:09:08 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 13:48:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5a3c2e
kde-plasma/plasma-workspace: systray [2/4]: Fix unreadable text w/ Breeze Dark
See also: https://mail.kde.org/pipermail/distributions/2020-June/000368.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=422684
Upstream commit faef126255222f727219bf69ac2b89857dc61ab2
"Port applets to use PlasmaExtras.PlaceholderMessage"
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 44 ++++++++++++++++++++++
.../plasma-workspace-5.19.2.ebuild | 5 ++-
2 files changed, 48 insertions(+), 1 deletion(-)
--git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
new file mode 100644
index 00000000000..527e199cc66
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
@@ -0,0 +1,44 @@
+From faef126255222f727219bf69ac2b89857dc61ab2 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 14 Jun 2020 09:08:21 -0600
+Subject: [PATCH] Port applets to use PlasmaExtras.PlaceholderMessage
+
+The Kirigami version uses QQC2 elements which don't respect the plasma
+theme and color scheme, leading to thing slooking out of place
+especially when using a dark color theme or scheme.
+
+Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
+---
+ applets/clipboard/contents/ui/Menu.qml | 2 +-
+ .../notifications/package/contents/ui/FullRepresentation.qml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/applets/clipboard/contents/ui/Menu.qml b/applets/clipboard/contents/ui/Menu.qml
+index 0bd6064a5..cac8380db 100644
+--- a/applets/clipboard/contents/ui/Menu.qml
++++ b/applets/clipboard/contents/ui/Menu.qml
+@@ -55,7 +55,7 @@ PlasmaExtras.ScrollArea {
+ onAction: menu.action(uuid)
+ }
+
+- Kirigami.PlaceholderMessage {
++ PlasmaExtras.PlaceholderMessage {
+ id: emptyHint
+
+ anchors.centerIn: parent
+diff --git a/applets/notifications/package/contents/ui/FullRepresentation.qml b/applets/notifications/package/contents/ui/FullRepresentation.qml
+index b34dee7af..989cb4341 100644
+--- a/applets/notifications/package/contents/ui/FullRepresentation.qml
++++ b/applets/notifications/package/contents/ui/FullRepresentation.qml
+@@ -585,7 +585,7 @@ PlasmaComponents3.Page {
+ }
+ }
+
+- Kirigami.PlaceholderMessage {
++ PlasmaExtras.PlaceholderMessage {
+ anchors.centerIn: parent
+ width: parent.width - (units.largeSpacing * 4)
+
+--
+2.27.0
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.2.ebuild
index c14dfc3f196..f7116713959 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.2.ebuild
@@ -123,7 +123,10 @@ PDEPEND="
>=kde-plasma/kde-cli-tools-${PVCUT}:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+)
RESTRICT+=" test"
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2020-05-16 22:38 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2020-05-16 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 0d9c0dab16aff448056e4f3d7ec914ded2d0a6ca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 19:43:30 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 16 22:38:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d9c0dab
kde-plasma/plasma-workspace: Fix animation duration w/ KF-5.70
See also:
https://mail.kde.org/pipermail/distributions/2020-May/000361.html
https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...e-5.18.5-stop-multiplying-duration-values.patch | 93 +++++++++
.../plasma-workspace-5.18.5-r1.ebuild | 225 +++++++++++++++++++++
2 files changed, 318 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch
new file mode 100644
index 00000000000..83539c14c04
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch
@@ -0,0 +1,93 @@
+From 2958702524348e9e4fcbdf490be731e92b353dad Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 24 Mar 2020 08:10:54 -0600
+Subject: Stop multiplying duration values
+
+Summary:
+After D28144, some animations are now too long because they were inappropriately
+multiplying a duration value. That's no longer necessary, so let's remove the
+multiplication.
+
+Depends on D28144
+
+Test Plan: Various things that were a bit too slow before feel just right now
+
+Reviewers: #vdg, #plasma, cblack
+
+Reviewed By: #vdg, #plasma, cblack
+
+Subscribers: cblack, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D28238
+---
+ applets/devicenotifier/package/contents/ui/FullRepresentation.qml | 2 +-
+ applets/systemtray/package/contents/ui/ExpanderArrow.qml | 2 +-
+ lookandfeel/contents/components/ActionButton.qml | 4 ++--
+ lookandfeel/contents/components/UserDelegate.qml | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
+index d15e47c..80b9c73 100644
+--- a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
++++ b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
+@@ -225,7 +225,7 @@ MouseArea {
+ popupIconTimer.restart()
+ }
+ }
+- Behavior on height { NumberAnimation { duration: units.shortDuration * 3 } }
++ Behavior on height { NumberAnimation { duration: units.shortDuration } }
+ }
+ }
+ }
+diff --git a/applets/systemtray/package/contents/ui/ExpanderArrow.qml b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
+index 9baf654..729f56b 100644
+--- a/applets/systemtray/package/contents/ui/ExpanderArrow.qml
++++ b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
+@@ -37,7 +37,7 @@ PlasmaCore.ToolTipArea {
+ anchors.fill: parent
+ onClicked: root.expanded = !root.expanded
+
+- readonly property int arrowAnimationDuration: units.shortDuration * 3
++ readonly property int arrowAnimationDuration: units.shortDuration
+
+ PlasmaCore.Svg {
+ id: arrowSvg
+diff --git a/lookandfeel/contents/components/ActionButton.qml b/lookandfeel/contents/components/ActionButton.qml
+index 9fbd2a8..7a66c56 100644
+--- a/lookandfeel/contents/components/ActionButton.qml
++++ b/lookandfeel/contents/components/ActionButton.qml
+@@ -44,7 +44,7 @@ Item {
+ opacity: activeFocus || containsMouse ? 1 : 0.85
+ Behavior on opacity {
+ PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
+- duration: units.longDuration * 2
++ duration: units.longDuration
+ easing.type: Easing.InOutQuad
+ }
+ }
+@@ -59,7 +59,7 @@ Item {
+ opacity: activeFocus || containsMouse ? (softwareRendering ? 0.8 : 0.15) : (softwareRendering ? 0.6 : 0)
+ Behavior on opacity {
+ PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
+- duration: units.longDuration * 3
++ duration: units.longDuration
+ easing.type: Easing.InOutQuad
+ }
+ }
+diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml
+index 8882e39..cdb55f1 100644
+--- a/lookandfeel/contents/components/UserDelegate.qml
++++ b/lookandfeel/contents/components/UserDelegate.qml
+@@ -72,7 +72,7 @@ Item {
+ Behavior on width {
+ PropertyAnimation {
+ from: faceSize
+- duration: units.longDuration * 2;
++ duration: units.longDuration;
+ }
+ }
+ width: isCurrent ? faceSize : faceSize - units.largeSpacing
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
new file mode 100644
index 00000000000..269e6a9c564
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${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/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/kdelibs4support-${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/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/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/solid-${KFMIN}:5
+ >=kde-plasma/kscreenlocker-${PVCUT}:5
+ >=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ media-libs/phonon[qt5(+)]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ 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 )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ qalculate? ( sci-libs/libqalculate:= )
+ qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+ telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=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-19.04.3:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-frameworks/kdesu-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-plasma/ksysguard-${PVCUT}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !<kde-plasma/plasma-desktop-5.16.80:5
+"
+PDEPEND="
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" # downstream patch
+
+ # Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backport):
+ # https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
+ "${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
+)
+
+RESTRICT+=" test"
+
+pkg_setup() {
+ ecm_pkg_setup
+
+ local md5
+ local srcfile=/etc/plasma/XX/10-agent-XX.sh
+ local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
+
+ if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
+ md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
+ if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
+ elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
+ elog "Copying to ${newdir}/env/10-agent-startup.sh..."
+ cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
+ fi
+ fi
+
+ if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
+ md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
+ if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
+ elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
+ elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
+ cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
+ fi
+ fi
+}
+
+src_prepare() {
+ ecm_src_prepare
+
+ if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
+ cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
+ fi
+ if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
+ cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
+ fi
+
+ 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
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package calendar KF5Holidays)
+ $(cmake_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake_use_find_package qalculate Qalculate)
+ $(cmake_use_find_package qrcode KF5Prison)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # default startup and shutdown scripts
+ insinto /etc/xdg/plasma-workspace/env
+ doins "${T}"/10-agent-startup.sh
+
+ insinto /etc/xdg/plasma-workspace/shutdown
+ doins "${T}"/10-agent-shutdown.sh
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ # Clean up pre-5.17.4 scripts
+ if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
+ rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
+ elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
+ fi
+ if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
+ rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
+ elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+ fi
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2020-05-16 22:38 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2020-05-16 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 6692de0e20892106db8051807d05ab6168bd17f3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 19:50:45 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 16 22:38:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6692de0e
kde-plasma/plasma-workspace: sddm-theme: Prevent logo from leaking in
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ce-5.18.5-sddm-theme-prevent-logo-leaking.patch | 94 ++++++++++++++++++++++
.../plasma-workspace-5.18.5-r1.ebuild | 2 +
2 files changed, 96 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch
new file mode 100644
index 00000000000..7cbe139a166
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch
@@ -0,0 +1,94 @@
+From 68601675d13bdf44248991a56e888093e58c56c3 Mon Sep 17 00:00:00 2001
+From: Filip Fila <filipfila.kde@gmail.com>
+Date: Wed, 13 May 2020 18:08:27 +0200
+Subject: [sddm-theme] Prevent the logo from leaking in after a fadeout
+
+Summary:
+Even when the vendor logo is turned off it can be briefly seen when the login screen changes from the fadeout state back into normal.
+
+Comments in other code say that "OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)" so this patch replaces it with NumberAnimation.
+
+There's also a minor fix included - placing the drop shadow sooner in the hierarchy because it should be drawn underneath an object, not in front of it.
+
+Test Plan:
+Reduce the fadeout time to something small and then:
+
+`sddm-greeter --test-mode --theme /usr/share/sddm/themes/breeze`
+
+Reviewers: ngraham, cblack, #plasma, mart
+
+Reviewed By: ngraham, #plasma, mart
+
+Subscribers: mart, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D29351
+---
+ sddm-theme/Main.qml | 44 +++++++++++++++++++++++---------------------
+ 1 file changed, 23 insertions(+), 21 deletions(-)
+
+diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml
+index 6746238..9910e7f 100644
+--- a/sddm-theme/Main.qml
++++ b/sddm-theme/Main.qml
+@@ -411,26 +411,6 @@ PlasmaCore.ColorScope {
+ }
+ }
+
+- Image {
+- id: logo
+- visible: config.showlogo == "shown"
+- source: config.logo
+- anchors.horizontalCenter: parent.horizontalCenter
+- anchors.bottom: footer.top
+- anchors.bottomMargin: units.largeSpacing
+- asynchronous: true
+- sourceSize.height: height
+- opacity: loginScreenRoot.uiVisible ? 0 : 1
+- fillMode: Image.PreserveAspectFit
+- height: Math.round(units.gridUnit * 3.5)
+- Behavior on opacity {
+- OpacityAnimator {
+- duration: units.longDuration
+- easing.type: Easing.InOutQuad
+- }
+- }
+- }
+-
+ DropShadow {
+ id: logoShadow
+ anchors.fill: logo
+@@ -444,7 +424,29 @@ PlasmaCore.ColorScope {
+ color: "black" // matches Breeze window decoration and desktopcontainment
+ opacity: loginScreenRoot.uiVisible ? 0 : 1
+ Behavior on opacity {
+- OpacityAnimator {
++ //OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
++ NumberAnimation {
++ duration: units.longDuration
++ easing.type: Easing.InOutQuad
++ }
++ }
++ }
++
++ Image {
++ id: logo
++ visible: config.showlogo == "shown"
++ source: config.logo
++ anchors.horizontalCenter: parent.horizontalCenter
++ anchors.bottom: footer.top
++ anchors.bottomMargin: units.largeSpacing
++ asynchronous: true
++ sourceSize.height: height
++ opacity: loginScreenRoot.uiVisible ? 0 : 1
++ fillMode: Image.PreserveAspectFit
++ height: Math.round(units.gridUnit * 3.5)
++ Behavior on opacity {
++ // OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
++ NumberAnimation {
+ duration: units.longDuration
+ easing.type: Easing.InOutQuad
+ }
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
index 269e6a9c564..4662a7858bf 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
@@ -127,6 +127,8 @@ PDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" # downstream patch
+ "${FILESDIR}/${P}-sddm-theme-prevent-logo-leaking.patch" # in Plasma/5.18
+
# Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backport):
# https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
"${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2020-01-21 16:29 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2020-01-21 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 3c5f2ec718dce2b835077dd5782548cc489c62f5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 15:40:04 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 15:50:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5f2ec7
kde-plasma/plasma-workspace: Also disable automatic scaling on Qt>=5.14
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=415421
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ace-5.17.5-disable-autoscaling-on-qt-5.14.patch | 47 +++++
.../plasma-workspace-5.17.5-r1.ebuild | 220 +++++++++++++++++++++
2 files changed, 267 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch
new file mode 100644
index 00000000000..114e653df8e
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch
@@ -0,0 +1,47 @@
+From ea66bff2af8466f2bb5acafcc43ac8f79b1f447f Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 21 Jan 2020 11:55:49 +0100
+Subject: Also disable automatic scaling on Qt >= 5.14
+
+Summary:
+Applications which set `Qt::AA_EnableHighDpiScaling` use the DPI of the monitor the window is on to calculate an additional scaling factor.
+Plasma sets `QT_SCREEN_SCALE_FACTORS` in the environment for manual specification of per-monitor scale, which combined with the automatic scaling may result in double scaling.
+To disable the automatic scaling, `QT_AUTO_SCREEN_SCALE_FACTOR=0` has to be set, even on Qt 5.14.
+
+As a side effect, this works around QTBUG-80967 as well.
+
+BUG: 415421
+
+Test Plan: On X11, with a >144dpi monitor and a scaling factor of 2 set manually, scaling was doubled previously. Now it works as expected.
+
+Reviewers: #plasma, apol, davidedmundson, fvogt
+
+Reviewed By: #plasma, davidedmundson, fvogt
+
+Subscribers: acooligan, fvogt, asturmlechner, dfaure, davidedmundson, anthonyfieroni, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D26185
+---
+ startkde/startplasma.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
+index 8d88587..4a89878 100644
+--- a/startkde/startplasma.cpp
++++ b/startkde/startplasma.cpp
+@@ -222,11 +222,9 @@ void runEnvironmentScripts()
+
+ void setupPlasmaEnvironment()
+ {
+-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+ //Manually disable auto scaling because we are scaling above
+ //otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
+ qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "0");
+-#endif
+
+ qputenv("KDE_FULL_SESSION", "true");
+ qputenv("KDE_SESSION_VERSION", "5");
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild
new file mode 100644
index 00000000000..157832caae9
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${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/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/kdelibs4support-${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/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/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/solid-${KFMIN}:5
+ >=kde-plasma/kscreenlocker-${PVCUT}:5
+ >=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ media-libs/phonon[qt5(+)]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ 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 )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ qalculate? ( sci-libs/libqalculate:= )
+ qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=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-19.04.3:5
+ >=kde-frameworks/kdesu-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-plasma/ksysguard-${PVCUT}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !<kde-plasma/plasma-desktop-5.16.80:5
+"
+PDEPEND="
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${PN}-5.17.2-waylandsessionrename.patch"
+ "${FILESDIR}/${P}-disable-autoscaling-on-qt-5.14.patch"
+)
+
+RESTRICT+=" test"
+
+pkg_setup() {
+ ecm_pkg_setup
+
+ local md5
+ local srcfile=/etc/plasma/XX/10-agent-XX.sh
+ local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
+
+ if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
+ md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
+ if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
+ elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
+ elog "Copying to ${newdir}/env/10-agent-startup.sh..."
+ cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
+ fi
+ fi
+
+ if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
+ md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
+ if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
+ elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
+ elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
+ cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
+ fi
+ fi
+}
+
+src_prepare() {
+ ecm_src_prepare
+
+ if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
+ cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
+ fi
+ if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
+ cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
+ fi
+
+ 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
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package calendar KF5Holidays)
+ $(cmake_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake_use_find_package qalculate Qalculate)
+ $(cmake_use_find_package qrcode KF5Prison)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ use gps && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # default startup and shutdown scripts
+ insinto /etc/xdg/plasma-workspace/env
+ doins "${T}"/10-agent-startup.sh
+
+ insinto /etc/xdg/plasma-workspace/shutdown
+ doins "${T}"/10-agent-shutdown.sh
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ # Clean up pre-5.17.4 scripts
+ if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
+ rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
+ elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
+ fi
+ if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
+ rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
+ elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+ fi
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2019-07-20 22:15 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2019-07-20 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 7fa0e743a95e1816d766dceb9430d13c7d70bcd6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 20:07:13 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 22:05:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa0e743
kde-plasma/plasma-workspace: Rename Xorg session
To make it distinguishable from Wayland session regardless of DM hacks.
SDDM hack can be dropped any time, both changes are still pending upstreams.
Closes: https://bugs.gentoo.org/689120
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-workspace-5.16.3-x11sessionrename.patch | 91 ++++++++++++++++++++++
.../plasma-workspace-5.16.3.ebuild | 1 +
2 files changed, 92 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch
new file mode 100644
index 00000000000..a851f5f54b8
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch
@@ -0,0 +1,91 @@
+From bcabb38b1f07a52847752fb54eb61696a1312a61 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 2 Jul 2019 10:13:54 +0200
+Subject: [PATCH] Fix Name conflict between plasma.desktop and
+ plasmawayland.desktop
+
+Summary:
+SDDM as of 0.18.1 appends " (Wayland)" to the Name of any session file it
+finds in wayland-sessions dir, and Plasma is relying on that behaviour to
+distinguish between its X11 and Wayland sessions. This leads to duplicate
+"Plasma" entries on any other DM not applying the same hack, e.g. lightdm,
+and users are lost without downstream patching.
+
+Instead of waiting for which of (SDDM, Plasma) is doing something about
+it first, renaming X11 session to "Plasma on Xorg" appears to be the most
+elegant solution out of the deadlock. SDDM can be fixed any time later.
+
+CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409
+See also: https://github.com/sddm/sddm/pull/997
+
+Reviewers: #plasma
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D22210
+---
+ plasma.desktop.cmake | 46 +----------------------------
+ 1 file changed, 1 insertion(+), 45 deletions(-)
+
+diff --git a/plasma.desktop.cmake b/plasma.desktop.cmake
+index 4d361606d..099de2908 100644
+--- a/plasma.desktop.cmake
++++ b/plasma.desktop.cmake
+@@ -3,51 +3,7 @@ Type=XSession
+ Exec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
+ TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
+ DesktopNames=KDE
+-Name=Plasma
+-Name[ar]=بلازما
+-Name[bs]=Plazma
+-Name[ca]=Plasma
+-Name[ca@valencia]=Plasma
+-Name[cs]=Plasma
+-Name[da]=Plasma
+-Name[de]=Plasma
+-Name[el]=Plasma
+-Name[en_GB]=Plasma
+-Name[es]=Plasma
+-Name[et]=Plasma
+-Name[eu]=Plasma
+-Name[fi]=Plasma
+-Name[fr]=Plasma
+-Name[gl]=Plasma
+-Name[he]=פלזמה
+-Name[hu]=Plasma
+-Name[id]=Plasma
+-Name[is]=Plasma
+-Name[it]=Plasma
+-Name[ja]=プラズマ
+-Name[ko]=Plasma
+-Name[lt]=Plasma
+-Name[nb]=Plasma
+-Name[nds]=Plasma
+-Name[nl]=Plasma
+-Name[nn]=Plasma
+-Name[pa]=ਪਲਾਜ਼ਮਾ
+-Name[pl]=Plazma
+-Name[pt]=Plasma
+-Name[pt_BR]=Plasma
+-Name[ru]=Plasma
+-Name[sk]=Plasma
+-Name[sl]=Plasma
+-Name[sr]=Плазма
+-Name[sr@ijekavian]=Плазма
+-Name[sr@ijekavianlatin]=Plasma
+-Name[sr@latin]=Plasma
+-Name[sv]=Plasma
+-Name[tr]=Plama
+-Name[uk]=Плазма
+-Name[x-test]=xxPlasmaxx
+-Name[zh_CN]=Plasma
+-Name[zh_TW]=Plasma
++Name=Plasma on Xorg
+ Comment=Plasma by KDE
+ Comment[ar]=بلازما كدي
+ Comment[bs]=Plazma od strane KDe
+--
+2.22.0
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.16.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.16.3.ebuild
index 5fbd5a4e8ad..80931e5994e 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.16.3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.16.3.ebuild
@@ -118,6 +118,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.14.80-startkde-script.patch"
"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+ "${FILESDIR}/${PN}-5.16.3-x11sessionrename.patch"
)
RESTRICT+=" test"
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2018-09-11 17:47 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2018-09-11 17:47 UTC (permalink / raw
To: gentoo-commits
commit: 1e10a827bb558a47393dc8d4f7b36b925e3a1c10
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 17:31:07 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 17:31:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e10a827
kde-plasma/plasma-workspace: MPRIS - change int to double for positions
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../plasma-workspace-5.13.5-double-positions.patch | 31 ++++
.../plasma-workspace-5.13.5-r1.ebuild | 174 +++++++++++++++++++++
2 files changed, 205 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.13.5-double-positions.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.13.5-double-positions.patch
new file mode 100644
index 00000000000..0c294af670a
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.13.5-double-positions.patch
@@ -0,0 +1,31 @@
+From 1bb02b98cfedfd6b51ac8de0c34a5778659433f7 Mon Sep 17 00:00:00 2001
+From: Arsen Arsen <arsenarsentmc@outlook.com>
+Date: Thu, 6 Sep 2018 10:29:09 +0200
+Subject: [Media Player] Change int to double for positions
+
+In previous versions of Plasma, media player had an overflow bug in positions, leading to the player resetting to 00:00.
+This only affects files longer than around 33 minutes 20 seconds.
+
+BUG: 397591
+FIXED-IN: 5.12.7
+
+Differential Revision: https://phabricator.kde.org/D15311
+---
+ applets/mediacontroller/contents/ui/ExpandedRepresentation.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml b/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml
+index 2922f99..904fe49 100644
+--- a/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml
++++ b/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml
+@@ -35,7 +35,7 @@ Item {
+
+ readonly property int controlSize: Math.min(height, width) / 4
+
+- property int position: mpris2Source.currentData.Position || 0
++ property double position: mpris2Source.currentData.Position || 0
+ readonly property real rate: mpris2Source.currentData.Rate || 1
+ readonly property double length: currentMetadata ? currentMetadata["mpris:length"] || 0 : 0
+
+--
+cgit v0.11.2
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild
new file mode 100644
index 00000000000..eed111285bb
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ media-libs/phonon[qt5(+)]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ appstream? ( dev-libs/appstream[qt5] )
+ calendar? ( $(add_frameworks_dep kholidays) )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( $(add_frameworks_dep prison) )
+ qalculate? ( sci-libs/libqalculate:= )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdesu)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep plasma-integration)
+ $(add_qt_dep qdbus)
+ $(add_qt_dep qtgraphicaleffects)
+ $(add_qt_dep qtpaths)
+ $(add_qt_dep qtquickcontrols 'widgets')
+ app-text/iso-codes
+ x11-apps/mkfontdir
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !dev-libs/xembed-sni-proxy
+ !kde-plasma/freespacenotifier:4
+ !kde-plasma/libtaskmanager:4
+ !kde-plasma/kcminit:4
+ !kde-plasma/kdebase-startkde:4
+ !kde-plasma/klipper:4
+ !kde-plasma/krunner:4
+ !kde-plasma/ksmserver:4
+ !kde-plasma/ksplash:4
+ !kde-plasma/plasma-workspace:4
+"
+PDEPEND="
+ $(add_plasma_dep kde-cli-tools)
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
+ "${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
+ "${FILESDIR}/${P}-double-positions.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package appstream AppStreamQt)
+ $(cmake-utils_use_find_package calendar KF5Holidays)
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+ elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2018-04-11 20:08 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2018-04-11 20:08 UTC (permalink / raw
To: gentoo-commits
commit: f1b097e71432eeacb0d7b38a0e65c8f7da3b4227
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 11 19:57:21 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 20:04:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b097e7
kde-plasma/plasma-workspace: Fix bbc weather dataengine
See also:
https://mail.kde.org/pipermail/kde-distro-packagers/2018-March/000311.html
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../plasma-workspace-5.12.4-bbc-weather.patch | 174 +++++++++++++++++++++
.../plasma-workspace-5.12.4-r1.ebuild | 174 +++++++++++++++++++++
2 files changed, 348 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.4-bbc-weather.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.4-bbc-weather.patch
new file mode 100644
index 00000000000..829a50477d8
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.4-bbc-weather.patch
@@ -0,0 +1,174 @@
+From 558a29efc4c9f055799d23ee6c75464e24489e5a Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Fri, 30 Mar 2018 17:10:32 +0200
+Subject: [weather dataengine] Fix BBC provider to adapt to change RSS feed
+
+Summary:
+The urls of the BBC weather feeds seem to have changed, resulting in the
+dataengine to use no longer existing urls.
+
+I could not find the change documented somewhere and also do not know about
+a contact person with BBC, so done based on examples on website, trial &
+error.
+There are some data issues visible in the new data feeds, so chance is the
+feeds might see more rework and might break things again. But without any
+contract or formal agreement we can just play catch-up.
+
+BUG: 392510
+
+Test Plan:
+Existing configured weather applets using a location from a BBC weather
+service work again.
+Newly configured weather applets using a BBC weather service also work.
+
+Reviewers: #plasma, jriddell, cfeck
+
+Reviewed By: cfeck
+
+Subscribers: cfeck, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D11808
+---
+ dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp | 47 +++++++++++++---------
+ dataengines/weather/ions/bbcukmet/ion_bbcukmet.h | 4 +-
+ 2 files changed, 31 insertions(+), 20 deletions(-)
+
+diff --git a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
+index 6acaa9b..fcf0bae 100644
+--- a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
++++ b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
+@@ -266,7 +266,19 @@ bool UKMETIon::updateIonSource(const QString& source)
+ setData(source, QStringLiteral("validate"), QStringLiteral("bbcukmet|malformed"));
+ return true;
+ }
+- m_place[QStringLiteral("bbcukmet|") +sourceAction[2]].XMLurl = sourceAction[3];
++
++ XMLMapInfo& place = m_place[QStringLiteral("bbcukmet|") + sourceAction[2]];
++
++ // backward compatibility after rss feed url change in 2018/03
++ place.sourceExtraArg = sourceAction[3];
++ if (place.sourceExtraArg.startsWith(QLatin1String("http://open.live.bbc.co.uk/"))) {
++ // Old data source id stored the full (now outdated) observation feed url
++ // http://open.live.bbc.co.uk/weather/feeds/en/STATIOID/observations.rss
++ // as extra argument, so extract the id from that
++ place.stationId = place.sourceExtraArg.section(QLatin1Char('/'), -2, -2);
++ } else {
++ place.stationId = place.sourceExtraArg;
++ }
+ getXMLData(sourceAction[0] + QLatin1Char('|') + sourceAction[2]);
+ return true;
+ }
+@@ -288,7 +300,7 @@ void UKMETIon::getXMLData(const QString& source)
+ }
+ }
+
+- const QUrl url(m_place[source].XMLurl);
++ const QUrl url(QStringLiteral("https://weather-broker-cdn.api.bbci.co.uk/en/observation/rss/") + m_place[source].stationId);
+
+ KIO::TransferJob* getJob = KIO::get(url, KIO::Reload, KIO::HideProgressInfo);
+ getJob->addMetaData(QStringLiteral("cookies"), QStringLiteral("none")); // Disable displaying cookies
+@@ -328,13 +340,8 @@ void UKMETIon::findPlace(const QString& place, const QString& source)
+ void UKMETIon::getFiveDayForecast(const QString& source)
+ {
+ XMLMapInfo& place = m_place[source];
+- QUrl xmlMap(place.forecastHTMLUrl);
+-
+- const QString stationID = xmlMap.path().section(QLatin1Char('/'), -1);
+-
+- place.XMLforecastURL = QStringLiteral("http://open.live.bbc.co.uk/weather/feeds/en/") + stationID + QStringLiteral("/3dayforecast.rss") + xmlMap.query();
+
+- const QUrl url(place.XMLforecastURL);
++ const QUrl url(QStringLiteral("https://weather-broker-cdn.api.bbci.co.uk/en/forecast/rss/3day/") + place.stationId);
+
+ KIO::TransferJob* getJob = KIO::get(url, KIO::Reload, KIO::HideProgressInfo);
+ getJob->addMetaData(QStringLiteral("cookies"), QStringLiteral("none")); // Disable displaying cookies
+@@ -362,8 +369,6 @@ void UKMETIon::readSearchHTMLData(const QString& source, const QByteArray& html)
+ const QString fullName = result.value(QStringLiteral("fullName")).toString();
+
+ if (!id.isEmpty() && !fullName.isEmpty()) {
+- const QString url = QStringLiteral("http://open.live.bbc.co.uk/weather/feeds/en/") + id + QStringLiteral("/observations.rss");
+-
+ QString tmp = QStringLiteral("bbcukmet|") + fullName;
+
+ // Duplicate places can exist
+@@ -372,7 +377,7 @@ void UKMETIon::readSearchHTMLData(const QString& source, const QByteArray& html)
+ counter++;
+ }
+ XMLMapInfo& place = m_place[tmp];
+- place.XMLurl = url;
++ place.stationId = id;
+ place.place = fullName;
+ m_locations.append(tmp);
+ }
+@@ -561,6 +566,9 @@ void UKMETIon::parseWeatherForecast(const QString& source, QXmlStreamReader& xml
+ if (xml.isStartElement()) {
+ if (elementName == QLatin1String("item")) {
+ parseFiveDayForecast(source, xml);
++ } else if (elementName == QLatin1String("link") &&
++ xml.namespaceUri().isEmpty()) {
++ m_place[source].forecastHTMLUrl = xml.readElementText();
+ } else {
+ parseUnknownElement(xml);
+ }
+@@ -644,9 +652,6 @@ void UKMETIon::parseWeatherObservation(const QString& source, WeatherData& data,
+ }
+ }
+
+- } else if (elementName == QLatin1String("link")) {
+- m_place[source].forecastHTMLUrl = xml.readElementText();
+-
+ } else if (elementName == QLatin1String("description")) {
+ QString observeString = xml.readElementText();
+ const QStringList observeData = observeString.split(QLatin1Char(':'));
+@@ -871,7 +876,7 @@ void UKMETIon::validate(const QString& source)
+ QString placeList;
+ for (const QString& place : qAsConst(m_locations)) {
+ const QString p = place.section(QLatin1Char('|'), 1, 1);
+- placeList.append(QStringLiteral("|place|") + p + QStringLiteral("|extra|") + m_place[place].XMLurl);
++ placeList.append(QStringLiteral("|place|") + p + QStringLiteral("|extra|") + m_place[place].stationId);
+ }
+ if (m_locations.count() > 1) {
+ setData(source, QStringLiteral("validate"),
+@@ -897,12 +902,18 @@ void UKMETIon::updateWeather(const QString& source)
+ QString weatherSource = source;
+ // TODO: why the replacement here instead of just a new string?
+ weatherSource.replace(QStringLiteral("bbcukmet|"), QStringLiteral("bbcukmet|weather|"));
+- weatherSource.append(QLatin1Char('|') + place.XMLurl);
++ weatherSource.append(QLatin1Char('|') + place.sourceExtraArg);
+
+ Plasma::DataEngine::Data data;
+
+- data.insert(QStringLiteral("Place"), weatherData.stationName);
+- data.insert(QStringLiteral("Station"), weatherData.stationName);
++ // work-around for buggy observation RSS feed missing the station name
++ QString stationName = weatherData.stationName;
++ if (stationName.isEmpty() || stationName == QLatin1String(",")) {
++ stationName = source.section(QLatin1Char('|'), 1, 1);
++ }
++
++ data.insert(QStringLiteral("Place"), stationName);
++ data.insert(QStringLiteral("Station"), stationName);
+ if (weatherData.observationDateTime.isValid()) {
+ data.insert(QStringLiteral("Observation Timestamp"), weatherData.observationDateTime);
+ }
+diff --git a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h
+index a1026f4..d9d3ad3 100644
+--- a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h
++++ b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h
+@@ -155,10 +155,10 @@ private:
+
+ private:
+ struct XMLMapInfo {
++ QString stationId;
+ QString place;
+- QString XMLurl;
+ QString forecastHTMLUrl;
+- QString XMLforecastURL;
++ QString sourceExtraArg;
+ };
+
+ // Key dicts
+--
+cgit v0.11.2
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.4-r1.ebuild
new file mode 100644
index 00000000000..6ed2c658078
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.12.4-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ media-libs/phonon[qt5(+)]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ appstream? ( dev-libs/appstream[qt5] )
+ calendar? ( $(add_frameworks_dep kholidays) )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( $(add_frameworks_dep prison) )
+ qalculate? ( sci-libs/libqalculate:= )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdesu)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep plasma-integration)
+ $(add_qt_dep qdbus)
+ $(add_qt_dep qtgraphicaleffects)
+ $(add_qt_dep qtpaths)
+ $(add_qt_dep qtquickcontrols 'widgets')
+ app-text/iso-codes
+ x11-apps/mkfontdir
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !dev-libs/xembed-sni-proxy
+ !kde-plasma/freespacenotifier:4
+ !kde-plasma/libtaskmanager:4
+ !kde-plasma/kcminit:4
+ !kde-plasma/kdebase-startkde:4
+ !kde-plasma/klipper:4
+ !kde-plasma/krunner:4
+ !kde-plasma/ksmserver:4
+ !kde-plasma/ksplash:4
+ !kde-plasma/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
+ "${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+ "${FILESDIR}/${P}-bbc-weather.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package appstream AppStreamQt)
+ $(cmake-utils_use_find_package calendar KF5Holidays)
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+ elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+ echo
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2018-02-09 13:57 Michael Palimaka
0 siblings, 0 replies; 44+ messages in thread
From: Michael Palimaka @ 2018-02-09 13:57 UTC (permalink / raw
To: gentoo-commits
commit: c006f861f27d664944c9cbbd8653aa5a5fdc1a75
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 9 13:55:21 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 13:57:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c006f861
kde-plasma/plasma-workspace: revision bump fixes CVE-2018-6790 and CVE-2018-6791
Bug: https://bugs.gentoo.org/647106
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../plasma-workspace-5.11.5-CVE-2018-6790.patch | 409 +++++++++++++++++++++
.../plasma-workspace-5.11.5-CVE-2018-6791.patch | 31 ++
.../plasma-workspace-5.11.5-r1.ebuild | 175 +++++++++
3 files changed, 615 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.11.5-CVE-2018-6790.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.11.5-CVE-2018-6790.patch
new file mode 100644
index 00000000000..b424e397a80
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.11.5-CVE-2018-6790.patch
@@ -0,0 +1,409 @@
+From f1e9a1c458ea44e9169c7e79b90a57fb7c65135f Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 31 Jan 2018 14:28:17 +0000
+Subject: [PATCH 1/2] Sanitise notification HTML
+
+Summary:
+Qt labels support a HTML subset, using a completely internal parser in
+QTextDocument.
+
+The Notification spec support an even smaller subset of notification
+elements.
+
+It's important to strip out irrelevant tags that could potentially load
+remote information without user interaction, such as img
+src or even <b style="background:url...
+
+But we want to maintain the basic rich text formatting of bold and
+italics and links.
+
+This parser iterates reads the XML, copying only permissable tags and
+attributes.
+
+A future obvious improvement would be to merge the original regular
+expressions into this stream parser, but I'm trying to minimise
+breakages to get this into 5.12.
+
+Test Plan:
+Moved code into it's own class for easy unit testing
+Tried a bunch of things, including what the old regexes were doing
+
+Also ran notify send with a few options to make sure things worked
+
+Reviewers: #plasma, fvogt
+
+Reviewed By: fvogt
+
+Subscribers: aacid, fvogt, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D10188
+---
+ dataengines/notifications/CMakeLists.txt | 8 ++
+ dataengines/notifications/notifications_test.cpp | 68 +++++++++++++
+ .../notifications/notificationsanitizer.cpp | 106 +++++++++++++++++++++
+ dataengines/notifications/notificationsanitizer.h | 35 +++++++
+ dataengines/notifications/notificationsengine.cpp | 19 +---
+ 5 files changed, 219 insertions(+), 17 deletions(-)
+ create mode 100644 dataengines/notifications/notifications_test.cpp
+ create mode 100644 dataengines/notifications/notificationsanitizer.cpp
+ create mode 100644 dataengines/notifications/notificationsanitizer.h
+
+diff --git a/dataengines/notifications/CMakeLists.txt b/dataengines/notifications/CMakeLists.txt
+index 4fd3ee76..ad6e2120 100644
+--- a/dataengines/notifications/CMakeLists.txt
++++ b/dataengines/notifications/CMakeLists.txt
+@@ -4,6 +4,7 @@ set(notifications_engine_SRCS
+ notificationsengine.cpp
+ notificationservice.cpp
+ notificationaction.cpp
++ notificationsanitizer.cpp
+ )
+
+ qt5_add_dbus_adaptor( notifications_engine_SRCS org.freedesktop.Notifications.xml notificationsengine.h NotificationsEngine )
+@@ -26,3 +27,10 @@ kcoreaddons_desktop_to_json(plasma_engine_notifications plasma-dataengine-notifi
+ install(TARGETS plasma_engine_notifications DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine)
+ install(FILES plasma-dataengine-notifications.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+ install(FILES notifications.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services)
++
++
++#unit test
++
++add_executable(notification_test notificationsanitizer.cpp notifications_test.cpp)
++target_link_libraries(notification_test Qt5::Test Qt5::Core)
++ecm_mark_as_test(notification_test)
+diff --git a/dataengines/notifications/notifications_test.cpp b/dataengines/notifications/notifications_test.cpp
+new file mode 100644
+index 00000000..58399746
+--- /dev/null
++++ b/dataengines/notifications/notifications_test.cpp
+@@ -0,0 +1,68 @@
++#include <QtTest>
++#include <QObject>
++#include <QDebug>
++#include "notificationsanitizer.h"
++
++class NotificationTest : public QObject
++{
++ Q_OBJECT
++public:
++ NotificationTest() {}
++private Q_SLOTS:
++ void parse_data();
++ void parse();
++};
++
++void NotificationTest::parse_data()
++{
++ QTest::addColumn<QString>("messageIn");
++ QTest::addColumn<QString>("expectedOut");
++
++ QTest::newRow("basic no HTML") << "I am a notification" << "I am a notification";
++ QTest::newRow("whitespace") << " I am a notification " << "I am a notification";
++
++ QTest::newRow("basic html") << "I am <b>the</b> notification" << "I am <b>the</b> notification";
++ QTest::newRow("nested html") << "I am <i><b>the</b></i> notification" << "I am <i><b>the</b></i> notification";
++
++ QTest::newRow("no extra tags") << "I am <blink>the</blink> notification" << "I am the notification";
++ QTest::newRow("no extra attrs") << "I am <b style=\"font-weight:20\">the</b> notification" << "I am <b>the</b> notification";
++
++ QTest::newRow("newlines") << "I am\nthe\nnotification" << "I am<br/>the<br/>notification";
++ QTest::newRow("multinewlines") << "I am\n\nthe\n\n\nnotification" << "I am<br/>the<br/>notification";
++
++ QTest::newRow("amp") << "me&you" << "me&you";
++ QTest::newRow("double escape") << "foo & <bar>" << "foo & <bar>";
++
++ QTest::newRow("quotes") << "'foo'" << "'foo'";//as label can't handle this normally valid entity
++
++ QTest::newRow("image normal") << "This is <img src=\"file:://foo/boo.png\" alt=\"cheese\"/> and more text" << "This is <img src=\"file:://foo/boo.png\" alt=\"cheese\"/> and more text";
++
++ //this input is technically wrong, so the output is also wrong, but QTextHtmlParser does the "right" thing
++ QTest::newRow("image normal no close") << "This is <img src=\"file:://foo/boo.png\" alt=\"cheese\"> and more text" << "This is <img src=\"file:://foo/boo.png\" alt=\"cheese\"> and more text</img>";
++
++ QTest::newRow("image remote URL") << "This is <img src=\"http://foo.com/boo.png\" alt=\"cheese\" /> and more text" << "This is <img alt=\"cheese\"/> and more text";
++
++ //more bad formatted options. To some extent actual output doesn't matter. Garbage in, garbabe out.
++ //the important thing is that it doesn't contain anything that could be parsed as the remote URL
++ QTest::newRow("image remote URL no close") << "This is <img src=\"http://foo.com/boo.png>\" alt=\"cheese\"> and more text" << "This is <img alt=\"cheese\"> and more text</img>";
++ QTest::newRow("image remote URL double open") << "This is <<img src=\"http://foo.com/boo.png>\" and more text" << "This is ";
++ QTest::newRow("image remote URL no entitiy close") << "This is <img src=\"http://foo.com/boo.png\" and more text" << "This is ";
++ QTest::newRow("image remote URL space in element name") << "This is < img src=\"http://foo.com/boo.png\" alt=\"cheese\" /> and more text" << "This is ";
++
++ QTest::newRow("link") << "This is a link <a href=\"http://foo.com/boo\"/> and more text" << "This is a link <a href=\"http://foo.com/boo\"/> and more text";
++}
++
++void NotificationTest::parse()
++{
++ QFETCH(QString, messageIn);
++ QFETCH(QString, expectedOut);
++
++ const QString out = NotificationSanitizer::parse(messageIn);
++ expectedOut = "<?xml version=\"1.0\"?><html>" + expectedOut + "</html>\n";
++ QCOMPARE(out, expectedOut);
++}
++
++
++QTEST_GUILESS_MAIN(NotificationTest)
++
++#include "notifications_test.moc"
+diff --git a/dataengines/notifications/notificationsanitizer.cpp b/dataengines/notifications/notificationsanitizer.cpp
+new file mode 100644
+index 00000000..5410132c
+--- /dev/null
++++ b/dataengines/notifications/notificationsanitizer.cpp
+@@ -0,0 +1,106 @@
++/*
++ * Copyright (C) 2017 David Edmundson <davidedmundson@kde.org>
++ *
++ * This program is free software you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public License
++ * along with this library; see the file COPYING.LIB. If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++*/
++
++#include "notificationsanitizer.h"
++
++#include <QXmlStreamReader>
++#include <QXmlStreamWriter>
++#include <QRegularExpression>
++#include <QDebug>
++#include <QUrl>
++
++QString NotificationSanitizer::parse(const QString &text)
++{
++ // replace all \ns with <br/>
++ QString t = text;
++
++ t.replace(QLatin1String("\n"), QStringLiteral("<br/>"));
++ // Now remove all inner whitespace (\ns are already <br/>s)
++ t = t.simplified();
++ // Finally, check if we don't have multiple <br/>s following,
++ // can happen for example when "\n \n" is sent, this replaces
++ // all <br/>s in succsession with just one
++ t.replace(QRegularExpression(QStringLiteral("<br/>\\s*<br/>(\\s|<br/>)*")), QLatin1String("<br/>"));
++ // This fancy RegExp escapes every occurence of & since QtQuick Text will blatantly cut off
++ // text where it finds a stray ampersand.
++ // Only &{apos, quot, gt, lt, amp}; as well as { character references will be allowed
++ t.replace(QRegularExpression(QStringLiteral("&(?!(?:apos|quot|[gl]t|amp);|#)")), QLatin1String("&"));
++
++ QXmlStreamReader r(QStringLiteral("<html>") + t + QStringLiteral("</html>"));
++ QString result;
++ QXmlStreamWriter out(&result);
++
++ const QVector<QString> allowedTags = {"b", "i", "u", "img", "a", "html", "br"};
++
++ out.writeStartDocument();
++ while (!r.atEnd()) {
++ r.readNext();
++
++ if (r.tokenType() == QXmlStreamReader::StartElement) {
++ const QString name = r.name().toString();
++ if (!allowedTags.contains(name)) {
++ continue;
++ }
++ out.writeStartElement(name);
++ if (name == QLatin1String("img")) {
++ auto src = r.attributes().value("src").toString();
++ auto alt = r.attributes().value("alt").toString();
++
++ const QUrl url(src);
++ if (url.isLocalFile()) {
++ out.writeAttribute(QStringLiteral("src"), src);
++ } else {
++ //image denied for security reasons! Do not copy the image src here!
++ }
++
++ out.writeAttribute(QStringLiteral("alt"), alt);
++ }
++ if (name == QLatin1String("a")) {
++ out.writeAttribute(QStringLiteral("href"), r.attributes().value("href").toString());
++ }
++ }
++
++ if (r.tokenType() == QXmlStreamReader::EndElement) {
++ const QString name = r.name().toString();
++ if (!allowedTags.contains(name)) {
++ continue;
++ }
++ out.writeEndElement();
++ }
++
++ if (r.tokenType() == QXmlStreamReader::Characters) {
++ const auto text = r.text().toString();
++ out.writeCharacters(text); //this auto escapes chars -> HTML entities
++ }
++ }
++ out.writeEndDocument();
++
++ if (r.hasError()) {
++ qWarning() << "Notification to send to backend contains invalid XML: "
++ << r.errorString() << "line" << r.lineNumber()
++ << "col" << r.columnNumber();
++ }
++
++ // The Text.StyledText format handles only html3.2 stuff and ' is html4 stuff
++ // so we need to replace it here otherwise it will not render at all.
++ result = result.replace(QLatin1String("'"), QChar('\''));
++
++
++ return result;
++}
+diff --git a/dataengines/notifications/notificationsanitizer.h b/dataengines/notifications/notificationsanitizer.h
+new file mode 100644
+index 00000000..561a84b7
+--- /dev/null
++++ b/dataengines/notifications/notificationsanitizer.h
+@@ -0,0 +1,35 @@
++/*
++ * Copyright (C) 2017 David Edmundson <davidedmundson@kde.org>
++ *
++ * This program is free software you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public License
++ * along with this library; see the file COPYING.LIB. If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++*/
++
++#include <QString>
++
++namespace NotificationSanitizer
++{
++ /*
++ * This turns generic random text of either plain text of any degree of faux-HTML into HTML allowed
++ * in the notification spec namely:
++ * a, img, b, i, u and br
++ * All other tags and attributes are stripped
++ * Whitespace is stripped and converted to <br/>
++ * Double newlines are compressed
++ *
++ * Image src is only copied when referring to a local file
++ */
++ QString parse(const QString &in);
++}
+diff --git a/dataengines/notifications/notificationsengine.cpp b/dataengines/notifications/notificationsengine.cpp
+index 72338aeb..caf310e5 100644
+--- a/dataengines/notifications/notificationsengine.cpp
++++ b/dataengines/notifications/notificationsengine.cpp
+@@ -20,6 +20,7 @@
+ #include "notificationsengine.h"
+ #include "notificationservice.h"
+ #include "notificationsadaptor.h"
++#include "notificationsanitizer.h"
+
+ #include <QDebug>
+ #include <KConfigGroup>
+@@ -281,23 +282,7 @@ uint NotificationsEngine::Notify(const QString &app_name, uint replaces_id,
+
+ const QString source = QStringLiteral("notification %1").arg(id);
+
+- // First trim whitespace from beginning and end
+- bodyFinal = bodyFinal.trimmed();
+- // Now replace all \ns with <br/>
+- bodyFinal = bodyFinal.replace(QLatin1String("\n"), QLatin1String("<br/>"));
+- // Now remove all inner whitespace (\ns are already <br/>s
+- bodyFinal = bodyFinal.simplified();
+- // Finally, check if we don't have multiple <br/>s following,
+- // can happen for example when "\n \n" is sent, this replaces
+- // all <br/>s in succsession with just one
+- bodyFinal.replace(QRegularExpression(QStringLiteral("<br/>\\s*<br/>(\\s|<br/>)*")), QLatin1String("<br/>"));
+- // This fancy RegExp escapes every occurence of & since QtQuick Text will blatantly cut off
+- // text where it finds a stray ampersand.
+- // Only &{apos, quot, gt, lt, amp}; as well as { character references will be allowed
+- bodyFinal.replace(QRegularExpression(QStringLiteral("&(?!(?:apos|quot|[gl]t|amp);|#)")), QLatin1String("&"));
+- // The Text.StyledText format handles only html3.2 stuff and ' is html4 stuff
+- // so we need to replace it here otherwise it will not render at all.
+- bodyFinal.replace(QLatin1String("'"), QChar('\''));
++ bodyFinal = NotificationSanitizer::parse(bodyFinal);
+
+ Plasma::DataEngine::Data notificationData;
+ notificationData.insert(QStringLiteral("id"), QString::number(id));
+--
+2.13.6
+
+From cb791b571aed1ea6976e0a6906df3e35dea657ef Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Mon, 5 Feb 2018 13:53:17 +0100
+Subject: [PATCH 2/2] [Notifications] Fix grouping
+
+Sanitize the body before doing anything else.
+Cleanup grouping logic.
+
+Differential Revision: https://phabricator.kde.org/D10315
+---
+ dataengines/notifications/notificationsengine.cpp | 18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/dataengines/notifications/notificationsengine.cpp b/dataengines/notifications/notificationsengine.cpp
+index caf310e5..bc48deed 100644
+--- a/dataengines/notifications/notificationsengine.cpp
++++ b/dataengines/notifications/notificationsengine.cpp
+@@ -217,7 +217,7 @@ uint NotificationsEngine::Notify(const QString &app_name, uint replaces_id,
+ qDebug() << "Currrent active notifications:" << m_activeNotifications;
+ qDebug() << "Guessing partOf as:" << partOf;
+ qDebug() << " New Notification: " << summary << body << timeout << "& Part of:" << partOf;
+- QString bodyFinal = body;
++ QString bodyFinal = NotificationSanitizer::parse(body);
+ QString summaryFinal = summary;
+
+ if (partOf > 0) {
+@@ -225,13 +225,13 @@ uint NotificationsEngine::Notify(const QString &app_name, uint replaces_id,
+ Plasma::DataContainer *container = containerForSource(source);
+ if (container) {
+ // append the body text
+- QString _body = container->data()[QStringLiteral("body")].toString();
+- if (_body != body) {
+- _body.append("\n").append(body);
+- } else {
+- _body = body;
++ const QString previousBody = container->data()[QStringLiteral("body")].toString();
++ if (previousBody != bodyFinal) {
++ // FIXME: This will just append the entire old XML document to another one, leading to:
++ // <?xml><html>old</html><br><?xml><html>new</html>
++ // It works but is not very clean.
++ bodyFinal = previousBody + QStringLiteral("<br/>") + bodyFinal;
+ }
+- bodyFinal = _body;
+
+ replaces_id = partOf;
+
+@@ -267,7 +267,7 @@ uint NotificationsEngine::Notify(const QString &app_name, uint replaces_id,
+
+ const int AVERAGE_WORD_LENGTH = 6;
+ const int WORD_PER_MINUTE = 250;
+- int count = summary.length() + body.length();
++ int count = summary.length() + body.length() - strlen("<?xml version=\"1.0\"><html></html>");
+
+ // -1 is "server default", 0 is persistent with "server default" display time,
+ // anything more should honor the setting
+@@ -282,8 +282,6 @@ uint NotificationsEngine::Notify(const QString &app_name, uint replaces_id,
+
+ const QString source = QStringLiteral("notification %1").arg(id);
+
+- bodyFinal = NotificationSanitizer::parse(bodyFinal);
+-
+ Plasma::DataEngine::Data notificationData;
+ notificationData.insert(QStringLiteral("id"), QString::number(id));
+ notificationData.insert(QStringLiteral("eventId"), eventId);
+--
+2.13.6
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.11.5-CVE-2018-6791.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.11.5-CVE-2018-6791.patch
new file mode 100644
index 00000000000..621687c59d2
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.11.5-CVE-2018-6791.patch
@@ -0,0 +1,31 @@
+From f32002ce50edc3891f1fa41173132c820b917d57 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 5 Feb 2018 13:12:51 +0100
+Subject: [PATCH] Make sure device paths are quoted
+
+in the case a vfat removable device has $() or `` in its label,
+such as $(touch foo) the quoted command may get executed,
+leaving an attack vector. Use KMacroExpander::expandMacrosShellQuote
+to make sure everything is quoted and not interpreted as a command
+
+BUG:389815
+---
+ soliduiserver/deviceserviceaction.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/soliduiserver/deviceserviceaction.cpp b/soliduiserver/deviceserviceaction.cpp
+index f49c967a..738b27c8 100644
+--- a/soliduiserver/deviceserviceaction.cpp
++++ b/soliduiserver/deviceserviceaction.cpp
+@@ -158,7 +158,7 @@ void DelayedExecutor::delayedExecute(const QString &udi)
+
+ QString exec = m_service.exec();
+ MacroExpander mx(device);
+- mx.expandMacros(exec);
++ mx.expandMacrosShellQuote(exec);
+
+ KRun::runCommand(exec, QString(), m_service.icon(), 0);
+ deleteLater();
+--
+2.13.6
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild
new file mode 100644
index 00000000000..adebe223325
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ media-libs/phonon[qt5(+)]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ appstream? ( dev-libs/appstream[qt5] )
+ calendar? ( $(add_kdeapps_dep kholidays) )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( $(add_frameworks_dep prison) )
+ qalculate? ( sci-libs/libqalculate:= )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdesu)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep plasma-integration)
+ $(add_qt_dep qdbus)
+ $(add_qt_dep qtgraphicaleffects)
+ $(add_qt_dep qtpaths)
+ $(add_qt_dep qtquickcontrols 'widgets')
+ app-text/iso-codes
+ x11-apps/mkfontdir
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ systemd? ( sys-apps/dbus[user-session] )
+ !systemd? ( sys-apps/dbus )
+ !dev-libs/xembed-sni-proxy
+ !kde-plasma/freespacenotifier:4
+ !kde-plasma/libtaskmanager:4
+ !kde-plasma/kcminit:4
+ !kde-plasma/kdebase-startkde:4
+ !kde-plasma/klipper:4
+ !kde-plasma/krunner:4
+ !kde-plasma/ksmserver:4
+ !kde-plasma/ksplash:4
+ !kde-plasma/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
+ "${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+ "${FILESDIR}/${P}-CVE-2018-6790.patch"
+ "${FILESDIR}/${P}-CVE-2018-6791.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package appstream AppStreamQt)
+ $(cmake-utils_use_find_package calendar KF5Holidays)
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+ elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+ echo
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2017-08-31 20:54 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2017-08-31 20:54 UTC (permalink / raw
To: gentoo-commits
commit: 20d6b0ac776026c2da57b4a8669bda248c5bacef
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 19:48:10 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 20:53:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d6b0ac
kde-plasma/plasma-workspace: Fix device notifier size, add USE=appstream
Upstream commit a59b9e61897887ea93cf736aff99243facdc45d9
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../plasma-workspace-5.10.5-devicenotifier.patch | 32 ++++
kde-plasma/plasma-workspace/metadata.xml | 1 +
.../plasma-workspace-5.10.5-r1.ebuild | 173 +++++++++++++++++++++
3 files changed, 206 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.5-devicenotifier.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.5-devicenotifier.patch
new file mode 100644
index 00000000000..978f326e620
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.5-devicenotifier.patch
@@ -0,0 +1,32 @@
+From b8f263cd9939530a6634a1ddb9533bf473a67805 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Wed, 23 Aug 2017 11:10:34 +0200
+Subject: [Device Notifier] Set preferred size for ActionItem
+
+In QtQuick Layouts implicit size (set by IconItem to the SVG's natural size) takes
+precedence over width/height. This was fixed in DeviceItem but forgotten here.
+
+BUG: 382541
+FIXED-IN: 5.8.8
+---
+ applets/devicenotifier/package/contents/ui/ActionItem.qml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/applets/devicenotifier/package/contents/ui/ActionItem.qml b/applets/devicenotifier/package/contents/ui/ActionItem.qml
+index 5e54866..df28365 100644
+--- a/applets/devicenotifier/package/contents/ui/ActionItem.qml
++++ b/applets/devicenotifier/package/contents/ui/ActionItem.qml
+@@ -56,8 +56,8 @@ MouseArea {
+
+ PlasmaCore.IconItem {
+ source: area.icon
+- width: units.iconSizes.smallMedium
+- height: width
++ Layout.preferredWidth: units.iconSizes.smallMedium
++ Layout.preferredHeight: width
+ }
+
+ PlasmaComponents.Label {
+--
+cgit v0.11.2
+
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index bc65a860b67..7c6938f31a7 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
+ <flag name="appstream">Enable AppStream software metadata support</flag>
<flag name="geolocation">Enables dataengine providing location information</flag>
<flag name="prison">Enable support for barcodes/QRcodes</flag>
<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.5-r1.ebuild
new file mode 100644
index 00000000000..eff5dff8c70
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.5-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ media-libs/phonon[qt5(+)]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ appstream? ( dev-libs/appstream[qt5] )
+ calendar? ( $(add_kdeapps_dep kholidays) )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( $(add_frameworks_dep prison) )
+ qalculate? ( sci-libs/libqalculate:= )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdesu)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep plasma-integration)
+ $(add_qt_dep qdbus)
+ $(add_qt_dep qtgraphicaleffects)
+ $(add_qt_dep qtpaths)
+ $(add_qt_dep qtquickcontrols 'widgets')
+ app-text/iso-codes
+ x11-apps/mkfontdir
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ !dev-libs/xembed-sni-proxy
+ !kde-plasma/freespacenotifier:4
+ !kde-plasma/libtaskmanager:4
+ !kde-plasma/kcminit:4
+ !kde-plasma/kdebase-startkde:4
+ !kde-plasma/klipper:4
+ !kde-plasma/krunner:4
+ !kde-plasma/ksmserver:4
+ !kde-plasma/ksplash:4
+ !kde-plasma/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
+ "${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+ "${FILESDIR}/${P}-devicenotifier.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package appstream AppStreamQt)
+ $(cmake-utils_use_find_package calendar KF5Holidays)
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+ elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+ echo
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2017-08-02 23:22 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2017-08-02 23:22 UTC (permalink / raw
To: gentoo-commits
commit: 69d39a82485753c7cfc90ce55438148076a3bfa3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 2 22:07:26 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 2 23:17:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d39a82
kde-plasma/plasma-workspace: Backport upstream fixes
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../files/plasma-workspace-5.10.4-ghns-https.patch | 34 +++++++++++
.../plasma-workspace-5.10.4-notifications.patch | 69 ++++++++++++++++++++++
.../plasma-workspace-5.10.4-r2.ebuild | 2 +
3 files changed, 105 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-ghns-https.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-ghns-https.patch
new file mode 100644
index 00000000000..2a805e32f0f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-ghns-https.patch
@@ -0,0 +1,34 @@
+commit ae943198bf74d563adcb1f3d36ee4ba1b7b274a9
+Author: Aleix Pol <aleixpol@kde.org>
+Date: Fri Jul 28 13:21:38 2017 +0200
+
+ Prefer using https for kns providers
+
+ CCBUG: 382820
+
+diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc
+index c683a257..03c7de0e 100644
+--- a/components/shellprivate/widgetexplorer/plasmoids.knsrc
++++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc
+@@ -36,7 +36,7 @@ Name[x-test]=xxPlasma Widgetsxx
+ Name[zh_CN]=Plasma 部件
+ Name[zh_TW]=Plasma 元件
+
+-ProvidersUrl=http://download.kde.org/ocs/providers.xml
++ProvidersUrl=https://download.kde.org/ocs/providers.xml
+ Categories=Plasma 5 Plasmoid
+ StandardResource=tmp
+ InstallationCommand=kpackagetool5 --install %f --type Plasma/Applet
+diff --git a/wallpapers/image/wallpaper.knsrc b/wallpapers/image/wallpaper.knsrc
+index 4a0cf2d6..2decc7e7 100644
+--- a/wallpapers/image/wallpaper.knsrc
++++ b/wallpapers/image/wallpaper.knsrc
+@@ -36,7 +36,7 @@ Name[x-test]=xxWallpapersxx
+ Name[zh_CN]=壁纸
+ Name[zh_TW]=桌布
+
+-ProvidersUrl=http://download.kde.org/ocs/providers.xml
++ProvidersUrl=https://download.kde.org/ocs/providers.xml
+ Categories=KDE Wallpaper 800x600,KDE Wallpaper 1024x768,KDE Wallpaper 1280x1024,KDE Wallpaper 1440x900,KDE Wallpaper 1600x1200,KDE Wallpaper (other)
+ StandardResource=wallpaper
+ Uncompress=archive
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-notifications.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-notifications.patch
new file mode 100644
index 00000000000..e964eeb8beb
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-notifications.patch
@@ -0,0 +1,69 @@
+commit 7e2a29b0b18abe31df68c2f176124acfbc15c438
+Author: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Tue Aug 1 12:53:38 2017 +0200
+
+ [Notifications] Improve mouse handling
+
+ * Make links clickable again
+ * Don't pass visualParent to context menu as we already give it a position, fixes it being positioned incorrectly
+ * Open context menu on press already like is done everywhere else
+ * Give "Copy" the edit-copy icon
+ * Deselect text after copying again, otherwise it stays selected but the user cannot unselect it.
+
+ BUG: 382263
+ FIXED-IN: 5.10.5
+
+ Differential Revision: https://phabricator.kde.org/D7029
+
+diff --git a/applets/notifications/package/contents/ui/NotificationItem.qml b/applets/notifications/package/contents/ui/NotificationItem.qml
+index dabf1b90..c260d588 100644
+--- a/applets/notifications/package/contents/ui/NotificationItem.qml
++++ b/applets/notifications/package/contents/ui/NotificationItem.qml
+@@ -282,8 +282,6 @@ MouseArea {
+ wrapMode: Text.Wrap
+ textFormat: TextEdit.RichText
+
+- onLinkActivated: Qt.openUrlExternally(link)
+-
+ // ensure selecting text scrolls the view as needed...
+ onCursorRectangleChanged: {
+ var flick = bodyTextScrollArea.flickableItem
+@@ -297,23 +295,33 @@ MouseArea {
+ anchors.fill: parent
+ acceptedButtons: Qt.RightButton | Qt.LeftButton
+
+- onClicked: {
+- if (mouse.button == Qt.RightButton)
++ onPressed: {
++ if (mouse.button === Qt.RightButton) {
+ contextMenu.open(mouse.x, mouse.y)
+- else {
+- notificationItem.clicked(mouse)
++ }
++ }
++
++ onClicked: {
++ if (mouse.button === Qt.LeftButton) {
++ var link = bodyText.linkAt(mouse.x, mouse.y)
++ if (link) {
++ Qt.openUrlExternally(link)
++ } else {
++ notificationItem.clicked(mouse)
++ }
+ }
+ }
+
+ PlasmaComponents.ContextMenu {
+ id: contextMenu
+- visualParent: parent
+
+ PlasmaComponents.MenuItem {
+ text: i18n("Copy")
++ icon: "edit-copy"
+ onClicked: {
+ bodyText.selectAll()
+ bodyText.copy()
++ bodyText.deselect()
+ }
+ }
+ }
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild
index 9f18cb3c6c8..939cbb96364 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild
@@ -122,6 +122,8 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
+ "${FILESDIR}/${P}-ghns-https.patch"
+ "${FILESDIR}/${P}-notifications.patch"
"${FILESDIR}/${P}-unused-dep.patch"
)
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2017-07-27 16:24 Andreas Sturmlechner
0 siblings, 0 replies; 44+ messages in thread
From: Andreas Sturmlechner @ 2017-07-27 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 479b6c9e6c960ed177190ad107c8b4aab98e6c48
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 16:10:41 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 16:24:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479b6c9e
kde-plasma/plasma-workspace: Fix DEPENDs, fix cmake warning
Upstream commits
7df184afa19f148c1cd09ae9588645bb2b4556fc
a2202472aa4d488da7562fe8b150c42dddc2d7f2
Reported-by: Michael Mair-Keimberger (iamnr3) <bu9zilla <AT> gmail.com>
Gentoo-bug: 626040
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../files/plasma-workspace-5.10.4-unused-dep.patch | 19 +++
.../plasma-workspace-5.10.4-r1.ebuild | 169 +++++++++++++++++++++
2 files changed, 188 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch
new file mode 100644
index 00000000000..fa0f3850965
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch
@@ -0,0 +1,19 @@
+commit 5a7d251cfbed417a2617945a94427a93cdd2e82d
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu Jul 27 17:50:17 2017 +0200
+
+ Drop unused dependency
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ba61d1cc..ab5536ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ include(ECMQtDeclareLoggingCategory)
+ include(KDEPackageAppTemplates)
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+- Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet KCMUtils
++ Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet
+ IdleTime Declarative TextWidgets KDELibs4Support Crash GlobalAccel
+ DBusAddons Wayland)
+ find_package(KF5NetworkManagerQt ${KF5_MIN_VERSION})
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r1.ebuild
new file mode 100644
index 00000000000..aff99b2e38b
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ calendar? ( $(add_kdeapps_dep kholidays) )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( $(add_frameworks_dep prison) )
+ qalculate? ( sci-libs/libqalculate:= )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdesu)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep plasma-integration)
+ $(add_qt_dep qdbus)
+ $(add_qt_dep qtgraphicaleffects)
+ $(add_qt_dep qtpaths)
+ $(add_qt_dep qtquickcontrols 'widgets')
+ app-text/iso-codes
+ x11-apps/mkfontdir
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ !dev-libs/xembed-sni-proxy
+ !kde-plasma/freespacenotifier:4
+ !kde-plasma/libtaskmanager:4
+ !kde-plasma/kcminit:4
+ !kde-plasma/kdebase-startkde:4
+ !kde-plasma/klipper:4
+ !kde-plasma/krunner:4
+ !kde-plasma/ksmserver:4
+ !kde-plasma/ksplash:4
+ !kde-plasma/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${P}-unused-dep.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package calendar KF5Holidays)
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+ elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+ echo
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2016-11-16 18:38 Michael Palimaka
0 siblings, 0 replies; 44+ messages in thread
From: Michael Palimaka @ 2016-11-16 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 7bc55c6cfd54f8989f8d7a7e5cdd49c29fb43c83
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 18:37:49 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 18:38:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc55c6c
kde-plasma/plasma-workspace: backport patch from upstream resolving krunner crash
Package-Manager: portage-2.3.2
.../plasma-workspace-5.8.3-krunner-crash.patch | 441 +++++++++++++++++++++
.../plasma-workspace-5.8.3-r2.ebuild | 176 ++++++++
2 files changed, 617 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch
new file mode 100644
index 00000000..9b238b6
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch
@@ -0,0 +1,441 @@
+From 3f859c3dbdded68cc96d4c695ff27d15c387da09 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Mon, 10 Oct 2016 16:30:24 +0200
+Subject: [PATCH] Port to new plasma-framework API
+
+Reduces unnecessary castings.
+Ports away the WindowedWidgets runner from KService
+
+REVIEW: 129101
+---
+ applets/systemtray/systemtray.cpp | 30 +++++++-------
+ .../shellprivate/widgetexplorer/widgetexplorer.cpp | 14 +++----
+ plasma-windowed/plasmawindowedcorona.cpp | 2 +-
+ runners/windowedwidgets/windowedwidgetsrunner.cpp | 46 ++++++++++------------
+ runners/windowedwidgets/windowedwidgetsrunner.h | 2 +-
+ shell/alternativeshelper.cpp | 6 +--
+ shell/containmentconfigview.cpp | 2 +-
+ shell/scripting/containment.cpp | 4 +-
+ shell/scripting/widget.cpp | 2 +-
+ shell/shellcorona.cpp | 15 +++----
+ 10 files changed, 60 insertions(+), 63 deletions(-)
+
+diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp
+index e1cd610..ecc23a4 100644
+--- a/applets/systemtray/systemtray.cpp
++++ b/applets/systemtray/systemtray.cpp
+@@ -99,19 +99,19 @@ void SystemTray::init()
+ {
+ Containment::init();
+
+- for (const auto &info: Plasma::PluginLoader::self()->listAppletInfo(QString())) {
+- if (!info.isValid() || info.property(QStringLiteral("X-Plasma-NotificationArea")) != "true") {
++ for (const auto &info: Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
++ if (!info.isValid() || info.value(QStringLiteral("X-Plasma-NotificationArea")) != "true") {
+ continue;
+ }
+- m_systrayApplets[info.pluginName()] = info;
++ m_systrayApplets[info.pluginId()] = KPluginInfo(info);
+
+- if (info.isPluginEnabledByDefault()) {
+- m_defaultPlasmoids += info.pluginName();
++ if (info.isEnabledByDefault()) {
++ m_defaultPlasmoids += info.pluginId();
+ }
+- const QString dbusactivation = info.property(QStringLiteral("X-Plasma-DBusActivationService")).toString();
++ const QString dbusactivation = info.value(QStringLiteral("X-Plasma-DBusActivationService"));
+ if (!dbusactivation.isEmpty()) {
+- qCDebug(SYSTEM_TRAY) << "ST Found DBus-able Applet: " << info.pluginName() << dbusactivation;
+- m_dbusActivatableTasks[info.pluginName()] = dbusactivation;
++ qCDebug(SYSTEM_TRAY) << "ST Found DBus-able Applet: " << info.pluginId() << dbusactivation;
++ m_dbusActivatableTasks[info.pluginId()] = dbusactivation;
+ }
+ }
+ }
+@@ -119,12 +119,12 @@ void SystemTray::init()
+ void SystemTray::newTask(const QString &task)
+ {
+ foreach (Plasma::Applet *applet, applets()) {
+- if (!applet->pluginInfo().isValid()) {
++ if (!applet->pluginMetaData().isValid()) {
+ continue;
+ }
+
+ //only allow one instance per applet
+- if (task == applet->pluginInfo().pluginName()) {
++ if (task == applet->pluginMetaData().pluginId()) {
+ //Applet::destroy doesn't delete the applet from Containment::applets in the same event
+ //potentially a dbus activated service being restarted can be added in this time.
+ if (!applet->destroyed()) {
+@@ -156,7 +156,7 @@ void SystemTray::newTask(const QString &task)
+ void SystemTray::cleanupTask(const QString &task)
+ {
+ foreach (Plasma::Applet *applet, applets()) {
+- if (!applet->pluginInfo().isValid() || task == applet->pluginInfo().pluginName()) {
++ if (!applet->pluginMetaData().isValid() || task == applet->pluginMetaData().pluginId()) {
+ //we are *not* cleaning the config here, because since is one
+ //of those automatically loaded/unloaded by dbus, we want to recycle
+ //the config the next time it's loaded, in case the user configured something here
+@@ -255,11 +255,11 @@ Q_INVOKABLE QString SystemTray::plasmoidCategory(QQuickItem *appletInterface) co
+ }
+
+ Plasma::Applet *applet = appletInterface->property("_plasma_applet").value<Plasma::Applet*>();
+- if (!applet || !applet->pluginInfo().isValid()) {
++ if (!applet || !applet->pluginMetaData().isValid()) {
+ return "UnknownCategory";
+ }
+
+- const QString cat = applet->pluginInfo().property(QStringLiteral("X-Plasma-NotificationAreaCategory")).toString();
++ const QString cat = applet->pluginMetaData().value(QStringLiteral("X-Plasma-NotificationAreaCategory"));
+
+ if (cat.isEmpty()) {
+ return "UnknownCategory";
+@@ -385,11 +385,11 @@ void SystemTray::restorePlasmoids()
+ foreach (Plasma::Applet *applet, applets()) {
+ //Here it should always be valid.
+ //for some reason it not always is.
+- if (!applet->pluginInfo().isValid()) {
++ if (!applet->pluginMetaData().isValid()) {
+ applet->config().parent().deleteGroup();
+ applet->deleteLater();
+ } else {
+- const QString task = applet->pluginInfo().pluginName();
++ const QString task = applet->pluginMetaData().pluginId();
+ if (!m_allowedPlasmoids.contains(task)) {
+ //in those cases we do delete the applet config completely
+ //as they were explicitly disabled by the user
+diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.cpp b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
+index c2b38a8..b445897 100644
+--- a/components/shellprivate/widgetexplorer/widgetexplorer.cpp
++++ b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
+@@ -249,14 +249,14 @@ void WidgetExplorerPrivate::addContainment(Containment *containment)
+ QObject::connect(containment, SIGNAL(appletRemoved(Plasma::Applet*)), q, SLOT(appletRemoved(Plasma::Applet*)));
+
+ foreach (Applet *applet, containment->applets()) {
+- if (applet->pluginInfo().isValid()) {
++ if (applet->pluginMetaData().isValid()) {
+ Containment *childContainment = applet->property("containment").value<Containment*>();
+ if (childContainment) {
+ addContainment(childContainment);
+ }
+- runningApplets[applet->pluginInfo().pluginName()]++;
++ runningApplets[applet->pluginMetaData().pluginId()]++;
+ } else {
+- qDebug() << "Invalid plugininfo. :(";
++ qDebug() << "Invalid plugin metadata. :(";
+ }
+ }
+ }
+@@ -268,10 +268,10 @@ void WidgetExplorerPrivate::containmentDestroyed()
+
+ void WidgetExplorerPrivate::appletAdded(Plasma::Applet *applet)
+ {
+- if (!applet->pluginInfo().isValid()) {
++ if (!applet->pluginMetaData().isValid()) {
+ return;
+ }
+- QString name = applet->pluginInfo().pluginName();
++ QString name = applet->pluginMetaData().pluginId();
+
+ runningApplets[name]++;
+ appletNames.insert(applet, name);
+@@ -471,9 +471,9 @@ void WidgetExplorer::uninstall(const QString &pluginName)
+ const auto &applets = c->applets();
+
+ foreach (Applet *applet, applets) {
+- const auto &appletInfo = applet->pluginInfo();
++ const auto &appletInfo = applet->pluginMetaData();
+
+- if (appletInfo.isValid() && appletInfo.pluginName() == pluginName) {
++ if (appletInfo.isValid() && appletInfo.pluginId() == pluginName) {
+ applet->destroy();
+ }
+ }
+diff --git a/plasma-windowed/plasmawindowedcorona.cpp b/plasma-windowed/plasmawindowedcorona.cpp
+index fbacbf8..b68d270 100644
+--- a/plasma-windowed/plasmawindowedcorona.cpp
++++ b/plasma-windowed/plasmawindowedcorona.cpp
+@@ -51,7 +51,7 @@ void PlasmaWindowedCorona::loadApplet(const QString &applet, const QVariantList
+
+ //forbid more instances per applet (todo: activate the correpsponding already loaded applet)
+ for (Plasma::Applet *a : cont->applets()) {
+- if (a->pluginInfo().pluginName() == applet) {
++ if (a->pluginMetaData().pluginId() == applet) {
+ return;
+ }
+ }
+diff --git a/runners/windowedwidgets/windowedwidgetsrunner.cpp b/runners/windowedwidgets/windowedwidgetsrunner.cpp
+index 5ccbd27..7f093a7 100644
+--- a/runners/windowedwidgets/windowedwidgetsrunner.cpp
++++ b/runners/windowedwidgets/windowedwidgetsrunner.cpp
+@@ -60,24 +60,22 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
+
+ QList<Plasma::QueryMatch> matches;
+
+- foreach (const KPluginInfo &info, Plasma::PluginLoader::self()->listAppletInfo(QString())) {
+- KService::Ptr service = info.service();
+-
+- if (((service->name().contains(term, Qt::CaseInsensitive) ||
+- service->genericName().contains(term, Qt::CaseInsensitive) ||
+- service->comment().contains(term, Qt::CaseInsensitive)) ||
+- service->categories().contains(term, Qt::CaseInsensitive) ||
++ foreach (const KPluginMetaData &md, Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
++ if (((md.name().contains(term, Qt::CaseInsensitive) ||
++ md.value(QLatin1String("GenericName")).contains(term, Qt::CaseInsensitive) ||
++ md.description().contains(term, Qt::CaseInsensitive)) ||
++ md.category().contains(term, Qt::CaseInsensitive) ||
+ term.startsWith(i18nc("Note this is a KRunner keyword", "mobile applications"))) &&
+- !info.property(QStringLiteral("NoDisplay")).toBool()) {
++ !md.rawData().value(QStringLiteral("NoDisplay")).toBool()) {
+
+- QVariant val = info.property(QStringLiteral("X-Plasma-StandAloneApp"));
++ QVariant val = md.value(QStringLiteral("X-Plasma-StandAloneApp"));
+ if (!val.isValid() || !val.toBool()) {
+ continue;
+ }
+
+ Plasma::QueryMatch match(this);
+- setupMatch(service, match);
+- if (service->name().compare(term, Qt::CaseInsensitive) == 0) {
++ setupMatch(md, match);
++ if (md.name().compare(term, Qt::CaseInsensitive) == 0) {
+ match.setType(Plasma::QueryMatch::ExactMatch);
+ match.setRelevance(1);
+ } else {
+@@ -85,8 +83,6 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
+ match.setRelevance(0.7);
+ }
+ matches << match;
+-
+- qDebug() << service;
+ }
+ }
+
+@@ -100,27 +96,27 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
+ void WindowedWidgetsRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match)
+ {
+ Q_UNUSED(context);
+- KService::Ptr service = KService::serviceByStorageId(match.data().toString());
+- if (service) {
+- QProcess::startDetached(QStringLiteral("plasmawindowed"), QStringList() << service->property(QStringLiteral("X-KDE-PluginInfo-Name"), QVariant::String).toString());
++ KPluginMetaData md(match.data().toString());
++ if (md.isValid()) {
++ QProcess::startDetached(QStringLiteral("plasmawindowed"), QStringList() << md.pluginId());
+ }
+ }
+
+-void WindowedWidgetsRunner::setupMatch(const KService::Ptr &service, Plasma::QueryMatch &match)
++void WindowedWidgetsRunner::setupMatch(const KPluginMetaData &md, Plasma::QueryMatch &match)
+ {
+- const QString name = service->name();
++ const QString name = md.pluginId();
+
+ match.setText(name);
+- match.setData(service->storageId());
++ match.setData(md.metaDataFileName());
+
+- if (!service->genericName().isEmpty() && service->genericName() != name) {
+- match.setSubtext(service->genericName());
+- } else if (!service->comment().isEmpty()) {
+- match.setSubtext(service->comment());
++ if (!md.name().isEmpty() && md.name() != name) {
++ match.setSubtext(md.name());
++ } else if (!md.description().isEmpty()) {
++ match.setSubtext(md.description());
+ }
+
+- if (!service->icon().isEmpty()) {
+- match.setIconName(service->icon());
++ if (!md.iconName().isEmpty()) {
++ match.setIconName(md.iconName());
+ }
+ }
+
+diff --git a/runners/windowedwidgets/windowedwidgetsrunner.h b/runners/windowedwidgets/windowedwidgetsrunner.h
+index 2294965..fbc8006 100644
+--- a/runners/windowedwidgets/windowedwidgetsrunner.h
++++ b/runners/windowedwidgets/windowedwidgetsrunner.h
+@@ -48,7 +48,7 @@ protected Q_SLOTS:
+
+
+ protected:
+- void setupMatch(const KService::Ptr &service, Plasma::QueryMatch &action);
++ void setupMatch(const KPluginMetaData &md, Plasma::QueryMatch &action);
+ };
+
+ #endif
+diff --git a/shell/alternativeshelper.cpp b/shell/alternativeshelper.cpp
+index d0f5dfd..6d76307 100644
+--- a/shell/alternativeshelper.cpp
++++ b/shell/alternativeshelper.cpp
+@@ -38,12 +38,12 @@ AlternativesHelper::~AlternativesHelper()
+
+ QStringList AlternativesHelper::appletProvides() const
+ {
+- return m_applet->pluginInfo().property(QStringLiteral("X-Plasma-Provides")).toStringList();
++ return KPluginMetaData::readStringList(m_applet->pluginMetaData().rawData(), QStringLiteral("X-Plasma-Provides"));
+ }
+
+ QString AlternativesHelper::currentPlugin() const
+ {
+- return m_applet->pluginInfo().pluginName();
++ return m_applet->pluginMetaData().pluginId();
+ }
+
+ QQuickItem *AlternativesHelper::applet() const
+@@ -53,7 +53,7 @@ QQuickItem *AlternativesHelper::applet() const
+
+ void AlternativesHelper::loadAlternative(const QString &plugin)
+ {
+- if (plugin == m_applet->pluginInfo().pluginName() || m_applet->isContainment()) {
++ if (plugin == m_applet->pluginMetaData().pluginId() || m_applet->isContainment()) {
+ return;
+ }
+
+diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp
+index cec067e..4c9d146 100644
+--- a/shell/containmentconfigview.cpp
++++ b/shell/containmentconfigview.cpp
+@@ -104,7 +104,7 @@ QAbstractItemModel *ContainmentConfigView::currentContainmentActionsModel()
+
+ QString ContainmentConfigView::containmentPlugin() const
+ {
+- return m_containment->pluginInfo().pluginName();
++ return m_containment->pluginMetaData().pluginId();
+ }
+
+ void ContainmentConfigView::setContainmentPlugin(const QString &plugin)
+diff --git a/shell/scripting/containment.cpp b/shell/scripting/containment.cpp
+index 6040e62..96e2009 100644
+--- a/shell/scripting/containment.cpp
++++ b/shell/scripting/containment.cpp
+@@ -248,7 +248,7 @@ QScriptValue Containment::widgets(QScriptContext *context, QScriptEngine *engine
+ int count = 0;
+
+ foreach (Plasma::Applet *widget, c->d->containment.data()->applets()) {
+- if (widgetType.isEmpty() || widget->pluginInfo().pluginName() == widgetType) {
++ if (widgetType.isEmpty() || widget->pluginMetaData().pluginId() == widgetType) {
+ widgets.setProperty(count, env->wrap(widget));
+ ++count;
+ }
+@@ -273,7 +273,7 @@ QString Containment::type() const
+ return QString();
+ }
+
+- return d->containment.data()->pluginInfo().pluginName();
++ return d->containment.data()->pluginMetaData().pluginId();
+ }
+
+ void Containment::remove()
+diff --git a/shell/scripting/widget.cpp b/shell/scripting/widget.cpp
+index a651c2a..b58822b 100644
+--- a/shell/scripting/widget.cpp
++++ b/shell/scripting/widget.cpp
+@@ -65,7 +65,7 @@ uint Widget::id() const
+ QString Widget::type() const
+ {
+ if (d->applet) {
+- return d->applet.data()->pluginInfo().pluginName();
++ return d->applet.data()->pluginMetaData().pluginId();
+ }
+
+ return QString();
+diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
+index 33259da..598fdb0 100644
+--- a/shell/shellcorona.cpp
++++ b/shell/shellcorona.cpp
+@@ -406,7 +406,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
+ || cont->location() == Plasma::Types::BottomEdge
+ || cont->location() == Plasma::Types::LeftEdge
+ || cont->location() == Plasma::Types::RightEdge) &&
+- cont->pluginInfo().pluginName() != QStringLiteral("org.kde.plasma.private.systemtray");
++ cont->pluginMetaData().pluginId() != QStringLiteral("org.kde.plasma.private.systemtray");
+ };
+
+ auto isDesktop = [] (Plasma::Containment *cont) {
+@@ -493,7 +493,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
+
+ KConfigGroup appletConfig = applet->config();
+
+- appletJson.insert("plugin", applet->pluginInfo().pluginName());
++ appletJson.insert("plugin", applet->pluginMetaData().pluginId());
+ appletJson.insert("config", dumpconfigGroupJS(appletConfig));
+
+ appletsJsonArray << appletJson;
+@@ -560,7 +560,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
+ QJsonObject appletJson;
+
+ appletJson.insert("title", applet->title());
+- appletJson.insert("plugin", applet->pluginInfo().pluginName());
++ appletJson.insert("plugin", applet->pluginMetaData().pluginId());
+
+ appletJson.insert("geometry.x", geometry.x() / gridUnit);
+ appletJson.insert("geometry.y", geometry.y() / gridUnit);
+@@ -1238,11 +1238,11 @@ void ShellCorona::handleContainmentAdded(Plasma::Containment *c)
+
+ void ShellCorona::executeSetupPlasmoidScript(Plasma::Containment *containment, Plasma::Applet *applet)
+ {
+- if (!applet->pluginInfo().isValid() || !containment->pluginInfo().isValid()) {
++ if (!applet->pluginMetaData().isValid() || !containment->pluginMetaData().isValid()) {
+ return;
+ }
+
+- const QString scriptFile = m_lookAndFeelPackage.filePath("plasmoidsetupscripts", applet->pluginInfo().pluginName() + ".js");
++ const QString scriptFile = m_lookAndFeelPackage.filePath("plasmoidsetupscripts", applet->pluginMetaData().pluginId() + ".js");
+
+ if (scriptFile.isEmpty()) {
+ return;
+@@ -1541,7 +1541,7 @@ Plasma::Containment *ShellCorona::setContainmentTypeForScreen(int screen, const
+ //if creation failed or invalid plugin, give up
+ if (!newContainment) {
+ return oldContainment;
+- } else if (!newContainment->pluginInfo().isValid()) {
++ } else if (!newContainment->pluginMetaData().isValid()) {
+ newContainment->deleteLater();
+ return oldContainment;
+ }
+@@ -1975,7 +1975,8 @@ void ShellCorona::activateLauncherMenu()
+ for (auto it = m_panelViews.constBegin(), end = m_panelViews.constEnd(); it != end; ++it) {
+ const auto applets = it.key()->applets();
+ for (auto applet : applets) {
+- if (applet->pluginInfo().property("X-Plasma-Provides").toStringList().contains(QStringLiteral("org.kde.plasma.launchermenu"))) {
++ const auto provides = KPluginMetaData::readStringList(applet->pluginMetaData().rawData(), QStringLiteral("X-Plasma-Provides"));
++ if (provides.contains(QLatin1String("org.kde.plasma.launchermenu"))) {
+ if (!applet->globalShortcut().isEmpty()) {
+ emit applet->activated();
+ return;
+--
+2.7.3
+
+From 59b2d1effcee8d449cbbcd237ba8cebaeb4dd949 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Mon, 14 Nov 2016 15:23:00 +0100
+Subject: [PATCH] [Windowed Widgets Runner] Don't access invalid
+ KPluginMetaData
+
+BUG: 372017
+FIXED-IN: 5.8.4
+
+Differential Revision: https://phabricator.kde.org/D3356
+---
+ runners/windowedwidgets/windowedwidgetsrunner.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/runners/windowedwidgets/windowedwidgetsrunner.cpp b/runners/windowedwidgets/windowedwidgetsrunner.cpp
+index 7f093a7..706b1bb 100644
+--- a/runners/windowedwidgets/windowedwidgetsrunner.cpp
++++ b/runners/windowedwidgets/windowedwidgetsrunner.cpp
+@@ -61,6 +61,10 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
+ QList<Plasma::QueryMatch> matches;
+
+ foreach (const KPluginMetaData &md, Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
++ if (!md.isValid()) {
++ continue;
++ }
++
+ if (((md.name().contains(term, Qt::CaseInsensitive) ||
+ md.value(QLatin1String("GenericName")).contains(term, Qt::CaseInsensitive) ||
+ md.description().contains(term, Qt::CaseInsensitive)) ||
+--
+2.7.3
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r2.ebuild
new file mode 100644
index 00000000..c97f621
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdesu)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep kjsembed)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep libksysguard)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui 'jpeg')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ dev-libs/libdbusmenu-qt[qt5]
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ calendar? ( $(add_kdeapps_dep kholidays) )
+ geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+ gps? ( sci-geosciences/gpsd )
+ prison? ( media-libs/prison:5 )
+ qalculate? ( sci-libs/libqalculate )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kded)
+ $(add_kdeapps_dep kio-extras)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep ksysguard)
+ $(add_plasma_dep milou)
+ $(add_plasma_dep plasma-integration)
+ $(add_qt_dep qdbus)
+ $(add_qt_dep qtgraphicaleffects)
+ $(add_qt_dep qtpaths)
+ $(add_qt_dep qtquickcontrols 'widgets')
+ app-text/iso-codes
+ x11-apps/mkfontdir
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xset
+ x11-apps/xsetroot
+ !dev-libs/xembed-sni-proxy
+ !kde-base/freespacenotifier:4
+ !kde-base/libtaskmanager:4
+ !kde-base/kcminit:4
+ !kde-base/kdebase-startkde:4
+ !kde-base/klipper:4
+ !kde-base/krunner:4
+ !kde-base/ksmserver:4
+ !kde-base/ksplash:4
+ !kde-base/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ # stable branch
+ "${FILESDIR}/${PN}-5.8.3-all-outputs-known.patch"
+ "${FILESDIR}/${PN}-5.8.3-sync-app-w-applets-config.patch"
+ "${FILESDIR}/${PN}-5.8.3-dont-connect-twice.patch"
+ "${FILESDIR}/${PN}-5.8.3-screenpool-screenchange.patch"
+ "${FILESDIR}/${PN}-5.8.3-krunner-crash.patch"
+ # master
+ "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
+ "${FILESDIR}/${PN}-5.8.3-systray-cpuload.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package calendar KF5Holidays)
+ $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake-utils_use_find_package gps libgps)
+ $(cmake-utils_use_find_package prison KF5Prison)
+ $(cmake-utils_use_find_package qalculate Qalculate)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ # startup and shutdown scripts
+ insinto /etc/plasma/startup
+ doins "${FILESDIR}/10-agent-startup.sh"
+
+ insinto /etc/plasma/shutdown
+ doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+ kde5_pkg_postinst
+
+ echo
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+ elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+ echo
+}
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2016-09-28 21:47 Michael Palimaka
0 siblings, 0 replies; 44+ messages in thread
From: Michael Palimaka @ 2016-09-28 21:47 UTC (permalink / raw
To: gentoo-commits
commit: ca18c48c16c6ee4afd70655c543838a5a301e135
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 13 12:25:03 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 21:46:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca18c48c
kde-plasma/plasma-workspace: Drop unused libXcomposite DEPEND
Reported-by: awilfox (irc)
Package-Manager: portage-2.2.28
.../files/plasma-workspace-5.6.5.1-unused-dep.patch | 20 ++++++++++++++++++++
.../files/plasma-workspace-5.7.3-unused-dep.patch | 20 ++++++++++++++++++++
.../plasma-workspace-5.6.5.1-r2.ebuild | 1 +
.../plasma-workspace/plasma-workspace-5.7.5.ebuild | 1 +
4 files changed, 42 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-unused-dep.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-unused-dep.patch
new file mode 100644
index 00000000..e288a97
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-unused-dep.patch
@@ -0,0 +1,20 @@
+commit a29bcad4fe0af53c0d8661cbd17eeb57b004342d
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed Aug 17 18:02:19 2016 +0200
+
+ libtaskmanager: Drop unused X11_Xcomposite
+
+diff --git a/libtaskmanager/CMakeLists.txt b/libtaskmanager/CMakeLists.txt
+index 4f81330..8333d61 100644
+--- a/libtaskmanager/CMakeLists.txt
++++ b/libtaskmanager/CMakeLists.txt
+@@ -65,9 +65,6 @@ if (X11_FOUND)
+ if (X11_Xrender_FOUND)
+ target_link_libraries(taskmanager PRIVATE ${X11_Xrender_LIB})
+ endif ()
+- if (X11_Xcomposite_FOUND)
+- target_link_libraries(taskmanager PRIVATE ${X11_Xcomposite_LIB})
+- endif ()
+ endif()
+
+ set_target_properties(taskmanager PROPERTIES
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.3-unused-dep.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.3-unused-dep.patch
new file mode 100644
index 00000000..27eebf1
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.3-unused-dep.patch
@@ -0,0 +1,20 @@
+commit 1cc82e71749a907f9345a9b969d3d1e124ed9753
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed Aug 17 17:58:17 2016 +0200
+
+ liblegacytaskmanager: Drop unused X11_Xcomposite
+
+diff --git a/liblegacytaskmanager/CMakeLists.txt b/liblegacytaskmanager/CMakeLists.txt
+index dab11b3..f13880b 100644
+--- a/liblegacytaskmanager/CMakeLists.txt
++++ b/liblegacytaskmanager/CMakeLists.txt
+@@ -65,9 +65,6 @@ if (X11_FOUND)
+ if (X11_Xrender_FOUND)
+ target_link_libraries(legacytaskmanager PRIVATE ${X11_Xrender_LIB})
+ endif ()
+- if (X11_Xcomposite_FOUND)
+- target_link_libraries(legacytaskmanager PRIVATE ${X11_Xcomposite_LIB})
+- endif ()
+ endif()
+
+ set_target_properties(legacytaskmanager PROPERTIES
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r2.ebuild
index 3ab4ada..94c93b7 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r2.ebuild
@@ -123,6 +123,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.6.5-drop-kscreen-dep.patch"
"${FILESDIR}/${PN}-5.6.5.1-struts.patch"
"${FILESDIR}/${PN}-5.6.5.1-legacy-session-mgmt.patch" # backport in 5.6 after release
+ "${FILESDIR}/${PN}-5.6.5.1-unused-dep.patch"
)
RESTRICT="test"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
index c94e5f6..76a7913 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
@@ -122,6 +122,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.7.3-unused-dep.patch"
"${FILESDIR}/${PN}-5.7.5-klipper-autostart.patch"
)
^ permalink raw reply related [flat|nested] 44+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/
@ 2016-02-09 16:25 Michael Palimaka
0 siblings, 0 replies; 44+ messages in thread
From: Michael Palimaka @ 2016-02-09 16:25 UTC (permalink / raw
To: gentoo-commits
commit: 0be8df1b52ad6ee0dbfe86ca22ec19fb47e88797
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 9 16:13:10 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 9 16:25:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be8df1b
kde-plasma/plasma-workspace: backport patch from upstream solving lock screen bypass
Gentoo-bug: 574270
Package-Manager: portage-2.2.27
.../plasma-workspace-5.4.3-lockscreen-bypass.patch | 38 ++++++++++++++++++++++
...-r1.ebuild => plasma-workspace-5.4.3-r2.ebuild} | 1 +
2 files changed, 39 insertions(+)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-lockscreen-bypass.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-lockscreen-bypass.patch
new file mode 100644
index 0000000..977251e
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-lockscreen-bypass.patch
@@ -0,0 +1,38 @@
+From 23a9ed7ba9995570227dbcd69c23f009de7dde49 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
+Date: Tue, 9 Feb 2016 16:37:50 +0100
+Subject: [PATCH] [greeter] Dont quit when last window closes
+
+Qt allows to have no screens. If all XRandR screens are disconnected
+there are also no QScreens. This is from an X11 perspective wrong, but
+we have to deal with it. No QScreens means that all views are destroyed
+and no new ones are created. Thus all windows close and the greeter
+exited successfully which in turn unlocked the screen.
+
+This change ensures that the greeter doesn't exit when all windows close.
+
+Funnily this was not a problem with the well known issue of Qt
+crashing when all screens are disconnected. The lock screen handles
+crashes gracefully and just restarts or more likely Qt also crashes
+the application using KSld and thus taking down the complete session.
+
+CCBUG: 358125
+---
+ ksmserver/screenlocker/greeter/main.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ksmserver/screenlocker/greeter/main.cpp b/ksmserver/screenlocker/greeter/main.cpp
+index fa4bf62..0a68835 100644
+--- a/ksmserver/screenlocker/greeter/main.cpp
++++ b/ksmserver/screenlocker/greeter/main.cpp
+@@ -56,6 +56,7 @@ int main(int argc, char* argv[])
+ // explicitly disable input methods as it makes it impossible to unlock, see BUG 306932
+ qputenv("QT_IM_MODULE", QByteArrayLiteral("compose"));
+ ScreenLocker::UnlockApp app(argc, argv);
++ app.setQuitOnLastWindowClosed(false);
+ QCoreApplication::setApplicationName(QStringLiteral("kscreenlocker_greet"));
+ QCoreApplication::setApplicationVersion(QStringLiteral("0.1"));
+ QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org"));
+--
+2.4.10
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r2.ebuild
similarity index 99%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r2.ebuild
index b6f96f5..0b95d6e 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r2.ebuild
@@ -130,6 +130,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-consolekit2.patch"
"${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch" #Upstream bug 354110
"${FILESDIR}/${PN}-5.4.3-no-SUID-no-GUID.patch"
+ "${FILESDIR}/${P}-lockscreen-bypass.patch"
)
RESTRICT="test"
^ permalink raw reply related [flat|nested] 44+ messages in thread
end of thread, other threads:[~2024-10-07 22:12 UTC | newest]
Thread overview: 44+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-17 19:02 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-10-07 22:12 Andreas Sturmlechner
2024-10-07 18:02 Andreas Sturmlechner
2024-09-20 17:11 Andreas Sturmlechner
2024-08-12 20:16 Andreas Sturmlechner
2024-06-05 18:57 Andreas Sturmlechner
2023-09-24 21:47 Andreas Sturmlechner
2023-06-27 11:25 Andreas Sturmlechner
2023-04-10 18:35 Andreas Sturmlechner
2023-03-23 8:39 Andreas Sturmlechner
2023-02-01 9:47 Andreas Sturmlechner
2022-11-30 1:44 Sam James
2022-10-03 8:43 Andreas Sturmlechner
2022-09-14 11:59 Andreas Sturmlechner
2022-09-09 7:34 Sam James
2022-06-14 12:44 Andreas Sturmlechner
2022-02-06 21:17 Andreas Sturmlechner
2021-12-14 9:28 Andreas Sturmlechner
2021-12-10 14:58 Andreas Sturmlechner
2021-11-30 14:33 Andreas Sturmlechner
2021-11-23 14:59 Andreas Sturmlechner
2021-09-22 21:59 Andreas Sturmlechner
2021-09-16 11:14 Andreas Sturmlechner
2021-05-29 21:19 Andreas Sturmlechner
2021-02-05 10:12 Andreas Sturmlechner
2021-01-23 22:45 Andreas Sturmlechner
2021-01-15 18:33 Andreas Sturmlechner
2020-10-04 16:07 Andreas Sturmlechner
2020-07-28 15:37 Andreas Sturmlechner
2020-07-09 17:52 Andreas Sturmlechner
2020-06-23 13:49 Andreas Sturmlechner
2020-05-16 22:38 Andreas Sturmlechner
2020-05-16 22:38 Andreas Sturmlechner
2020-01-21 16:29 Andreas Sturmlechner
2019-07-20 22:15 Andreas Sturmlechner
2018-09-11 17:47 Andreas Sturmlechner
2018-04-11 20:08 Andreas Sturmlechner
2018-02-09 13:57 Michael Palimaka
2017-08-31 20:54 Andreas Sturmlechner
2017-08-02 23:22 Andreas Sturmlechner
2017-07-27 16:24 Andreas Sturmlechner
2016-11-16 18:38 Michael Palimaka
2016-09-28 21:47 Michael Palimaka
2016-02-09 16:25 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox