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

2019-07-19 Thread Evangelos Foutras via arch-commits 
Date: Friday, July 19, 2019 @ 23:22:52
  Author: foutrelis
Revision: 358405

upgpkg: thunar 1.8.8-1

New upstream release.

Modified:
  thunar/trunk/PKGBUILD
Deleted:
  thunar/trunk/bz15352-revert-deactivate-move-to-trash.patch

---+
 PKGBUILD  |   11 +---
 bz15352-revert-deactivate-move-to-trash.patch |   60 
 2 files changed, 3 insertions(+), 68 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-19 23:12:15 UTC (rev 358404)
+++ PKGBUILD2019-07-19 23:22:52 UTC (rev 358405)
@@ -2,7 +2,7 @@
 # Contributor: Andrew Simmons 
 
 pkgname=thunar
-pkgver=1.8.7
+pkgver=1.8.8
 pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('x86_64')
@@ -18,16 +18,11 @@
 'thunar-volman: manages removable devices'
 'thunar-archive-plugin: create and deflate archives'
 'thunar-media-tags-plugin: view/edit id3/ogg tags')
-source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2
-bz15352-revert-deactivate-move-to-trash.patch)
-sha256sums=('3e033af06751beee23e73cf16cbd97513d3c0adf358d8a42158af38a44b9d329'
-'c531416c79bb7b196e649e36f032d7e257eeff0e7e455dcefc7c174268c24345')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
+sha256sums=('a03761de4a43c36b9daa6029e6e3263a23c8ce429d78a9f9156ab48efdb2800c')
 
 prepare() {
   cd "$srcdir/Thunar-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=15352#c12
-  patch -Np1 -i ../bz15352-revert-deactivate-move-to-trash.patch
 }
 
 build() {

Deleted: bz15352-revert-deactivate-move-to-trash.patch
===
--- bz15352-revert-deactivate-move-to-trash.patch   2019-07-19 23:12:15 UTC 
(rev 358404)
+++ bz15352-revert-deactivate-move-to-trash.patch   2019-07-19 23:22:52 UTC 
(rev 358405)
@@ -1,60 +0,0 @@
-From 67708919154038c9f161389009167d04a7ee0be4 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras 
-Date: Sat, 29 Jun 2019 17:10:36 +0300
-Subject: [PATCH] Revert "Deactivate "Move to Trash" menu entry on volumes
- without trash (Bug #15352)"
-
-This reverts commit efcbf4d59a8bdd4d8197c92b857eead676ce2100.
-
-That commit makes it impossible to remove files using WebDAV.

- thunar/thunar-standard-view.c | 10 ++
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
-index 111d..6fd92d72 100644
 a/thunar/thunar-standard-view.c
-+++ b/thunar/thunar-standard-view.c
-@@ -4438,7 +4438,6 @@ thunar_standard_view_selection_changed 
(ThunarStandardView *standard_view)
-   ThunarFile *current_directory;
-   gbooleancan_paste_into_folder;
-   gbooleanrestorable;
--  gbooleantrashable;
-   gbooleanpastable;
-   gbooleanwritable;
-   gbooleantrashed;
-@@ -4462,7 +4461,6 @@ thunar_standard_view_selection_changed 
(ThunarStandardView *standard_view)
-   /* determine the new list of selected files (replacing GtkTreePath's with 
ThunarFile's) */
-   selected_files = (*THUNAR_STANDARD_VIEW_GET_CLASS 
(standard_view)->get_selected_items) (standard_view);
-   restorable = (selected_files != NULL);
--  trashable = (selected_files != NULL);
-   for (lp = selected_files; lp != NULL; lp = lp->next, ++n_selected_files)
- {
-   /* determine the iterator for the path */
-@@ -4477,16 +4475,12 @@ thunar_standard_view_selection_changed 
(ThunarStandardView *standard_view)
-   /* enable "Restore" if we have only trashed files (atleast one file) */
-   if (!thunar_file_is_trashed (lp->data))
- restorable = FALSE;
--
--  /* enable "Move to Trash" if files can be trashed */
--  if (!thunar_file_can_be_trashed (lp->data))
--trashable = FALSE;
- }
- 
-   /* and setup the new selected files list */
-   standard_view->priv->selected_files = selected_files;
- 
--  /* check whether the folder displayed by the view is writable/in the 
trash/can be trashed */
-+  /* check whether the folder displayed by the view is writable/in the trash 
*/
-   current_directory = thunar_navigator_get_current_directory 
(THUNAR_NAVIGATOR (standard_view));
-   writable = (current_directory != NULL && thunar_file_is_writable 
(current_directory));
-   trashed = (current_directory != NULL && thunar_file_is_trashed 
(current_directory));
-@@ -4535,7 +4529,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
- 
-   /* update the "Move to Trash" action */
-   g_object_set (G_OBJECT (standard_view->priv->action_move_to_trash),
--"sensitive", (n_selected_files > 0) && trashable,
-+"sensitive", (n_selected_files > 0) && writable,
- "visible", !trashed && thunar_g_vfs_is_uri_scheme_supported 
("trash"),
- "tooltip", ngettext ("Move the selected file to the Trash",
-

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

2019-05-23 Thread Evangelos Foutras via arch-commits 
Date: Friday, May 24, 2019 @ 04:00:12
  Author: foutrelis
Revision: 353928

upgpkg: thunar 1.8.6-2

Revert commit which breaks copying to Samba and WebDAV shares (FS#62705).

Added:
  thunar/trunk/bz14718-check-destination-writable.patch
Modified:
  thunar/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 bz14718-check-destination-writable.patch |   45 +
 2 files changed, 53 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-23 19:59:57 UTC (rev 353927)
+++ PKGBUILD2019-05-24 04:00:12 UTC (rev 353928)
@@ -3,7 +3,7 @@
 
 pkgname=thunar
 pkgver=1.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern file manager for Xfce"
 arch=('x86_64')
 url="https://docs.xfce.org/xfce/thunar/start;
@@ -18,11 +18,16 @@
 'thunar-volman: manages removable devices'
 'thunar-archive-plugin: create and deflate archives'
 'thunar-media-tags-plugin: view/edit id3/ogg tags')
-source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
-sha256sums=('c0e5fb828e3d036941dfeb7ed7f9f2b17b729fc044c2bf7c4218c1c91b38ef2a')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2
+bz14718-check-destination-writable.patch)
+sha256sums=('c0e5fb828e3d036941dfeb7ed7f9f2b17b729fc044c2bf7c4218c1c91b38ef2a'
+'0ce17a449f8b853828a660389b06037ee9317c3d295b4ff184b196c72bf30f79')
 
 prepare() {
   cd "$srcdir/Thunar-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=15367
+  patch -Rp1 -i ../bz14718-check-destination-writable.patch
 }
 
 build() {

Added: bz14718-check-destination-writable.patch
===
--- bz14718-check-destination-writable.patch(rev 0)
+++ bz14718-check-destination-writable.patch2019-05-24 04:00:12 UTC (rev 
353928)
@@ -0,0 +1,45 @@
+From d4cc7e6fc0a39a0d554375c7530df7a20802e354 Mon Sep 17 00:00:00 2001
+From: Andre Miranda 
+Date: Fri, 5 Apr 2019 23:16:52 -0300
+Subject: [PATCH] Correctly check if destination is writable (Bug #14718)
+
+---
+ thunar/thunar-transfer-job.c | 23 +--
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/thunar/thunar-transfer-job.c b/thunar/thunar-transfer-job.c
+index 570f28a2..47fa3bfc 100644
+--- a/thunar/thunar-transfer-job.c
 b/thunar/thunar-transfer-job.c
+@@ -827,14 +827,25 @@ thunar_transfer_job_verify_destination 
(ThunarTransferJob  *transfer_job,
+ }
+ }
+ 
+-  if (succeed && g_file_info_get_attribute_boolean (filesystem_info, 
G_FILE_ATTRIBUTE_FILESYSTEM_READONLY))
++  if (succeed)
+ {
+-  g_set_error (error, G_IO_ERROR, G_IO_ERROR_READ_ONLY,
+-   _("Error while copying to \"%s\": The destination is 
read-only"),
+-   dest_name);
++  dest_info = g_file_query_info (dest, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, 
0,
++ exo_job_get_cancellable (EXO_JOB 
(transfer_job)),
++ NULL);
+ 
+-  /* meh */
+-  succeed = FALSE;
++  if (dest_info != NULL)
++{
++  if (!g_file_info_get_attribute_boolean (dest_info, 
G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE))
++{
++  g_set_error (error, G_IO_ERROR, G_IO_ERROR_READ_ONLY,
++   _("Error while copying to \"%s\": The destination 
is read-only"),
++   dest_name);
++
++  succeed = FALSE;
++}
++
++  g_object_unref (G_OBJECT (dest_info));
++}
+ }
+ 
+   g_object_unref (filesystem_info);

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

2018-06-13 Thread Evangelos Foutras via arch-commits 
Date: Thursday, June 14, 2018 @ 02:28:19
  Author: foutrelis
Revision: 326916

upgpkg: thunar 1.8.1-1

New upstream release.

Modified:
  thunar/trunk/PKGBUILD
Deleted:
  thunar/trunk/replace-gtk_widget_reparent-with-xfce_widget_reparent.patch

-+
 PKGBUILD|   12 --
 replace-gtk_widget_reparent-with-xfce_widget_reparent.patch |   58 --
 2 files changed, 3 insertions(+), 67 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-14 00:50:44 UTC (rev 326915)
+++ PKGBUILD2018-06-14 02:28:19 UTC (rev 326916)
@@ -3,7 +3,7 @@
 # Contributor: Andrew Simmons 
 
 pkgname=thunar
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('x86_64')
@@ -19,17 +19,11 @@
 'thunar-volman: manages removable devices'
 'thunar-archive-plugin: create and deflate archives'
 'thunar-media-tags-plugin: view/edit id3/ogg tags')
-source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2
-replace-gtk_widget_reparent-with-xfce_widget_reparent.patch)
-sha256sums=('acf151bceedb20aed45a6da61d7bb85a4a03964090c80454e72e61e7fc9e49c7'
-'5560d21d09625b952796bc716712575f300d459dee5187afcd3798f178110643')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
+sha256sums=('96fabaa68db32f513e9bcb34fa2a26c1462127727fad0bc25a8a5ba9aab4c12c')
 
 prepare() {
   cd "$srcdir/Thunar-$pkgver"
-
-  # Allow building against libxfce4ui 4.12
-  patch -Rp1 -F3 -i 
../replace-gtk_widget_reparent-with-xfce_widget_reparent.patch
-  xdt-autogen
 }
 
 build() {

Deleted: replace-gtk_widget_reparent-with-xfce_widget_reparent.patch
===
--- replace-gtk_widget_reparent-with-xfce_widget_reparent.patch 2018-06-14 
00:50:44 UTC (rev 326915)
+++ replace-gtk_widget_reparent-with-xfce_widget_reparent.patch 2018-06-14 
02:28:19 UTC (rev 326916)
@@ -1,58 +0,0 @@
-From fbb87f2f1b779182a8802e091ff4fb1175b47326 Mon Sep 17 00:00:00 2001
-From: Andre Miranda 
-Date: Sun, 14 Jan 2018 16:25:26 -0300
-Subject: Replace gtk_widget_reparent with xfce_widget_reparent
-
-Requires libxfce4ui >=4.13.2

- configure.ac | 2 +-
- thunar/thunar-progress-dialog.c | 6 --
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9bc80ce..c2d6a80 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -153,7 +153,7 @@ XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.30.0])
- XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0])
- XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
--XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.13.2])
- XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0])
- 
- dnl **
-diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
-index 1a87a38..8ecee40 100644
 a/thunar/thunar-progress-dialog.c
