From 587a8ed9e3b02a0dda34719b1c85f857b40c0a41f5cbad230d09f45146e8755f Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 22 Mar 2019 14:38:44 +0000 Subject: [PATCH 1/2] Accepting request 687684 from home:Vogtinator:gdkontop - Edit 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch: * Allow overriding GDK_BACKEND in .config/plasma-workspace/env OBS-URL: https://build.opensuse.org/request/show/687684 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=444 --- ...GTK_BACKEND-x11-in-a-wayland-session.patch | 21 ++++++++----------- plasma5-workspace.changes | 6 ++++++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch b/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch index 1390780..4a2e8aa 100644 --- a/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch +++ b/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch @@ -8,21 +8,18 @@ Works around missing window decorations and broken config file reading. startkde/startplasmacompositor.cmake | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index dd9e304d..53be3be8 100644 ---- a/startkde/startplasmacompositor.cmake -+++ b/startkde/startplasmacompositor.cmake -@@ -174,6 +174,10 @@ XDG_DATA_DIRS="@KDE_INSTALL_FULL_DATADIR@:/usr/share:/usr/local/share" +Index: plasma-workspace-5.15.3/startkde/startplasmacompositor.cmake +=================================================================== +--- plasma-workspace-5.15.3.orig/startkde/startplasmacompositor.cmake ++++ plasma-workspace-5.15.3/startkde/startplasmacompositor.cmake +@@ -118,6 +118,10 @@ else + export QT_WAYLAND_FORCE_DPI=96 fi - export XDG_DATA_DIRS +# GTK3 uses the wayland backend by default, but its implementation is not correct +# enough to work well here. Window decorations are missing, for instance. +export GDK_BACKEND=x11 + - # Make sure that D-Bus is running - if qdbus-qt5 >/dev/null 2>/dev/null; then - : # ok --- -2.16.2 - + # Get a property value from org.freedesktop.locale1 + queryLocale1() { + qdbus-qt5 --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1" diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index c0e8082..b45d254 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 22 10:53:54 UTC 2019 - Fabian Vogt + +- Edit 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch: + * Allow overriding GDK_BACKEND in .config/plasma-workspace/env + ------------------------------------------------------------------- Tue Mar 12 13:15:24 UTC 2019 - fabian@ritter-vogt.de From 1496c5595b3192ec4b9cd383960ea500a0d53665aa65e7dcee54046621a3355b Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 23 Mar 2019 16:55:10 +0000 Subject: [PATCH 2/2] Accepting request 687907 from home:KAMiKAZOW:Test - Fix wording - Changed dependecy status of sounds package from Required to Recommended because Plasma load just fine without it. OBS-URL: https://build.opensuse.org/request/show/687907 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=445 --- plasma5-workspace.changes | 7 +++++++ plasma5-workspace.spec | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index b45d254..709ef39 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 23 15:43:44 UTC 2019 - Markus S + +- Fix wording +- Changed dependecy status of sounds package from Required to + Recommended because Plasma load just fine without it. + ------------------------------------------------------------------- Fri Mar 22 10:53:54 UTC 2019 - Fabian Vogt diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 541cd86..8746739 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -149,7 +149,7 @@ Requires: libqt5-qtquickcontrols Requires: milou5 >= %{_plasma5_version} # boo#912317 Requires: gmenudbusmenuproxy >= %{_plasma5_version} -Requires: oxygen5-sounds >= %{_plasma5_version} +Recommends: oxygen5-sounds >= %{_plasma5_version} Requires: solid-imports Requires: xembedsniproxy >= %{_plasma5_version} # startkde and startplasma call these @@ -203,8 +203,7 @@ Group: Development/Libraries/KDE %requires_ge plasma-framework %description libs -This package contains the basic packages for a K Desktop Environment -workspace. +This package contains the basic packages for a KDE Plasma 5 workspace. %package -n xembedsniproxy Summary: XEmbed SNI Proxy @@ -243,8 +242,8 @@ Provides: plasma-workspace5-devel = %{version} Obsoletes: plasma-workspace5-devel < %{version} %description devel -This package contains the basic packages for a K Desktop Environment -workspace. Development files. +This package contains the basic packages for a KDE Plasma 5 workspace. +Development files. %package -n plasma5-session Summary: KDE Plasma 5 X11 Session