pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=46

Browse Source
This commit is contained in:
OBS User unknown 2008-05-13 10:41:24 +00:00 committed by Git OBS Bridge
parent b19100ddba
commit 3436db16ac
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gnome-session-gnome-wm-compiz-manager.patch
View File

@ -1,7 +1,7 @@
diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-patched/gnome-session/gnome-wm 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/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 +++ gnome-session-2.22.1.1-patched/gnome-session/gnome-wm 2008-05-13 09:15:37.539788000 +0200
@@ -39,6 +39,14 @@ done @@ -39,22 +39,33 @@ done
# WINDOW_MANAGER overrides all # WINDOW_MANAGER overrides all
@ -16,22 +16,21 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-
if [ -z "$WINDOW_MANAGER" ] ; then if [ -z "$WINDOW_MANAGER" ] ; then
# Create a list of window manager we can handle, trying to only use the # Create a list of window manager we can handle, trying to only use the
# compositing ones when it makes sense # 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 - xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null
IS_X_COMPOSITED=$? - IS_X_COMPOSITED=$?
+ if [ "x$XDG_CONFIG_HOME" = "x" ]; then
+ COMPIZ_ENABLED_FILE="$HOME/.config/compiz/enable-compiz"
+ else
+ COMPIZ_ENABLED_FILE="$XDG_CONFIG_HOME/compiz/enable-compiz"
+ fi
+
+ KNOWN_WM="metacity sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm"
- KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm" - KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm"
- if [ $IS_X_COMPOSITED -eq 0 ] ; then - if [ $IS_X_COMPOSITED -eq 0 ] ; then
- KNOWN_WM="compiz beryl $KNOWN_WM" - KNOWN_WM="compiz beryl $KNOWN_WM"
+ if [ "x$XDG_CONFIG_HOME" = "x" ]; then + if [ -f "$COMPIZ_ENABLED_FILE" ] ; 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" + KNOWN_WM="compiz-manager $KNOWN_WM"
fi fi
- # metacity is still the default wm in GNOME - # metacity is still the default wm in GNOME
@ -43,7 +42,7 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-
for wm in $KNOWN_WM ; do for wm in $KNOWN_WM ; do
IFS=":" IFS=":"
for dir in $PATH ; do for dir in $PATH ; do
@@ -65,6 +79,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then @@ -65,6 +76,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then
done done
IFS=$OLDIFS IFS=$OLDIFS
done done
@ -51,7 +50,7 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-
else else
WINDOW_MANAGER=$DEFWM WINDOW_MANAGER=$DEFWM
fi fi
@@ -104,11 +119,7 @@ if [ ! -z "$SMID" ] ; then @@ -104,11 +116,7 @@ if [ ! -z "$SMID" ] ; then
OPT1=-i OPT1=-i
OPT2=$SMID OPT2=$SMID
;; ;;
@ -64,7 +63,7 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-
OPT1=--sm-client-id OPT1=--sm-client-id
OPT2=$SMID OPT2=$SMID
;; ;;
@@ -116,18 +127,6 @@ if [ ! -z "$SMID" ] ; then @@ -116,18 +124,6 @@ if [ ! -z "$SMID" ] ; then
esac esac
fi fi

7
gnome-session.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 13 09:22:13 CEST 2008 - vuntz@suse.de
- Update gnome-session-gnome-wm-compiz-manager.patch to look for
the right file for compiz activation. Fix bnc#389648, thanks to
Jigish Gohil.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 6 14:21:42 CEST 2008 - rodrigo@suse.de Tue May 6 14:21:42 CEST 2008 - rodrigo@suse.de

6
gnome-session.spec
View File

@ -16,7 +16,7 @@ BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel gn
License: GPL v2 or later; LGPL v2.1 or later License: GPL v2 or later; LGPL v2.1 or later
Group: System/GUI/GNOME Group: System/GUI/GNOME
Version: 2.22.1.1 Version: 2.22.1.1
Release: 23 Release: 27
Summary: Session Tools for the GNOME 2.x Desktop Summary: Session Tools for the GNOME 2.x Desktop
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: gnome Source1: gnome
@ -179,6 +179,10 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}-2.0.lang %files lang -f %{name}-2.0.lang
%changelog %changelog
* Tue May 13 2008 vuntz@suse.de
- Update gnome-session-gnome-wm-compiz-manager.patch to look for
the right file for compiz activation. Fix bnc#389648, thanks to
Jigish Gohil.
* Tue May 06 2008 rodrigo@suse.de * Tue May 06 2008 rodrigo@suse.de
- Updated gnome-session-parse-autostart-command-line.patch to - Updated gnome-session-parse-autostart-command-line.patch to
deal also with %%U arguments in .desktop files (bnc#242907) deal also with %%U arguments in .desktop files (bnc#242907)