Date: Sunday, October 6, 2013 @ 08:46:09 Author: foutrelis Revision: 195944
archrelease: copy trunk to extra-i686, extra-x86_64 Added: slim/repos/extra-i686/PKGBUILD (from rev 195943, slim/trunk/PKGBUILD) slim/repos/extra-i686/slim-1.3.6-add-sessiondir.patch (from rev 195943, slim/trunk/slim-1.3.6-add-sessiondir.patch) slim/repos/extra-i686/slim-1.3.6-fix-libslim-libraries.patch (from rev 195943, slim/trunk/slim-1.3.6-fix-libslim-libraries.patch) slim/repos/extra-i686/slim.logrotate (from rev 195943, slim/trunk/slim.logrotate) slim/repos/extra-i686/slim.pam (from rev 195943, slim/trunk/slim.pam) slim/repos/extra-x86_64/PKGBUILD (from rev 195943, slim/trunk/PKGBUILD) slim/repos/extra-x86_64/slim-1.3.6-add-sessiondir.patch (from rev 195943, slim/trunk/slim-1.3.6-add-sessiondir.patch) slim/repos/extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch (from rev 195943, slim/trunk/slim-1.3.6-fix-libslim-libraries.patch) slim/repos/extra-x86_64/slim.logrotate (from rev 195943, slim/trunk/slim.logrotate) slim/repos/extra-x86_64/slim.pam (from rev 195943, slim/trunk/slim.pam) Deleted: slim/repos/extra-i686/PKGBUILD slim/repos/extra-i686/slim-1.3.6-fix-libslim-libraries.patch slim/repos/extra-i686/slim.logrotate slim/repos/extra-i686/slim.pam slim/repos/extra-x86_64/PKGBUILD slim/repos/extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch slim/repos/extra-x86_64/slim.logrotate slim/repos/extra-x86_64/slim.pam -----------------------------------------------------+ /PKGBUILD | 130 ++++++++++++++++++ /slim-1.3.6-fix-libslim-libraries.patch | 40 +++++ /slim.logrotate | 18 ++ /slim.pam | 14 + extra-i686/PKGBUILD | 62 -------- extra-i686/slim-1.3.6-add-sessiondir.patch | 28 +++ extra-i686/slim-1.3.6-fix-libslim-libraries.patch | 20 -- extra-i686/slim.logrotate | 9 - extra-i686/slim.pam | 7 extra-x86_64/PKGBUILD | 62 -------- extra-x86_64/slim-1.3.6-add-sessiondir.patch | 28 +++ extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch | 20 -- extra-x86_64/slim.logrotate | 9 - extra-x86_64/slim.pam | 7 14 files changed, 258 insertions(+), 196 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-10-06 06:45:51 UTC (rev 195943) +++ extra-i686/PKGBUILD 2013-10-06 06:46:09 UTC (rev 195944) @@ -1,62 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> -# Contributor: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Thayer Williams <tha...@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Hugo Ideler <hugoide...@dse.nl> - -pkgname=slim -pkgver=1.3.6 -pkgrel=1 -pkgdesc="Desktop-independent graphical login manager for X11" -arch=('i686' 'x86_64') -url="http://slim.berlios.de/" -license=('GPL2') -depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth') -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.pam - slim.logrotate) -sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df' - '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0' - 'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4' - '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - # Fix installation path of slim.service - sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt - - patch -Np1 -i "$srcdir/slim-1.3.6-fix-libslim-libraries.patch" -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DUSE_PAM=yes \ - -DUSE_CONSOLEKIT=no - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/slim.pam" "$pkgdir/etc/pam.d/slim" - install -Dm644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim" - - # Provide sane defaults - sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' \ - -e 's|/var/run/slim.lock|/var/lock/slim.lock|' \ - "$pkgdir/etc/slim.conf" -} - -# vim:set ts=2 sw=2 et: Copied: slim/repos/extra-i686/PKGBUILD (from rev 195943, slim/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-10-06 06:46:09 UTC (rev 195944) @@ -0,0 +1,65 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Thayer Williams <tha...@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: Hugo Ideler <hugoide...@dse.nl> + +pkgname=slim +pkgver=1.3.6 +pkgrel=2 +pkgdesc="Desktop-independent graphical login manager for X11" +arch=('i686' 'x86_64') +url="http://slim.berlios.de/" +license=('GPL2') +depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth') +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') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # Fix installation path of slim.service + 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() { + cd "$srcdir/$pkgname-$pkgver" + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DUSE_PAM=yes \ + -DUSE_CONSOLEKIT=no + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/slim.pam" "$pkgdir/etc/pam.d/slim" + install -Dm644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim" + + # Provide sane defaults + sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' \ + -e 's|/var/run/slim.lock|/var/lock/slim.lock|' \ + "$pkgdir/etc/slim.conf" +} + +# vim:set ts=2 sw=2 et: Copied: slim/repos/extra-i686/slim-1.3.6-add-sessiondir.patch (from rev 195943, slim/trunk/slim-1.3.6-add-sessiondir.patch) =================================================================== --- extra-i686/slim-1.3.6-add-sessiondir.patch (rev 0) +++ extra-i686/slim-1.3.6-add-sessiondir.patch 2013-10-06 06:46:09 UTC (rev 195944) @@ -0,0 +1,28 @@ +From 741e43960a4ea3a8bc230b1f599311d800c2cc83 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu <iwama...@nigauri.org> +Date: Wed, 02 Oct 2013 23:23:24 +0000 +Subject: Update slim.conf. Add sessiondir. + +Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> +--- +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 Deleted: extra-i686/slim-1.3.6-fix-libslim-libraries.patch =================================================================== --- extra-i686/slim-1.3.6-fix-libslim-libraries.patch 2013-10-06 06:45:51 UTC (rev 195943) +++ extra-i686/slim-1.3.6-fix-libslim-libraries.patch 2013-10-06 06:46:09 UTC (rev 195944) @@ -1,20 +0,0 @@ -diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt ---- slim-1.3.6.orig/CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300 -+++ slim-1.3.6/CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300 -@@ -119,6 +119,7 @@ if(USE_PAM) - if(PAM_FOUND) - message("\tPAM Found") - set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM") -+ target_link_libraries(libslim ${PAM_LIBRARY}) - target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY}) - target_link_libraries(slimlock ${PAM_LIBRARY}) - include_directories(${PAM_INCLUDE_DIR}) -@@ -178,6 +179,8 @@ include_directories( - ) - - target_link_libraries(libslim -+ ${X11_Xft_LIB} -+ ${X11_Xrandr_LIB} - ${JPEG_LIBRARIES} - ${PNG_LIBRARIES} - ) Copied: slim/repos/extra-i686/slim-1.3.6-fix-libslim-libraries.patch (from rev 195943, slim/trunk/slim-1.3.6-fix-libslim-libraries.patch) =================================================================== --- extra-i686/slim-1.3.6-fix-libslim-libraries.patch (rev 0) +++ extra-i686/slim-1.3.6-fix-libslim-libraries.patch 2013-10-06 06:46:09 UTC (rev 195944) @@ -0,0 +1,20 @@ +diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt +--- slim-1.3.6.orig/CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300 ++++ slim-1.3.6/CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300 +@@ -119,6 +119,7 @@ if(USE_PAM) + if(PAM_FOUND) + message("\tPAM Found") + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM") ++ target_link_libraries(libslim ${PAM_LIBRARY}) + target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY}) + target_link_libraries(slimlock ${PAM_LIBRARY}) + include_directories(${PAM_INCLUDE_DIR}) +@@ -178,6 +179,8 @@ include_directories( + ) + + target_link_libraries(libslim ++ ${X11_Xft_LIB} ++ ${X11_Xrandr_LIB} + ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} + ) Deleted: extra-i686/slim.logrotate =================================================================== --- extra-i686/slim.logrotate 2013-10-06 06:45:51 UTC (rev 195943) +++ extra-i686/slim.logrotate 2013-10-06 06:46:09 UTC (rev 195944) @@ -1,9 +0,0 @@ -/var/log/slim.log { - compress - rotate 1 - size 1024k - notifempty - missingok - copytruncate - noolddir -} Copied: slim/repos/extra-i686/slim.logrotate (from rev 195943, slim/trunk/slim.logrotate) =================================================================== --- extra-i686/slim.logrotate (rev 0) +++ extra-i686/slim.logrotate 2013-10-06 06:46:09 UTC (rev 195944) @@ -0,0 +1,9 @@ +/var/log/slim.log { + compress + rotate 1 + size 1024k + notifempty + missingok + copytruncate + noolddir +} Deleted: extra-i686/slim.pam =================================================================== --- extra-i686/slim.pam 2013-10-06 06:45:51 UTC (rev 195943) +++ extra-i686/slim.pam 2013-10-06 06:46:09 UTC (rev 195944) @@ -1,7 +0,0 @@ -#%PAM-1.0 - -auth include system-local-login --auth optional pam_gnome_keyring.so -account include system-local-login -session include system-local-login --session optional pam_gnome_keyring.so auto_start Copied: slim/repos/extra-i686/slim.pam (from rev 195943, slim/trunk/slim.pam) =================================================================== --- extra-i686/slim.pam (rev 0) +++ extra-i686/slim.pam 2013-10-06 06:46:09 UTC (rev 195944) @@ -0,0 +1,7 @@ +#%PAM-1.0 + +auth include system-local-login +-auth optional pam_gnome_keyring.so +account include system-local-login +session include system-local-login +-session optional pam_gnome_keyring.so auto_start Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-10-06 06:45:51 UTC (rev 195943) +++ extra-x86_64/PKGBUILD 2013-10-06 06:46:09 UTC (rev 195944) @@ -1,62 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> -# Contributor: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Thayer Williams <tha...@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Hugo Ideler <hugoide...@dse.nl> - -pkgname=slim -pkgver=1.3.6 -pkgrel=1 -pkgdesc="Desktop-independent graphical login manager for X11" -arch=('i686' 'x86_64') -url="http://slim.berlios.de/" -license=('GPL2') -depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth') -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.pam - slim.logrotate) -sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df' - '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0' - 'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4' - '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - # Fix installation path of slim.service - sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt - - patch -Np1 -i "$srcdir/slim-1.3.6-fix-libslim-libraries.patch" -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DUSE_PAM=yes \ - -DUSE_CONSOLEKIT=no - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/slim.pam" "$pkgdir/etc/pam.d/slim" - install -Dm644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim" - - # Provide sane defaults - sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' \ - -e 's|/var/run/slim.lock|/var/lock/slim.lock|' \ - "$pkgdir/etc/slim.conf" -} - -# vim:set ts=2 sw=2 et: Copied: slim/repos/extra-x86_64/PKGBUILD (from rev 195943, slim/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-10-06 06:46:09 UTC (rev 195944) @@ -0,0 +1,65 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Thayer Williams <tha...@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: Hugo Ideler <hugoide...@dse.nl> + +pkgname=slim +pkgver=1.3.6 +pkgrel=2 +pkgdesc="Desktop-independent graphical login manager for X11" +arch=('i686' 'x86_64') +url="http://slim.berlios.de/" +license=('GPL2') +depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth') +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') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # Fix installation path of slim.service + 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() { + cd "$srcdir/$pkgname-$pkgver" + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DUSE_PAM=yes \ + -DUSE_CONSOLEKIT=no + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/slim.pam" "$pkgdir/etc/pam.d/slim" + install -Dm644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim" + + # Provide sane defaults + sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' \ + -e 's|/var/run/slim.lock|/var/lock/slim.lock|' \ + "$pkgdir/etc/slim.conf" +} + +# vim:set ts=2 sw=2 et: Copied: slim/repos/extra-x86_64/slim-1.3.6-add-sessiondir.patch (from rev 195943, slim/trunk/slim-1.3.6-add-sessiondir.patch) =================================================================== --- extra-x86_64/slim-1.3.6-add-sessiondir.patch (rev 0) +++ extra-x86_64/slim-1.3.6-add-sessiondir.patch 2013-10-06 06:46:09 UTC (rev 195944) @@ -0,0 +1,28 @@ +From 741e43960a4ea3a8bc230b1f599311d800c2cc83 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu <iwama...@nigauri.org> +Date: Wed, 02 Oct 2013 23:23:24 +0000 +Subject: Update slim.conf. Add sessiondir. + +Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> +--- +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 Deleted: extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch =================================================================== --- extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch 2013-10-06 06:45:51 UTC (rev 195943) +++ extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch 2013-10-06 06:46:09 UTC (rev 195944) @@ -1,20 +0,0 @@ -diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt ---- slim-1.3.6.orig/CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300 -+++ slim-1.3.6/CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300 -@@ -119,6 +119,7 @@ if(USE_PAM) - if(PAM_FOUND) - message("\tPAM Found") - set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM") -+ target_link_libraries(libslim ${PAM_LIBRARY}) - target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY}) - target_link_libraries(slimlock ${PAM_LIBRARY}) - include_directories(${PAM_INCLUDE_DIR}) -@@ -178,6 +179,8 @@ include_directories( - ) - - target_link_libraries(libslim -+ ${X11_Xft_LIB} -+ ${X11_Xrandr_LIB} - ${JPEG_LIBRARIES} - ${PNG_LIBRARIES} - ) Copied: slim/repos/extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch (from rev 195943, slim/trunk/slim-1.3.6-fix-libslim-libraries.patch) =================================================================== --- extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch (rev 0) +++ extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch 2013-10-06 06:46:09 UTC (rev 195944) @@ -0,0 +1,20 @@ +diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt +--- slim-1.3.6.orig/CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300 ++++ slim-1.3.6/CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300 +@@ -119,6 +119,7 @@ if(USE_PAM) + if(PAM_FOUND) + message("\tPAM Found") + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM") ++ target_link_libraries(libslim ${PAM_LIBRARY}) + target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY}) + target_link_libraries(slimlock ${PAM_LIBRARY}) + include_directories(${PAM_INCLUDE_DIR}) +@@ -178,6 +179,8 @@ include_directories( + ) + + target_link_libraries(libslim ++ ${X11_Xft_LIB} ++ ${X11_Xrandr_LIB} + ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} + ) Deleted: extra-x86_64/slim.logrotate =================================================================== --- extra-x86_64/slim.logrotate 2013-10-06 06:45:51 UTC (rev 195943) +++ extra-x86_64/slim.logrotate 2013-10-06 06:46:09 UTC (rev 195944) @@ -1,9 +0,0 @@ -/var/log/slim.log { - compress - rotate 1 - size 1024k - notifempty - missingok - copytruncate - noolddir -} Copied: slim/repos/extra-x86_64/slim.logrotate (from rev 195943, slim/trunk/slim.logrotate) =================================================================== --- extra-x86_64/slim.logrotate (rev 0) +++ extra-x86_64/slim.logrotate 2013-10-06 06:46:09 UTC (rev 195944) @@ -0,0 +1,9 @@ +/var/log/slim.log { + compress + rotate 1 + size 1024k + notifempty + missingok + copytruncate + noolddir +} Deleted: extra-x86_64/slim.pam =================================================================== --- extra-x86_64/slim.pam 2013-10-06 06:45:51 UTC (rev 195943) +++ extra-x86_64/slim.pam 2013-10-06 06:46:09 UTC (rev 195944) @@ -1,7 +0,0 @@ -#%PAM-1.0 - -auth include system-local-login --auth optional pam_gnome_keyring.so -account include system-local-login -session include system-local-login --session optional pam_gnome_keyring.so auto_start Copied: slim/repos/extra-x86_64/slim.pam (from rev 195943, slim/trunk/slim.pam) =================================================================== --- extra-x86_64/slim.pam (rev 0) +++ extra-x86_64/slim.pam 2013-10-06 06:46:09 UTC (rev 195944) @@ -0,0 +1,7 @@ +#%PAM-1.0 + +auth include system-local-login +-auth optional pam_gnome_keyring.so +account include system-local-login +session include system-local-login +-session optional pam_gnome_keyring.so auto_start