[arch-commits] Commit in thunar/trunk (PKGBUILD libpng-1.4.patch)

Eric Bélanger eric at archlinux.org
Thu Jan 21 03:03:04 UTC 2010


    Date: Wednesday, January 20, 2010 @ 22:03:04
  Author: eric
Revision: 64536

upgpkg: thunar 1.0.1-5
    Rebuilt for libpng 1.4 and libjpeg 8

Added:
  thunar/trunk/libpng-1.4.patch
Modified:
  thunar/trunk/PKGBUILD

------------------+
 PKGBUILD         |   11 +++++++----
 libpng-1.4.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-21 02:17:17 UTC (rev 64535)
+++ PKGBUILD	2010-01-21 03:03:04 UTC (rev 64536)
@@ -4,7 +4,7 @@
 
 pkgname=thunar
 pkgver=1.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="new modern file manager for Xfce"
 arch=(i686 x86_64)
 license=('GPL2' 'LGPL2')
@@ -18,12 +18,15 @@
 options=('!libtool')
 install=${pkgname}.install
 source=(http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-${pkgver}.tar.bz2
-	thunar-vfs-fix-umask.patch)
-md5sums=('218373aa45d74b6ba8c69c4d5af3bb19'
-         '7247041fd2c411e4a129d3f90350893c')
+	thunar-vfs-fix-umask.patch libpng-1.4.patch)
+md5sums=('218373aa45d74b6ba8c69c4d5af3bb19' '7247041fd2c411e4a129d3f90350893c'\
+         'ee998c20ba13d0cb18741da8b7d67328')
+sha1sums=('2fcd3a7b0e27b01f059dffc8ffdac94e2b2aa064' '47526f997627264813843cf466c5ee9335047458'\
+         '99f520655582acb5bffbee72bf0bc37aef37bc69')
 
 build() {
   cd ${srcdir}/Thunar-${pkgver}
+  patch -p1 < ../libpng-1.4.patch || return 1
   # http://bugs.archlinux.org/task/15460
   patch -Np0 -i ${srcdir}/thunar-vfs-fix-umask.patch || return 1
   

Added: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch	                        (rev 0)
+++ libpng-1.4.patch	2010-01-21 03:03:04 UTC (rev 64536)
@@ -0,0 +1,12 @@
+diff -Naur Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c
+--- Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c	2010-01-20 21:31:35.000000000 -0500
++++ Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c	2010-01-20 21:34:51.000000000 -0500
+@@ -1169,7 +1169,7 @@
+     goto done0;
+ 
+   /* verify the png signature */
+-  if (G_LIKELY (png_check_sig ((png_bytep) signature, sizeof (signature))))
++  if (G_LIKELY (!png_sig_cmp ((png_bytep) signature, 0, sizeof (signature))))
+     rewind (fp);
+   else
+     goto done0;




More information about the arch-commits mailing list