This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/gnome-flashback in repository x2goserver. discards 4751d94 Fix gnome-flashback on Ubuntu 15.04 and hopefully other distros with gnome-flashback 3.10 & later new a94df39 Lay the groundwork for gnome-flashback on Ubuntu 15.04 and other distros with gnome-flashback 3.10 & later This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4751d94) \ N -- N -- N refs/heads/feature/gnome-flashback (a94df39) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2goserver/bin/x2goruncommand | 7 +++++++ 1 file changed, 7 insertions(+) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 a94df39a796533dbe2997fe87363d8552f536437 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Apr 1 17:54:13 2017 -0400 Lay the groundwork for gnome-flashback on Ubuntu 15.04 and other distros with gnome-flashback 3.10 & later Note that on epel7, gnome-flashback starts successfully, but gnome-control-center fails due to lack of 3D in current nx-libs. --- x2goserver/bin/x2goruncommand | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 004a958..1f0a1ed 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -125,24 +125,42 @@ 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. # # Also, it appears that some Linux GNOME2 distros need DESKTOP_SESSION="gnome" # while others do not. +# +# Also note that the XDG_CURRENT_DESKTOP value comes from +# "DesktopNames" in the /usr/share/xsessions/ .desktop file 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 + export XDG_SESSION_DESKTOP="$DESKTOP_SESSION" + export XDG_CURRENT_DESKTOP="GNOME-Flashback:Unity" + 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 +176,12 @@ 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" + export XDG_SESSION_DESKTOP="$DESKTOP_SESSION" + export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME" + 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
-
git-admin＠x2go.org