Made slim more freedesktop compliant.

* Sessions can now be based on /usr/share/xsessions
* Changed X11R6 to X11
* no ~/.xinitrc (or alike)  required

package/x11/slim/freedesktop.patch

@@ -18,8 +18,8 @@ diff -ur slim-1.3.0.orig/app.cpp slim-1.3.0/app.cpp
              replaceVariables(sessStart, USER_VAR, pw->pw_name);
 diff -ur slim-1.3.0.orig/cfg.cpp slim-1.3.0/cfg.cpp
 --- slim-1.3.0.orig/cfg.cpp	2007-07-15 15:09:28.000000000 +0100
-+++ slim-1.3.0/cfg.cpp	2007-08-25 13:55:19.000000000 +0100
-@@ -23,6 +23,75 @@
++++ slim-1.3.0/cfg.cpp	2007-08-27 16:06:50.000000000 +0100
+@@ -23,23 +23,90 @@
  
  typedef pair<string,string> option;
  
@@ -80,12 +80,9 @@ diff -ur slim-1.3.0.orig/cfg.cpp slim-1.3.0/cfg.cpp
 +}
 +
 +const char *get_sessions_str(map<string,string> &m){
-+	string s("default");;
++	string s("default");
 +	map<string,string>::iterator it;
 +	for(it=m.begin();it!=m.end();it++){
-+		/*if(it!=m.begin()){
-+			s+=",";
-+		}*/
 +		s+=",";
 +		s+=(*it).first;
 +	}
@@ -95,17 +92,30 @@ diff -ur slim-1.3.0.orig/cfg.cpp slim-1.3.0/cfg.cpp
  Cfg::Cfg() 
      : currentSession(-1)
  {
-@@ -33,7 +102,8 @@
+     // Configuration options
+-    options.insert(option("default_path","./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"));
+-    options.insert(option("default_xserver","/usr/X11R6/bin/X"));
++    options.insert(option("default_path","./:/bin:/usr/bin:/usr/local/bin:/usr/X11/bin"));
++    options.insert(option("default_xserver","/usr/X11/bin/X"));
+     options.insert(option("xserver_arguments",""));
      options.insert(option("numlock",""));
      options.insert(option("daemon",""));
-     options.insert(option("xauth_path","/usr/X11R6/bin/xauth"));
+-    options.insert(option("xauth_path","/usr/X11R6/bin/xauth"));
 -    options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session"));
++    options.insert(option("xauth_path","/usr/X11/bin/xauth"));
 +    //options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session"));
 +    options.insert(option("login_cmd","default"));
      options.insert(option("halt_cmd","/sbin/shutdown -h now"));
      options.insert(option("reboot_cmd","/sbin/shutdown -r now"));
      options.insert(option("suspend_cmd",""));
-@@ -49,7 +119,9 @@
+     options.insert(option("sessionstart_cmd",""));
+     options.insert(option("sessionstop_cmd",""));
+-    options.insert(option("console_cmd","/usr/X11R6/bin/xterm -C -fg white -bg black +sb -g %dx%d+%d+%d -fn %dx%d -T ""Console login"" -e /bin/sh -c ""/bin/cat /etc/issue; exec /bin/login"""));
++    options.insert(option("console_cmd","/usr/X11/bin/xterm -C -fg white -bg black +sb -g %dx%d+%d+%d -fn %dx%d -T ""Console login"" -e /bin/sh -c ""/bin/cat /etc/issue; exec /bin/login"""));
+     options.insert(option("screenshot_cmd","import -window root /slim.png"));
+     options.insert(option("welcome_msg","Welcome to %host"));
+     options.insert(option("default_user",""));
+@@ -49,7 +116,9 @@
      options.insert(option("authfile","/var/run/slim.auth"));
      options.insert(option("shutdown_msg","The system is halting..."));
      options.insert(option("reboot_msg","The system is rebooting..."));
@@ -116,7 +126,7 @@ diff -ur slim-1.3.0.orig/cfg.cpp slim-1.3.0/cfg.cpp
      options.insert(option("sessiondir",""));
      options.insert(option("hidecursor","false"));
  
-@@ -108,6 +180,7 @@
+@@ -108,6 +177,7 @@
      options.insert(option("msg_shadow_color","#FFFFFF"));
  
      error = "";
@@ -137,16 +147,16 @@ diff -ur slim-1.3.0.orig/cfg.h slim-1.3.0/cfg.h
  
 diff -ur slim-1.3.0.orig/Makefile slim-1.3.0/Makefile
 --- slim-1.3.0.orig/Makefile	2007-07-15 15:09:28.000000000 +0100
-+++ slim-1.3.0/Makefile	2007-08-25 13:04:25.000000000 +0100
++++ slim-1.3.0/Makefile	2007-08-27 16:06:27.000000000 +0100
 @@ -5,9 +5,9 @@
  #######################################################
  CXX=/usr/bin/g++
  CC=/usr/bin/gcc
 -CFLAGS=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
-+CFLAGS=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include -I/usr/X11R7/include/
++CFLAGS=-Wall -I. -I/usr/X11/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include 
  CXXFLAGS=$(CFLAGS)
 -LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
-+LDFLAGS=-L/usr/X11R6/lib -L/usr/X11R7/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
++LDFLAGS=-L/usr/X11/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
  CUSTOM=-DHAVE_SHADOW
  ifdef USE_PAM
  LDFLAGS+= -lpam