Plasma 5.17.1 - built and fixed?

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=480
This commit is contained in:
Wolfgang Bauer
2019-10-23 07:44:53 +00:00
committed by Git OBS Bridge
parent b27cb3136e
commit 034318857a
8 changed files with 40 additions and 116 deletions

View File

@@ -1,53 +0,0 @@
From 3f7e44cade8aae45396f6bbdd22c60ce4cd508d2 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 18 Oct 2019 09:36:27 +0200
Subject: [PATCH] Fix reading environment variables with newline
Summary:
Use '\0' as separator as '\n' is likely to appear in values.
BUG: 413130
Test Plan:
/etc/profile.d/mc.sh exported an mc() function,
which resulted in "syntax error: unexpected end of file" in the Plasma session.
Now the mc function is correctly set in the environment.
Reviewers: #plasma, apol
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D24750
---
startkde/plasma-sourceenv.sh | 2 +-
startkde/startplasma.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/startkde/plasma-sourceenv.sh b/startkde/plasma-sourceenv.sh
index 70c3b6487..b8a50aa0d 100644
--- a/startkde/plasma-sourceenv.sh
+++ b/startkde/plasma-sourceenv.sh
@@ -3,4 +3,4 @@ do
. $i >/dev/null
done
-env
+env -0
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index e0f7004b4..cb4eda2b8 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
@@ -91,7 +91,7 @@ void sourceFiles(const QStringList &files)
p.waitForFinished(-1);
const auto fullEnv = p.readAllStandardOutput();
- auto envs = fullEnv.split('\n');
+ auto envs = fullEnv.split('\0');
for (auto &env: envs) {
if (env.startsWith("_=") || env.startsWith("SHLVL"))
--
2.22.0

View File

@@ -1,43 +0,0 @@
From da9ec45b9574097da9bed042f809062cb6c0bbe3 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Tue, 15 Oct 2019 15:27:16 +0200
Subject: [PATCH] [gmenu-dbusmenu-proxy] Don't create ~/.gtkrc-2.0
BUG: 412970
---
gmenu-dbusmenu-proxy/menuproxy.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gmenu-dbusmenu-proxy/menuproxy.cpp b/gmenu-dbusmenu-proxy/menuproxy.cpp
index 24542f286..8c2d2bd91 100644
--- a/gmenu-dbusmenu-proxy/menuproxy.cpp
+++ b/gmenu-dbusmenu-proxy/menuproxy.cpp
@@ -98,7 +98,7 @@ MenuProxy::MenuProxy()
enableGtkSettings(false);
}
- // kde-gtk-config just deletes and re-creates the gtkrc-2.0, watch this and add out config to it again
+ // kde-gtk-config just deletes and re-creates the gtkrc-2.0, watch this and add our config to it again
m_writeGtk2SettingsTimer->setSingleShot(true);
m_writeGtk2SettingsTimer->setInterval(1000);
connect(m_writeGtk2SettingsTimer, &QTimer::timeout, this, &MenuProxy::writeGtk2Settings);
@@ -178,9 +178,15 @@ QString MenuProxy::gtk3SettingsIniPath()
void MenuProxy::writeGtk2Settings()
{
+ QFile rcFile(gtkRc2Path());
+ if (!rcFile.exists()) {
+ // Don't create it here, that would break writing default GTK-2.0 settings on first login,
+ // as the gtkbreeze kconf_update script only does so if it does not exist
+ return;
+ }
+
qCDebug(DBUSMENUPROXY) << "Writing gtkrc-2.0 to" << (m_enabled ? "enable" : "disable") << "global menu support";
- QFile rcFile(gtkRc2Path());
if (!rcFile.open(QIODevice::ReadWrite | QIODevice::Text)) {
return;
}
--
2.22.0

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4480ccf0b9168bdd10d4a5fa3ee40e5e77f10c12713f9de55c5d19e23fe993f0
size 4960412

View File

@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl2fKUQACgkQ7JTRj38F
mX4xjwf+LcgOxW4vRjvZ4W+pjnxYKtDk1Vf//LcCfgNcpsbD6O0a6sWD8yfCMKQ5
zUQX2HfISR9Nze2EscR5TD7Hh6tFvWziutSyjM0WcKezAbXdd9a0khWbhKdwdEmz
UnbJTVMUFbbY4ViOCZ5QRlEa6n1zXJSZTGqMBOkIMpw+NfmR7OYC5D0f+JVpXfa+
gnhlk9XpM67uViFbgjIhROH1czZVfCINAj9Lndd47T61Q6VP2nMmaA5qiYTg/6QF
9Cu6zB3ZVFMxv4Ot6ezM7UPmRbtryUZj7QRuXcm7nf75Ag0tAx5HDNXXgp5hIgT2
BYy5k1FNbA2StAtCXnXvKMbLTmZNPA==
=lWPr
-----END PGP SIGNATURE-----

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21c69bca0b358073fb0b945e79727d65f104dda54c6cfd643719fdd603831616
size 4960796

View File

@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl2vI6wACgkQ7JTRj38F
mX6SAAf/fvIhzp/NQLdQJq+nLUPQzzv1xh2TEYCiL9mK2gFrd6Yp6rm2AwhBGF9I
84mDAvAYXRtwVQV3/goQI4qzTxZb4LAEst9QmgOC3GwnVzxmiPGg739BxOw2rWkO
FDtRXQeX/byhwMjWHKNOh/Xpoi5z++oYmbtK1Cs54nxa7OxkzOlNsVI/qVW7erXG
OcW/YN9wxjbsNVWtz9ZK6Li5O73dlzyr6OFqu6bz4i72cMgvo6ucp37mp8lBj7DA
26AIoPHDBBnGr8h3OQlVqpr8q2N46x7zJqe0GOdj5mcHeyFaNUAmrRyqGPZnZJ+0
hae6eHHw3NAqI8i+1TLimdAM9llFfw==
=BmNC
-----END PGP SIGNATURE-----

View File

@@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue Oct 22 16:44:45 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.17.1
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.17.1.php
- Changes since 5.17.0:
* [Windows Runner] Gather window again when running result (kde#412386)
* [startplasma] Pass actual variable to kapplymousetheme
* Fix slideshow crashing in invalidate() (kde#413018)
* Fix reading environment variables with newline (kde#413130)
* [Media Controller] Multiple artists support (kde#405762)
* [gmenu-dbusmenu-proxy] Don't create ~/.gtkrc-2.0
* [Notifications] Also consider enabled and connected for screen to be checked against
* [Notifications] Don't bind model inside headerItem
* [XembedSNIProxy] Do not crash on null pointer (kde#409652)
* [XembedSNIProxy] Scale only big icons (kde#366047)
* [XembedSNIProxy] Check size in each update() (kde#358240)
- Remove patches, now upstream:
* 0001-Fix-reading-environment-variables-with-newline.patch
* 0001-gmenu-dbusmenu-proxy-Don-t-create-.gtkrc-2.0.patch
-------------------------------------------------------------------
Fri Oct 18 07:48:42 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@@ -27,22 +27,19 @@ Name: plasma5-workspace
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
# Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
Version: 5.17.0
Version: 5.17.1
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
Group: System/GUI/KDE
Url: http://www.kde.org/
Source: plasma-workspace-%{version}.tar.xz
Source: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
%if %{with lang}
Source1: plasma-workspace-%{version}.tar.xz.sig
Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
Source3: baselibs.conf
Source4: plasmafullwayland.desktop
# PATCH-FIX-UPSTREAM
Patch1: 0001-gmenu-dbusmenu-proxy-Don-t-create-.gtkrc-2.0.patch
Patch2: 0001-Fix-reading-environment-variables-with-newline.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch