summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-01-09 20:15:46 +0100
committertnut <thierryn1 at hispeed dot ch>2010-01-09 20:15:46 +0100
commit8a8a57ca9d8846d6ef937f13f8e05cdd79e50f9a (patch)
tree7526f5dcdf10f5d826cbc5a21f82ea0e55d3cf5a
parentad069aad35e558c445b9b5894d55bce0bbf2075a (diff)
downloadnutyx-pakxe-8a8a57ca9d8846d6ef937f13f8e05cdd79e50f9a.tar.gz
nutyx-pakxe-8a8a57ca9d8846d6ef937f13f8e05cdd79e50f9a.tar.bz2
nutyx-pakxe-8a8a57ca9d8846d6ef937f13f8e05cdd79e50f9a.tar.xz
nutyx-pakxe-8a8a57ca9d8846d6ef937f13f8e05cdd79e50f9a.zip
maj de slim#1.3.1-2, ajout du thème de NuTyX 2009.2
-rw-r--r--extra/slim/.footprint11
-rw-r--r--extra/slim/.md5sum8
-rw-r--r--extra/slim/Pkgfile12
-rw-r--r--extra/slim/background.jpgbin217023 -> 0 bytes
-rw-r--r--extra/slim/panel.pngbin16123 -> 0 bytes
-rw-r--r--extra/slim/slim.conf6
-rw-r--r--extra/slim/slim.theme37
-rw-r--r--extra/slim/xinitrc13
8 files changed, 30 insertions, 57 deletions
diff --git a/extra/slim/.footprint b/extra/slim/.footprint
index a5ea4776b..2b9987bcd 100644
--- a/extra/slim/.footprint
+++ b/extra/slim/.footprint
@@ -32,7 +32,10 @@ drwxr-xr-x root/root usr/share/slim/themes/default/
-rw-r--r-- root/root usr/share/slim/themes/default/background.jpg
-rw-r--r-- root/root usr/share/slim/themes/default/panel.png
-rw-r--r-- root/root usr/share/slim/themes/default/slim.theme
-drwxr-xr-x root/root usr/share/slim/themes/nutyx/
--rw-r--r-- root/root usr/share/slim/themes/nutyx/background.jpg
--rw-r--r-- root/root usr/share/slim/themes/nutyx/panel.png
--rw-r--r-- root/root usr/share/slim/themes/nutyx/slim.theme
+drwxr-xr-x install/install usr/share/slim/themes/slim-nutyx/
+-rw-r--r-- install/install usr/share/slim/themes/slim-nutyx/COPYING
+-rw-r--r-- install/install usr/share/slim/themes/slim-nutyx/COPYRIGHT.background
+-rw-r--r-- install/install usr/share/slim/themes/slim-nutyx/COPYRIGHT.panel
+-rw-r--r-- install/install usr/share/slim/themes/slim-nutyx/background.png
+-rw-r--r-- install/install usr/share/slim/themes/slim-nutyx/panel.png
+-rw-r--r-- install/install usr/share/slim/themes/slim-nutyx/slim.theme
diff --git a/extra/slim/.md5sum b/extra/slim/.md5sum
index eafd3fa54..1d0174630 100644
--- a/extra/slim/.md5sum
+++ b/extra/slim/.md5sum
@@ -1,9 +1,7 @@
-7b7b1a5b55eed7ca84000f732a1ffd26 background.jpg
87a3a022fa1d6dfe460c2989de1da5db gcc44.patch
-2dd28bf9ad148cde22b22916501b26f3 panel.png
f7e9ef62e3d4c8e3e85865c0a169fc5f slim
727d0acb24c0fbf0751134c37a9c895f slim-1.3.1.tar.gz
-c68a7b0f547f6d8a416dbccfd40ba690 slim.conf
-9086dc769e942bc27d363d9784533600 slim.theme
+d0c5fd4f91c385cc23c35f981ac2c695 slim.conf
+fdfe21bf4e734d7bdcdcd827b7e13585 slimnutyx-2009.2.tar.gz
9143a67ce78ca11a7e811138859ad54f stdlib.patch
-868863affb13c10868fe839be5f5698b xinitrc
+ef027552f7aba90c012513030a3e4805 xinitrc
diff --git a/extra/slim/Pkgfile b/extra/slim/Pkgfile
index 2d913e16c..c0e66fc56 100644
--- a/extra/slim/Pkgfile
+++ b/extra/slim/Pkgfile
@@ -6,10 +6,11 @@
name=slim
version=1.3.1
-release=1
+release=2
source=(http://download.berlios.de/$name/$name-$version.tar.gz\
+ http://kiao.no-ip.info/NuTyX/files/slimnutyx-2009.2.tar.gz
stdlib.patch xinitrc gcc44.patch \
- slim slim.conf panel.png background.jpg slim.theme)
+ slim slim.conf )
build() {
cd $name-$version
@@ -18,11 +19,8 @@ build() {
sed -i "s|/usr/X11R6/include|/usr/include/xorg|g" slim.conf
sed -i "s|/usr/X11R6/|/usr/|g" slim.conf
make DESTDIR=$PKG install
- mkdir -p $PKG/usr/share/slim/themes/nutyx/
- for i in background.jpg panel.png slim.theme
- do
- cp ../$i $PKG/usr/share/slim/themes/nutyx/
- done
+ mv $SRC/slim-nutyx \
+ $PKG/usr/share/slim/themes/
mkdir -p $PKG/etc/skel
install -m644 ../slim.conf $PKG/etc/slim.conf
install -m644 ../xinitrc $PKG/etc/slim.xinitrc
diff --git a/extra/slim/background.jpg b/extra/slim/background.jpg
deleted file mode 100644
index 5df72ae5d..000000000
--- a/extra/slim/background.jpg
+++ /dev/null
Binary files differ
diff --git a/extra/slim/panel.png b/extra/slim/panel.png
deleted file mode 100644
index 384154325..000000000
--- a/extra/slim/panel.png
+++ /dev/null
Binary files differ
diff --git a/extra/slim/slim.conf b/extra/slim/slim.conf
index 52158faee..8cf5cc460 100644
--- a/extra/slim/slim.conf
+++ b/extra/slim/slim.conf
@@ -51,7 +51,7 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session
# 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 twm,fvwm,jwm,lxde,blackbox,openbox,fluxbox,xfce4,gnome,icewm,wmaker,twindy,e16,ede
+sessions twm,fvwm,jwm,lxde,blackbox,openbox,fluxbox,xfce4,gnome,icewm,wmaker,twindy,e16,ede,mwm
# Executed when pressing F11 (requires imagemagick)
screenshot_cmd import -window root /slim.png
@@ -69,10 +69,10 @@ reboot_msg The system is rebooting...
# current theme, use comma separated list to specify a set to
# randomly choose from
-current_theme nutyx
+current_theme slim-nutyx
# Lock file
-lockfile /var/run/slim.lock
+lockfile /var/lock/slim.lock
# Log file
logfile /var/log/slim.log
diff --git a/extra/slim/slim.theme b/extra/slim/slim.theme
deleted file mode 100644
index c237b26c0..000000000
--- a/extra/slim/slim.theme
+++ /dev/null
@@ -1,37 +0,0 @@
-# text04 theme for SLiM
-# by Johannes Winkelmann
-
-# Messages (ie: shutdown)
-msg_color #FFFFFF
-msg_font Verdana:size=18:bold:dpi=75
-msg_x 50%
-msg_y 40%
-msg_shadow_color #702342
-msg_shadow_xoffset 1
-msg_shadow_yoffset 1
-
-# valid values: stretch, tile
-background_style stretch
-background_color #eedddd
-
-# Input controls
-input_panel_x 25%
-input_panel_y 65%
-input_name_x 394
-input_name_y 181
-input_font Verdana:size=12:dpi=75
-input_color #000000
-
-# Username / password request
-username_font Verdana:size=14:bold:dpi=75
-username_color #f9f9f9
-username_x 280
-username_y 183
-password_x 50%
-password_y 183
-username_shadow_color #702342
-username_shadow_xoffset 1
-username_shadow_yoffset 1
-
-username_msg Utilisateur:
-password_msg Mot de passe:
diff --git a/extra/slim/xinitrc b/extra/slim/xinitrc
index 604efdd96..fdd8e0673 100644
--- a/extra/slim/xinitrc
+++ b/extra/slim/xinitrc
@@ -1,12 +1,20 @@
# $Id: xinitrc,v 1.4 2008/05/13 17:33:40 install Exp install $
# the following variable defines the session which is started if the user
# doesn't explicitely select a session
-DEFAULT_SESSION=jwm
+DEFAULT_SESSION=startede
case $1 in
xfce4)
exec startxfce4
;;
+ede)
+ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+ eval `dbus-launch --sh-syntax --exit-with-session`
+ export DBUS_SESSION_BUS_ADDRESS
+ fi
+ exec startede
+ ;;
+
openbox)
if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
eval `dbus-launch --sh-syntax --exit-with-session`
@@ -90,6 +98,9 @@ gnome)
exec gnome-session
exec dbus-launch --exit-with-session gnome-session
;;
+mwm)
+ exec mwm
+ ;;
*)
exec $DEFAULT_SESSION
;;