From acbeaafd5878a45ffd2869201e3cbbb28c5ae4a9 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Tue, 27 Apr 2010 16:13:22 +0200
Subject: maj thunar#1.0.1-3, ajout patch

---
 xfce/thunar/.md5sum          |  1 +
 xfce/thunar/Pkgfile          |  7 ++++---
 xfce/thunar/libpng-1.4.patch | 12 ++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 xfce/thunar/libpng-1.4.patch

(limited to 'xfce')

diff --git a/xfce/thunar/.md5sum b/xfce/thunar/.md5sum
index 3fecd715b..85e6a8db0 100644
--- a/xfce/thunar/.md5sum
+++ b/xfce/thunar/.md5sum
@@ -1,2 +1,3 @@
 218373aa45d74b6ba8c69c4d5af3bb19  Thunar-1.0.1.tar.bz2
+ee998c20ba13d0cb18741da8b7d67328  libpng-1.4.patch
 5fdeb9aae2885fbe1a19b3d6fff58ab1  thunar-volman-handle-unmountable-volumes.patch
diff --git a/xfce/thunar/Pkgfile b/xfce/thunar/Pkgfile
index 2517aa83e..2518740fb 100755
--- a/xfce/thunar/Pkgfile
+++ b/xfce/thunar/Pkgfile
@@ -1,18 +1,19 @@
 # Description: Gestionnaire de fichiers pour Xfce
 # URL: http://thunar.xfce.org
 # Maintainer: NuTyX core team
-# Packager: fred.galusik at gmail.com
+# Packager: thierryn1 at hispeed dot ch
 # Depends on: exo, dbus, desktop-file-utils, freetype, gamin, gconf, gtk, hal, libexif, libjpeg, libpng, librsvg, xfce4-panel, libxfce4util, pcre, shared-mime-info, startup-notification, xfconf
 
 name=thunar
 version=1.0.1
-release=2
+release=3
 source=(http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-$version.tar.bz2 \
-thunar-volman-handle-unmountable-volumes.patch)
+thunar-volman-handle-unmountable-volumes.patch libpng-1.4.patch)
 
 build() {
 cd Thunar-$version
 patch -p1 < ../thunar-volman-handle-unmountable-volumes.patch
+patch -Np1 -i ../libpng-1.4.patch
 	./configure --prefix=/usr\
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/xfce4 \
diff --git a/xfce/thunar/libpng-1.4.patch b/xfce/thunar/libpng-1.4.patch
new file mode 100644
index 000000000..7f38165f7
--- /dev/null
+++ b/xfce/thunar/libpng-1.4.patch
@@ -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;
-- 
cgit v1.2.3-70-g09d2