pool/plasma5-desktop
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plasma 5.22 Beta, tested a bit more. Now with cmake >= 3.16 and duplicates in .changes removed (now using git log a..b instead of a...b)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-desktop?expand=0&rev=481
This commit is contained in:
Christophe Marin
2021-05-15 16:17:05 +00:00
committed by Git OBS Bridge
parent 6248da52e6
commit dae69926f1
8 changed files with 126 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
0001-Use-python3-explicitly.patch Normal file
View File

@@ -0,0 +1,38 @@
From 7b9e8fd045786d9e5113bbf60d14231fec2a4b81 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 14 May 2021 17:45:19 +0200
Subject: [PATCH 1/2] Use python3 explicitly
Depending on the distribution, "python" means either any Python version or
Python 2 specifically. Be on the safe side and just use python3 explicitly.
(cherry picked from commit ce0c35c29d2a3df1fab5770e1749eb16e03895e6)
---
kcms/keyboard/kcminputrc_fix_botched_5_21_0.py | 2 +-
kcms/keyboard/kcminputrc_migrate_repeat_value.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py b/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
index 56a8d7ddc..c6f76ac37 100755
--- a/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
+++ b/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
#
diff --git a/kcms/keyboard/kcminputrc_migrate_repeat_value.py b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
index bd1667969..16bfa384d 100755
--- a/kcms/keyboard/kcminputrc_migrate_repeat_value.py
+++ b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import sys
for line in sys.stdin:
--
2.25.1

46
0002-No-usr-bin-env-in-shebangs.patch Normal file
View File

@@ -0,0 +1,46 @@
From 3978f593df65d3e8248560fa5f938a3a6c949cdf Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 14 May 2021 17:52:19 +0200
Subject: [PATCH 2/2] No /usr/bin/env in shebangs
- Force use of the system python
- Helps the dependency generator
---
kcms/keyboard/kcminputrc_fix_botched_5_21_0.py | 2 +-
kcms/keyboard/kcminputrc_migrate_repeat_value.py | 2 +-
kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py b/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
index c6f76ac37..0aec9e3b9 100755
--- a/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
+++ b/kcms/keyboard/kcminputrc_fix_botched_5_21_0.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
#
diff --git a/kcms/keyboard/kcminputrc_migrate_repeat_value.py b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
index 16bfa384d..3c950305f 100755
--- a/kcms/keyboard/kcminputrc_migrate_repeat_value.py
+++ b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
import sys
for line in sys.stdin:
diff --git a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py
index a019986ac..cec9c78ce 100644
--- a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py
+++ b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
import fileinput
for line in fileinput.input():
--
2.25.1

3
plasma-desktop-5.21.5.tar.xz
View File

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

11
plasma-desktop-5.21.5.tar.xz.sig
View File

@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAmCRPp0ACgkQEZaMRJKM
rvyDEQf6AknIKIGKxV1zdMSYuVXlZSQyTMuIooKCAU1YO4jsA9kDsadxPXK5UYYw
UlC3jrLpzi1QI0TNx90VU6/bRaYqmH/FJSeQygKfohVXZ3fgPzW2AmYzQWnFs+gq
NR652sZmf8y8Gpi4VsVYiMzLYywiYnDjxJXGwdU96jquOd8VBLzM/cK7mHlfjMmi
vk13bxo04YrfSvHkzLbe1caCDSR9OL+i6EYzVVnyP/PgT+534YD63Ijl9IHL+itr
SCsSqnDO5iZNCN2RzuvyjHqdhj/sKx+B9hkBrIIF2mI3MVraslT7eslLDm49Wxu3
ACbygqxq1g04SwlPWrNjEu4eJhY/3w==
=XNSj
-----END PGP SIGNATURE-----

3
plasma-desktop-5.21.90.tar.xz Normal file
View File

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

11
plasma-desktop-5.21.90.tar.xz.sig Normal file
View File

@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmCdJvsACgkQ7JTRj38F
mX7FbQgAhthxcffwIyBIOvNXKEL/5FQ5gHsNe49ov9TRHTVVAhfYNiMMR1s6aNrc
eoWMPCqiA/3M23wotebXkieDV8gQ6miWC8UHiu2ysD6E8HYF9oT2CybAaHirrz9u
5bZBM93CEuPOz/ZeWAcp1eTpj0pgDyjek0+DxWWtGq9//tJ8f3z6KhP1Ku3N4GxF
vxWCWp7ILr3aF4acp58uPAeiXpSNxhGIR4/kTgS8zOuOeqUVM+C3lo3ZhawW8DkB
mtOv++Uafvxrl+NjMWS/fkeU1d7qXf0gA/ZEzmlLeqY1fNH6kYyOc6AUrjYH+ELE
WAHirJYc/0Gja4PaahlRQtWZDW4l9Q==
=cooK
-----END PGP SIGNATURE-----

16
plasma5-desktop.changes
View File

@@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri May 14 15:54:40 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patches for proper deps of kconf_update scripts:
* 0001-Use-python3-explicitly.patch
* 0002-No-usr-bin-env-in-shebangs.patch
-------------------------------------------------------------------
Thu May 13 18:15:42 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.21.90
* New feature release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.21.90
- Too many changes to list here
-------------------------------------------------------------------
Tue May 4 14:15:41 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

25
plasma5-desktop.spec
View File

