Accepting request 952127 from KDE:Frameworks5
Plasma 5.24 respun tars (again) for URL changes (not built yet) (forwarded request 952125 from Vogtinator) OBS-URL: https://build.opensuse.org/request/show/952127 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=182
This commit is contained in:
commit
57eb13abe3
@ -1,30 +0,0 @@
|
|||||||
From 5db85cf17cd11236f8ee44ba95dd56b81087c6aa Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
||||||
Date: Thu, 21 Oct 2021 08:20:33 +0200
|
|
||||||
Subject: [PATCH 1/2] Revert "Drop setupX11 from startplasma-waylandsession"
|
|
||||||
|
|
||||||
This reverts commit 8bf0e43620de3416e783c307ba10111c6964757b.
|
|
||||||
---
|
|
||||||
startkde/startplasma-waylandsession.cpp | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
|
|
||||||
index 3a054a04f..ed496cc24 100644
|
|
||||||
--- a/startkde/startplasma-waylandsession.cpp
|
|
||||||
+++ b/startkde/startplasma-waylandsession.cpp
|
|
||||||
@@ -19,6 +19,12 @@ int main(int argc, char **argv)
|
|
||||||
|
|
||||||
out << "startplasma-waylandsession: Starting up...";
|
|
||||||
|
|
||||||
+ if (qEnvironmentVariableIsSet("DISPLAY")) {
|
|
||||||
+ setupX11();
|
|
||||||
+ } else {
|
|
||||||
+ qWarning() << "running kwin without Xwayland support";
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (!syncDBusEnvironment()) {
|
|
||||||
out << "Could not sync environment to dbus.\n";
|
|
||||||
return 2;
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
@ -7,11 +7,11 @@ Subject: [PATCH] Use qdbus-qt5
|
|||||||
startkde/startplasma-wayland.cpp | 2 +-
|
startkde/startplasma-wayland.cpp | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
Index: plasma-workspace-5.17.80git.20210531T011335~40d302afe/startkde/startplasma-wayland.cpp
|
Index: plasma-workspace-5.17.80git.20210928T142611~d53fd656e/startkde/startplasma-wayland.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- plasma-workspace-5.17.80git.20210531T011335~40d302afe.orig/startkde/startplasma-wayland.cpp 2021-05-31 03:13:35.000000000 +0200
|
--- plasma-workspace-5.17.80git.20210928T142611~d53fd656e.orig/startkde/startplasma-wayland.cpp 2021-09-28 16:26:11.000000000 +0200
|
||||||
+++ plasma-workspace-5.17.80git.20210531T011335~40d302afe/startkde/startplasma-wayland.cpp 2021-05-31 06:59:35.188774369 +0200
|
+++ plasma-workspace-5.17.80git.20210928T142611~d53fd656e/startkde/startplasma-wayland.cpp 2021-09-28 22:02:12.820708290 +0200
|
||||||
@@ -71,7 +71,7 @@
|
@@ -58,7 +58,7 @@
|
||||||
runEnvironmentScripts();
|
runEnvironmentScripts();
|
||||||
|
|
||||||
if (!qEnvironmentVariableIsSet("DBUS_SESSION_BUS_ADDRESS")) {
|
if (!qEnvironmentVariableIsSet("DBUS_SESSION_BUS_ADDRESS")) {
|
||||||
|
@ -1,86 +0,0 @@
|
|||||||
From 075b2f27722d2f28a5c3d4e201c7e7e787cb68de Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
||||||
Date: Thu, 21 Oct 2021 08:20:38 +0200
|
|
||||||
Subject: [PATCH 2/2] Revert "Drop X11 root properties for KDE full session /
|
|
||||||
session version"
|
|
||||||
|
|
||||||
This reverts commit 9a4e3d39c2a9ca48f39a60ae2ea88e9921723cec.
|
|
||||||
---
|
|
||||||
startkde/startplasma-waylandsession.cpp | 1 +
|
|
||||||
startkde/startplasma-x11.cpp | 1 +
|
|
||||||
startkde/startplasma.cpp | 22 ++++++++++++++++++++++
|
|
||||||
startkde/startplasma.h | 1 +
|
|
||||||
4 files changed, 25 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
|
|
||||||
index ed496cc24..d0c83bf5a 100644
|
|
||||||
--- a/startkde/startplasma-waylandsession.cpp
|
|
||||||
+++ b/startkde/startplasma-waylandsession.cpp
|
|
||||||
@@ -41,6 +41,7 @@ int main(int argc, char **argv)
|
|
||||||
// Keep for KF5; remove in KF6 (KInit will be gone then)
|
|
||||||
runSync(QStringLiteral("kdeinit5_shutdown"), {});
|
|
||||||
|
|
||||||
+ cleanupX11();
|
|
||||||
out << "startplasma-waylandsession: Done.\n";
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
|
|
||||||
index d6b2c5439..7ddf7b3ea 100644
|
|
||||||
--- a/startkde/startplasma-x11.cpp
|
|
||||||
+++ b/startkde/startplasma-x11.cpp
|
|
||||||
@@ -93,6 +93,7 @@ int main(int argc, char **argv)
|
|
||||||
runSync(QStringLiteral("kdeinit5_shutdown"), {});
|
|
||||||
|
|
||||||
cleanupPlasmaEnvironment(oldSystemdEnvironment);
|
|
||||||
+ cleanupX11();
|
|
||||||
|
|
||||||
out << "startkde: Done.\n";
|
|
||||||
|
|
||||||
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
|
|
||||||
index 8d0b0ba89..5f78e7016 100644
|
|
||||||
--- a/startkde/startplasma.cpp
|
|
||||||
+++ b/startkde/startplasma.cpp
|
|
||||||
@@ -336,6 +336,28 @@ void setupX11()
|
|
||||||
// so don't move this up.
|
|
||||||
|
|
||||||
runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
|
|
||||||
+ runSync(QStringLiteral("xprop"),
|
|
||||||
+ {QStringLiteral("-root"),
|
|
||||||
+ QStringLiteral("-f"),
|
|
||||||
+ QStringLiteral("KDE_FULL_SESSION"),
|
|
||||||
+ QStringLiteral("8t"),
|
|
||||||
+ QStringLiteral("-set"),
|
|
||||||
+ QStringLiteral("KDE_FULL_SESSION"),
|
|
||||||
+ QStringLiteral("true")});
|
|
||||||
+ runSync(QStringLiteral("xprop"),
|
|
||||||
+ {QStringLiteral("-root"),
|
|
||||||
+ QStringLiteral("-f"),
|
|
||||||
+ QStringLiteral("KDE_SESSION_VERSION"),
|
|
||||||
+ QStringLiteral("32c"),
|
|
||||||
+ QStringLiteral("-set"),
|
|
||||||
+ QStringLiteral("KDE_SESSION_VERSION"),
|
|
||||||
+ QStringLiteral("5")});
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void cleanupX11()
|
|
||||||
+{
|
|
||||||
+ runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")});
|
|
||||||
+ runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")});
|
|
||||||
}
|
|
||||||
|
|
||||||
void cleanupPlasmaEnvironment(const std::optional<QStringList> &oldSystemdEnvironment)
|
|
||||||
diff --git a/startkde/startplasma.h b/startkde/startplasma.h
|
|
||||||
index e8684be74..00c5c1570 100644
|
|
||||||
--- a/startkde/startplasma.h
|
|
||||||
+++ b/startkde/startplasma.h
|
|
||||||
@@ -26,6 +26,7 @@ void importSystemdEnvrionment();
|
|
||||||
void runEnvironmentScripts();
|
|
||||||
void setupPlasmaEnvironment();
|
|
||||||
void cleanupPlasmaEnvironment(const std::optional<QStringList> &oldSystemdEnvironment);
|
|
||||||
+void cleanupX11();
|
|
||||||
bool syncDBusEnvironment();
|
|
||||||
void setupFontDpi();
|
|
||||||
QProcess *setupKSplash();
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:2ebee6ab2f10cabc350e0f75a0d8462ae0b7616a795d078f6bb5765396052575
|
|
||||||
size 9010724
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmHUDx4ACgkQ11dEg7tX
|
|
||||||
sY0VdxAAuiQ0lUZNgGkxJh1Z9b+i15BjtW6fmg9xC26zbj/P3mngz5mPSlHdQ7W4
|
|
||||||
lkU1OQwWsBghAcKDnKKm7A/QeMloJOSXbTePgsbVti8p8uttoxhwwkAKSMaWRlEA
|
|
||||||
8uO/58U3YrWvqEKvT6tkoHSfdP3/c5PRCIvYSlRhkvVA5ZEHfeBo69w1800JluHl
|
|
||||||
amMijFctSq1xYvFObqoseKl599I2ErgXFr0l+en04nU17DuOP0NnpnXa/0SbeWt8
|
|
||||||
zOMOlRKtSy9EfW+EiYK5Z6M1aJGJiCKpSSFLZOCQA2G8DJ5REJ+E2bzXkwqExQzP
|
|
||||||
mD96AcXiwDE90JJ9cI6kMT3vlBPBvrhgh5I+k+tQ5Tw4Rmsg7w1MirvDFptLypUd
|
|
||||||
V/cfHbwpkMsg2glxkRif70RcC/24VndOxRc8Mi9A7m3fTHqIoyPIV+QfBZggaG1v
|
|
||||||
Tm7NCIcHuS9IfTQTZXT3qitund1bu6iGeaVIyMnOZbgW0YQZmehlTFeti4S+Jd90
|
|
||||||
jzLnMh26D228je5yuKdBAiY3QwUyIOdl4mLqpC789vUR+HawMO5Bv+OHSoTBBHNv
|
|
||||||
7jI7tlfg49iOSzblzVIjS+h3AhH6dQ9UDMHXPxqn1WSw9P6cWkL5huqbbYVWdvPU
|
|
||||||
vjbe8gm5+QSsc54rGjyscLBxQ3kW0GJnw4zVAbR75/cW16Owp/A=
|
|
||||||
=am6B
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
plasma-workspace-5.24.0.tar.xz
Normal file
3
plasma-workspace-5.24.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e337943732cafda000b972856ba0eab953f2c3190b8d8d952a3c6e1105d5d34a
|
||||||
|
size 18458776
|
16
plasma-workspace-5.24.0.tar.xz.sig
Normal file
16
plasma-workspace-5.24.0.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmIBAZYACgkQ11dEg7tX
|
||||||
|
sY3Xzw//blIGnDst3ASBE9vpm53BlJPIy5s2+lp059KGQ5KamrbeJ/Bf/NZzmxFT
|
||||||
|
Y2F9tu50pCSBUVFu38/ev5EYNMkf5MYOSVzfVrif7HbaxaKbisu06S4bB8p0igck
|
||||||
|
3uPN5qBjlcjgoSqPR5aFfoyWCbcni6Sf81K9+qAlWSexMZWWt4pI86fnGaqqJLVx
|
||||||
|
VJHkJMiOUTi62wfsr6cN5KLQX4XbYDy2eTGAKvG8iPTbQ2qGnDF6iD2+dkSA16ZZ
|
||||||
|
mpUdjzSQ12IMIpgRkCn4r75oR5DITWLzwcXj61QMd/YMFNSX81BysO59DiR9K7FI
|
||||||
|
Ly/XrRYRuAAw3yjk5xAi+5lZ8IDhoeQRRlOE1dppwfoTkStEwQHr0YscirXLHOJo
|
||||||
|
W1iozRRWwm4vZ13c7dN+IsbaiEoiwWtJl/NZ1NO4w23pQvdu30F8LHdXAqBbFv30
|
||||||
|
oyUERgn/AyShOeQLnTYHPRk6oI1Jt5dn2qxc02WltAg5Iw/AA4d+09nDasW+sHP4
|
||||||
|
Puy+coEH3EUtPTzlNtA64zZEkayUsK6hPAAPvBKMh1rCTL2gq0AxrM3e2JdNsRDP
|
||||||
|
s2FJiL/lR8dE+68LGT7/oWJUzJYOV3AomtiNeZ7rKWBWnnYmuhUBffKFgn0Iri63
|
||||||
|
zaaJg7MKdrmmM8kvM6j/B8xFSqEvy3EjOP4ZA5GsVOEFy/Y0cJc=
|
||||||
|
=dZ2i
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +1,42 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Feb 5 19:51:02 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Update to 5.24.0
|
||||||
|
* New bugfix release
|
||||||
|
* For more details please see:
|
||||||
|
* https://kde.org/announcements/plasma/5/5.24.0
|
||||||
|
- Too many changes to list here
|
||||||
|
- Drop patches, now upstream:
|
||||||
|
* 0001-sddm-theme-Change-wallpaper-extension-so-that-it-poi.patch
|
||||||
|
* 0001-systemdialogs-Remove-leftover-and-broken-components.patch
|
||||||
|
* 0001-Make-SessionManagementScreen-a-FocusScope.patch
|
||||||
|
* 0001-Fix-initial-focus-in-LockScreenUi.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jan 22 13:09:31 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Add patch to fix initial focus in SDDM (kde#447817):
|
||||||
|
* 0001-Make-SessionManagementScreen-a-FocusScope.patch
|
||||||
|
- Add patch to fix initial focus in the lockscreen:
|
||||||
|
* 0001-Fix-initial-focus-in-LockScreenUi.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 13 20:30:34 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Update to 5.23.90
|
||||||
|
* New feature release
|
||||||
|
* For more details please see:
|
||||||
|
* https://kde.org/announcements/plasma/5/5.23.90
|
||||||
|
- Too many changes to list here
|
||||||
|
- Rebase 0001-Use-qdbus-qt5.patch
|
||||||
|
- Replace xprop-kde-full-session.desktop with autostart file:
|
||||||
|
* 0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch
|
||||||
|
* 0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch
|
||||||
|
- Add patch to fix the upstream sddm theme background:
|
||||||
|
* 0001-sddm-theme-Change-wallpaper-extension-so-that-it-poi.patch
|
||||||
|
- Add patch to fix screen sharing dialog (kde#448423):
|
||||||
|
* 0001-systemdialogs-Remove-leftover-and-broken-components.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jan 4 14:58:20 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
Tue Jan 4 14:58:20 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
@ -16,36 +16,34 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
# Internal QML imports
|
%global __requires_exclude qmlimport\\((org\\.kde\\.plasma\\.private|org\\.kde\\.private\\.kcm|org\\.kde\\.plasma\\.kcm|LocaleListModel|FingerprintModel).*
|
||||||
%global __requires_exclude qmlimport\\((org\\.kde\\.plasma\\.private|org\\.kde\\.private\\.kcm|org\\.kde\\.plasma\\.kcm).*
|
|
||||||
|
|
||||||
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
||||||
%{!?_fillupdir: %global _fillupdir %{_localstatedir}/adm/fillup-templates}
|
%{!?_fillupdir: %global _fillupdir %{_localstatedir}/adm/fillup-templates}
|
||||||
|
|
||||||
%define kf5_version 5.58.0
|
%define kf5_version 5.58.0
|
||||||
|
|
||||||
%bcond_without lang
|
%bcond_without released
|
||||||
Name: plasma5-workspace
|
Name: plasma5-workspace
|
||||||
# Full Plasma 5 version (e.g. 5.9.1)
|
# Full Plasma 5 version (e.g. 5.9.1)
|
||||||
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
|
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
|
||||||
# Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
|
# 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}')}
|
%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
|
||||||
Version: 5.23.5
|
Version: 5.24.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: The KDE Plasma Workspace Components
|
Summary: The KDE Plasma Workspace Components
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: System/GUI/KDE
|
Group: System/GUI/KDE
|
||||||
URL: http://www.kde.org/
|
URL: http://www.kde.org/
|
||||||
Source: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
|
Source: plasma-workspace-%{version}.tar.xz
|
||||||
%if %{with lang}
|
%if %{with released}
|
||||||
Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig
|
Source1: plasma-workspace-%{version}.tar.xz.sig
|
||||||
Source2: plasma.keyring
|
Source2: plasma.keyring
|
||||||
%endif
|
%endif
|
||||||
|
Source3: xprop-kde-full-session.desktop
|
||||||
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
|
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
|
||||||
Patch501: 0001-Use-qdbus-qt5.patch
|
Patch501: 0001-Use-qdbus-qt5.patch
|
||||||
Patch502: 0001-Ignore-default-sddm-face-icons.patch
|
Patch502: 0001-Ignore-default-sddm-face-icons.patch
|
||||||
Patch503: 0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch
|
|
||||||
Patch504: 0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch
|
|
||||||
# PATCH-FEATURE-OPENSUSE
|
# PATCH-FEATURE-OPENSUSE
|
||||||
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
|
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
|
||||||
BuildRequires: breeze5-icons
|
BuildRequires: breeze5-icons
|
||||||
@ -142,6 +140,8 @@ BuildRequires: pkgconfig(xrender)
|
|||||||
BuildRequires: pkgconfig(xtst)
|
BuildRequires: pkgconfig(xtst)
|
||||||
BuildRequires: pkgconfig(zlib)
|
BuildRequires: pkgconfig(zlib)
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
|
# Needed for kcm_users
|
||||||
|
Requires: accountsservice
|
||||||
# contains default style, cursors, etc
|
# contains default style, cursors, etc
|
||||||
Requires: breeze >= %{_plasma5_version}
|
Requires: breeze >= %{_plasma5_version}
|
||||||
# battery applet
|
# battery applet
|
||||||
@ -179,9 +179,10 @@ Requires: kuserfeedback-imports
|
|||||||
Requires: xembedsniproxy >= %{_plasma5_version}
|
Requires: xembedsniproxy >= %{_plasma5_version}
|
||||||
# startkde and startplasma call these
|
# startkde and startplasma call these
|
||||||
Requires: awk
|
Requires: awk
|
||||||
Requires: xprop
|
|
||||||
Requires: xrdb
|
Requires: xrdb
|
||||||
Requires: xsetroot
|
Requires: xsetroot
|
||||||
|
# Used by Source3: xprop-kde-full-session.desktop
|
||||||
|
Requires: xprop
|
||||||
# hardcode versions of plasma-framework-components and plasma-framework-private packages, as upstream doesn't keep backwards compability there
|
# hardcode versions of plasma-framework-components and plasma-framework-private packages, as upstream doesn't keep backwards compability there
|
||||||
%requires_ge plasma-framework-components
|
%requires_ge plasma-framework-components
|
||||||
%requires_ge plasma-framework
|
%requires_ge plasma-framework
|
||||||
@ -202,6 +203,10 @@ Provides: %{name}-branding-upstream = %{version}
|
|||||||
Provides: dbus(org.freedesktop.Notifications)
|
Provides: dbus(org.freedesktop.Notifications)
|
||||||
Obsoletes: %{name}-branding-upstream < %{version}
|
Obsoletes: %{name}-branding-upstream < %{version}
|
||||||
Provides: qt5qmlimport(org.kde.plasma.shell.2) = 0
|
Provides: qt5qmlimport(org.kde.plasma.shell.2) = 0
|
||||||
|
# Was dropped in 5.20, replaced by kcm_users from p-d
|
||||||
|
Provides: kde-user-manager = %{version}
|
||||||
|
Obsoletes: kde-user-manager < %{version}
|
||||||
|
Obsoletes: kde-user-manager-lang < %{version}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains the basic packages for a Plasma workspace.
|
This package contains the basic packages for a Plasma workspace.
|
||||||
@ -324,7 +329,7 @@ Plasma 5 session with Wayland from a display manager.
|
|||||||
%install
|
%install
|
||||||
%kf5_makeinstall -C build
|
%kf5_makeinstall -C build
|
||||||
|
|
||||||
%if %{with lang}
|
%if %{with released}
|
||||||
%{kf5_find_lang}
|
%{kf5_find_lang}
|
||||||
%{kf5_find_htmldocs}
|
%{kf5_find_htmldocs}
|
||||||
%endif
|
%endif
|
||||||
@ -347,24 +352,26 @@ Plasma 5 session with Wayland from a display manager.
|
|||||||
touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
|
touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
|
||||||
ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
|
ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
|
||||||
|
|
||||||
|
install -m0644 %{SOURCE3} %{buildroot}%{_kf5_configdir}/autostart/xprop-kde-full-session.desktop
|
||||||
|
|
||||||
%fdupes %{buildroot}/%{_prefix}
|
%fdupes %{buildroot}/%{_prefix}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
%{systemd_user_post plasma-gmenudbusmenuproxy.service plasma-kcminit-phase1.service plasma-kcminit.service \
|
%{systemd_user_post plasma-gmenudbusmenuproxy.service plasma-kcminit-phase1.service plasma-kcminit.service \
|
||||||
plasma-krunner.service plasma-ksmserver.service plasma-ksplash-ready.service plasma-plasmashell.service \
|
plasma-krunner.service plasma-ksmserver.service plasma-ksplash-ready.service plasma-plasmashell.service \
|
||||||
plasma-xembedsniproxy.service plasma-baloorunner.service plasma-restoresession.service}
|
plasma-xembedsniproxy.service plasma-baloorunner.service plasma-restoresession.service plasma-ksplash.service}
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%{systemd_user_preun plasma-gmenudbusmenuproxy.service plasma-kcminit-phase1.service plasma-kcminit.service \
|
%{systemd_user_preun plasma-gmenudbusmenuproxy.service plasma-kcminit-phase1.service plasma-kcminit.service \
|
||||||
plasma-krunner.service plasma-ksmserver.service plasma-ksplash-ready.service plasma-plasmashell.service \
|
plasma-krunner.service plasma-ksmserver.service plasma-ksplash-ready.service plasma-plasmashell.service \
|
||||||
plasma-xembedsniproxy.service plasma-baloorunner.service plasma-restoresession.service}
|
plasma-xembedsniproxy.service plasma-baloorunner.service plasma-restoresession.service plasma-ksplash.service}
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
%{systemd_user_postun plasma-gmenudbusmenuproxy.service plasma-kcminit-phase1.service plasma-kcminit.service \
|
%{systemd_user_postun plasma-gmenudbusmenuproxy.service plasma-kcminit-phase1.service plasma-kcminit.service \
|
||||||
plasma-krunner.service plasma-ksmserver.service plasma-ksplash-ready.service plasma-plasmashell.service \
|
plasma-krunner.service plasma-ksmserver.service plasma-ksplash-ready.service plasma-plasmashell.service \
|
||||||
plasma-xembedsniproxy.service plasma-baloorunner.service plasma-restoresession.service}
|
plasma-xembedsniproxy.service plasma-baloorunner.service plasma-restoresession.service plasma-ksplash.service}
|
||||||
|
|
||||||
%post libs -p /sbin/ldconfig
|
%post libs -p /sbin/ldconfig
|
||||||
%postun libs -p /sbin/ldconfig
|
%postun libs -p /sbin/ldconfig
|
||||||
@ -407,6 +414,20 @@ fi
|
|||||||
%license LICENSES/*
|
%license LICENSES/*
|
||||||
%{_kf5_applicationsdir}/org.kde.kcolorschemeeditor.desktop
|
%{_kf5_applicationsdir}/org.kde.kcolorschemeeditor.desktop
|
||||||
%{_kf5_applicationsdir}/org.kde.kfontview.desktop
|
%{_kf5_applicationsdir}/org.kde.kfontview.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_autostart.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_colors.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_cursortheme.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_desktoptheme.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_fontinst.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_fonts.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_formats.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_icons.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_lookandfeel.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_nightcolor.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_notifications.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_style.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_translations.desktop
|
||||||
|
%{_kf5_applicationsdir}/kcm_users.desktop
|
||||||
%{_kf5_bindir}/kcminit
|
%{_kf5_bindir}/kcminit
|
||||||
%{_kf5_bindir}/kcminit_startup
|
%{_kf5_bindir}/kcminit_startup
|
||||||
%{_kf5_bindir}/kfontinst
|
%{_kf5_bindir}/kfontinst
|
||||||
@ -434,6 +455,7 @@ fi
|
|||||||
%{_kf5_bindir}/plasma-apply-wallpaperimage
|
%{_kf5_bindir}/plasma-apply-wallpaperimage
|
||||||
%{_kf5_configdir}/autostart/org.kde.plasmashell.desktop
|
%{_kf5_configdir}/autostart/org.kde.plasmashell.desktop
|
||||||
%{_kf5_configdir}/autostart/klipper.desktop
|
%{_kf5_configdir}/autostart/klipper.desktop
|
||||||
|
%{_kf5_configdir}/autostart/xprop-kde-full-session.desktop
|
||||||
%{_kf5_configkcfgdir}/
|
%{_kf5_configkcfgdir}/
|
||||||
%{_kf5_knsrcfilesdir}/colorschemes.knsrc
|
%{_kf5_knsrcfilesdir}/colorschemes.knsrc
|
||||||
%{_kf5_knsrcfilesdir}/gtk_themes.knsrc
|
%{_kf5_knsrcfilesdir}/gtk_themes.knsrc
|
||||||
@ -456,14 +478,13 @@ fi
|
|||||||
%{_kf5_libdir}/kconf_update_bin/krunnerhistory
|
%{_kf5_libdir}/kconf_update_bin/krunnerhistory
|
||||||
%{_kf5_libdir}/libexec/baloorunner
|
%{_kf5_libdir}/libexec/baloorunner
|
||||||
%{_kf5_libdir}/libexec/plasma-sourceenv.sh
|
%{_kf5_libdir}/libexec/plasma-sourceenv.sh
|
||||||
%{_kf5_libdir}/libexec/startplasma-waylandsession
|
|
||||||
%{_kf5_libdir}/libexec/plasma-dbus-run-session-if-needed
|
%{_kf5_libdir}/libexec/plasma-dbus-run-session-if-needed
|
||||||
%{_kf5_plugindir}/
|
%{_kf5_plugindir}/
|
||||||
%{_kf5_qmldir}/
|
%{_kf5_qmldir}/
|
||||||
%{_kf5_applicationsdir}/org.kde.klipper.desktop
|
%{_kf5_applicationsdir}/org.kde.klipper.desktop
|
||||||
%{_kf5_applicationsdir}/org.kde.plasmashell.desktop
|
%{_kf5_applicationsdir}/org.kde.plasmashell.desktop
|
||||||
%{_kf5_applicationsdir}/org.kde.systemmonitor.desktop
|
%{_kf5_applicationsdir}/org.kde.systemmonitor.desktop
|
||||||
%{_kf5_applicationsdir}/plasma-windowed.desktop
|
%{_kf5_applicationsdir}/org.kde.plasmawindowed.desktop
|
||||||
%{_kf5_configkcfgdir}/freespacenotifier.kcfg
|
%{_kf5_configkcfgdir}/freespacenotifier.kcfg
|
||||||
%{_kf5_configkcfgdir}/iconssettingsbase.kcfg
|
%{_kf5_configkcfgdir}/iconssettingsbase.kcfg
|
||||||
# %%{_kf5_configkcfgdir}/feedbacksettings.kcfg
|
# %%{_kf5_configkcfgdir}/feedbacksettings.kcfg
|
||||||
@ -517,7 +538,6 @@ fi
|
|||||||
%dir %{_kf5_sharedir}/kpackage/kcms
|
%dir %{_kf5_sharedir}/kpackage/kcms
|
||||||
%{_kf5_sharedir}/kpackage/kcms/kcm_translations
|
%{_kf5_sharedir}/kpackage/kcms/kcm_translations
|
||||||
# %%{_kf5_sharedir}/kpackage/kcms/kcm_feedback
|
# %%{_kf5_sharedir}/kpackage/kcms/kcm_feedback
|
||||||
%{_kf5_sharedir}/kpackage/kcms/kcm5_icons
|
|
||||||
%{_kf5_sharedir}/kpackage/kcms/kcm_desktoptheme
|
%{_kf5_sharedir}/kpackage/kcms/kcm_desktoptheme
|
||||||
%dir %{_kf5_libdir}/libexec/kauth
|
%dir %{_kf5_libdir}/libexec/kauth
|
||||||
%{_kf5_libdir}/libexec/kauth/fontinst
|
%{_kf5_libdir}/libexec/kauth/fontinst
|
||||||
@ -534,13 +554,15 @@ fi
|
|||||||
%{_userunitdir}/plasma-kcminit.service
|
%{_userunitdir}/plasma-kcminit.service
|
||||||
%{_userunitdir}/plasma-krunner.service
|
%{_userunitdir}/plasma-krunner.service
|
||||||
%{_userunitdir}/plasma-ksmserver.service
|
%{_userunitdir}/plasma-ksmserver.service
|
||||||
|
%{_userunitdir}/plasma-ksplash.service
|
||||||
%{_userunitdir}/plasma-ksplash-ready.service
|
%{_userunitdir}/plasma-ksplash-ready.service
|
||||||
%{_userunitdir}/plasma-plasmashell.service
|
%{_userunitdir}/plasma-plasmashell.service
|
||||||
%{_userunitdir}/plasma-restoresession.service
|
%{_userunitdir}/plasma-restoresession.service
|
||||||
%{_userunitdir}/plasma-baloorunner.service
|
%{_userunitdir}/plasma-baloorunner.service
|
||||||
%{_userunitdir}/plasma-workspace@.target
|
|
||||||
%{_userunitdir}/plasma-xembedsniproxy.service
|
|
||||||
%{_userunitdir}/plasma-core.target
|
%{_userunitdir}/plasma-core.target
|
||||||
|
%{_userunitdir}/plasma-workspace.target
|
||||||
|
%{_userunitdir}/plasma-workspace-{wayland,x11}.target
|
||||||
|
%{_userunitdir}/plasma-xembedsniproxy.service
|
||||||
|
|
||||||
%files -n xembedsniproxy
|
%files -n xembedsniproxy
|
||||||
%license LICENSES/*
|
%license LICENSES/*
|
||||||
@ -585,7 +607,7 @@ fi
|
|||||||
%dir %{_datadir}/wayland-sessions/
|
%dir %{_datadir}/wayland-sessions/
|
||||||
%{_datadir}/wayland-sessions/plasmawayland.desktop
|
%{_datadir}/wayland-sessions/plasmawayland.desktop
|
||||||
|
|
||||||
%if %{with lang}
|
%if %{with released}
|
||||||
%files lang -f %{name}.lang
|
%files lang -f %{name}.lang
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
10
xprop-kde-full-session.desktop
Normal file
10
xprop-kde-full-session.desktop
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
# To work around boo#1191825 until all FF versions got the fix
|
||||||
|
Name=Set KDE_FULL_SESSION=1
|
||||||
|
Exec=xprop -root -format KDE_FULL_SESSION 32a -set KDE_FULL_SESSION 1
|
||||||
|
Type=Application
|
||||||
|
X-KDE-StartupNotify=false
|
||||||
|
NoDisplay=true
|
||||||
|
OnlyShowIn=KDE;
|
||||||
|
X-KDE-autostart-phase=0
|
||||||
|
X-systemd-skip=true
|
Loading…
x
Reference in New Issue
Block a user