From 9159b8ca1c97a398204d7a7d4d78c3394639bd02 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Oct 2013 03:11:14 -0700 Subject: Mon Oct 7 03:07:04 PDT 2013 --- extra/slim/PKGBUILD | 7 +++++-- extra/slim/slim-1.3.6-add-sessiondir.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 extra/slim/slim-1.3.6-add-sessiondir.patch (limited to 'extra/slim') diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 27a492819..188d4c064 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195897 2013-10-03 23:13:04Z foutrelis $ +# $Id: PKGBUILD 195944 2013-10-06 06:46:09Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Gaetan Bisson # Contributor: Thayer Williams @@ -7,7 +7,7 @@ pkgname=slim pkgver=1.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="Desktop-independent graphical login manager for X11" arch=('i686' 'x86_64') url="http://slim.berlios.de/" @@ -17,10 +17,12 @@ makedepends=('cmake' 'freeglut') backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim') source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz slim-1.3.6-fix-libslim-libraries.patch + slim-1.3.6-add-sessiondir.patch slim.pam slim.logrotate) sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df' '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0' + '0dffd53a69eb9033a67fad964df6fc150ee7a483e29d8eb8b559010fbd14e5fd' 'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4' '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def') @@ -31,6 +33,7 @@ prepare() { sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt patch -Np1 -i "$srcdir/slim-1.3.6-fix-libslim-libraries.patch" + patch -Np1 -i "$srcdir/slim-1.3.6-add-sessiondir.patch" } build() { diff --git a/extra/slim/slim-1.3.6-add-sessiondir.patch b/extra/slim/slim-1.3.6-add-sessiondir.patch new file mode 100644 index 000000000..f6abf0bc7 --- /dev/null +++ b/extra/slim/slim-1.3.6-add-sessiondir.patch @@ -0,0 +1,28 @@ +From 741e43960a4ea3a8bc230b1f599311d800c2cc83 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Wed, 02 Oct 2013 23:23:24 +0000 +Subject: Update slim.conf. Add sessiondir. + +Signed-off-by: Nobuhiro Iwamatsu +--- +diff --git a/slim.conf b/slim.conf +index a8e2e1c..c5f1d38 100644 +--- a/slim.conf ++++ b/slim.conf +@@ -47,11 +47,9 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session + # options "-d" and "-nodaemon" + # daemon yes + +-# Available sessions (first one is the default). +-# 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-session,wmaker,blackbox ++# Set directory that contains the xsessions. ++# slim reads xsesion from this directory, and be able to select. ++sessiondir /usr/share/xsessions/ + + # Executed when pressing F11 (requires imagemagick) + screenshot_cmd import -window root /slim.png +-- +cgit v0.9.2 -- cgit v1.2.3-54-g00ecf