From 89a2e798b93bb91cb7406764c58c2b731bca87ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 27 Jul 2018 08:25:42 +0200
Subject: [PATCH 1/3] Enable XWayland

so applications requiring X11 can start.  See e.g.
https://source.puri.sm/Librem5/Apps_Issues/issues/42 is fixed.

Don't remove it form the config so it's easy for people to test without
XWayland.
---
 data/rootston.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/rootston.ini b/data/rootston.ini
index 3d07964d..702cff78 100644
--- a/data/rootston.ini
+++ b/data/rootston.ini
@@ -1,5 +1,5 @@
-[core]
-xwayland=false
+#[core]
+#xwayland=false
 
 [cursor:seat0]
 map-to-output:HDMI-A-1
-- 
GitLab


From fb06a7d8478538328df3b80cddf3c775bc98c9da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 27 Jul 2018 08:29:18 +0200
Subject: [PATCH 2/3] Start gnome-session via a login shell

This makes sure all files from /etc/profile are properly sourced.  The
trick is taken from /usr/bin/gnome-session itself.
---
 data/phosh.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/phosh.in b/data/phosh.in
index b0f47f2a..f3d104dc 100755
--- a/data/phosh.in
+++ b/data/phosh.in
@@ -15,4 +15,6 @@ if [ -f "/etc/phosh/rootston.ini" ]; then
   ROOTSTON_INI=/etc/phosh/rootston.ini
 fi
 
-exec "${ROOTSTON}" -C "${ROOTSTON_INI}" -E "gnome-session --disable-acceleration-check --session=phosh"
+# Run gnome-session through a login shell so it picks
+# variables from /etc/profile.d (XDG_*)
+exec "${ROOTSTON}" -C "${ROOTSTON_INI}" -E "bash -lc 'gnome-session --disable-acceleration-check --session=phosh'"
-- 
GitLab


From 5c134ba7974aca1907cdfbd83ce1daa8e538ff4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 27 Jul 2018 09:04:22 +0200
Subject: [PATCH 3/3] monitor: Fix WL_OUTPUT_PREFERRED_MODE comparison c'n'p
 error

and use a simpler expressionfor WL_OUTPUT_CURRENT_MODE
---
 src/monitor/monitor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c
index 796c0bf2..62aa6e53 100644
--- a/src/monitor/monitor.c
+++ b/src/monitor/monitor.c
@@ -100,10 +100,10 @@ output_handle_mode (void             *data,
   if (height > self->height)
     self->height = height;
 
-  if ((flags & WL_OUTPUT_MODE_CURRENT) == 1)
+  if (flags & WL_OUTPUT_MODE_CURRENT)
     self->current_mode = self->modes->len - 1;
 
-  if ((flags & WL_OUTPUT_MODE_PREFERRED) == 1)
+  if (flags & WL_OUTPUT_MODE_PREFERRED)
     self->preferred_mode = self->modes->len - 1;
 }
 
-- 
GitLab