-+++ b/thunar/thunar-progress-dialog.c
-@@ -24,6 +24,8 @@
- 
- #include 
- 
-+#include 
-+
- #include 
- #include 
- #include 
-@@ -253,7 +255,7 @@ thunar_progress_dialog_job_finished (ThunarProgressDialog 
*dialog,
-   if (n_views == SCROLLVIEW_THRESHOLD-1)
- {
-   /* reparent the content box */
--  gtk_widget_reparent (dialog->content_box, dialog->vbox);
-+  xfce_widget_reparent (dialog->content_box, dialog->vbox);
- 
-   /* destroy the scroll win */
-   gtk_widget_destroy (dialog->scrollwin);
-@@ -366,7 +368,7 @@ thunar_progress_dialog_add_job (ThunarProgressDialog 
*dialog,
-   gtk_widget_show (viewport);
- 
-   /* move the content box into the viewport */
--  gtk_widget_reparent (dialog->content_box, viewport);
-+  xfce_widget_reparent (dialog->content_box, viewport);
- }
- 
-   g_signal_connect_swapped (view, "need-attention",
--- 
-cgit v1.1
-

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

2018-06-06 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, June 6, 2018 @ 22:52:49
  Author: foutrelis
Revision: 326095

upgpkg: thunar 1.8.0-1

New upstream release.

Added:
  thunar/trunk/replace-gtk_widget_reparent-with-xfce_widget_reparent.patch
Modified:
  thunar/trunk/PKGBUILD

-+
 PKGBUILD|   21 ++-
 replace-gtk_widget_reparent-with-xfce_widget_reparent.patch |   58 ++
 2 files changed, 73 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-06 21:55:42 UTC (rev 326094)
+++ PKGBUILD2018-06-06 22:52:49 UTC (rev 326095)
@@ -3,7 +3,7 @@
 # Contributor: Andrew Simmons 
 
 pkgname=thunar
-pkgver=1.6.15
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('x86_64')
@@ -11,8 +11,8 @@
 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')
+ 'libgudev' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+makedepends=('intltool' 'xfce4-panel' 'xfce4-dev-tools')
 optdepends=('gvfs: for trash support, mounting with udisk and remote 
filesystems'
 'xfce4-panel: for trash applet'
 'tumbler: for thumbnail previews'
@@ -19,9 +19,19 @@
 'thunar-volman: manages removable devices'
 'thunar-archive-plugin: create and deflate archives'
 'thunar-media-tags-plugin: view/edit id3/ogg tags')
-source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
-sha256sums=('e81291a8519f495e0a059ff1f2d29608bc6d37c0be83b1f38f3c9aa25f8d252d')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2
+replace-gtk_widget_reparent-with-xfce_widget_reparent.patch)
+sha256sums=('acf151bceedb20aed45a6da61d7bb85a4a03964090c80454e72e61e7fc9e49c7'
+'5560d21d09625b952796bc716712575f300d459dee5187afcd3798f178110643')
 
+prepare() {
+  cd "$srcdir/Thunar-$pkgver"
+
+  # Allow building against libxfce4ui 4.12
+  patch -Rp1 -F3 -i 
../replace-gtk_widget_reparent-with-xfce_widget_reparent.patch
+  xdt-autogen
+}
+
 build() {
   cd "$srcdir/Thunar-$pkgver"
 
@@ -29,7 +39,6 @@
 --prefix=/usr \
 --sysconfdir=/etc \
 --enable-gio-unix \
---enable-dbus \
 --enable-gudev \
 --enable-notifications \
 --enable-exif \

Added: replace-gtk_widget_reparent-with-xfce_widget_reparent.patch
===
--- replace-gtk_widget_reparent-with-xfce_widget_reparent.patch 
(rev 0)
+++ replace-gtk_widget_reparent-with-xfce_widget_reparent.patch 2018-06-06 
22:52:49 UTC (rev 326095)
@@ -0,0 +1,58 @@
+From fbb87f2f1b779182a8802e091ff4fb1175b47326 Mon Sep 17 00:00:00 2001
+From: Andre Miranda 
+Date: Sun, 14 Jan 2018 16:25:26 -0300
+Subject: Replace gtk_widget_reparent with xfce_widget_reparent
+
+Requires libxfce4ui >=4.13.2
+---
+ configure.ac | 2 +-
+ thunar/thunar-progress-dialog.c | 6 --
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9bc80ce..c2d6a80 100644
+--- a/configure.ac
 b/configure.ac
+@@ -153,7 +153,7 @@ XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.30.0])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0])
+ XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
+-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.13.2])
+ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0])
+ 
+ dnl **
+diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
+index 1a87a38..8ecee40 100644
+--- a/thunar/thunar-progress-dialog.c
 b/thunar/thunar-progress-dialog.c
