Merge pull request #720 from yast/wayland

Wayland

package/yast2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  6 09:19:55 UTC 2018 - jreidinger@suse.com
+
+- improve wayland support (bsc#1083907)
+- 4.0.65
+
 -------------------------------------------------------------------
 Thu Apr  5 17:38:35 UTC 2018 - igonzalezsosa@suse.com
 

package/yast2.spec

@@ -16,7 +16,7 @@
 #
 
 Name:           yast2
-Version:        4.0.64
+Version:        4.0.65
 Release:        0
 Summary:        YaST2 - Main Package
 License:        GPL-2.0

scripts/yast2

@@ -254,7 +254,7 @@ while true ; do
 		--kcontrol)   Y2UI_ARGS="$Y2UI_ARGS --kcontrol_id YaST" ; shift ;;
 		--qt)  export CMDLINE_UI="qt"  ; shift ;;
 		--gtk)  export CMDLINE_UI="gtk"  ; shift ;;
-		--ncurses)  unset DISPLAY ; shift ;;
+		--ncurses)  unset DISPLAY ;  unset WAYLAND_DISPLAY ; shift ;;
 		--) shift ; break ;;
 		*) echo "Unrecognized option $1" ; exit 1 ;;
 
@@ -304,6 +304,7 @@ case "`basename $0`" in
 	YaST|yast|yast1|zast)
 		if [ -z "$CMDLINE_UI" ]; then
 			unset DISPLAY;
+                        unset WAYLAND_DISPLAY;
 		fi
 	;;
 esac
@@ -335,9 +336,13 @@ fi
 
 # Fallback GUI
 SELECTED_GUI=ncurses
-# if we have a DISPLAY, select a preferred GUI
-if [ -n "$DISPLAY" ]; then
+# if we have a DISPLAY or WAYLAND_DISPLAY, select a preferred GUI
+if [ -n "$DISPLAY" -o -n "$WAYLAND_DISPLAY" ]; then
     select_gui_frontend
+    # for wayland only environment, switch qt to use it
+    if [ -n "$WAYLAND_DISPLAY" -a -z "$DISPLAY" ]; then
+      export QT_QPA_PLATFORM=wayland
+    fi
 fi
 
 if [ -n "$TESTING_YAST2" ]; then