[arch-commits] Commit in thunar/repos (6 files)
Evangelos Foutras
foutrelis at archlinux.org
Fri Jun 30 23:32:42 UTC 2017
Date: Friday, June 30, 2017 @ 23:32:41
Author: foutrelis
Revision: 299447
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
thunar/repos/extra-i686/PKGBUILD
(from rev 299446, thunar/trunk/PKGBUILD)
thunar/repos/extra-x86_64/PKGBUILD
(from rev 299446, thunar/trunk/PKGBUILD)
Deleted:
thunar/repos/extra-i686/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch
thunar/repos/extra-i686/PKGBUILD
thunar/repos/extra-x86_64/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch
thunar/repos/extra-x86_64/PKGBUILD
------------------------------------------------------------------------------+
/PKGBUILD | 92 ++++++++++
extra-i686/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch | 43 ----
extra-i686/PKGBUILD | 55 -----
extra-x86_64/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch | 43 ----
extra-x86_64/PKGBUILD | 55 -----
5 files changed, 92 insertions(+), 196 deletions(-)
Deleted: extra-i686/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch
===================================================================
--- extra-i686/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch 2017-06-30 23:32:06 UTC (rev 299446)
+++ extra-i686/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch 2017-06-30 23:32:41 UTC (rev 299447)
@@ -1,43 +0,0 @@
-From 4dd549db77838c9345f10a72f10e705f8ae327d4 Mon Sep 17 00:00:00 2001
-From: Viktor Odintsev <zakhams at gmail.com>
-Date: Thu, 13 Apr 2017 01:15:53 +0300
-Subject: [PATCH] Fix deadlock in mutex causing Thunar to hang (Bug #13481)
-
-file_rename_mutex could remain locked due to the return statement
-in function thunar_file_monitor.
----
- thunar/thunar-file.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
-index c7aae58a..53bebbcd 100644
---- a/thunar/thunar-file.c
-+++ b/thunar/thunar-file.c
-@@ -827,16 +827,16 @@ thunar_file_monitor (GFileMonitor *monitor,
- else
- other_file = thunar_file_get (other_path, NULL);
-
-- if (other_file == NULL)
-- return;
--
-- /* notify the thumbnail cache that we can now also move the thumbnail */
-- thunar_file_move_thumbnail_cache_file (event_path, other_path);
-+ if (other_file != NULL)
-+ {
-+ /* notify the thumbnail cache that we can now also move the thumbnail */
-+ thunar_file_move_thumbnail_cache_file (event_path, other_path);
-
-- /* reload the containing target folder */
-- thunar_file_reload_parent (other_file);
-+ /* reload the containing target folder */
-+ thunar_file_reload_parent (other_file);
-
-- g_object_unref (other_file);
-+ g_object_unref (other_file);
-+ }
-
- G_UNLOCK (file_rename_mutex);
- }
---
-2.12.2
-
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-06-30 23:32:06 UTC (rev 299446)
+++ extra-i686/PKGBUILD 2017-06-30 23:32:41 UTC (rev 299447)
@@ -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.11
-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'
- 'libgudev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
-makedepends=('intltool' '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')
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2
- 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch)
-sha256sums=('b1c7c3121827f59610900ef1cc19aa10a50ab2cc3ae38eee15181b64256e8b42'
- '8b3bc7c848d8beedaecfea84169eecaee4019cca68b85eae4786b2d59f6889d2')
-
-prepare() {
- cd "$srcdir/Thunar-$pkgver"
-
- # https://bugzilla.xfce.org/show_bug.cgi?id=13481
- patch -Np1 -i ../0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch
-}
-
-build() {
- cd "$srcdir/Thunar-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-gio-unix \
- --enable-dbus \
- --enable-gudev \
- --enable-notifications \
- --enable-exif \
- --enable-pcre \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/Thunar-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar/repos/extra-i686/PKGBUILD (from rev 299446, thunar/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-06-30 23:32:41 UTC (rev 299447)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
+
+pkgname=thunar
+pkgver=1.6.12
+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'
+ 'libgudev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+makedepends=('intltool' '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')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
+sha256sums=('fb22091f07ec6de2c9d9d89c61289d2bc3436b36c8c53ccbc9c32ca8a99f2086')
+
+build() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-gio-unix \
+ --enable-dbus \
+ --enable-gudev \
+ --enable-notifications \
+ --enable-exif \
+ --enable-pcre \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/Thunar-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch
===================================================================
--- extra-x86_64/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch 2017-06-30 23:32:06 UTC (rev 299446)
+++ extra-x86_64/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch 2017-06-30 23:32:41 UTC (rev 299447)
@@ -1,43 +0,0 @@
-From 4dd549db77838c9345f10a72f10e705f8ae327d4 Mon Sep 17 00:00:00 2001
-From: Viktor Odintsev <zakhams at gmail.com>
-Date: Thu, 13 Apr 2017 01:15:53 +0300
-Subject: [PATCH] Fix deadlock in mutex causing Thunar to hang (Bug #13481)
-
-file_rename_mutex could remain locked due to the return statement
-in function thunar_file_monitor.
----
- thunar/thunar-file.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
-index c7aae58a..53bebbcd 100644
---- a/thunar/thunar-file.c
-+++ b/thunar/thunar-file.c
-@@ -827,16 +827,16 @@ thunar_file_monitor (GFileMonitor *monitor,
- else
- other_file = thunar_file_get (other_path, NULL);
-
-- if (other_file == NULL)
-- return;
--
-- /* notify the thumbnail cache that we can now also move the thumbnail */
-- thunar_file_move_thumbnail_cache_file (event_path, other_path);
-+ if (other_file != NULL)
-+ {
-+ /* notify the thumbnail cache that we can now also move the thumbnail */
-+ thunar_file_move_thumbnail_cache_file (event_path, other_path);
-
-- /* reload the containing target folder */
-- thunar_file_reload_parent (other_file);
-+ /* reload the containing target folder */
-+ thunar_file_reload_parent (other_file);
-
-- g_object_unref (other_file);
-+ g_object_unref (other_file);
-+ }
-
- G_UNLOCK (file_rename_mutex);
- }
---
-2.12.2
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-06-30 23:32:06 UTC (rev 299446)
+++ extra-x86_64/PKGBUILD 2017-06-30 23:32:41 UTC (rev 299447)
@@ -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.11
-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'
- 'libgudev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
-makedepends=('intltool' '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')
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2
- 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch)
-sha256sums=('b1c7c3121827f59610900ef1cc19aa10a50ab2cc3ae38eee15181b64256e8b42'
- '8b3bc7c848d8beedaecfea84169eecaee4019cca68b85eae4786b2d59f6889d2')
-
-prepare() {
- cd "$srcdir/Thunar-$pkgver"
-
- # https://bugzilla.xfce.org/show_bug.cgi?id=13481
- patch -Np1 -i ../0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch
-}
-
-build() {
- cd "$srcdir/Thunar-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-gio-unix \
- --enable-dbus \
- --enable-gudev \
- --enable-notifications \
- --enable-exif \
- --enable-pcre \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/Thunar-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar/repos/extra-x86_64/PKGBUILD (from rev 299446, thunar/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-06-30 23:32:41 UTC (rev 299447)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
+
+pkgname=thunar
+pkgver=1.6.12
+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'
+ 'libgudev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+makedepends=('intltool' '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')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
+sha256sums=('fb22091f07ec6de2c9d9d89c61289d2bc3436b36c8c53ccbc9c32ca8a99f2086')
+
+build() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-gio-unix \
+ --enable-dbus \
+ --enable-gudev \
+ --enable-notifications \
+ --enable-exif \
+ --enable-pcre \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/Thunar-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list