diff options
Diffstat (limited to 'extra/slim')
-rw-r--r-- | extra/slim/PKGBUILD | 16 | ||||
-rw-r--r-- | extra/slim/slim-1.3.2-libpng15.patch | 11 |
2 files changed, 19 insertions, 8 deletions
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 6dea30917..fc74689a8 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141487 2011-10-30 22:51:16Z bisson $ +# $Id: PKGBUILD 148930 2012-02-05 11:56:28Z ibiru $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -6,7 +6,7 @@ pkgname=slim pkgver=1.3.2 -pkgrel=6 +pkgrel=7 pkgdesc='Desktop-independent graphical login manager for X11' arch=('i686' 'x86_64') url='http://slim.berlios.de/' @@ -17,38 +17,38 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'rc.d' 'pam.d' 'logrotate' - 'gcc44.patch' 'ptr_pam.patch' 'no-host.patch' 'restart.patch' 'sigterm.patch' 'session-name.patch' - 'tty-slowness.patch') + 'tty-slowness.patch' + 'slim-1.3.2-libpng15.patch') sha1sums=('e421d5487732c8317f8f591906661e014b036358' '6fe0ba83509af634bce47be34e30995965bffc79' 'a0e991ef0ac5120465a3be014a26e70ba073b6ae' 'b969cc902c1d9915a5609141a652c77b2732407b' - '51121d451116c768d0fc027ff1ea70aaaef036e7' '640668c984a13593a1bfba8d3b503c005d5f401e' 'b86eddd083fb9f6259e46c735f55ebe76c655bd3' '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435' '0b35048723c527fb824c5e0f9b9064f751871785' 'fdd35562ce010babaeb793f92f9906fdcdaf3f9f' - '213fefe8533c845ea8c40585b6a8097820d5e5d2') + '213fefe8533c845ea8c40585b6a8097820d5e5d2' + '3cd674e548f4e0aadbbd32a67b4efd1ed263afef') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's/png12/png14/g' Makefile - patch -p1 -i ../gcc44.patch # FS#14815: lacks include for gcc-4.4 + sed -i -e 's/png12/png15/g' Makefile patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM patch -p1 -i ../no-host.patch # cf patch: do not set PAM host patch -p1 -i ../restart.patch # cf patch: restart X server if killed patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd patch -p1 -i ../session-name.patch # FS#26693: fix default session name patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start + patch -p0 -i ../slim-1.3.2-libpng15.patch make USE_PAM=1 } diff --git a/extra/slim/slim-1.3.2-libpng15.patch b/extra/slim/slim-1.3.2-libpng15.patch new file mode 100644 index 000000000..720608567 --- /dev/null +++ b/extra/slim/slim-1.3.2-libpng15.patch @@ -0,0 +1,11 @@ +--- png.c ++++ png.c +@@ -57,7 +57,7 @@ + return(0); + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); + fclose(infile); |