libjpeg/libpng rebuild.

PKGBUILD

@@ -3,19 +3,26 @@
 
 pkgname=dillo
 pkgver=2.1.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A small, fast graphical web browser built on FLTK"
 arch=(i686 x86_64)
 url="http://www.dillo.org"
 license=('GPL')
-depends=('fltk2' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' 'libxi' 'libxinerama')
+depends=('fltk2' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor'
+         'libxi' 'libxinerama')
 backup=(etc/dillo/{dillorc,dpidrc})
-source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('93f674f2a42d90a1cdb88a6972325954')
+source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2
+        libpng14.patch)
+md5sums=('93f674f2a42d90a1cdb88a6972325954'
+         '5336bd3a3b4698c5250ce59e4f2ff91a')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui --enable-ssl
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/libpng14.patch" || return 1
+
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui \
+              --enable-ssl
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR="$pkgdir" install
 }

libpng14.patch

+diff -upr dillo-2.1.1.orig/src/png.c dillo-2.1.1/src/png.c
+--- dillo-2.1.1.orig/src/png.c	2010-01-23 04:09:50.000000000 +0200
++++ dillo-2.1.1/src/png.c	2010-01-23 04:12:34.000000000 +0200
+@@ -345,7 +345,7 @@ static void Png_write(DilloPng *png, voi
+             return;            /* need MORE data */
+          }
+          /* check the image signature - DON'T update ipbufstart! */
+-         if (!png_check_sig(png->ipbuf, DATASIZE)) {
++         if (png_sig_cmp(png->ipbuf, 0, DATASIZE)) {
+             /* you lied to me about it being a PNG image */
+             MSG_WARN("\"%s\" is not a PNG file.\n", URL_STR(png->url));
+             png->state = IS_finished;