[arch-commits] Commit in slim/trunk (PKGBUILD slim-1.3.2-libpng15.patch)

[Eric Bélanger]

    Date: Thursday, January 26, 2012 @ 21:03:47
  Author: eric
Revision: 147687

upgpkg: slim 1.3.2-7

Rebuild against libpng 1.5 and libtiff 4.0

Added:
  slim/trunk/slim-1.3.2-libpng15.patch
Modified:
  slim/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   11 +++++++----
 slim-1.3.2-libpng15.patch |   11 +++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-27 01:31:15 UTC (rev 147686)
+++ PKGBUILD	2012-01-27 02:03:47 UTC (rev 147687)
@@ -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/'
@@ -22,7 +22,8 @@
         'restart.patch'
         'sigterm.patch'
         'session-name.patch'
-        'tty-slowness.patch')
+        'tty-slowness.patch'
+        'slim-1.3.2-libpng15.patch')
 sha1sums=('e421d5487732c8317f8f591906661e014b036358'
           '6fe0ba83509af634bce47be34e30995965bffc79'
           'a0e991ef0ac5120465a3be014a26e70ba073b6ae'
@@ -32,20 +33,22 @@
           '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435'
           '0b35048723c527fb824c5e0f9b9064f751871785'
           'fdd35562ce010babaeb793f92f9906fdcdaf3f9f'
-          '213fefe8533c845ea8c40585b6a8097820d5e5d2')
+          '213fefe8533c845ea8c40585b6a8097820d5e5d2'
+          '3cd674e548f4e0aadbbd32a67b4efd1ed263afef')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	sed -i -e 's/png12/png14/g' Makefile
+	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
 }

Added: slim-1.3.2-libpng15.patch
===================================================================
--- slim-1.3.2-libpng15.patch	                        (rev 0)
+++ slim-1.3.2-libpng15.patch	2012-01-27 02:03:47 UTC (rev 147687)
@@ -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);