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

[Allan McRae]

    Date: Tuesday, July 14, 2009 @ 22:06:13
  Author: allan
Revision: 46270

Merged revisions 45465,46269 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/thunar/trunk

........
  r45465 | andyrtr | 2009-07-12 20:04:32 +1000 (Sun, 12 Jul 2009) | 2 lines
  
  upgpkg: thunar 1.0.1-3
      fix #15460
........
  r46269 | allan | 2009-07-15 12:05:11 +1000 (Wed, 15 Jul 2009) | 2 lines
  
  upgpkg: thunar 1.0.1-4
      re-rebuild for libjpeg (FS#15506), make xfce4-panel an optdep (FS#13697)
........

Added:
  thunar/repos/extra-i686/thunar-vfs-fix-umask.patch
    (from rev 46269, thunar/trunk/thunar-vfs-fix-umask.patch)
Modified:
  thunar/repos/extra-i686/	(properties)
  thunar/repos/extra-i686/PKGBUILD

----------------------------+
 PKGBUILD                   |   19 +++++++++++++------
 thunar-vfs-fix-umask.patch |   11 +++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)


Property changes on: thunar/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /thunar/trunk:1-43907
   + /thunar/trunk:1-46269

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-15 02:05:11 UTC (rev 46269)
+++ extra-i686/PKGBUILD	2009-07-15 02:06:13 UTC (rev 46270)
@@ -4,22 +4,29 @@
 
 pkgname=thunar
 pkgver=1.0.1
-pkgrel=2
+pkgrel=4
 pkgdesc="new modern file manager for Xfce"
 arch=(i686 x86_64)
 license=('GPL2' 'LGPL2')
 url="http://thunar.xfce.org"
 groups=('xfce4')
-depends=('desktop-file-utils' 'libexif>=0.6.17' 'xfce4-panel>=4.6.1' 'hicolor-icon-theme' 'fam')
-makedepends=('intltool' 'pkgconfig')
-optdepends=('gamin:   a fam replacement to make thunar monitor changes to files on the fly')
+depends=('desktop-file-utils' 'libexif>=0.6.17' 'hicolor-icon-theme' 'fam' \
+         'glib2' 'exo' 'libxfce4util' 'hal' 'libpng' 'libjpeg>=7')
+makedepends=('intltool' 'pkgconfig' 'xfce4-panel>=4.6.1')
+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/xfce-4.6.1/src/Thunar-${pkgver}.tar.bz2)
-md5sums=('218373aa45d74b6ba8c69c4d5af3bb19')
+source=(http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-${pkgver}.tar.bz2
+	thunar-vfs-fix-umask.patch)
+md5sums=('218373aa45d74b6ba8c69c4d5af3bb19'
+         '7247041fd2c411e4a129d3f90350893c')
 
 build() {
   cd ${srcdir}/Thunar-${pkgver}
+  # 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

Copied: thunar/repos/extra-i686/thunar-vfs-fix-umask.patch (from rev 46269, thunar/trunk/thunar-vfs-fix-umask.patch)
===================================================================
--- extra-i686/thunar-vfs-fix-umask.patch	                        (rev 0)
+++ extra-i686/thunar-vfs-fix-umask.patch	2009-07-15 02:06:13 UTC (rev 46270)
@@ -0,0 +1,11 @@
+--- 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;
+     }
+