git.iko.soy/unity8
on xenial help sign in
Fix whitespace, remove some hacks
0b1f43aJosh Arenson
data/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -22,7 +22,7 @@ install(FILES
22 DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d
22 DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d
23 )
23 )
24
24
25− # install dash icon
25+# install dash icon
26install(FILES
26install(FILES
27 ${CMAKE_CURRENT_SOURCE_DIR}/${DASH_APP}.png
27 ${CMAKE_CURRENT_SOURCE_DIR}/${DASH_APP}.png
28 DESTINATION ${SHELL_APP_DIR}/Dash/
28 DESTINATION ${SHELL_APP_DIR}/Dash/
data/unity8-greeter-wrapper+2−2
@@ -38,7 +38,7 @@ set_greeter_var()
38 initctl set-env --global "$1=$2"
38 initctl set-env --global "$1=$2"
39 fi
39 fi
40}
40}
41−echo "JOSH: starting greeter wrapper" >&2
41+
42SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
42SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
43rm -f $SUB_SOCKET # clear socket in case we were hard shut down
43rm -f $SUB_SOCKET # clear socket in case we were hard shut down
44
44
@@ -92,7 +92,7 @@ if [ "$(id -u phablet 2>/dev/null)" = "32011" ]; then
92fi
92fi
93
93
94# And finally actually start the greeter
94# And finally actually start the greeter
95−exec env MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &
95+exec env QT_QPA_PLATFORM=ubuntumirclient MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &
96CMD_PID=$!
96CMD_PID=$!
97wait $CMD_PID
97wait $CMD_PID
98CMD_PID=
98CMD_PID=
data/unity8-greeter.desktop.in+1−2
@@ -2,7 +2,6 @@
2Type=Application
2Type=Application
3Name=Unity 8 Greeter
3Name=Unity 8 Greeter
4Comment=The converged Unity shell's Greeter
4Comment=The converged Unity shell's Greeter
5−#FIXME: This is a WAR for lp:1528082
6−Exec=env QT_QPA_PLATFORM=ubuntumirclient MIR_SERVER_PLATFORM_GRAPHICS_LIB=/usr/lib/x86_64-linux-gnu/mir/server-platform/graphics-mesa-kms.so.7 /usr/bin/unity8-greeter-wrapper /usr/bin/unity8 --mode=greeter
5+Exec=/usr/bin/unity8-greeter-wrapper /usr/bin/unity8 --mode=greeter
7X-LightDM-Session-Type=mir
6X-LightDM-Session-Type=mir
8X-Ubuntu-Touch=true
7X-Ubuntu-Touch=true