[arch-commits] Commit in slim/trunk (6 files)
Gaetan Bisson
bisson at archlinux.org
Sat Aug 21 13:22:56 UTC 2010
Date: Saturday, August 21, 2010 @ 09:22:55
Author: bisson
Revision: 88246
upstream minor update (and updated patches to match this update)
Added:
slim/trunk/slim-gcc44.patch
Modified:
slim/trunk/PKGBUILD
slim/trunk/slim-restart.patch
slim/trunk/slim-tty-slowness.patch
slim/trunk/slim.install
Deleted:
slim/trunk/slim-1.3.1-gcc44.patch
-------------------------+
PKGBUILD | 58 ++++++++++++++++++++++------------------------
slim-1.3.1-gcc44.patch | 12 ---------
slim-gcc44.patch | 11 ++++++++
slim-restart.patch | 42 ++++++++++++++++-----------------
slim-tty-slowness.patch | 9 +++----
slim.install | 6 ++--
6 files changed, 68 insertions(+), 70 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-08-21 12:36:06 UTC (rev 88245)
+++ PKGBUILD 2010-08-21 13:22:55 UTC (rev 88246)
@@ -4,54 +4,52 @@
# Contributor: Hugo Ideler <hugoideler at dse.nl>
pkgname=slim
-pkgver=1.3.1
-pkgrel=7
-pkgdesc="Desktop-independent graphical login manager for X11"
+pkgver=1.3.2
+pkgrel=1
+pkgdesc='Desktop-independent graphical login manager for X11'
arch=('i686' 'x86_64')
-url="http://slim.berlios.de/"
+url='http://slim.berlios.de/'
license=('GPL2')
depends=('pam' 'libxmu' 'libpng' 'libjpeg>=8' 'libxft')
backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
install=slim.install
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
+source=("http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz"
'slim'
'slim.logrotate'
'slim.pam'
'slim-restart.patch'
'slim-tty-slowness.patch'
- 'slim-1.3.1-gcc44.patch')
-md5sums=('727d0acb24c0fbf0751134c37a9c895f'
- 'd8ea9c4dee2811524b67f4f666311a1f'
- '43da096480bf72c3ccec8ad8400f34f0'
- 'b20fe3c8487a039050986d60e45233a9'
- '648d871fe7d2a97b7d7b928019e2feee'
- 'be48f19a2e2f154bed750171e8d0fc7f'
- '197e6d05af30e32f96e6fb36110ae752')
+ 'slim-gcc44.patch')
+sha1sums=('e421d5487732c8317f8f591906661e014b036358'
+ '6fe0ba83509af634bce47be34e30995965bffc79'
+ 'b969cc902c1d9915a5609141a652c77b2732407b'
+ 'aff213af9ade7fe05db54fcd9a193e3dcb002aa9'
+ 'e9b5b624da2063d4e0cbc68de44a3eae22d509cb'
+ '213fefe8533c845ea8c40585b6a8097820d5e5d2'
+ '51121d451116c768d0fc027ff1ea70aaaef036e7')
build() {
cd "$srcdir/${pkgname}-$pkgver"
- # fix sluggish tty after slim start
- patch -Np1 -i $srcdir/slim-tty-slowness.patch || return 1
+ sed -i -e 's/png12/png14/g' Makefile # libpng 1.4.0
+ patch -p1 < ../slim-gcc44.patch
+ patch -p1 < ../slim-tty-slowness.patch # fix sluggish tty after slim start
+ patch -p1 < ../slim-restart.patch # restart X server if killed
+ # See http://developer.berlios.de/patch/?func=detailpatch&patch_id=2378&group_id=2663
- patch -Np1 -i $srcdir/slim-1.3.1-gcc44.patch || return 1
+ make USE_PAM=1
+}
- # Restart Xserver if killed
- # http://developer.berlios.de/patch/?func=detailpatch&patch_id=2378&group_id=2663
- patch -Np1 -i "$srcdir/slim-restart.patch" || return 1
+package() {
+ cd "$srcdir/${pkgname}-$pkgver"
- #libpng 1.4.0
- sed -i -e 's/png12/png14/g' Makefile || return 1
+ make DESTDIR="$pkgdir" MANDIR=/usr/share/man install
- make USE_PAM=1 || return 1
- make DESTDIR="$pkgdir" MANDIR=/usr/share/man install || return 1
+ install -D -m755 ../slim "$pkgdir/etc/rc.d/slim"
+ install -D -m644 ../slim.logrotate "$pkgdir/etc/logrotate.d/slim"
+ install -D -m644 ../slim.pam "$pkgdir/etc/pam.d/slim"
- install -D -m755 "$srcdir/slim" "$pkgdir/etc/rc.d/slim" || return 1
- install -D -m644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim" || return 1
- install -D -m644 "$srcdir/slim.pam" "$pkgdir/etc/pam.d/slim" || return 1
-
# Provide sane defaults
- sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' \
- "$pkgdir/etc/slim.conf" || return 1
- sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "$pkgdir/etc/slim.conf" || return 1
+ 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"
}
Deleted: slim-1.3.1-gcc44.patch
===================================================================
--- slim-1.3.1-gcc44.patch 2010-08-21 12:36:06 UTC (rev 88245)
+++ slim-1.3.1-gcc44.patch 2010-08-21 13:22:55 UTC (rev 88246)
@@ -1,12 +0,0 @@
-diff -up slim-1.3.1/switchuser.cpp.orig slim-1.3.1/switchuser.cpp
-diff -up slim-1.3.1/switchuser.h.orig slim-1.3.1/switchuser.h
---- slim-1.3.1/switchuser.h.orig 2008-09-26 02:54:15.000000000 +0200
-+++ slim-1.3.1/switchuser.h 2009-02-22 10:55:51.000000000 +0100
-@@ -13,6 +13,7 @@
- #define _SWITCHUSER_H_
-
- #include <stdlib.h>
-+#include <stdio.h> /* remove */
- #include <unistd.h>
- #include <string.h>
- #include <pwd.h>
Added: slim-gcc44.patch
===================================================================
--- slim-gcc44.patch (rev 0)
+++ slim-gcc44.patch 2010-08-21 13:22:55 UTC (rev 88246)
@@ -0,0 +1,11 @@
+diff -aur slim-1.3.2/switchuser.h slim-1.3.2.a/switchuser.h
+--- slim-1.3.2/switchuser.h 2010-07-08 07:04:10.000000000 +0200
++++ slim-1.3.2.a/switchuser.h 2010-08-21 15:10:34.306212393 +0200
+@@ -13,6 +13,7 @@
+ #define _SWITCHUSER_H_
+
+ #include <stdlib.h>
++#include <stdio.h> /* remove */
+ #include <unistd.h>
+ #include <string.h>
+ #include <pwd.h>
Modified: slim-restart.patch
===================================================================
--- slim-restart.patch 2010-08-21 12:36:06 UTC (rev 88245)
+++ slim-restart.patch 2010-08-21 13:22:55 UTC (rev 88246)
@@ -1,7 +1,7 @@
-diff -ur slim-1.3.1.orig/app.cpp slim-1.3.1/app.cpp
---- slim-1.3.1.orig/app.cpp 2008-09-26 02:54:15.000000000 +0200
-+++ slim-1.3.1/app.cpp 2008-11-21 20:38:48.000000000 +0100
-@@ -102,6 +102,11 @@
+diff -aur slim-1.3.2.b/app.cpp slim-1.3.2.c/app.cpp
+--- slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200
++++ slim-1.3.2.c/app.cpp 2010-08-21 15:11:03.946389843 +0200
+@@ -104,6 +104,11 @@
extern App* LoginApp;
@@ -12,8 +12,8 @@
+
void CatchSignal(int sig) {
cerr << APPNAME << ": unexpected signal " << sig << endl;
- LoginApp->StopServer();
-@@ -109,19 +114,6 @@
+
+@@ -114,19 +119,6 @@
exit(ERR_EXIT);
}
@@ -33,15 +33,15 @@
void User1Signal(int sig) {
signal(sig, User1Signal);
}
-@@ -267,7 +259,6 @@
+@@ -277,7 +269,6 @@
signal(SIGHUP, CatchSignal);
signal(SIGPIPE, CatchSignal);
signal(SIGUSR1, User1Signal);
- signal(SIGALRM, AlarmSignal);
#ifndef XNEST_DEBUG
- OpenLog();
-@@ -287,7 +278,6 @@
+ if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
+@@ -298,7 +289,6 @@
CreateServerAuth();
StartServer();
@@ -49,7 +49,7 @@
#endif
}
-@@ -603,6 +593,8 @@
+@@ -614,6 +604,8 @@
int status;
while (wpid != pid) {
wpid = wait(&status);
@@ -58,7 +58,7 @@
}
if (WIFEXITED(status) && WEXITSTATUS(status)) {
LoginPanel->Message("Failed to execute login command");
-@@ -648,9 +640,6 @@
+@@ -659,9 +651,6 @@
void App::Reboot() {
@@ -68,7 +68,7 @@
#ifdef USE_PAM
try{
pam.end();
-@@ -673,9 +662,6 @@
+@@ -684,9 +673,6 @@
void App::Halt() {
@@ -78,7 +78,7 @@
#ifdef USE_PAM
try{
pam.end();
-@@ -761,6 +747,7 @@
+@@ -772,6 +758,7 @@
StopServer();
RemoveLock();
@@ -86,7 +86,7 @@
Run();
}
-@@ -831,6 +818,7 @@
+@@ -842,6 +829,7 @@
for(cycles = 0; cycles < ncycles; cycles++) {
if((Dpy = XOpenDisplay(DisplayName))) {
@@ -94,7 +94,7 @@
return 1;
} else {
if(!ServerTimeout(1, (char *) "X server to begin accepting connections"))
-@@ -913,9 +901,6 @@
+@@ -926,9 +914,6 @@
ServerPID = -1;
break;
}
@@ -104,7 +104,7 @@
// Wait for server to start up
if(WaitForServer() == 0) {
-@@ -948,15 +933,12 @@
+@@ -963,15 +948,12 @@
void App::StopServer() {
@@ -120,9 +120,9 @@
// Catch X error
XSetIOErrorHandler(IgnoreXIO);
-diff -ur slim-1.3.1.orig/app.h slim-1.3.1/app.h
---- slim-1.3.1.orig/app.h 2008-09-26 02:54:15.000000000 +0200
-+++ slim-1.3.1/app.h 2008-11-21 20:38:48.000000000 +0100
+diff -aur slim-1.3.2.b/app.h slim-1.3.2.c/app.h
+--- slim-1.3.2.b/app.h 2010-08-21 15:10:40.499582804 +0200
++++ slim-1.3.2.c/app.h 2010-08-21 15:11:03.946389843 +0200
@@ -34,6 +34,7 @@
~App();
void Run();
@@ -130,8 +130,8 @@
+ void RestartServer();
void StopServer();
- // Lock functions
-@@ -48,7 +49,6 @@
+ bool serverStarted;
+@@ -49,7 +50,6 @@
void Console();
void Exit();
void KillAllClients(Bool top);
Modified: slim-tty-slowness.patch
===================================================================
--- slim-tty-slowness.patch 2010-08-21 12:36:06 UTC (rev 88245)
+++ slim-tty-slowness.patch 2010-08-21 13:22:55 UTC (rev 88246)
@@ -1,6 +1,7 @@
---- slim-1.3.1.orig/app.cpp 2009-01-13 11:30:36.000000000 +0900
-+++ slim-1.3.1/app.cpp 2009-01-13 11:32:27.000000000 +0900
-@@ -270,21 +270,22 @@
+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
@@ -21,7 +22,7 @@
}
+ OpenLog();
-+
++
+ if (daemonmode) UpdatePid();
+
CreateServerAuth();
Modified: slim.install
===================================================================
--- slim.install 2010-08-21 12:36:06 UTC (rev 88245)
+++ slim.install 2010-08-21 13:22:55 UTC (rev 88246)
@@ -1,7 +1,7 @@
post_install() {
- cat << _EOF
+ cat <<EOF
- Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
+==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
-_EOF
+EOF
}
More information about the arch-commits
mailing list