Hello community, here is the log from the commit of package gnome-session checked in at Tue May 6 01:22:43 CEST 2008. -------- --- GNOME/gnome-session/gnome-session.changes 2008-05-01 12:59:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-session/gnome-session.changes 2008-05-05 11:44:44.609773000 +0200 @@ -1,0 +2,7 @@ +Mon May 5 11:49:44 CEST 2008 - vuntz@suse.de + +- Drop gnome-session-compiz.patch and replace with + gnome-session-gnome-wm-compiz-manager.patch to correctly start + compiz-manager when the user has configured this. + +------------------------------------------------------------------- Old: ---- gnome-session-compiz.patch New: ---- gnome-session-gnome-wm-compiz-manager.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.hY7153/_old 2008-05-06 01:20:40.000000000 +0200 +++ /var/tmp/diff_new_pack.hY7153/_new 2008-05-06 01:20:40.000000000 +0200 @@ -16,7 +16,7 @@ License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.22.1.1 -Release: 19 +Release: 21 Summary: Session Tools for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Source1: gnome @@ -33,8 +33,6 @@ Patch7: gnome-session-2.19.92-kdm-support.patch #PATCH-FEATURE-UPSTREAM gnome-session-motd.patch bgo159604 rodrigo@novell.com -- Needs to get upstream or be dropped Patch8: gnome-session-motd.patch -#PATCH-FIX-OPENSUSE gnome-session-compiz.patch bnc170839 maw@novell.com -Patch10: gnome-session-compiz.patch #PATCH-FIX-OPENSUSE gnome-session-wm-switch.patch bnc180506 danw@novell.com Patch12: gnome-session-wm-switch.patch #PATCH-FIX-OPENSUSE gnome-session-no-devel-fatals.patch jpr@novell.com -- Prevents badly breaking factory for people @@ -52,6 +50,8 @@ Patch19: gnome-session-include-unistd.patch # PATCH-FIX-UPSTREAM gnome-session-bnc385150-performance-hostname.patch bnc385150 vuntz@novell.com -- Extreme slowness on some network setup Patch20: gnome-session-bnc385150-performance-hostname.patch +# PATCH-FEATURE-OPENSUSE gnome-session-gnome-wm-compiz-manager.patch vuntz@novell.com -- Launch compiz-manager when configured +Patch21: gnome-session-gnome-wm-compiz-manager.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: control-center2 Obsoletes: gnome-core @@ -116,7 +116,6 @@ %patch5 -p1 %patch7 %patch8 -%patch10 %patch12 -p1 %patch13 %patch14 -p1 @@ -125,6 +124,7 @@ %patch18 %patch19 -p0 %patch20 -p1 +%patch21 -p1 gnome-patch-translation-update %build @@ -179,6 +179,10 @@ %files lang -f %{name}-2.0.lang %changelog +* Mon May 05 2008 vuntz@suse.de +- Drop gnome-session-compiz.patch and replace with + gnome-session-gnome-wm-compiz-manager.patch to correctly start + compiz-manager when the user has configured this. * Thu May 01 2008 vuntz@suse.de - Work around bnc#379332 for the live installer desktop file in the gnome script by changing the Exec key to use gnomesu. ++++++ gnome-session-gnome-wm-compiz-manager.patch ++++++ diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-patched/gnome-session/gnome-wm --- gnome-session-2.22.1.1/gnome-session/gnome-wm 2008-04-10 16:32:20.000000000 +0200 +++ gnome-session-2.22.1.1-patched/gnome-session/gnome-wm 2008-05-05 11:22:33.628080000 +0200 @@ -39,6 +39,14 @@ done # WINDOW_MANAGER overrides all +# Migrate compiz to compiz-manager +if [ "x$WINDOW_MANAGER" = "xcompiz" ]; then + WINDOW_MANAGER="compiz-manager" +fi +if [ "x$DEFWM" = "xcompiz" ]; then + DEFWM="compiz-manager" +fi + if [ -z "$WINDOW_MANAGER" ] ; then # Create a list of window manager we can handle, trying to only use the # compositing ones when it makes sense @@ -46,15 +54,21 @@ if [ -z "$WINDOW_MANAGER" ] ; then xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null IS_X_COMPOSITED=$? - KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm" - if [ $IS_X_COMPOSITED -eq 0 ] ; then - KNOWN_WM="compiz beryl $KNOWN_WM" + if [ "x$XDG_CONFIG_HOME" = "x" ]; then + COMPIZ_ENABLED_FILE="$HOME/.config/compiz/enable/enable-compiz" + else + COMPIZ_ENABLED_FILE="$XDG_CONFIG_HOME/compiz/enable/enable-compiz" + fi + + KNOWN_WM="metacity sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm" + + if [ -f "$COMPIZ_ENABLED_FILE" -a $IS_X_COMPOSITED -eq 0 ] ; then + KNOWN_WM="compiz-manager $KNOWN_WM" fi - # metacity is still the default wm in GNOME - KNOWN_WM="metacity $KNOWN_WM" OLDIFS=$IFS if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then + for wm in $KNOWN_WM ; do IFS=":" for dir in $PATH ; do @@ -65,6 +79,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then done IFS=$OLDIFS done + else WINDOW_MANAGER=$DEFWM fi @@ -104,11 +119,7 @@ if [ ! -z "$SMID" ] ; then OPT1=-i OPT2=$SMID ;; - compiz) - OPT1=--sm-client-id - OPT2=$SMID - ;; - beryl) + compiz-manager) OPT1=--sm-client-id OPT2=$SMID ;; @@ -116,18 +127,6 @@ if [ ! -z "$SMID" ] ; then esac fi -case `basename $WINDOW_MANAGER` in - compiz) - export LIBGL_ALWAYS_INDIRECT=1 - gtk-window-decorator & - OPT3=glib - OPT4=gconf - ;; - beryl) - emerald & - ;; -esac - -exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4 +exec $WINDOW_MANAGER $OPT1 $OPT2 echo "ERROR: No window manager could run!" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de