Accepting request 588484 from home:Vogtinator:branches:KDE:Frameworks5

- Add patch to allow kdesu to be used on wayland:
  * 0001-Unset-QT_QPA_PLATFORM-to-get-xcb.patch

OBS-URL: https://build.opensuse.org/request/show/588484
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdesu?expand=0&rev=148
This commit is contained in:
Luca Beltrame 2018-03-19 10:13:53 +00:00 committed by Git OBS Bridge
parent 4ccaf499bc
commit 9394943b1c
3 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,31 @@
From 42b0b5adb9154519a2eda7da81a993c17a536f0a Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 17 Mar 2018 17:02:39 +0100
Subject: [PATCH] Unset QT_QPA_PLATFORM to get xcb
Currently we can't get wayland applications to work, as they rely on
XDG_RUNTIME_DIR being set.
With wayland 1.15, WAYLAND_DISPLAY can be an absolute path though, so this
can be replaced by setting WAYLAND_DISPLAY=$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY
before unsetting XDG_RUNTIME_DIR and removing the unsetenv of QT_QPA_PLATFORM.
---
src/kdesu_stub.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/kdesu_stub.c b/src/kdesu_stub.c
index 49db577..5038628 100644
--- a/src/kdesu_stub.c
+++ b/src/kdesu_stub.c
@@ -315,6 +315,9 @@ int main()
/* Handle display */
if (strcmp(params[P_DISPLAY].value, "no")) {
+ /* We only handle X11 - so unset QT_QPA_PLATFORM to get xcb. */
+ unsetenv("QT_QPA_PLATFORM");
+
xsetenv("DISPLAY", params[P_DISPLAY].value);
if (params[P_DISPLAY_AUTH].value[0]) {
int fd2;
--
2.16.2

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 19 09:59:40 UTC 2018 - fabian@ritter-vogt.de
- Add patch to allow kdesu to be used on wayland:
* 0001-Unset-QT_QPA_PLATFORM-to-get-xcb.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 12 23:29:41 CET 2018 - lbeltrame@kde.org Mon Mar 12 23:29:41 CET 2018 - lbeltrame@kde.org

View File

@ -45,6 +45,8 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%
Source1: baselibs.conf Source1: baselibs.conf
# PATCH-FIX-OPENSUSE fpie.patch -- make kdesud compile/link with -(f)pie flags # PATCH-FIX-OPENSUSE fpie.patch -- make kdesud compile/link with -(f)pie flags
Patch0: fpie.patch Patch0: fpie.patch
# PATCH-FIX-OPENSUSE
Patch1: 0001-Unset-QT_QPA_PLATFORM-to-get-xcb.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -86,7 +88,7 @@ Development files.
%lang_package -n %lname %lang_package -n %lname
%prep %prep
%setup -q %setup -q
%patch0 -p1 %autopatch -p1
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build