[arch-commits] Commit in slim/repos (34 files)
Tobias Powalowski
tpowa at archlinux.org
Mon Jul 16 15:36:13 UTC 2012
Date: Monday, July 16, 2012 @ 11:36:12
Author: tpowa
Revision: 163599
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
slim/repos/extra-i686/PKGBUILD
(from rev 163598, slim/trunk/PKGBUILD)
slim/repos/extra-i686/install
(from rev 163598, slim/trunk/install)
slim/repos/extra-i686/libpng-1.4+-support.patch
(from rev 163598, slim/trunk/libpng-1.4+-support.patch)
slim/repos/extra-i686/logrotate
(from rev 163598, slim/trunk/logrotate)
slim/repos/extra-i686/pam.d
(from rev 163598, slim/trunk/pam.d)
slim/repos/extra-i686/rc.d
(from rev 163598, slim/trunk/rc.d)
slim/repos/extra-i686/session-name.patch
(from rev 163598, slim/trunk/session-name.patch)
slim/repos/extra-i686/slim.service
(from rev 163598, slim/trunk/slim.service)
slim/repos/extra-i686/tty-slowness.patch
(from rev 163598, slim/trunk/tty-slowness.patch)
slim/repos/extra-x86_64/PKGBUILD
(from rev 163598, slim/trunk/PKGBUILD)
slim/repos/extra-x86_64/install
(from rev 163598, slim/trunk/install)
slim/repos/extra-x86_64/libpng-1.4+-support.patch
(from rev 163598, slim/trunk/libpng-1.4+-support.patch)
slim/repos/extra-x86_64/logrotate
(from rev 163598, slim/trunk/logrotate)
slim/repos/extra-x86_64/pam.d
(from rev 163598, slim/trunk/pam.d)
slim/repos/extra-x86_64/rc.d
(from rev 163598, slim/trunk/rc.d)
slim/repos/extra-x86_64/session-name.patch
(from rev 163598, slim/trunk/session-name.patch)
slim/repos/extra-x86_64/slim.service
(from rev 163598, slim/trunk/slim.service)
slim/repos/extra-x86_64/tty-slowness.patch
(from rev 163598, slim/trunk/tty-slowness.patch)
Deleted:
slim/repos/extra-i686/install
slim/repos/extra-i686/libpng-1.4+-support.patch
slim/repos/extra-i686/logrotate
slim/repos/extra-i686/pam.d
slim/repos/extra-i686/rc.d
slim/repos/extra-i686/session-name.patch
slim/repos/extra-i686/slim.service
slim/repos/extra-i686/tty-slowness.patch
slim/repos/extra-x86_64/install
slim/repos/extra-x86_64/libpng-1.4+-support.patch
slim/repos/extra-x86_64/logrotate
slim/repos/extra-x86_64/pam.d
slim/repos/extra-x86_64/rc.d
slim/repos/extra-x86_64/session-name.patch
slim/repos/extra-x86_64/slim.service
slim/repos/extra-x86_64/tty-slowness.patch
----------------------------------------+
extra-i686/PKGBUILD | 62 ++++++++++++++++++++++++++
extra-i686/install | 14 +++---
extra-i686/libpng-1.4+-support.patch | 28 ++++++------
extra-i686/logrotate | 18 +++----
extra-i686/pam.d | 20 ++++----
extra-i686/rc.d | 72 +++++++++++++++----------------
extra-i686/session-name.patch | 42 +++++++++---------
extra-i686/slim.service | 18 +++----
extra-i686/tty-slowness.patch | 60 ++++++++++++-------------
extra-x86_64/PKGBUILD | 62 ++++++++++++++++++++++++++
extra-x86_64/install | 14 +++---
extra-x86_64/libpng-1.4+-support.patch | 28 ++++++------
extra-x86_64/logrotate | 18 +++----
extra-x86_64/pam.d | 20 ++++----
extra-x86_64/rc.d | 72 +++++++++++++++----------------
extra-x86_64/session-name.patch | 42 +++++++++---------
extra-x86_64/slim.service | 18 +++----
extra-x86_64/tty-slowness.patch | 60 ++++++++++++-------------
18 files changed, 396 insertions(+), 272 deletions(-)
Copied: slim/repos/extra-i686/PKGBUILD (from rev 163598, slim/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Thayer Williams <thayer at archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Hugo Ideler <hugoideler at dse.nl>
+
+pkgname=slim
+pkgver=1.3.4
+pkgrel=2
+pkgdesc='Desktop-independent graphical login manager for X11'
+arch=('i686' 'x86_64')
+url='http://slim.berlios.de/'
+license=('GPL2')
+depends=('consolekit' 'pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+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"
+ 'rc.d'
+ 'pam.d'
+ 'logrotate'
+ 'slim.service'
+ 'session-name.patch'
+ 'libpng-1.4+-support.patch')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../session-name.patch # FS#26693: fix default session name
+ patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build
+ cd ${srcdir}
+ mkdir build
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes
+ make
+}
+
+package() {
+ cd ${srcdir}/build/
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim
+ install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim
+ install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim
+
+ # Provide sane defaults
+ sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf
+ sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf
+ # install systemd files
+ install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service
+}
+md5sums=('51543533e492b41007811f7d880720fa'
+ 'd8ea9c4dee2811524b67f4f666311a1f'
+ '37ef35079139544d04b8316c7f66f754'
+ '43da096480bf72c3ccec8ad8400f34f0'
+ 'a5d6bde9e63899df7d2081e1585bbe54'
+ 'ebcb6829028615686de7b64ceeaaf8ed'
+ '6d19bd7a91592ed2bb902b22b9594565')
Deleted: extra-i686/install
===================================================================
--- extra-i686/install 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-i686/install 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,7 +0,0 @@
-post_install() {
- cat <<EOF
-
-==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
-
-EOF
-}
Copied: slim/repos/extra-i686/install (from rev 163598, slim/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,7 @@
+post_install() {
+ cat <<EOF
+
+==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
+
+EOF
+}
Deleted: extra-i686/libpng-1.4+-support.patch
===================================================================
--- extra-i686/libpng-1.4+-support.patch 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-i686/libpng-1.4+-support.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,14 +0,0 @@
---- a/image.cpp 2012-06-26 04:20:14.000000000 -0400
-+++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400
-@@ -781,7 +781,11 @@
- (png_infopp) NULL);
- }
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp(png_jmpbuf((png_ptr)))) {
-+#else
- if (setjmp(png_ptr->jmpbuf)) {
-+#endif
- goto png_destroy;
- }
-
Copied: slim/repos/extra-i686/libpng-1.4+-support.patch (from rev 163598, slim/trunk/libpng-1.4+-support.patch)
===================================================================
--- extra-i686/libpng-1.4+-support.patch (rev 0)
+++ extra-i686/libpng-1.4+-support.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,14 @@
+--- a/image.cpp 2012-06-26 04:20:14.000000000 -0400
++++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400
+@@ -781,7 +781,11 @@
+ (png_infopp) NULL);
+ }
+
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++ if (setjmp(png_jmpbuf((png_ptr)))) {
++#else
+ if (setjmp(png_ptr->jmpbuf)) {
++#endif
+ goto png_destroy;
+ }
+
Deleted: extra-i686/logrotate
===================================================================
--- extra-i686/logrotate 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-i686/logrotate 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,9 +0,0 @@
-/var/log/slim.log {
- compress
- rotate 1
- size 1024k
- notifempty
- missingok
- copytruncate
- noolddir
-}
Copied: slim/repos/extra-i686/logrotate (from rev 163598, slim/trunk/logrotate)
===================================================================
--- extra-i686/logrotate (rev 0)
+++ extra-i686/logrotate 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,9 @@
+/var/log/slim.log {
+ compress
+ rotate 1
+ size 1024k
+ notifempty
+ missingok
+ copytruncate
+ noolddir
+}
Deleted: extra-i686/pam.d
===================================================================
--- extra-i686/pam.d 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-i686/pam.d 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-auth required pam_unix.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_limits.so
-session required pam_unix.so
-session optional pam_loginuid.so
-session optional pam_systemd.so
Copied: slim/repos/extra-i686/pam.d (from rev 163598, slim/trunk/pam.d)
===================================================================
--- extra-i686/pam.d (rev 0)
+++ extra-i686/pam.d 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth requisite pam_nologin.so
+auth required pam_env.so
+auth required pam_unix.so
+account required pam_unix.so
+password required pam_unix.so
+session required pam_limits.so
+session required pam_unix.so
+session optional pam_loginuid.so
+-session optional pam_systemd.so
Deleted: extra-i686/rc.d
===================================================================
--- extra-i686/rc.d 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-i686/rc.d 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/slim`
-case "$1" in
- start)
- stat_busy "Starting Simple Login Manager"
- [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon slim
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Simple Login Manager"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon slim
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: slim/repos/extra-i686/rc.d (from rev 163598, slim/trunk/rc.d)
===================================================================
--- extra-i686/rc.d (rev 0)
+++ extra-i686/rc.d 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/slim`
+case "$1" in
+ start)
+ stat_busy "Starting Simple Login Manager"
+ [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon slim
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Simple Login Manager"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon slim
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: extra-i686/session-name.patch
===================================================================
--- extra-i686/session-name.patch 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-i686/session-name.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,21 +0,0 @@
-diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
---- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000
-+++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000
-@@ -23,7 +23,7 @@
- Root = root;
- cfg = config;
-
-- session = "";
-+ session = cfg->nextSession(session);
-
- // Init GC
- XGCValues gcv;
-@@ -188,7 +188,7 @@
- }
-
- void Panel::ClearPanel() {
-- session = "";
-+ session = cfg->nextSession(session);
- Reset();
- XClearWindow(Dpy, Root);
- XClearWindow(Dpy, Win);
Copied: slim/repos/extra-i686/session-name.patch (from rev 163598, slim/trunk/session-name.patch)
===================================================================
--- extra-i686/session-name.patch (rev 0)
+++ extra-i686/session-name.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,21 @@
+diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
+--- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000
++++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000
+@@ -23,7 +23,7 @@
+ Root = root;
+ cfg = config;
+
+- session = "";
++ session = cfg->nextSession(session);
+
+ // Init GC
+ XGCValues gcv;
+@@ -188,7 +188,7 @@
+ }
+
+ void Panel::ClearPanel() {
+- session = "";
++ session = cfg->nextSession(session);
+ Reset();
+ XClearWindow(Dpy, Root);
+ XClearWindow(Dpy, Win);
Deleted: extra-i686/slim.service
===================================================================
--- extra-i686/slim.service 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-i686/slim.service 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,9 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-
-[Install]
-Alias=display-manager.service
Copied: slim/repos/extra-i686/slim.service (from rev 163598, slim/trunk/slim.service)
===================================================================
--- extra-i686/slim.service (rev 0)
+++ extra-i686/slim.service 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,9 @@
+[Unit]
+Description=SLiM Simple Login Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/slim -nodaemon
+
+[Install]
+Alias=display-manager.service
Deleted: extra-i686/tty-slowness.patch
===================================================================
--- extra-i686/tty-slowness.patch 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-i686/tty-slowness.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,30 +0,0 @@
-diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
---- slim-1.3.2.a/app.cpp 2010-08-21 15:10:13.702755711 +0200
-+++ slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200
-@@ -280,21 +280,22 @@
- signal(SIGALRM, AlarmSignal);
-
- #ifndef XNEST_DEBUG
-- OpenLog();
--
- if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
- daemonmode = true;
- }
-
- // Daemonize
- if (daemonmode) {
-- if (daemon(0, 1) == -1) {
-+ if (daemon(0, 0) == -1) {
- cerr << APPNAME << ": " << strerror(errno) << endl;
- exit(ERR_EXIT);
- }
-- UpdatePid();
- }
-
-+ OpenLog();
-+
-+ if (daemonmode) UpdatePid();
-+
- CreateServerAuth();
- StartServer();
- alarm(2);
Copied: slim/repos/extra-i686/tty-slowness.patch (from rev 163598, slim/trunk/tty-slowness.patch)
===================================================================
--- extra-i686/tty-slowness.patch (rev 0)
+++ extra-i686/tty-slowness.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,30 @@
+diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
+--- slim-1.3.2.a/app.cpp 2010-08-21 15:10:13.702755711 +0200
++++ slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200
+@@ -280,21 +280,22 @@
+ signal(SIGALRM, AlarmSignal);
+
+ #ifndef XNEST_DEBUG
+- OpenLog();
+-
+ if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
+ daemonmode = true;
+ }
+
+ // Daemonize
+ if (daemonmode) {
+- if (daemon(0, 1) == -1) {
++ if (daemon(0, 0) == -1) {
+ cerr << APPNAME << ": " << strerror(errno) << endl;
+ exit(ERR_EXIT);
+ }
+- UpdatePid();
+ }
+
++ OpenLog();
++
++ if (daemonmode) UpdatePid();
++
+ CreateServerAuth();
+ StartServer();
+ alarm(2);
Copied: slim/repos/extra-x86_64/PKGBUILD (from rev 163598, slim/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Thayer Williams <thayer at archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Hugo Ideler <hugoideler at dse.nl>
+
+pkgname=slim
+pkgver=1.3.4
+pkgrel=2
+pkgdesc='Desktop-independent graphical login manager for X11'
+arch=('i686' 'x86_64')
+url='http://slim.berlios.de/'
+license=('GPL2')
+depends=('consolekit' 'pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+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"
+ 'rc.d'
+ 'pam.d'
+ 'logrotate'
+ 'slim.service'
+ 'session-name.patch'
+ 'libpng-1.4+-support.patch')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../session-name.patch # FS#26693: fix default session name
+ patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build
+ cd ${srcdir}
+ mkdir build
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes
+ make
+}
+
+package() {
+ cd ${srcdir}/build/
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim
+ install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim
+ install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim
+
+ # Provide sane defaults
+ sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf
+ sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf
+ # install systemd files
+ install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service
+}
+md5sums=('51543533e492b41007811f7d880720fa'
+ 'd8ea9c4dee2811524b67f4f666311a1f'
+ '37ef35079139544d04b8316c7f66f754'
+ '43da096480bf72c3ccec8ad8400f34f0'
+ 'a5d6bde9e63899df7d2081e1585bbe54'
+ 'ebcb6829028615686de7b64ceeaaf8ed'
+ '6d19bd7a91592ed2bb902b22b9594565')
Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-x86_64/install 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,7 +0,0 @@
-post_install() {
- cat <<EOF
-
-==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
-
-EOF
-}
Copied: slim/repos/extra-x86_64/install (from rev 163598, slim/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,7 @@
+post_install() {
+ cat <<EOF
+
+==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
+
+EOF
+}
Deleted: extra-x86_64/libpng-1.4+-support.patch
===================================================================
--- extra-x86_64/libpng-1.4+-support.patch 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-x86_64/libpng-1.4+-support.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,14 +0,0 @@
---- a/image.cpp 2012-06-26 04:20:14.000000000 -0400
-+++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400
-@@ -781,7 +781,11 @@
- (png_infopp) NULL);
- }
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp(png_jmpbuf((png_ptr)))) {
-+#else
- if (setjmp(png_ptr->jmpbuf)) {
-+#endif
- goto png_destroy;
- }
-
Copied: slim/repos/extra-x86_64/libpng-1.4+-support.patch (from rev 163598, slim/trunk/libpng-1.4+-support.patch)
===================================================================
--- extra-x86_64/libpng-1.4+-support.patch (rev 0)
+++ extra-x86_64/libpng-1.4+-support.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,14 @@
+--- a/image.cpp 2012-06-26 04:20:14.000000000 -0400
++++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400
+@@ -781,7 +781,11 @@
+ (png_infopp) NULL);
+ }
+
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++ if (setjmp(png_jmpbuf((png_ptr)))) {
++#else
+ if (setjmp(png_ptr->jmpbuf)) {
++#endif
+ goto png_destroy;
+ }
+
Deleted: extra-x86_64/logrotate
===================================================================
--- extra-x86_64/logrotate 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-x86_64/logrotate 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,9 +0,0 @@
-/var/log/slim.log {
- compress
- rotate 1
- size 1024k
- notifempty
- missingok
- copytruncate
- noolddir
-}
Copied: slim/repos/extra-x86_64/logrotate (from rev 163598, slim/trunk/logrotate)
===================================================================
--- extra-x86_64/logrotate (rev 0)
+++ extra-x86_64/logrotate 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,9 @@
+/var/log/slim.log {
+ compress
+ rotate 1
+ size 1024k
+ notifempty
+ missingok
+ copytruncate
+ noolddir
+}
Deleted: extra-x86_64/pam.d
===================================================================
--- extra-x86_64/pam.d 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-x86_64/pam.d 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-auth required pam_unix.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_limits.so
-session required pam_unix.so
-session optional pam_loginuid.so
-session optional pam_systemd.so
Copied: slim/repos/extra-x86_64/pam.d (from rev 163598, slim/trunk/pam.d)
===================================================================
--- extra-x86_64/pam.d (rev 0)
+++ extra-x86_64/pam.d 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth requisite pam_nologin.so
+auth required pam_env.so
+auth required pam_unix.so
+account required pam_unix.so
+password required pam_unix.so
+session required pam_limits.so
+session required pam_unix.so
+session optional pam_loginuid.so
+-session optional pam_systemd.so
Deleted: extra-x86_64/rc.d
===================================================================
--- extra-x86_64/rc.d 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-x86_64/rc.d 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/slim`
-case "$1" in
- start)
- stat_busy "Starting Simple Login Manager"
- [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon slim
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Simple Login Manager"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon slim
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: slim/repos/extra-x86_64/rc.d (from rev 163598, slim/trunk/rc.d)
===================================================================
--- extra-x86_64/rc.d (rev 0)
+++ extra-x86_64/rc.d 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/slim`
+case "$1" in
+ start)
+ stat_busy "Starting Simple Login Manager"
+ [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon slim
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Simple Login Manager"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon slim
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: extra-x86_64/session-name.patch
===================================================================
--- extra-x86_64/session-name.patch 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-x86_64/session-name.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,21 +0,0 @@
-diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
---- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000
-+++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000
-@@ -23,7 +23,7 @@
- Root = root;
- cfg = config;
-
-- session = "";
-+ session = cfg->nextSession(session);
-
- // Init GC
- XGCValues gcv;
-@@ -188,7 +188,7 @@
- }
-
- void Panel::ClearPanel() {
-- session = "";
-+ session = cfg->nextSession(session);
- Reset();
- XClearWindow(Dpy, Root);
- XClearWindow(Dpy, Win);
Copied: slim/repos/extra-x86_64/session-name.patch (from rev 163598, slim/trunk/session-name.patch)
===================================================================
--- extra-x86_64/session-name.patch (rev 0)
+++ extra-x86_64/session-name.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,21 @@
+diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
+--- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000
++++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000
+@@ -23,7 +23,7 @@
+ Root = root;
+ cfg = config;
+
+- session = "";
++ session = cfg->nextSession(session);
+
+ // Init GC
+ XGCValues gcv;
+@@ -188,7 +188,7 @@
+ }
+
+ void Panel::ClearPanel() {
+- session = "";
++ session = cfg->nextSession(session);
+ Reset();
+ XClearWindow(Dpy, Root);
+ XClearWindow(Dpy, Win);
Deleted: extra-x86_64/slim.service
===================================================================
--- extra-x86_64/slim.service 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-x86_64/slim.service 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,9 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-
-[Install]
-Alias=display-manager.service
Copied: slim/repos/extra-x86_64/slim.service (from rev 163598, slim/trunk/slim.service)
===================================================================
--- extra-x86_64/slim.service (rev 0)
+++ extra-x86_64/slim.service 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,9 @@
+[Unit]
+Description=SLiM Simple Login Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/slim -nodaemon
+
+[Install]
+Alias=display-manager.service
Deleted: extra-x86_64/tty-slowness.patch
===================================================================
--- extra-x86_64/tty-slowness.patch 2012-07-16 15:33:34 UTC (rev 163598)
+++ extra-x86_64/tty-slowness.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -1,30 +0,0 @@
-diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
---- slim-1.3.2.a/app.cpp 2010-08-21 15:10:13.702755711 +0200
-+++ slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200
-@@ -280,21 +280,22 @@
- signal(SIGALRM, AlarmSignal);
-
- #ifndef XNEST_DEBUG
-- OpenLog();
--
- if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
- daemonmode = true;
- }
-
- // Daemonize
- if (daemonmode) {
-- if (daemon(0, 1) == -1) {
-+ if (daemon(0, 0) == -1) {
- cerr << APPNAME << ": " << strerror(errno) << endl;
- exit(ERR_EXIT);
- }
-- UpdatePid();
- }
-
-+ OpenLog();
-+
-+ if (daemonmode) UpdatePid();
-+
- CreateServerAuth();
- StartServer();
- alarm(2);
Copied: slim/repos/extra-x86_64/tty-slowness.patch (from rev 163598, slim/trunk/tty-slowness.patch)
===================================================================
--- extra-x86_64/tty-slowness.patch (rev 0)
+++ extra-x86_64/tty-slowness.patch 2012-07-16 15:36:12 UTC (rev 163599)
@@ -0,0 +1,30 @@
+diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
+--- slim-1.3.2.a/app.cpp 2010-08-21 15:10:13.702755711 +0200
++++ slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200
+@@ -280,21 +280,22 @@
+ signal(SIGALRM, AlarmSignal);
+
+ #ifndef XNEST_DEBUG
+- OpenLog();
+-
+ if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
+ daemonmode = true;
+ }
+
+ // Daemonize
+ if (daemonmode) {
+- if (daemon(0, 1) == -1) {
++ if (daemon(0, 0) == -1) {
+ cerr << APPNAME << ": " << strerror(errno) << endl;
+ exit(ERR_EXIT);
+ }
+- UpdatePid();
+ }
+
++ OpenLog();
++
++ if (daemonmode) UpdatePid();
++
+ CreateServerAuth();
+ StartServer();
+ alarm(2);
More information about the arch-commits
mailing list