Accepting request 772262 from KDE:Frameworks5

Plasma 5.18.0, not yet final tars. Please publish disable KF5 before accepting. (forwarded request 770821 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/772262
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=128
This commit is contained in:
Dominique Leuenberger 2020-02-10 20:52:11 +00:00 committed by Git OBS Bridge
commit f62331349c
10 changed files with 87 additions and 178 deletions

View File

@ -1,70 +0,0 @@
From 2167422cd0fa8b1059f5bc8a213bbeda3faa5391 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 24 Mar 2018 14:51:47 +0100
Subject: [PATCH] Add suffix to the wayland session's name
Sddm added the prefix previously, this is not the case anymore.
---
login-sessions/plasmawayland.desktop.cmake | 46 +---------------------
1 file changed, 1 insertion(+), 45 deletions(-)
diff --git a/login-sessions/plasmawayland.desktop.cmake b/login-sessions/plasmawayland.desktop.cmake
index 2415ec28..9319fcf9 100644
--- a/login-sessions/plasmawayland.desktop.cmake
+++ b/login-sessions/plasmawayland.desktop.cmake
@@ -2,51 +2,7 @@
Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
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 (Wayland)
Comment=Plasma by KDE
Comment[ar]=بلازما كدي
Comment[bs]=Plazma od strane KDe
--
2.21.0

View File

@ -1,31 +0,0 @@
From 73ffadbeda0e27689c995aa1576e1f773a329cc8 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 11 Jan 2020 17:19:50 +0100
Subject: [PATCH] Set QT_AUTO_SCREEN_SCALE_FACTOR=0 for Qt >= 5.14 as well
It behaves differently than expected, so this is still needed.
https://bugs.kde.org/show_bug.cgi?id=415421
---
startkde/startplasma.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index ffb67ffb2..5cc9ea1b3 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
@@ -218,11 +218,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");
--
2.23.0

View File

@ -5,8 +5,7 @@ Subject: [PATCH] Use qdbus-qt5
---
startkde/startplasma-wayland.cpp | 2 +-
wallpapers/image/wallpaper.knsrc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
index 5b0e0746d..c651ea4fe 100644
@ -21,16 +20,3 @@ index 5b0e0746d..c651ea4fe 100644
return 1;
}
setupPlasmaEnvironment();
diff --git a/wallpapers/image/wallpaper.knsrc b/wallpapers/image/wallpaper.knsrc
index 6b390ba72..2136d43a5 100644
--- a/wallpapers/image/wallpaper.knsrc
+++ b/wallpapers/image/wallpaper.knsrc
@@ -43,4 +43,4 @@ Categories=KDE Wallpaper 800x600,KDE Wallpaper 1024x768,KDE Wallpaper 1280x1024,
StandardResource=wallpaper
Uncompress=archive
-AdoptionCommand=qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'for (var i in desktops()) { d = desktops()[i]; d.wallpaperPlugin = "org.kde.image"; d.currentConfigGroup = ["Wallpaper", "org.kde.image", "General"]; d.writeConfig("Image", "%f") }'
+AdoptionCommand=qdbus-qt5 org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'for (var i in desktops()) { d = desktops()[i]; d.wallpaperPlugin = "org.kde.image"; d.currentConfigGroup = ["Wallpaper", "org.kde.image", "General"]; d.writeConfig("Image", "%f") }'
--
2.22.0

View File

