From 6182366010d23aa192a8d461a00b0111b0b71d38 Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Date: Sun, 2 Nov 2014 11:59:12 +0100
Subject: [PATCH] Source environment variables from droid-hal before ours

This way we only care about Green Island specific variables or changes
to droid-hal defaults in our configuration file.
---
 packaging/plasma-phone-components.spec   | 16 +++++-----------
 services/plasma-phone-compositor.service |  1 +
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packaging/plasma-phone-components.spec b/packaging/plasma-phone-components.spec
index 052d67fe..f0f63a59 100644
--- a/packaging/plasma-phone-components.spec
+++ b/packaging/plasma-phone-components.spec
@@ -80,18 +80,12 @@ chmod 755 %{buildroot}%{_bindir}/plasma-phone
 # File with environment variables, used by compositor systemd unit
 mkdir -p %{buildroot}%{_sharedstatedir}/environment/greenisland
 cat > %{buildroot}%{_sharedstatedir}/environment/greenisland/greenisland.conf <<EOF
-# From hammerhead configuration
-QT_QPA_PLATFORM=hwcomposer
-EGL_PLATFORM=hwcomposer
-QT_QPA_EGLFS_DEPTH=32
-QT_QPA_EGLFS_HIDECURSOR=1
-LIPSTICK_OPTIONS=-plugin evdevtouch:/dev/input/event1 -plugin evdevkeyboard:keymap=/usr/share/qt5/keymaps/droid.qmap
-
-# This one was set to 1 in hammerhead configuration,
-# but it's just wrong
-QT_COMPOSITOR_NEGATE_INVERTED_Y=0
-
+# Use QScreen backend
 KSCREEN_BACKEND=QScreen
+
+# This one is often set to 1 but, at least for hammerhead, we need it set to 0
+# TODO: Check whether this is always the case when we'll support more devices
+QT_COMPOSITOR_NEGATE_INVERTED_Y=0
 EOF
 
 # File with environment variables, used by shell systemd unit
diff --git a/services/plasma-phone-compositor.service b/services/plasma-phone-compositor.service
index beee00a8..5cc14887 100644
--- a/services/plasma-phone-compositor.service
+++ b/services/plasma-phone-compositor.service
@@ -11,6 +11,7 @@ After=pre-user-session.target
 
 [Service]
 Type=notify
+EnvironmentFile=-/var/lib/environment/compositor/*.conf
 EnvironmentFile=-/var/lib/environment/greenisland/*.conf
 ExecStart=/usr/bin/greenisland $LIPSTICK_OPTIONS -p org.kde.satellite.compositor.phone
 Restart=always