+@@ -24,6 +24,8 @@
+ 
+ #include 
+ 
++#include 
++
+ #include 
+ #include 
+ #include 
+@@ -253,7 +255,7 @@ thunar_progress_dialog_job_finished (ThunarProgressDialog 
*dialog,
+   if (n_views == SCROLLVIEW_THRESHOLD-1)
+ {
+   /* reparent the content box */
+-  gtk_widget_reparent (dialog->content_box, dialog->vbox);
++  xfce_widget_reparent (dialog->content_box, dialog->vbox);
+ 
+   /* destroy the scroll win */
+   gtk_widget_destroy (dialog->scrollwin);
+@@ -366,7 +368,7 @@ thunar_progress_dialog_add_job (ThunarProgressDialog 
*dialog,
+   gtk_widget_show (viewport);
+ 
+   /* move the content box into the viewport */
+-  gtk_widget_reparent (dialog->content_box, viewport);
++  xfce_widget_reparent (dialog->content_box, viewport);
+ }
+ 
+   g_signal_connect_swapped (view, "need-attention",
+-- 
+cgit v1.1
+

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

2017-06-30 Thread Evangelos Foutras 
Date: Friday, June 30, 2017 @ 23:32:06
  Author: foutrelis
Revision: 299446

upgpkg: thunar 1.6.12-1

New upstream release.

Modified:
  thunar/trunk/PKGBUILD
Deleted:
  thunar/trunk/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch

-+
 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch |   43 
--
 PKGBUILD|   17 ---
 2 files changed, 4 insertions(+), 56 deletions(-)

Deleted: 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch
===
--- 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch 
2017-06-30 22:01:34 UTC (rev 299445)
+++ 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch 
2017-06-30 23:32:06 UTC (rev 299446)
@@ -1,43 +0,0 @@
-From 4dd549db77838c9345f10a72f10e705f8ae327d4 Mon Sep 17 00:00:00 2001
-From: Viktor Odintsev 
-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
-

Modified: PKGBUILD
===
--- PKGBUILD2017-06-30 22:01:34 UTC (rev 299445)
+++ PKGBUILD2017-06-30 23:32:06 UTC (rev 299446)
@@ -3,8 +3,8 @@
 # Contributor: Andrew Simmons 
 
 pkgname=thunar
-pkgver=1.6.11
-pkgrel=2
+pkgver=1.6.12
+pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://thunar.xfce.org;
@@ -19,18 +19,9 @@
 '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')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
+sha256sums=('fb22091f07ec6de2c9d9d89c61289d2bc3436b36c8c53ccbc9c32ca8a99f2086')
 
-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"

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

2017-05-01 Thread Evangelos Foutras 
Date: Monday, May 1, 2017 @ 15:45:43
  Author: foutrelis
Revision: 295131

upgpkg: thunar 1.6.11-2

Fix mutex deadlock (FS#53712).

Added:
  thunar/trunk/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch
Modified:
  thunar/trunk/PKGBUILD

-+
 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch |   43 
++
 PKGBUILD|   11 +-
 2 files changed, 51 insertions(+), 3 deletions(-)

Added: 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch
===
--- 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch 
(rev 0)
+++ 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch 
2017-05-01 15:45:43 UTC (rev 295131)
@@ -0,0 +1,43 @@
+From 4dd549db77838c9345f10a72f10e705f8ae327d4 Mon Sep 17 00:00:00 2001
+From: Viktor Odintsev 
+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
+

Modified: PKGBUILD
===
--- PKGBUILD2017-05-01 07:00:08 UTC (rev 295130)
+++ PKGBUILD2017-05-01 15:45:43 UTC (rev 295131)
@@ -4,7 +4,7 @@
 
 pkgname=thunar
 pkgver=1.6.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://thunar.xfce.org;
@@ -19,11 +19,16 @@
 '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=('b1c7c3121827f59610900ef1cc19aa10a50ab2cc3ae38eee15181b64256e8b42')
+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() {

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

2015-04-20 Thread Evangelos Foutras 
Date: Monday, April 20, 2015 @ 20:11:59
  Author: foutrelis
Revision: 237796

upgpkg: thunar 1.6.7-1

New upstream release.

Modified:
  thunar/trunk/PKGBUILD
Deleted:
  thunar/trunk/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch

-+
 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch |   27 
--
 PKGBUILD|   13 +---
 2 files changed, 4 insertions(+), 36 deletions(-)

Deleted: 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch
===
--- 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch 
2015-04-20 18:10:45 UTC (rev 237795)
+++ 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch 
2015-04-20 18:11:59 UTC (rev 237796)
@@ -1,27 +0,0 @@
-From cdfdb7290abb270f5f98c93089c3b6e3c35859bc Mon Sep 17 00:00:00 2001
-From: Thaddaeus Tintenfisch thad.fi...@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
-

Modified: PKGBUILD
===
--- PKGBUILD2015-04-20 18:10:45 UTC (rev 237795)
+++ PKGBUILD2015-04-20 18:11:59 UTC (rev 237796)
@@ -3,8 +3,8 @@
 # Contributor: Andrew Simmons andrew.simm...@gmail.com
 
 pkgname=thunar
-pkgver=1.6.6
-pkgrel=2
+pkgver=1.6.7
+pkgrel=1
 pkgdesc=Modern file manager for Xfce
 arch=('i686' 'x86_64')
 url=http://thunar.xfce.org;
@@ -20,16 +20,11 @@
 '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')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
+sha256sums=('e35f05d5413ffd26bfe866f47b1d199045e3b42912da47c831d3689e12336ee5')
 
 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() {

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

2015-03-25 Thread Evangelos Foutras 
Date: Wednesday, March 25, 2015 @ 11:35:07
  Author: foutrelis
Revision: 234691

upgpkg: thunar 1.6.6-2

Fix drag and drop from the desktop to be a move operation (FS#44328).

Added:
  thunar/trunk/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch
Modified:
  thunar/trunk/PKGBUILD

-+
 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch |   27 
++
 PKGBUILD|   15 -
 2 files changed, 39 insertions(+), 3 deletions(-)

Added: 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch
===
--- 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch 
(rev 0)
+++ 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch 
2015-03-25 10:35:07 UTC (rev 234691)
@@ -0,0 +1,27 @@
+From cdfdb7290abb270f5f98c93089c3b6e3c35859bc Mon Sep 17 00:00:00 2001
+From: Thaddaeus Tintenfisch thad.fi...@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
+

Modified: PKGBUILD
===
--- PKGBUILD2015-03-25 09:58:11 UTC (rev 234690)
+++ PKGBUILD2015-03-25 10:35:07 UTC (rev 234691)
@@ -4,7 +4,7 @@
 
 pkgname=thunar
 pkgver=1.6.6
-pkgrel=1
+pkgrel=2
 pkgdesc=Modern file manager for Xfce
 arch=('i686' 'x86_64')
 url=http://thunar.xfce.org;
@@ -20,9 +20,18 @@
 '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')
+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

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

2015-01-04 Thread Evangelos Foutras 
Date: Sunday, January 4, 2015 @ 20:12:13
  Author: foutrelis
Revision: 228426

upgpkg: thunar 1.6.4-1

New upstream release.

Modified:
  thunar/trunk/PKGBUILD
Deleted:
  thunar/trunk/0001-Fix-Open-With-default-app-with-glib-2.41.patch

-+
 0001-Fix-Open-With-default-app-with-glib-2.41.patch |   88 --
 PKGBUILD|   17 ---
 2 files changed, 4 insertions(+), 101 deletions(-)

Deleted: 0001-Fix-Open-With-default-app-with-glib-2.41.patch
===
--- 0001-Fix-Open-With-default-app-with-glib-2.41.patch 2015-01-04 15:08:43 UTC 
(rev 228425)
+++ 0001-Fix-Open-With-default-app-with-glib-2.41.patch 2015-01-04 19:12:13 UTC 
(rev 228426)
@@ -1,88 +0,0 @@
-From 9fcfc59456976dc7cc296fd7451fd6bbffe151b6 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras evange...@foutrelis.com
-Date: Fri, 3 Oct 2014 06:59:54 +0300
-Subject: [PATCH] Fix Open With default app with glib = 2.41
-
-Beginning with glib = 2.41, g_app_info_get_all_for_type() no longer
-puts the default application in front of the list.
-
-This commit adds thunar_g_app_info_get_all_for_type() which imitates the
-old behavior of g_app_info_get_all_for_type() and moves the default
-application to the front of the list.
-
-https://bugzilla.xfce.org/show_bug.cgi?id=11212

- thunar/thunar-file.c   |  2 +-
- thunar/thunar-gio-extensions.c | 29 +
- thunar/thunar-gio-extensions.h |  2 ++
- 3 files changed, 32 insertions(+), 1 deletion(-)
-
-diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
-index c45cf81..ee2f467 100644
 a/thunar/thunar-file.c
-+++ b/thunar/thunar-file.c
-@@ -4017,7 +4017,7 @@ thunar_file_list_get_applications (GList *file_list)
- 
-   /* determine the list of applications that can open this file */
-   if (G_UNLIKELY (current_type != NULL))
--list = g_app_info_get_all_for_type (current_type);
-+list = thunar_g_app_info_get_all_for_type (current_type);
-   else
- list = NULL;
- 
-diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
-index 369c1f4..1c45443 100644
 a/thunar/thunar-gio-extensions.c
-+++ b/thunar/thunar-gio-extensions.c
-@@ -513,6 +513,35 @@ thunar_g_file_list_to_stringv (GList *list)
- 
- 
- 
-+GList *
-+thunar_g_app_info_get_all_for_type (const char *content_type)
-+{
-+  GList*infos, *info;
-+  GAppInfo *default_info;
-+
-+  infos = g_app_info_get_all_for_type (content_type);
-+  default_info = g_app_info_get_default_for_type (content_type, FALSE);
-+
-+  if (default_info == NULL)
-+return infos;
-+
-+  for (info = infos; info; info = info-next)
-+  {
-+if (g_app_info_equal (info-data, default_info))
-+{
-+  g_object_unref (info-data);
-+  infos = g_list_delete_link (infos, info);
-+  break;
-+}
-+  }
-+
-+  infos = g_list_prepend (infos, default_info);
-+
-+  return infos;
-+}
-+
-+
-+
- gboolean
- thunar_g_app_info_launch (GAppInfo  *info,
-   GFile *working_directory,
-diff --git a/thunar/thunar-gio-extensions.h b/thunar/thunar-gio-extensions.h
-index c19101e..b05c6cd 100644
 a/thunar/thunar-gio-extensions.h
-+++ b/thunar/thunar-gio-extensions.h
-@@ -76,6 +76,8 @@ gchar   **thunar_g_file_list_to_stringv (GList   
  *list);
- #define   thunar_g_file_list_copy   
thunarx_file_info_list_copy
- #define   thunar_g_file_list_free   
thunarx_file_info_list_free
- 
-+GList*thunar_g_app_info_get_all_for_type(const char 
*content_type);
-+
- gboolean  thunar_g_app_info_launch  (GAppInfo  *info,
-  GFile 
*working_directory,
-  GList 
*path_list,
--- 
-2.1.2
-

Modified: PKGBUILD
===
--- PKGBUILD2015-01-04 15:08:43 UTC (rev 228425)
+++ PKGBUILD2015-01-04 19:12:13 UTC (rev 228426)
@@ -3,8 +3,8 @@
 # Contributor: Andrew Simmons andrew.simm...@gmail.com
 
 pkgname=thunar
-pkgver=1.6.3
-pkgrel=2
+pkgver=1.6.4
+pkgrel=1
 pkgdesc=Modern file manager for Xfce
 arch=('i686' 'x86_64')
 url=http://thunar.xfce.org;
@@ -20,18 +20,9 @@
 '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/1.6/Thunar-$pkgver.tar.bz2
-0001-Fix-Open-With-default-app-with-glib-2.41.patch)
-sha256sums=('9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d'
-'bc584c21de2d25530fb8039ef6863be3884cd2012427a4a5ead23498238c3232')
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)

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

2014-10-02 Thread Evangelos Foutras 
Date: Friday, October 3, 2014 @ 06:32:49
  Author: foutrelis
Revision: 223793

upgpkg: thunar 1.6.3-2

- Fix Open With default app with glib = 2.41
- Fix FS#38465: Remove polkit-gnome from optdepends

Added:
  thunar/trunk/0001-Fix-Open-With-default-app-with-glib-2.41.patch
Modified:
  thunar/trunk/PKGBUILD

-+
 0001-Fix-Open-With-default-app-with-glib-2.41.patch |   88 ++
 PKGBUILD|   16 ++-
 2 files changed, 100 insertions(+), 4 deletions(-)

Added: 0001-Fix-Open-With-default-app-with-glib-2.41.patch
===
--- 0001-Fix-Open-With-default-app-with-glib-2.41.patch 
(rev 0)
+++ 0001-Fix-Open-With-default-app-with-glib-2.41.patch 2014-10-03 04:32:49 UTC 
(rev 223793)
@@ -0,0 +1,88 @@
+From fa0505341809837dec0dff7fbd7e197bd36d7e4f Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras evange...@foutrelis.com
+Date: Fri, 3 Oct 2014 06:59:54 +0300
+Subject: [PATCH] Fix Open With default app with glib = 2.41
+
+Beginning with glib = 2.41, g_app_info_get_all_for_type() no longer
+puts the default application in front of the list.
+
+This commit adds thunar_g_app_info_get_all_for_type() which imitates the
+old behavior of g_app_info_get_all_for_type() and moves the default
+application to the frond of the list.
+
+https://bugzilla.xfce.org/show_bug.cgi?id=11212
+---
+ thunar/thunar-file.c   |  2 +-
+ thunar/thunar-gio-extensions.c | 29 +
+ thunar/thunar-gio-extensions.h |  2 ++
+ 3 files changed, 32 insertions(+), 1 deletion(-)
+
+diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
+index c45cf81..ee2f467 100644
+--- a/thunar/thunar-file.c
 b/thunar/thunar-file.c
+@@ -4017,7 +4017,7 @@ thunar_file_list_get_applications (GList *file_list)
+ 
+   /* determine the list of applications that can open this file */
+   if (G_UNLIKELY (current_type != NULL))
+-list = g_app_info_get_all_for_type (current_type);
++list = thunar_g_app_info_get_all_for_type (current_type);
+   else
+ list = NULL;
+ 
+diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
+index 369c1f4..1c45443 100644
+--- a/thunar/thunar-gio-extensions.c
 b/thunar/thunar-gio-extensions.c
+@@ -513,6 +513,35 @@ thunar_g_file_list_to_stringv (GList *list)
+ 
+ 
+ 
++GList *
++thunar_g_app_info_get_all_for_type (const char *content_type)
++{
++  GList*infos, *info;
++  GAppInfo *default_info;
++
++  infos = g_app_info_get_all_for_type (content_type);
++  default_info = g_app_info_get_default_for_type (content_type, FALSE);
++
++  if (default_info == NULL)
++return infos;
++
++  for (info = infos; info; info = info-next)
++  {
++if (g_app_info_equal (info-data, default_info))
++{
++  g_object_unref (info-data);
++  infos = g_list_delete_link (infos, info);
++  break;
++}
++  }
++
++  infos = g_list_prepend (infos, default_info);
++
++  return infos;
++}
++
++
++
+ gboolean
+ thunar_g_app_info_launch (GAppInfo  *info,
+   GFile *working_directory,
+diff --git a/thunar/thunar-gio-extensions.h b/thunar/thunar-gio-extensions.h
+index c19101e..b05c6cd 100644
+--- a/thunar/thunar-gio-extensions.h
 b/thunar/thunar-gio-extensions.h
+@@ -76,6 +76,8 @@ gchar   **thunar_g_file_list_to_stringv (GList   
  *list);
+ #define   thunar_g_file_list_copy   
thunarx_file_info_list_copy
+ #define   thunar_g_file_list_free   
thunarx_file_info_list_free
+ 
++GList*thunar_g_app_info_get_all_for_type(const char 
*content_type);
++
+ gboolean  thunar_g_app_info_launch  (GAppInfo  *info,
+  GFile 
*working_directory,
+  GList 
*path_list,
+-- 
+2.1.2
+

Modified: PKGBUILD
===
--- PKGBUILD2014-10-02 22:35:30 UTC (rev 223792)
+++ PKGBUILD2014-10-03 04:32:49 UTC (rev 223793)
@@ -4,7 +4,7 @@
 
 pkgname=thunar
 pkgver=1.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc=Modern file manager for Xfce
 arch=('i686' 'x86_64')
 url=http://thunar.xfce.org;
@@ -14,7 +14,6 @@
  'udev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
 makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
 optdepends=('gvfs: for trash support, mounting with udisk and remote 
filesystems'
-'polkit-gnome: for mounting internal partitions (needs root 
password)'
 'xfce4-panel: for trash applet'
 'tumbler: for thumbnail previews'
 'thunar-volman: manages removable devices'
@@ -21,9 +20,18 @@
 'thunar-archive-plugin: create and deflate archives'
 'thunar-media-tags-plugin: view/edit id3/ogg tags')

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

2012-11-06 Thread Evangelos Foutras 
Date: Tuesday, November 6, 2012 @ 06:46:37
  Author: foutrelis
Revision: 170253

upgpkg: thunar 1.4.0-4

Remove workaround now that GVFS is patched for FS#32325: Duplicate entries for 
mounted volumes in file manager

Modified:
  thunar/trunk/PKGBUILD
Deleted:
  thunar/trunk/thunar-1.4.0-dont-add-duplicates-of-devices.patch

---+
 PKGBUILD  |8 --
 thunar-1.4.0-dont-add-duplicates-of-devices.patch |   59 
 2 files changed, 1 insertion(+), 66 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-06 11:45:54 UTC (rev 170252)
+++ PKGBUILD2012-11-06 11:46:37 UTC (rev 170253)
@@ -4,7 +4,7 @@
 
 pkgname=thunar
 pkgver=1.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc=Modern file manager for Xfce
 arch=('i686' 'x86_64')
 url=http://thunar.xfce.org;
@@ -23,19 +23,13 @@
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2
-thunar-1.4.0-dont-add-duplicates-of-devices.patch
 thunar-1.4.0-show-loop-devices-hack.patch)
 sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba'
-'c25f86a4c298c24327b0681702167aea9f9d712a738c8f3883f5d66da7f08f19'
 '185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e')
 
 build() {
   cd $srcdir/Thunar-$pkgver
 
-  # https://bugzilla.xfce.org/show_bug.cgi?id=9440
-  # Backport of http://git.xfce.org/xfce/thunar/commit/?id=70a4301
-  patch -Np1 -i $srcdir/thunar-1.4.0-dont-add-duplicates-of-devices.patch
-
   # Fix: Loop devices not appearing in Thunar side pane
   # https://bugs.archlinux.org/task/29894
   # https://bugzilla.xfce.org/show_bug.cgi?id=8947

Deleted: thunar-1.4.0-dont-add-duplicates-of-devices.patch
===
--- thunar-1.4.0-dont-add-duplicates-of-devices.patch   2012-11-06 11:45:54 UTC 
(rev 170252)
+++ thunar-1.4.0-dont-add-duplicates-of-devices.patch   2012-11-06 11:46:37 UTC 
(rev 170253)
@@ -1,59 +0,0 @@
-diff -uprb Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c 
Thunar-1.4.0/thunar/thunar-shortcuts-model.c
 Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c  2012-11-03 
07:42:39.0 +0200
-+++ Thunar-1.4.0/thunar/thunar-shortcuts-model.c   2012-11-03 
08:13:25.0 +0200
-@@ -1221,11 +1221,25 @@ thunar_shortcuts_model_volume_added (GVo
-  GVolume  *volume,
-  ThunarShortcutsModel *model)
- {
-+  GList *lp;
-+  gint  idx;
-+
-   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
-   _thunar_return_if_fail (model-volume_monitor == volume_monitor);
-   _thunar_return_if_fail (G_IS_VOLUME (volume));
-   _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- 
-+  /* check that the volume is not in the internal list already */
-+  if (g_list_find (model-hidden_volumes, volume) != NULL)
-+return;
-+
-+  /* nor in the list of visible volumes */
-+  for (idx = 0, lp = model-shortcuts; lp != NULL; ++idx, lp = lp-next)
-+{
-+  if (THUNAR_SHORTCUT (lp-data)-volume == volume)
-+return;
-+}
-+
-   /* place the volume on the hidden list */
-   model-hidden_volumes = g_list_prepend (model-hidden_volumes, g_object_ref 
(volume));
- 
-diff -uprb Thunar-1.4.0.orig/thunar/thunar-tree-model.c 
Thunar-1.4.0/thunar/thunar-tree-model.c
 Thunar-1.4.0.orig/thunar/thunar-tree-model.c   2012-11-03 
07:42:39.0 +0200
-+++ Thunar-1.4.0/thunar/thunar-tree-model.c2012-11-03 08:09:36.0 
+0200
-@@ -1127,11 +1127,26 @@ thunar_tree_model_volume_added (GVolumeM
- GVolume*volume,
- ThunarTreeModel*model)
- {
-+  ThunarTreeModelItem *item = NULL;
-+  GNode   *node;
-+
-   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
-   _thunar_return_if_fail (model-volume_monitor == volume_monitor);
-   _thunar_return_if_fail (G_IS_VOLUME (volume));
-   _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
- 
-+  /* check that the volume is not in the internal list already */
-+  if (g_list_find (model-hidden_volumes, volume) != NULL)
-+return;
-+
-+  /* nor in the list of visible volumes */
-+  for (node = model-root-children; node != NULL; node = node-next)
-+{
-+  item = THUNAR_TREE_MODEL_ITEM (node-data);
-+  if (item-volume == volume)
-+return;
-+}
-+
-   /* place the volume on the hidden list */
-   model-hidden_volumes = g_list_prepend (model-hidden_volumes, g_object_ref 
(volume));
-

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

2012-11-03 Thread Evangelos Foutras 
Date: Saturday, November 3, 2012 @ 02:32:00
  Author: foutrelis
Revision: 170121

upgpkg: thunar 1.4.0-3

Backport upstream fix for FS#32325: [gvfs] Duplicate entries for mounted 
volumes in file manager

Added:
  thunar/trunk/thunar-1.4.0-dont-add-duplicates-of-devices.patch
Modified:
  thunar/trunk/PKGBUILD

---+
 PKGBUILD  |8 ++
 thunar-1.4.0-dont-add-duplicates-of-devices.patch |   59 
 2 files changed, 66 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-03 05:44:49 UTC (rev 170120)
+++ PKGBUILD2012-11-03 06:32:00 UTC (rev 170121)
@@ -4,7 +4,7 @@
 
 pkgname=thunar
 pkgver=1.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc=Modern file manager for Xfce
 arch=('i686' 'x86_64')
 url=http://thunar.xfce.org;
@@ -23,13 +23,19 @@
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2
+thunar-1.4.0-dont-add-duplicates-of-devices.patch
 thunar-1.4.0-show-loop-devices-hack.patch)
 sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba'
+'c25f86a4c298c24327b0681702167aea9f9d712a738c8f3883f5d66da7f08f19'
 '185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e')
 
 build() {
   cd $srcdir/Thunar-$pkgver
 
+  # https://bugzilla.xfce.org/show_bug.cgi?id=9440
+  # Backport of http://git.xfce.org/xfce/thunar/commit/?id=70a4301
+  patch -Np1 -i $srcdir/thunar-1.4.0-dont-add-duplicates-of-devices.patch
+
   # Fix: Loop devices not appearing in Thunar side pane
   # https://bugs.archlinux.org/task/29894
   # https://bugzilla.xfce.org/show_bug.cgi?id=8947

Added: thunar-1.4.0-dont-add-duplicates-of-devices.patch
===
--- thunar-1.4.0-dont-add-duplicates-of-devices.patch   
(rev 0)
+++ thunar-1.4.0-dont-add-duplicates-of-devices.patch   2012-11-03 06:32:00 UTC 
(rev 170121)
@@ -0,0 +1,59 @@
+diff -uprb Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c 
Thunar-1.4.0/thunar/thunar-shortcuts-model.c
+--- Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c  2012-11-03 
07:42:39.0 +0200
 Thunar-1.4.0/thunar/thunar-shortcuts-model.c   2012-11-03 
08:13:25.0 +0200
+@@ -1221,11 +1221,25 @@ thunar_shortcuts_model_volume_added (GVo
+  GVolume  *volume,
+  ThunarShortcutsModel *model)
+ {
++  GList *lp;
++  gint  idx;
++
+   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
+   _thunar_return_if_fail (model-volume_monitor == volume_monitor);
+   _thunar_return_if_fail (G_IS_VOLUME (volume));
+   _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ 
++  /* check that the volume is not in the internal list already */
++  if (g_list_find (model-hidden_volumes, volume) != NULL)
++return;
++
++  /* nor in the list of visible volumes */
++  for (idx = 0, lp = model-shortcuts; lp != NULL; ++idx, lp = lp-next)
++{
++  if (THUNAR_SHORTCUT (lp-data)-volume == volume)
++return;
++}
++
+   /* place the volume on the hidden list */
+   model-hidden_volumes = g_list_prepend (model-hidden_volumes, g_object_ref 
(volume));
+ 
+diff -uprb Thunar-1.4.0.orig/thunar/thunar-tree-model.c 
Thunar-1.4.0/thunar/thunar-tree-model.c
+--- Thunar-1.4.0.orig/thunar/thunar-tree-model.c   2012-11-03 
07:42:39.0 +0200
 Thunar-1.4.0/thunar/thunar-tree-model.c2012-11-03 08:09:36.0 
+0200
+@@ -1127,11 +1127,26 @@ thunar_tree_model_volume_added (GVolumeM
+ GVolume*volume,
+ ThunarTreeModel*model)
+ {
++  ThunarTreeModelItem *item = NULL;
++  GNode   *node;
++
+   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
+   _thunar_return_if_fail (model-volume_monitor == volume_monitor);
+   _thunar_return_if_fail (G_IS_VOLUME (volume));
+   _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+ 
++  /* check that the volume is not in the internal list already */
++  if (g_list_find (model-hidden_volumes, volume) != NULL)
++return;
++
++  /* nor in the list of visible volumes */
++  for (node = model-root-children; node != NULL; node = node-next)
++{
++  item = THUNAR_TREE_MODEL_ITEM (node-data);
++  if (item-volume == volume)
++return;
++}
++
+   /* place the volume on the hidden list */
+   model-hidden_volumes = g_list_prepend (model-hidden_volumes, g_object_ref 
(volume));
+

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

2012-05-25 Thread Evangelos Foutras 
Date: Saturday, May 26, 2012 @ 00:29:43
  Author: foutrelis
Revision: 159693

upgpkg: thunar 1.4.0-2

Fix FS#29894: Loop devices not appearing in Thunar side pane.

Added:
  thunar/trunk/thunar-1.4.0-show-loop-devices-hack.patch
Modified:
  thunar/trunk/PKGBUILD

---+
 PKGBUILD  |   13 ++---
 thunar-1.4.0-show-loop-devices-hack.patch |   15 +++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-26 02:34:17 UTC (rev 159692)
+++ PKGBUILD2012-05-26 04:29:43 UTC (rev 159693)
@@ -4,7 +4,7 @@
 
 pkgname=thunar
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc=Modern file manager for Xfce
 arch=('i686' 'x86_64')
 url=http://thunar.xfce.org;
@@ -22,12 +22,19 @@
 'thunar-media-tags-plugin: view/edit id3/ogg tags')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2)
-sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba')
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2
+thunar-1.4.0-show-loop-devices-hack.patch)
+sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba'
+'185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e')
 
 build() {
   cd $srcdir/Thunar-$pkgver
 
+  # Fix: Loop devices not appearing in Thunar side pane
+  # https://bugs.archlinux.org/task/29894
+  # https://bugzilla.xfce.org/show_bug.cgi?id=8947
+  patch -Np1 -i $srcdir/thunar-1.4.0-show-loop-devices-hack.patch
+
   ./configure \
 --prefix=/usr \
 --sysconfdir=/etc \

Added: thunar-1.4.0-show-loop-devices-hack.patch
===
--- thunar-1.4.0-show-loop-devices-hack.patch   (rev 0)
+++ thunar-1.4.0-show-loop-devices-hack.patch   2012-05-26 04:29:43 UTC (rev 
159693)
@@ -0,0 +1,15 @@
+diff -upr Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c 
Thunar-1.4.0/thunar/thunar-gio-extensions.c
+--- Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c   2012-05-26 
07:03:39.0 +0300
 Thunar-1.4.0/thunar/thunar-gio-extensions.c2012-05-26 
07:05:06.0 +0300
+@@ -550,6 +550,11 @@ thunar_g_volume_is_present (GVolume *vol
+   has_media = g_drive_has_media (drive);
+   g_object_unref (drive);
+ }
++  else
++{
++  /* XXX: hack to show loop devices with gvfs 1.12 / udisks2 */
++  has_media = g_volume_can_mount (volume);
++}
+ 
+   mount = g_volume_get_mount (volume);
+   if (mount != NULL)