diff --git a/package/x11/slim/X11R6.patch.disabled b/package/x11/slim/X11R6.patch.disabled deleted file mode 100644 index 5d27d71..0000000 --- a/package/x11/slim/X11R6.patch.disabled +++ /dev/null @@ -1,49 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../slim/slim.conf.patch -# Copyright (C) 2007 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./slim.conf.orig 2007-08-08 23:49:01.000000000 +0000 -+++ ./slim.conf 2007-08-08 23:54:33.000000000 +0000 -@@ -1,17 +1,17 @@ - # Path, X server and arguments (if needed) - # Note: -xauth $authfile is automatically appended --default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin --default_xserver /usr/X11R6/bin/X -+default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11/bin -+default_xserver /usr/X11/bin/X - #xserver_arguments -dpi 75 - - # Commands for halt, login, etc. - halt_cmd /sbin/shutdown -h now - reboot_cmd /sbin/shutdown -r now --console_cmd /usr/X11R6/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" -+console_cmd /usr/X11/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" - #suspend_cmd /usr/sbin/suspend - - # Full path to the xauth binary --xauth_path /usr/X11R6/bin/xauth -+xauth_path /usr/X11/bin/xauth - - # Xauth file for server - authfile /var/run/slim.auth -@@ -51,7 +51,7 @@ - # The current chosen session name is replaced in the login_cmd - # above, so your login command can handle different sessions. - # see the xinitrc.sample file shipped with slim sources --sessions xfce4,icewm,wmaker,blackbox -+sessions openbox,xfce4,icewm,wmaker,blackbox - - # Executed when pressing F11 (requires imagemagick) - screenshot_cmd import -window root /slim.png diff --git a/package/x11/slim/freedesktop.patch b/package/x11/slim/freedesktop.patch deleted file mode 100644 index b894798..0000000 --- a/package/x11/slim/freedesktop.patch +++ /dev/null @@ -1,205 +0,0 @@ -diff -ur slim-1.3.0.orig/app.cpp slim-1.3.0/app.cpp ---- slim-1.3.0.orig/app.cpp 2007-07-15 15:09:28.000000000 +0100 -+++ slim-1.3.0/app.cpp 2007-08-27 15:49:20.000000000 +0100 -@@ -556,6 +556,14 @@ - string loginCommand = cfg->getOption("login_cmd"); - replaceVariables(loginCommand, SESSION_VAR, session); - replaceVariables(loginCommand, THEME_VAR, themeName); -+ if(loginCommand=="default"){ -+ if (session=="default"||session==""){ -+ loginCommand=". /etc/profile;exec $WINDOWMANAGER"; -+ } else { -+ loginCommand="exec "; -+ loginCommand+=cfg->session_map.find(session)->second; -+ } -+ } - string sessStart = cfg->getOption("sessionstart_cmd"); - if (sessStart != "") { - 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-27 16:06:50.000000000 +0100 -@@ -23,23 +23,90 @@ - - typedef pair option; - -+int dir_sel(const struct dirent *entry){ -+ char *c; -+ if ((c=strrchr(entry->d_name,'.'))){ -+ if (strcmp(c,".desktop")==0){ -+ return 1; -+ } -+ } -+ return 0; -+} -+ -+int parse_session(string &path,string &name,string &exec){ -+ string line; -+ int rc=0; -+ ifstream file(path.c_str()); -+ if (!file.is_open()){ -+ return 0; -+ } -+ while(!file.eof()){ -+ getline(file,line); -+ const char *s=line.c_str(); -+ char *s2; -+ if(!(s2=strchr(s,'='))){ -+ continue; -+ } -+ s2++; -+ if(line.compare(0,s2-s,"Name=")==0){ -+ line.erase(0,s2-s); -+ name=line; -+ rc++; -+ }else if(line.compare(0,s2-s,"Exec=")==0){ -+ line.erase(0,s2-s); -+ exec=line; -+ rc++; -+ } -+ if (rc==2){ -+ return rc; -+ } -+ } -+ return rc; -+} -+ -+int get_sessions(map &m){ -+ struct dirent **entries; -+ int i,n; -+ n=scandir("/usr/share/xsessions",&entries,dir_sel,alphasort); -+ for(i=0;id_name; -+ if (parse_session(path,s,s2)==2){ -+ m.insert(pair(s,s2)); -+ } -+ } -+ return (n?1:0); -+} -+ -+const char *get_sessions_str(map &m){ -+ string s("default"); -+ map::iterator it; -+ for(it=m.begin();it!=m.end();it++){ -+ s+=","; -+ s+=(*it).first; -+ } -+ return s.c_str(); -+} -+ - Cfg::Cfg() - : currentSession(-1) - { - // 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("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","")); - 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...")); -- options.insert(option("sessions","wmaker,blackbox,icewm")); -+ //options.insert(option("sessions","wmaker,blackbox,icewm")); -+ get_sessions(session_map); -+ options.insert(option("sessions",get_sessions_str(session_map))); - options.insert(option("sessiondir","")); - options.insert(option("hidecursor","false")); - -@@ -108,6 +177,7 @@ - options.insert(option("msg_shadow_color","#FFFFFF")); - - error = ""; -+ - - } - -diff -ur slim-1.3.0.orig/cfg.h slim-1.3.0/cfg.h ---- slim-1.3.0.orig/cfg.h 2007-07-15 15:09:28.000000000 +0100 -+++ slim-1.3.0/cfg.h 2007-08-25 13:06:11.000000000 +0100 -@@ -43,6 +43,7 @@ - - string nextSession(string current); - -+ mapsession_map; - private: - void fillSessionList(); - -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-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/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/X11/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg - CUSTOM=-DHAVE_SHADOW - ifdef USE_PAM - LDFLAGS+= -lpam -diff -ur slim-1.3.0.orig/slim.conf slim-1.3.0/slim.conf ---- slim-1.3.0.orig/slim.conf 2007-07-15 15:09:28.000000000 +0100 -+++ slim-1.3.0/slim.conf 2007-08-27 15:59:33.000000000 +0100 -@@ -1,17 +1,17 @@ - # Path, X server and arguments (if needed) - # Note: -xauth $authfile is automatically appended --default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin --default_xserver /usr/X11R6/bin/X -+default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11/bin -+default_xserver /usr/X11/bin/X - #xserver_arguments -dpi 75 - - # Commands for halt, login, etc. - halt_cmd /sbin/shutdown -h now - reboot_cmd /sbin/shutdown -r now --console_cmd /usr/X11R6/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" -+console_cmd /usr/X11/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" - #suspend_cmd /usr/sbin/suspend - - # Full path to the xauth binary --xauth_path /usr/X11R6/bin/xauth -+xauth_path /usr/X11/bin/xauth - - # Xauth file for server - authfile /var/run/slim.auth -@@ -33,7 +33,7 @@ - # to adjust the command according to your preferred shell, - # i.e. for freebsd use: - # login_cmd exec /bin/sh - ~/.xinitrc %session --login_cmd exec /bin/bash -login ~/.xinitrc %session -+#login_cmd exec /bin/bash -login ~/.xinitrc %session - - # Commands executed when starting and exiting a session. - # They can be used for registering a X11 session with -@@ -51,7 +51,7 @@ - # The current chosen session name is replaced in the login_cmd - # above, so your login command can handle different sessions. - # see the xinitrc.sample file shipped with slim sources --sessions xfce4,icewm,wmaker,blackbox -+#sessions xfce4,icewm,wmaker,blackbox - - # Executed when pressing F11 (requires imagemagick) - screenshot_cmd import -window root /slim.png diff --git a/package/x11/slim/slim.cache b/package/x11/slim/slim.cache deleted file mode 100644 index 77e6e61..0000000 --- a/package/x11/slim/slim.cache +++ /dev/null @@ -1,40 +0,0 @@ - -[TIMESTAMP] 1174161995 Sat Mar 17 16:06:35 2007 -[BUILDTIME] 100 (9) -[SIZE] 1.03 MB, 15 files - -[DEP] 00-dirtree -[DEP] bash -[DEP] binutils -[DEP] bzip2 -[DEP] coreutils -[DEP] diffutils -[DEP] expat -[DEP] findutils -[DEP] fontconfig -[DEP] freetype -[DEP] gawk -[DEP] gcc -[DEP] glibc -[DEP] grep -[DEP] kbproto -[DEP] libice -[DEP] libjpeg -[DEP] libpng -[DEP] libsm -[DEP] libx11 -[DEP] libxau -[DEP] libxdmcp -[DEP] libxext -[DEP] libxft -[DEP] libxmu -[DEP] libxrender -[DEP] libxt -[DEP] linux-header -[DEP] make -[DEP] renderproto -[DEP] sed -[DEP] sysfiles -[DEP] tar -[DEP] xproto -[DEP] zlib diff --git a/package/x11/slim/slim.conf b/package/x11/slim/slim.conf deleted file mode 100644 index cd9d759..0000000 --- a/package/x11/slim/slim.conf +++ /dev/null @@ -1,19 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../slim/slim.conf -# Copyright (C) 2007 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- - -# inject proper X11 libdir because of lib64 -pkgprefix -t libx11 -var_append GCC_WRAPPER_APPEND ' ' "-L$root$( pkgprefix libdir libx11 )" - -register_xdm slim "Simple Login Manager for X11" "$bindir/slim -d" diff --git a/package/x11/slim/slim.desc b/package/x11/slim/slim.desc deleted file mode 100644 index d326874..0000000 --- a/package/x11/slim/slim.desc +++ /dev/null @@ -1,33 +0,0 @@ -[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] -[COPY] Filename: package/.../slim/slim.desc -[COPY] Copyright (C) 2007 The OpenSDE Project -[COPY] -[COPY] More information can be found in the files COPYING and README. -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; version 2 of the License. A copy of the -[COPY] GNU General Public License can be found in the file COPYING. -[COPY] --- SDE-COPYRIGHT-NOTE-END --- - -[I] A simple login manager for X11 - -[T] SLiM is a simple login manager for X11. It features customizable options, -[T] themes, and support for PNG and XFT. It does not depend on a particuar -[T] toolkit or desktop environment. - -[U] http://slim.berlios.de/ - -[A] Simone Rota -[M] Alejandro Mery - -[C] extra/login - -[L] GPL -[S] Stable -[V] 1.3.0 -[P] X -----5---9 800.000 - -[D] 3546437750 slim-1.3.0.tar.gz http://download.berlios.de/slim/