[arch-commits] Commit in thunar/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Mar 25 10:35:26 UTC 2015
Date: Wednesday, March 25, 2015 @ 11:35:26
Author: foutrelis
Revision: 234692
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
thunar/repos/extra-i686/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch
(from rev 234691, thunar/trunk/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch)
thunar/repos/extra-i686/PKGBUILD
(from rev 234691, thunar/trunk/PKGBUILD)
thunar/repos/extra-i686/thunar.install
(from rev 234691, thunar/trunk/thunar.install)
thunar/repos/extra-x86_64/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch
(from rev 234691, thunar/trunk/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch)
thunar/repos/extra-x86_64/PKGBUILD
(from rev 234691, thunar/trunk/PKGBUILD)
thunar/repos/extra-x86_64/thunar.install
(from rev 234691, thunar/trunk/thunar.install)
Deleted:
thunar/repos/extra-i686/PKGBUILD
thunar/repos/extra-i686/thunar.install
thunar/repos/extra-x86_64/PKGBUILD
thunar/repos/extra-x86_64/thunar.install
------------------------------------------------------------------------------+
/PKGBUILD | 128 ++++++++++
/thunar.install | 28 ++
extra-i686/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch | 27 ++
extra-i686/PKGBUILD | 55 ----
extra-i686/thunar.install | 14 -
extra-x86_64/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch | 27 ++
extra-x86_64/PKGBUILD | 55 ----
extra-x86_64/thunar.install | 14 -
8 files changed, 210 insertions(+), 138 deletions(-)
Copied: thunar/repos/extra-i686/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch (from rev 234691, thunar/trunk/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch)
===================================================================
--- extra-i686/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch (rev 0)
+++ extra-i686/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch 2015-03-25 10:35:26 UTC (rev 234692)
@@ -0,0 +1,27 @@
+From cdfdb7290abb270f5f98c93089c3b6e3c35859bc Mon Sep 17 00:00:00 2001
+From: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
+Date: Sun, 22 Feb 2015 23:34:45 +0100
+Subject: [PATCH] Fallback to non-cached version of source file (bug #9142)
+
+---
+ thunar/thunar-file.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
+index 9b5aa9b..9dedf47 100644
+--- a/thunar/thunar-file.c
++++ b/thunar/thunar-file.c
+@@ -1978,6 +1978,10 @@ thunar_file_accepts_drop (ThunarFile *file,
+ /* determine the cached version of the source file */
+ ofile = thunar_file_cache_lookup (lp->data);
+
++ /* fallback to non-cached version */
++ if (ofile == NULL)
++ ofile = thunar_file_get (lp->data, NULL);
++
+ /* we have only move if we know the source and both the source and the target
+ * are on the same disk, and the source file is owned by the current user.
+ */
+--
+2.3.4
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-03-25 10:35:07 UTC (rev 234691)
+++ extra-i686/PKGBUILD 2015-03-25 10:35:26 UTC (rev 234692)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
-
-pkgname=thunar
-pkgver=1.6.6
-pkgrel=1
-pkgdesc="Modern file manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://thunar.xfce.org"
-license=('GPL2' 'LGPL2.1')
-groups=('xfce4')
-depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify'
- 'udev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
-makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
-optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
- 'xfce4-panel: for trash applet'
- 'tumbler: for thumbnail previews'
- 'thunar-volman: manages removable devices'
- 'thunar-archive-plugin: create and deflate archives'
- 'thunar-media-tags-plugin: view/edit id3/ogg tags')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
-sha256sums=('b9a55104b18ae01c5190d7ea02cbd7ba56d7affed9df416bf7fec6dff2d889b2')
-
-build() {
- cd "$srcdir/Thunar-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-gio-unix \
- --enable-dbus \
- --enable-startup-notification \
- --enable-gudev \
- --enable-notifications \
- --enable-exif \
- --enable-pcre \
- --enable-gtk-doc \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/Thunar-$pkgver"
-
- make DESTDIR=${pkgdir} install
- sed -i 's:x-directory/gnome-default-handler;::' \
- "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar/repos/extra-i686/PKGBUILD (from rev 234691, thunar/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-03-25 10:35:26 UTC (rev 234692)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
+
+pkgname=thunar
+pkgver=1.6.6
+pkgrel=2
+pkgdesc="Modern file manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://thunar.xfce.org"
+license=('GPL2' 'LGPL2.1')
+groups=('xfce4')
+depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify'
+ 'udev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
+optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
+ 'xfce4-panel: for trash applet'
+ 'tumbler: for thumbnail previews'
+ 'thunar-volman: manages removable devices'
+ 'thunar-archive-plugin: create and deflate archives'
+ 'thunar-media-tags-plugin: view/edit id3/ogg tags')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2
+ 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch)
+sha256sums=('b9a55104b18ae01c5190d7ea02cbd7ba56d7affed9df416bf7fec6dff2d889b2'
+ 'a4e26ff5debb4e8324e26ea62a2897f5c63f5e11376cd35bea2950714039fa4f')
+
+prepare() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=9142
+ patch -Np1 -i ../0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch
+}
+
+build() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-gio-unix \
+ --enable-dbus \
+ --enable-startup-notification \
+ --enable-gudev \
+ --enable-notifications \
+ --enable-exif \
+ --enable-pcre \
+ --enable-gtk-doc \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ make DESTDIR=${pkgdir} install
+ sed -i 's:x-directory/gnome-default-handler;::' \
+ "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/thunar.install
===================================================================
--- extra-i686/thunar.install 2015-03-25 10:35:07 UTC (rev 234691)
+++ extra-i686/thunar.install 2015-03-25 10:35:26 UTC (rev 234692)
@@ -1,14 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar/repos/extra-i686/thunar.install (from rev 234691, thunar/trunk/thunar.install)
===================================================================
--- extra-i686/thunar.install (rev 0)
+++ extra-i686/thunar.install 2015-03-25 10:35:26 UTC (rev 234692)
@@ -0,0 +1,14 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: thunar/repos/extra-x86_64/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch (from rev 234691, thunar/trunk/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch)
===================================================================
--- extra-x86_64/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch (rev 0)
+++ extra-x86_64/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch 2015-03-25 10:35:26 UTC (rev 234692)
@@ -0,0 +1,27 @@
+From cdfdb7290abb270f5f98c93089c3b6e3c35859bc Mon Sep 17 00:00:00 2001
+From: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
+Date: Sun, 22 Feb 2015 23:34:45 +0100
+Subject: [PATCH] Fallback to non-cached version of source file (bug #9142)
+
+---
+ thunar/thunar-file.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
+index 9b5aa9b..9dedf47 100644
+--- a/thunar/thunar-file.c
++++ b/thunar/thunar-file.c
+@@ -1978,6 +1978,10 @@ thunar_file_accepts_drop (ThunarFile *file,
+ /* determine the cached version of the source file */
+ ofile = thunar_file_cache_lookup (lp->data);
+
++ /* fallback to non-cached version */
++ if (ofile == NULL)
++ ofile = thunar_file_get (lp->data, NULL);
++
+ /* we have only move if we know the source and both the source and the target
+ * are on the same disk, and the source file is owned by the current user.
+ */
+--
+2.3.4
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-03-25 10:35:07 UTC (rev 234691)
+++ extra-x86_64/PKGBUILD 2015-03-25 10:35:26 UTC (rev 234692)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
-
-pkgname=thunar
-pkgver=1.6.6
-pkgrel=1
-pkgdesc="Modern file manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://thunar.xfce.org"
-license=('GPL2' 'LGPL2.1')
-groups=('xfce4')
-depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify'
- 'udev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
-makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
-optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
- 'xfce4-panel: for trash applet'
- 'tumbler: for thumbnail previews'
- 'thunar-volman: manages removable devices'
- 'thunar-archive-plugin: create and deflate archives'
- 'thunar-media-tags-plugin: view/edit id3/ogg tags')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
-sha256sums=('b9a55104b18ae01c5190d7ea02cbd7ba56d7affed9df416bf7fec6dff2d889b2')
-
-build() {
- cd "$srcdir/Thunar-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-gio-unix \
- --enable-dbus \
- --enable-startup-notification \
- --enable-gudev \
- --enable-notifications \
- --enable-exif \
- --enable-pcre \
- --enable-gtk-doc \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/Thunar-$pkgver"
-
- make DESTDIR=${pkgdir} install
- sed -i 's:x-directory/gnome-default-handler;::' \
- "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar/repos/extra-x86_64/PKGBUILD (from rev 234691, thunar/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-03-25 10:35:26 UTC (rev 234692)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
+
+pkgname=thunar
+pkgver=1.6.6
+pkgrel=2
+pkgdesc="Modern file manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://thunar.xfce.org"
+license=('GPL2' 'LGPL2.1')
+groups=('xfce4')
+depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify'
+ 'udev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
+optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
+ 'xfce4-panel: for trash applet'
+ 'tumbler: for thumbnail previews'
+ 'thunar-volman: manages removable devices'
+ 'thunar-archive-plugin: create and deflate archives'
+ 'thunar-media-tags-plugin: view/edit id3/ogg tags')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2
+ 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch)
+sha256sums=('b9a55104b18ae01c5190d7ea02cbd7ba56d7affed9df416bf7fec6dff2d889b2'
+ 'a4e26ff5debb4e8324e26ea62a2897f5c63f5e11376cd35bea2950714039fa4f')
+
+prepare() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=9142
+ patch -Np1 -i ../0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch
+}
+
+build() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-gio-unix \
+ --enable-dbus \
+ --enable-startup-notification \
+ --enable-gudev \
+ --enable-notifications \
+ --enable-exif \
+ --enable-pcre \
+ --enable-gtk-doc \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ make DESTDIR=${pkgdir} install
+ sed -i 's:x-directory/gnome-default-handler;::' \
+ "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/thunar.install
===================================================================
--- extra-x86_64/thunar.install 2015-03-25 10:35:07 UTC (rev 234691)
+++ extra-x86_64/thunar.install 2015-03-25 10:35:26 UTC (rev 234692)
@@ -1,14 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar/repos/extra-x86_64/thunar.install (from rev 234691, thunar/trunk/thunar.install)
===================================================================
--- extra-x86_64/thunar.install (rev 0)
+++ extra-x86_64/thunar.install 2015-03-25 10:35:26 UTC (rev 234692)
@@ -0,0 +1,14 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list