@ -1,34 +0,0 @@
From b704fa4d735222166cd2d43c9f8da60df5b4fd0d Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 4 May 2018 09:10:10 +0200
Subject: [PATCH] sddm-theme: Set needsFullUserModel=false
Otherwise SDDM has to load all users even if they're not shown.
See https://github.com/sddm/sddm/pull/1017
---
sddm-theme/Main.qml | 2 ++
sddm-theme/theme.conf.cmake | 1 +
2 files changed, 3 insertions(+)
Index: plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/Main.qml
===================================================================
--- plasma-workspace-5.15.80git.20190316T190106~d7654042.orig/sddm-theme/Main.qml 2019-03-16 19:01:06.000000000 +0100
+++ plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/Main.qml 2019-03-16 20:56:49.279402750 +0100
@@ -182,6 +182,8 @@
if ( userListModel.count === 0 ) return false
+ if ( userListModel.hasOwnProperty("containsAllUsers") && !userListModel.containsAllUsers) return false
+
return userListModel.count <= userListModel.disableAvatarsThreshold && (userList.y + mainStack.y) > 0
}
Index: plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/theme.conf.cmake
===================================================================
--- plasma-workspace-5.15.80git.20190316T190106~d7654042.orig/sddm-theme/theme.conf.cmake 2019-03-16 19:01:06.000000000 +0100
+++ plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/theme.conf.cmake 2019-03-16 20:56:49.279402750 +0100
@@ -3,3 +3,4 @@ type=image
color=#1d99f3
fontSize=10
background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
+needsFullUserModel=false

