|
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---# This copyright note is auto-generated by ./scripts/Create-CopyPatch.## Filename: package/.../slim/X11R6.patch# Copyright (C) 2007 - 2009 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--- ./Makefile.orig 2009-08-13 21:04:35.000000000 +0300
+++ ./Makefile 2009-08-13 21:04:53.000000000 +0300
@@ -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
|
