rpms/gnome-session
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Edit window manager patch again to add 'glib' to compiz launch.

Browse Source
This commit is contained in:
Kristian Høgsberg 2007-08-10 19:09:52 +00:00
parent 2298d83358
commit 0b8f849e1a
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnome-session-2.17.5-window-manager.patch
View File

@ -1,6 +1,6 @@
diff -up gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager gnome-session-2.19.6/data/gnome-session.schemas.in diff -up gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager gnome-session-2.19.6/data/gnome-session.schemas.in
--- gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager 2007-07-30 16:07:16.000000000 -0400 --- gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager 2007-07-30 16:07:16.000000000 -0400
+++ gnome-session-2.19.6/data/gnome-session.schemas.in 2007-08-09 17:40:50.000000000 -0400 +++ gnome-session-2.19.6/data/gnome-session.schemas.in 2007-08-09 17:47:42.000000000 -0400
@@ -2,11 +2,22 @@ @@ -2,11 +2,22 @@
<gconfschemafile> <gconfschemafile>
<schemalist> <schemalist>
@ -27,7 +27,7 @@ diff -up gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager gnome
<long>Show the splash screen when the session starts up</long> <long>Show the splash screen when the session starts up</long>
diff -up gnome-session-2.19.6/gnome-session/gnome-wm.window-manager gnome-session-2.19.6/gnome-session/gnome-wm diff -up gnome-session-2.19.6/gnome-session/gnome-wm.window-manager gnome-session-2.19.6/gnome-session/gnome-wm
--- gnome-session-2.19.6/gnome-session/gnome-wm.window-manager 2007-07-30 16:07:15.000000000 -0400 --- gnome-session-2.19.6/gnome-session/gnome-wm.window-manager 2007-07-30 16:07:15.000000000 -0400
+++ gnome-session-2.19.6/gnome-session/gnome-wm 2007-08-09 17:44:21.000000000 -0400 +++ gnome-session-2.19.6/gnome-session/gnome-wm 2007-08-10 15:01:04.000000000 -0400
@@ -3,7 +3,9 @@ @@ -3,7 +3,9 @@
# The user can specify his prefered WM by setting the WINDOW_MANAGER # The user can specify his prefered WM by setting the WINDOW_MANAGER
# environment variable. # environment variable.
@ -49,11 +49,30 @@ diff -up gnome-session-2.19.6/gnome-session/gnome-wm.window-manager gnome-sessio
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
@@ -117,6 +122,7 @@ fi @@ -82,6 +87,7 @@ fi
OPT1=
OPT2=
OPT3=
+OPT4=
if [ ! -z "$SMID" ] ; then
case `basename $WINDOW_MANAGER` in
sawfish|sawmill|metacity)
@@ -117,14 +123,16 @@ fi
case `basename $WINDOW_MANAGER` in case `basename $WINDOW_MANAGER` in
compiz) compiz)
+ export LIBGL_ALWAYS_INDIRECT=1 + export LIBGL_ALWAYS_INDIRECT=1
gtk-window-decorator & gtk-window-decorator &
OPT3=gconf - OPT3=gconf
+ OPT3=glib
+ OPT4=gconf
;; ;;
beryl)
emerald &
;;
esac
-exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3
+exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4
echo "ERROR: No window manager could run!"

5
gnome-session.spec
View File

@ -12,7 +12,7 @@
Summary: GNOME session manager Summary: GNOME session manager
Name: gnome-session Name: gnome-session
Version: 2.19.6 Version: 2.19.6
Release: 4%{?dist} Release: 5%{?dist}
URL: http://www.gnome.org URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
Source1: redhat-default-session Source1: redhat-default-session
@ -185,6 +185,9 @@ fi
%doc %{_datadir}/man/man*/* %doc %{_datadir}/man/man*/*
%changelog %changelog
* Fri Aug 10 2007 Kristian Høgsberg <krh@redhat.com> - 2.19.6-5
- Edit window manager patch again to add 'glib' to compiz launch.
* Thu Aug 9 2007 Kristian Høgsberg <krh@redhat.com> - 2.19.6-4 * Thu Aug 9 2007 Kristian Høgsberg <krh@redhat.com> - 2.19.6-4
- Edit the right window manager patch and delete the old one. - Edit the right window manager patch and delete the old one.