View File

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

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEyBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl4UqBwACgkQ7JTRj38F
mX5D3Qf4z+sBteYguSgooaLRHUziJqeTIEe5FlAmCYVNFJCrphLgG8kvxyUuiKFB
GgBcmHGNA6h1YkdeZAwR5rqOaX4sBPteQ8SQMJkr9G07A1fHhXnbAgpP7pecuSjd
6BFHMquKDFWH6txeauw8y1qZdYhoW63bK+0kBFXI7EjEIKYuUSKIVdAx9ixWpbvJ
ThytsrWny3ZhP5viCO8p365sYYHed7tiz7F7a4Qm6Pq9Jmx+4gdAkznKO77+FvfD
ZWemwJ6byXtOaYpOScLARBQ/jgkYMfGbVHGhUWjMJd3hHQrdhqs9aCnFozyAyaUe
kCj4phOrmIOXAA1t6z9AIkCb5S2L
=seip
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl48FOMACgkQ7JTRj38F
mX47LQf8CUX2Tsp5vLxY+AjJS7ZddWCsZiYysG4A1PTlwALUN0taRYhNVLrgjIOw
Mgo9Nyaw5D+V3UkR4R4mf3iN79xL0IZQJUj1ZOHoeCGBCXVQvB7fKS/F0xI0H1aM
D9WPscJ8jnA6EenQm8cmuIAssAJVpf89j00/Mv2P9fIv1JjFrW1xn4M8qPLkzxu7
gJ7zGMsyMjhPT3wr+1t+G7f1kl4z5lD8/zA8hBubhG6y6TsrP3WUI1KE9ioK9gDb
1kLvYnbo6WqQ6puGdpJrgLHAOwQHAOC+Lz9RDJ+i4oyFGErJlup8Jqq7S6/F4Gfe
gi6PoQjLlpqPfXu8tHnbTLQuR/bLoA==
=RBY/
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,63 @@
-------------------------------------------------------------------
Thu Feb 6 15:10:07 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.18.0
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.18.0.php
- Changes since 5.17.90:
* tooltips always have normal color group
* Fix typo
* [Notifications] Don't dodge notification popups
* [Notifications] Fixup setSourceModel
* [SNI] Fix race condition in item registration (kde#416652)
* [Notifications] Fix typo
* Shut up
* [System Tray] Initially set correct category for plasmoids (kde#416947)
* [Task Manager] Remove strict URL handling (kde#385727)
* [context menu] Remove last traces of "Lock Widgets" action from UI (kde#416578)
* Remove unused includes
* Port plasma-workspace to autoconfig.kde.org
* [sddm-theme] Fix broken wallpaper loading
* [Notifications] Fix action button size
* search for a default wallpaper in lookandfeel
* [startkde] Export LC_TIME again (kde#416670)
* [Notifications] Set transient parent for file menu (kde#387597)
* [SystemTray] Fix model update in settings (missing icon) (kde#416400)
* [SystemTray] Remove scrollbar paddings
* Runner/Windows make the window finding more reliable (kde#414804)
* Kicker/RecentDocuments display place's icon when resource matches one
* [Notifications] When there is only a reply action, show reply field right away
* [Notifications] Send reply text as targeted signal
* Also disable automatic scaling on Qt >= 5.14 (kde#415421)
* add includes needed for compiling with qt 5.13
- Drop patches, now upstream:
* 0001-Set-QT_AUTO_SCREEN_SCALE_FACTOR-0-for-Qt-5.14-as-wel.patch
-------------------------------------------------------------------
Thu Jan 23 11:20:38 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
- Replace %make_jobs with %cmake_build
-------------------------------------------------------------------
Tue Jan 21 08:47:53 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- knewstuff-imports is needed for several KCMs
-------------------------------------------------------------------
Thu Jan 16 14:04:21 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.17.90
* New feature release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.17.90.php
- Too many changes to list here
- Drop patches, now upstream:
* 0001-Add-suffix-to-the-wayland-session-s-name.patch
* lazy-sddm-theme.patch
- Refresh patches:
* 0001-Use-qdbus-qt5.patch
-------------------------------------------------------------------
Tue Jan 14 12:10:11 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -27,15 +27,15 @@ 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.5
Version: 5.18.0
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
Group: System/GUI/KDE
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}
Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig
Source1: plasma-workspace-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
Source3: baselibs.conf
@ -44,13 +44,8 @@ Source4: plasmafullwayland.desktop
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
Patch503: 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch
# PATCH-FIX-UPSTREAM (once sddm part merged)
Patch504: 0001-Add-suffix-to-the-wayland-session-s-name.patch
# PATCH-FEATURE-OPENSUSE
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
# PATCH-FIX-OPENSUSE
Patch507: lazy-sddm-theme.patch
Patch508: 0001-Set-QT_AUTO_SCREEN_SCALE_FACTOR-0-for-Qt-5.14-as-wel.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@ -137,6 +132,7 @@ Requires: kded
Requires: kdelibs4support
Requires: kglobalaccel5 >= %{_plasma5_version}
Requires: kinit
Requires: kquickcharts
Requires: kscreen5 >= %{_plasma5_version}
Requires: kscreenlocker >= %{_plasma5_version}
Requires: kwin5 >= %{_plasma5_version}
@ -151,6 +147,8 @@ Requires: milou5 >= %{_plasma5_version}
Requires: gmenudbusmenuproxy >= %{_plasma5_version}
Recommends: oxygen5-sounds >= %{_plasma5_version}
Requires: solid-imports
# Used by KCMs
Requires: knewstuff-imports
Requires: xembedsniproxy >= %{_plasma5_version}
# startkde and startplasma call these
Requires: awk
@ -296,8 +294,8 @@ Plasma 5 session with Wayland from a display manager.
%autopatch -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
%make_jobs
%cmake_kf5 -d build -- -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
%cmake_build
%install
%kf5_makeinstall -C build
@ -412,14 +410,14 @@ fi
%{_kf5_plugindir}/
%{_kf5_qmldir}/
%{_kf5_applicationsdir}/org.kde.klipper.desktop
%{_kf5_applicationsdir}/plasma-windowed.desktop
%{_kf5_applicationsdir}/org.kde.plasmashell.desktop
%{_kf5_applicationsdir}/org.kde.systemmonitor.desktop
%{_kf5_applicationsdir}/plasma-windowed.desktop
%{_kf5_configkcfgdir}/freespacenotifier.kcfg
%{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service
%{_kf5_sharedir}/dbus-1/services/org.kde.baloorunner.service
%{_kf5_sharedir}/dbus-1/services/org.kde.plasma.Notifications.service
%{_kf5_sharedir}/dbus-1/services/org.kde.LogoutPrompt.service
%{_kf5_sharedir}/dbus-1/services/org.kde.baloorunner.service
%{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service
%{_kf5_sharedir}/dbus-1/services/org.kde.plasma.Notifications.service
%{_kf5_sharedir}/desktop-directories/
%{_kf5_sharedir}/kconf_update/
%dir %{_kf5_htmldir}