@@ -28,7 +28,7 @@
%bcond_without lang
Name: plasma5-desktop
Version: 5.21.5
Version: 5.21.90
Release: 0
# Full Plasma 5 version (e.g. 5.9.3)
%{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}}
@@ -38,11 +38,15 @@ Summary: The KDE Plasma Workspace Components
License: GPL-2.0-only
Group: System/GUI/KDE
URL: http://www.kde.org/
Source: https://download.kde.org/stable/plasma/%{version}/plasma-desktop-%{version}.tar.xz
Source: https://download.kde.org/unstable/plasma/%{version}/plasma-desktop-%{version}.tar.xz
%if %{with lang}
Source1: https://download.kde.org/stable/plasma/%{version}/plasma-desktop-%{version}.tar.xz.sig
Source1: https://download.kde.org/unstable/plasma/%{version}/plasma-desktop-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch1: 0001-Use-python3-explicitly.patch
# PATCH-FIX-OPENSUSE
Patch2: 0002-No-usr-bin-env-in-shebangs.patch
BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@@ -59,7 +63,6 @@ BuildRequires: cmake(KF5ActivitiesStats) >= %{kf5_version}
BuildRequires: cmake(KF5Attica) >= %{kf5_version}
BuildRequires: cmake(KF5Auth) >= %{kf5_version}
BuildRequires: cmake(KF5Baloo) >= %{kf5_version}
BuildRequires: cmake(KF5Codecs) >= %{kf5_version}
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5DBusAddons) >= %{kf5_version}
@@ -141,7 +144,6 @@ Requires: plasma5-workspace >= %{_plasma5_bugfix}
Requires: kinfocenter5
Requires: kirigami2
Requires: kmenuedit5
Requires: ksysguard5
# Needed for sensors
Requires: libksysguard5-imports
# kcm_style does DBus calls to the KDED module.
@@ -237,6 +239,9 @@ sed -i"" "s/Name=Desktop/Name=Desktop Containment/g" containments/desktop/packag
cp %{_datadir}/ibus/dicts/emoji-*.dict %{buildroot}%{_kf5_sharedir}/plasma/ibus-emoji-dicts/
%endif
# Work around kde#437118
rm %{buildroot}%{_kf5_sharedir}/kpackage/kcms/kcm_landingpage/contents/ui/FeedbackControls.qml
# no devel files needed here
rm -rfv %{buildroot}%{_kf5_sharedir}/dbus-1/interfaces/
%fdupes %{buildroot}/%{_prefix}
@@ -257,24 +262,20 @@ sed -i"" "s/Name=Desktop/Name=Desktop Containment/g" containments/desktop/packag
%{_kf5_bindir}/tastenbrett
%{_kf5_configdir}/autostart/kaccess.desktop
%{_kf5_libdir}/libexec/
%{_kf5_libdir}/libkdeinit5_kaccess.so
%{_kf5_plugindir}/kcm_activities.so
%{_kf5_plugindir}/kcm_clock.so
%{_kf5_plugindir}/kcm_desktoppaths.so
%{_kf5_plugindir}/kcm_formats.so
%{_kf5_plugindir}/kcm_joystick.so
%{_kf5_plugindir}/kcm_keyboard.so
%{_kf5_plugindir}/kcm_plasmasearch.so
%dir %{_kf5_plugindir}/kcms/
%{_kf5_plugindir}/kcms/kcm_access.so
%{_kf5_plugindir}/kcms/kcm_autostart.so
%{_kf5_plugindir}/kcms/kcm_baloofile.so
%{_kf5_plugindir}/kcms/kcm_componentchooser.so
%{_kf5_plugindir}/kcms/kcm_kded.so
%{_kf5_plugindir}/kcms/kcm_keys.so
%{_kf5_plugindir}/kcms/kcm_launchfeedback.so
%{_kf5_plugindir}/kcms/kcm_nightcolor.so
%{_kf5_plugindir}/kcms/kcm_notifications.so
%{_kf5_plugindir}/kcms/kcm_landingpage.so
%{_kf5_plugindir}/kcms/kcm_smserver.so
%{_kf5_plugindir}/kcms/kcm_splashscreen.so
%{_kf5_plugindir}/kcms/kcm_users.so
@@ -310,18 +311,16 @@ sed -i"" "s/Name=Desktop/Name=Desktop Containment/g" containments/desktop/packag
%dir %{_kf5_sharedir}/kpackage/
%dir %{_kf5_sharedir}/kpackage/kcms/
%{_kf5_sharedir}/kpackage/kcms/kcm5_kded/
%{_kf5_sharedir}/kpackage/kcms/kcm_autostart/
%{_kf5_sharedir}/kpackage/kcms/kcm_baloofile/
%{_kf5_sharedir}/kpackage/kcms/kcm_keys/
%{_kf5_sharedir}/kpackage/kcms/kcm_launchfeedback/
%{_kf5_sharedir}/kpackage/kcms/kcm_nightcolor/
%{_kf5_sharedir}/kpackage/kcms/kcm_notifications/
%{_kf5_sharedir}/kpackage/kcms/kcm_smserver/
%{_kf5_sharedir}/kpackage/kcms/kcm_splashscreen/
%{_kf5_sharedir}/kpackage/kcms/kcm_users/
%{_kf5_sharedir}/kpackage/kcms/kcm_workspace/
%{_kf5_sharedir}/kpackage/kcms/kcmaccess/
%{_kf5_sharedir}/kpackage/kcms/kcm_componentchooser
%{_kf5_sharedir}/kpackage/kcms/kcm_landingpage/
%{_kf5_sharedir}/kcmkeyboard/
%{_kf5_notifydir}/
%{_kf5_servicesdir}/