diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-11-05 13:42:45 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-11-05 13:42:45 +0000 |
| commit | 06cceba8ce6809dcd072797f8faf090ea1b2a6b4 (patch) | |
| tree | f113e306522fadda16b9b9b22c503d69546cf428 /x11 | |
| parent | 713f6a72ba77972db7866a5aa4c6223c49fc6a71 (diff) | |
| download | aports-06cceba8ce6809dcd072797f8faf090ea1b2a6b4.tar.bz2 aports-06cceba8ce6809dcd072797f8faf090ea1b2a6b4.tar.xz | |
x11/slim: added init.d script
also:
* build fix for gcc-4.4
* alpinize default config
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/slim/APKBUILD | 39 | ||||
| -rw-r--r-- | x11/slim/slim-1.3.1-gcc4.4.patch | 17 |
2 files changed, 47 insertions, 9 deletions
diff --git a/x11/slim/APKBUILD b/x11/slim/APKBUILD index b6f193f404..6476730e12 100644 --- a/x11/slim/APKBUILD +++ b/x11/slim/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=slim pkgver=1.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Desktop-independent graphical login manager for X11" url="http://slim.berlios.de/" license="GPL-2" @@ -11,20 +11,41 @@ depends="" install= source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.logrotate - $pkgname-restart.patch" + $pkgname.initd + slim-1.3.1-gcc4.4.patch + slim-restart.patch" -build () -{ +prepare() { + cd "$srcdir/slim-$pkgver" + for i in ../*.patch; do + patch -p1 -i $i || return 1 + done + sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|'\ + -e 's|/var/run/slim.lock|/var/lock/slim.lock|' \ + -e 's|halt_cmd.*|halt_cmd /sbin/poweroff|'\ + -e 's|reboot_cmd.*|reboot_cmd /sbin/reboot|'\ + -e 's|console_cmd.*|console_cmd /usr/bin/terminal|'\ + -e 's|login_cmd.*|login_cmd exec /bin/sh -l /etc/X11/xinit/xinitrc|' \ + -e 's|screenshot_cmd.*|screenshot_cmd scrot /slim.png|' \ + -e 's|imagemagick|scrot|' \ + slim.conf || return 1 +} + +build() { cd "$srcdir/slim-$pkgver" - patch -Np1 -i "$srcdir/slim-restart.patch" || return 1 make CXX="${CXX:-g++}" CC="${CC:-gcc}" || return 1 - make DESTDIR="$pkgdir" MANDIR=/usr/share/man install || return 1 +} - install -D -m644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim" || return 1 - 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 +package() { + cd "$srcdir/slim-$pkgver" + make DESTDIR="$pkgdir" MANDIR=/usr/share/man install || return 1 + install -D -m755 ../slim.initd "$pkgdir"/etc/init.d/slim || return 1 + install -D -m644 ../slim.logrotate "$pkgdir"/etc/logrotate.d/slim } + md5sums="727d0acb24c0fbf0751134c37a9c895f slim-1.3.1.tar.gz 43da096480bf72c3ccec8ad8400f34f0 slim.logrotate +6ee3a023e56052528295034be809cfc6 slim.initd +a00df4316e2392fff7e75daf5c826cae slim-1.3.1-gcc4.4.patch 648d871fe7d2a97b7d7b928019e2feee slim-restart.patch" diff --git a/x11/slim/slim-1.3.1-gcc4.4.patch b/x11/slim/slim-1.3.1-gcc4.4.patch new file mode 100644 index 0000000000..5708d70717 --- /dev/null +++ b/x11/slim/slim-1.3.1-gcc4.4.patch @@ -0,0 +1,17 @@ +Patch to allow compilation with gcc-4.4 + +Notified by Daniel J. - from Debian bug tracker + +http://bugs.gentoo.org/252745 + +--- a/switchuser.h 2008-11-11 19:40:18.000000000 +0000 ++++ b/switchuser.h 2008-11-11 19:40:28.000000000 +0000 +@@ -18,6 +18,7 @@ + #include <pwd.h> + #include <grp.h> + #include <paths.h> ++#include <cstdio> + #include <iostream> + #include "const.h" + #include "cfg.h" + |