12
0

Plasma 5.15 Beta. Again to adjust for kwin5 change in the target prj. When accepting, don't forward just yet to let the kwin5 sr pass.

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=433
This commit is contained in:
Wolfgang Bauer
2019-01-19 09:07:08 +00:00
committed by Git OBS Bridge
parent f3511038a0
commit bc17911fb7
7 changed files with 36 additions and 48 deletions

View File

@@ -1,27 +0,0 @@
From f7fd48a7103c20e1484d7d07de650729ff48eda5 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 24 Mar 2018 19:43:19 +0100
Subject: [PATCH] Set XDG_SESSION_TYPE=wayland in startplasmacompositor
KWorkSpace::detectPlatform uses that, so make sure it's set.
---
startkde/startplasmacompositor.cmake | 3 +++
1 file changed, 3 insertions(+)
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
index 53be3be8..7be28e32 100644
--- a/startkde/startplasmacompositor.cmake
+++ b/startkde/startplasmacompositor.cmake
@@ -222,6 +222,9 @@ export KDE_SESSION_UID
XDG_CURRENT_DESKTOP=KDE
export XDG_CURRENT_DESKTOP
+XDG_SESSION_TYPE=wayland
+export XDG_SESSION_TYPE
+
# kwin_wayland can possibly also start dbus-activated services which need env variables.
# In that case, the update in startplasma might be too late.
if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
--
2.16.2

View File

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

View File

@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlw0qTQACgkQ7JTRj38F
mX4enAf9HGWTzfPECBUnKrbgvtARV59q6HOQV2UjkUtKkN9PYaS4gPEhysRhpF/7
05U97dkxnboMK8Ye28Z4ICiEjQBEQnkxDS7V4V/gzoOa7qzUA/p26otDJAQF0Sl4
umWeRNFmBhCJ5cmf8vVcSEHjzHtzy0NLLWS0XOOpYOJi3nlScgd5WKdlkMhaWPds
PJbHan4ElEVT23rqG4MZfT5n770hobvQplcaI8yELQBQOaNZwMnFwYoxUbQQ6NKb
PGFYpekptA8BJ9CGs17vms0vJ9boFAjw0b1SJaVG7Bh0O3g4x8GKjf58vPbGSqFo
C66kTVp5mDXrOOPjAh2azB2+GsHsZA==
=DqF5
-----END PGP SIGNATURE-----

View File

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

View File

@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlxAc0kACgkQ7JTRj38F
mX4L+Qf9G/WJkbEbfEPXIQuA7PeY6o5/ZL4662kmE4ZoctHcE3xUU9Xl+bkSeorj
gn4SebgsbBnPomC3yFrJDkC8gDlrSbT3+C8dC2m/71aFVlVLYQEI/VHXGrdzy2oR
7VJw+Wki/HGYwrmys3HKdTiLjjOShu+8MgwooBjZ90mJo+16wGjVVfBhLmxPwnca
+vpsfbFEhttp03vzVLOt+UMldKfEV+chENvfVtuOm4pCRsPJ8CFXxdmxrR2boTle
335cEKE7WXN7hgwzX9fl7ImHmDY1blxqhtjSbNIAkZb4P7bgA3KiVzQZ9G5H7H0q
EWwPlztXeg7j3uQ78wcKsODOcr26lw==
=sCLd
-----END PGP SIGNATURE-----

View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Jan 17 18:48:48 UTC 2019 - fabian@ritter-vogt.de
- Update to 5.14.90
* New feature release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.14.90.php
- Too many changes to list here
- mkfontdir and xset not required anymore
- Remove patches, now upstream:
* 0001-Set-XDG_SESSION_TYPE-wayland-in-startplasmacomposito.patch
-------------------------------------------------------------------
Tue Jan 8 13:37:26 UTC 2019 - 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.14.5
Version: 5.14.90
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: https://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
%if %{with lang}
Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig
Source1: https://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
Source3: baselibs.conf
@@ -49,8 +49,6 @@ 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-FIX-UPSTREAM (or alternative solution)
Patch505: 0001-Set-XDG_SESSION_TYPE-wayland-in-startplasmacomposito.patch
# PATCH-FEATURE-OPENSUSE
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
# PATCH-FIX-OPENSUSE
@@ -62,6 +60,7 @@ BuildRequires: phonon4qt5-devel >= 4.6.60
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: cmake(AppStreamQt) >= 0.10.4
BuildRequires: cmake(KDED) >= %{kf5_version}
BuildRequires: cmake(KF5Activities) >= %{kf5_version}
BuildRequires: cmake(KF5Baloo)
BuildRequires: cmake(KF5CoreAddons) >= %{kf5_version}
@@ -154,10 +153,9 @@ Requires: oxygen5-sounds >= %{_plasma5_version}
Requires: solid-imports
Requires: xembedsniproxy >= %{_plasma5_version}
# startkde and startplasma call these
Requires: mkfontdir
Requires: awk
Requires: xprop
Requires: xrdb
Requires: xset
Requires: xsetroot
# hardcode versions of plasma-framework-components and plasma-framework-private packages, as upstream doesn't keep backwards compability there
%requires_ge plasma-framework-components
@@ -397,6 +395,7 @@ fi
%{_kf5_configdir}/autostart/krunner.desktop
%config %{_kf5_configdir}/plasmoids.knsrc
%config %{_kf5_configdir}/wallpaper.knsrc
%config %{_kf5_configdir}/wallpaperplugin.knsrc
%config %{_kf5_configdir}/taskmanagerrulesrc
%config %{_kf5_configdir}/kuiserver.categories
%dir %{_kf5_libdir}/libexec
@@ -421,6 +420,7 @@ fi
%{_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}/desktop-directories/
%{_kf5_sharedir}/kconf_update/
%dir %{_kf5_htmldir}
@@ -442,6 +442,9 @@ fi
%dir %{_kf5_sharedir}/sddm/themes
%{_kf5_sharedir}/sddm/themes/breeze/
%{_kf5_debugdir}/*.categories
%dir %{_kf5_sharedir}/kpackage
%dir %{_kf5_sharedir}/kpackage/kcms
%{_kf5_sharedir}/kpackage/kcms/kcm_translations
%files -n xembedsniproxy
%license COPYING*