This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/gnome-flashback in repository x2goserver. commit 4751d9488b42ba59cd4632e65733a055541101c4 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Apr 1 17:54:13 2017 -0400 Fix gnome-flashback on Ubuntu 15.04 and hopefully other distros with gnome-flashback 3.10 & later Note: The only testing I have done is with epel7. On it, gnome-flashback's metacity is segfaulting with libNX_X11 . The fix for this will probably be in another X2Go package. --- x2goserver/bin/x2goruncommand | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 004a958..cabe39b 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -125,14 +125,19 @@ fi # Note that we are assuming that users are using a patched # version of GNOME Flashback which disables the acceleration check # altogether. -# Ubuntu 14.04 (trusty) and later: +# Ubuntu 14.04 (trusty) & 14.10 (utopic) # GNOME -> gnome-session --session=gnome-flashback --disable-acceleration-check # UNITY -> gnome-session --session=ubuntu # (GNOME3 based desktop shells) # Additionally, $GTK_MODULES must include "unity-gtk-module". # Note that we are assuming that the user has gnome-session -# 3.9.90-0ubuntu12.1 or later on 14.04, which added -# --disable-acceleration-check . +# 3.9.90-0ubuntu12.1 or later on 14.04, or 3.9.90-0ubuntu16.1 on +# 14.10, which added --disable-acceleration-check . +# Ubuntu 15.04 (vivid) & later: +# GNOME -> gnome-session --session=gnome-flashback-metacity --disable-acceleration-check +# UNITY -> gnome-session --session=ubuntu +# (GNOME3 based desktop shells) +# Additionally, $GTK_MODULES must include "unity-gtk-module". # # The logic for launching GNOME should be generic enough # to work with every other distro. @@ -142,7 +147,15 @@ fi if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 14.04" | bc)" == "1" ]; then + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 15.04" | bc)" == "1" ]; then + export DESKTOP_SESSION="gnome-flashback-metacity" + if [ -z "$GTK_MODULES" ] ; then + export GTK_MODULES="unity-gtk-module" + else + export GTK_MODULES="$GTK_MODULES:unity-gtk-module" + fi + args=" --session=$DESKTOP_SESSION --disable-acceleration-check" + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE = 14.04" | bc)" == "1" -o "$(echo "$DISTRIB_RELEASE = 14.10" | bc)" == "1" ]; then export DESKTOP_SESSION="gnome-flashback" if [ -z "$GTK_MODULES" ] ; then export GTK_MODULES="unity-gtk-module" @@ -158,6 +171,10 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then export GTK_MODULES="$GTK_MODULES:unity-gtk-module" fi args=" --session=$DESKTOP_SESSION" + # GNOME Flashback 3.10 & later + elif [ -e /usr/share/gnome-session/sessions/gnome-flashback-metacity.session ]; then + export DESKTOP_SESSION="gnome-flashback-metacity" + args=" --session=$DESKTOP_SESSION --disable-acceleration-check" # GNOME Flashback 3.8 (Metacity) elif [ -e /usr/share/gnome-session/sessions/gnome-flashback.session ]; then export DESKTOP_SESSION="gnome-flashback" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git