[arch-commits] Commit in thunar/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Saturday, May 22, 2010 @ 10:19:16
  Author: andyrtr
Revision: 80836

upgpkg: thunar 1.0.2-1
new version 1.0.2; remove unneeded patches

Modified:
  thunar/trunk/PKGBUILD
Deleted:
  thunar/trunk/libpng-1.4.patch
  thunar/trunk/thunar-vfs-fix-umask.patch

----------------------------+
 PKGBUILD                   |   22 +++++++---------------
 libpng-1.4.patch           |   12 ------------
 thunar-vfs-fix-umask.patch |   11 -----------
 3 files changed, 7 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-22 13:46:12 UTC (rev 80835)
+++ PKGBUILD	2010-05-22 14:19:16 UTC (rev 80836)
@@ -3,33 +3,25 @@
 # Contributor: Andrew Simmons <andrew.simmons at gmail.com>
 
 pkgname=thunar
-pkgver=1.0.1
-pkgrel=6
+pkgver=1.0.2
+pkgrel=1
 pkgdesc="new modern file manager for Xfce"
 arch=(i686 x86_64)
 license=('GPL2' 'LGPL2.1')
 url="http://thunar.xfce.org"
 groups=('xfce4')
-depends=('desktop-file-utils' 'libexif>=0.6.17' 'hicolor-icon-theme' 'fam' \
-         'gtk2' 'exo' 'libxfce4util' 'hal' 'libpng' 'libjpeg>=7' 'startup-notification')
-makedepends=('intltool' 'pkgconfig' 'xfce4-panel>=4.6.1')
+depends=('desktop-file-utils' 'libexif>=0.6.19' 'hicolor-icon-theme' 'fam' \
+         'gtk2' 'exo>=0.3.107' 'libxfce4util>=4.6.2' 'hal>=0.5.14' 'libpng' 'libjpeg>=8.0.1' 'startup-notification')
+makedepends=('intltool' 'pkgconfig' 'xfce4-panel>=4.6.4')
 optdepends=('gamin:   a fam replacement to make thunar monitor changes to files on the fly'
             'xfce4-panel: for trash applet')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://www.xfce.org/archive/src/xfce/thunar/1.0/Thunar-${pkgver}.tar.bz2
-	thunar-vfs-fix-umask.patch libpng-1.4.patch)
-md5sums=('218373aa45d74b6ba8c69c4d5af3bb19' '7247041fd2c411e4a129d3f90350893c'\
-         'ee998c20ba13d0cb18741da8b7d67328')
-sha1sums=('2fcd3a7b0e27b01f059dffc8ffdac94e2b2aa064' '47526f997627264813843cf466c5ee9335047458'\
-         '99f520655582acb5bffbee72bf0bc37aef37bc69')
+source=(http://archive.xfce.org/src/xfce/${pkgname}/1.0/Thunar-${pkgver}.tar.bz2)
+md5sums=('c91073202d373a1f9951a1240083c36d')
 
 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
-  
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --disable-static \
     --disable-gnome-thumbnailers --enable-exif --enable-pcre

Deleted: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch	2010-05-22 13:46:12 UTC (rev 80835)
+++ libpng-1.4.patch	2010-05-22 14:19:16 UTC (rev 80836)
@@ -1,12 +0,0 @@
-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;

Deleted: thunar-vfs-fix-umask.patch
===================================================================
--- thunar-vfs-fix-umask.patch	2010-05-22 13:46:12 UTC (rev 80835)
+++ thunar-vfs-fix-umask.patch	2010-05-22 14:19:16 UTC (rev 80836)
@@ -1,11 +0,0 @@
---- thunar-vfs/thunar-vfs-io-jobs.c.orig	2009-05-19 18:44:00.000000000 +0100
-+++ thunar-vfs/thunar-vfs-io-jobs.c	2009-05-19 18:46:04.000000000 +0100
-@@ -708,7 +708,7 @@
-       _thunar_vfs_job_process_path (job, lp);
- 
-       /* try to create the target directory */
--      if (!_thunar_vfs_io_ops_mkdir (lp->data, 0777 & ~umask(0), THUNAR_VFS_IO_OPS_NONE, error))
-+      if (!_thunar_vfs_io_ops_mkdir (lp->data, 0777, THUNAR_VFS_IO_OPS_NONE, error))
-         return FALSE;
-     }
-