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

[Evangelos Foutras]

    Date: Tuesday, May 5, 2015 @ 20:07:13
  Author: foutrelis
Revision: 238512

upgpkg: thunar 1.6.8-1

New upstream release.

Modified:
  thunar/trunk/PKGBUILD
Deleted:
  thunar/trunk/0001-Do-not-perform-the-complete-folder-reload-in-idle-bu.patch
  thunar/trunk/0001-Update-F5-binding-for-new-ThunarWindow-reload-signal.patch

-----------------------------------------------------------------+
 0001-Do-not-perform-the-complete-folder-reload-in-idle-bu.patch |   31 ----------
 0001-Update-F5-binding-for-new-ThunarWindow-reload-signal.patch |   29 ---------
 PKGBUILD                                                        |   18 +----
 3 files changed, 4 insertions(+), 74 deletions(-)

Deleted: 0001-Do-not-perform-the-complete-folder-reload-in-idle-bu.patch
===================================================================
--- 0001-Do-not-perform-the-complete-folder-reload-in-idle-bu.patch	2015-05-05 17:40:41 UTC (rev 238511)
+++ 0001-Do-not-perform-the-complete-folder-reload-in-idle-bu.patch	2015-05-05 18:07:13 UTC (rev 238512)
@@ -1,31 +0,0 @@
-From ea00375c7d041105033678d5515b651a34e1804d Mon Sep 17 00:00:00 2001
-From: Harald Judt <h.judt at gmx.at>
-Date: Thu, 23 Apr 2015 21:41:45 +0200
-Subject: [PATCH] Do not perform the complete folder reload in idle (bug
- #11849)
-
-This can cause an infinite loop as described in the bug report.
----
- thunar/thunar-folder.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c
-index 9e6fc17..2d70f52 100644
---- a/thunar/thunar-folder.c
-+++ b/thunar/thunar-folder.c
-@@ -551,10 +551,10 @@ thunar_folder_finished (ExoJob       *job,
-   if (folder->reload_info)
-     {
-       for (lp = folder->files; lp != NULL; lp = lp->next)
--        thunar_file_reload_idle (lp->data);
-+        thunar_file_reload (lp->data);
- 
-       /* reload folder information too */
--      thunar_file_reload_idle (folder->corresponding_file);
-+      thunar_file_reload (folder->corresponding_file);
- 
-       folder->reload_info = FALSE;
-     }
--- 
-2.3.6
-

Deleted: 0001-Update-F5-binding-for-new-ThunarWindow-reload-signal.patch
===================================================================
--- 0001-Update-F5-binding-for-new-ThunarWindow-reload-signal.patch	2015-05-05 17:40:41 UTC (rev 238511)
+++ 0001-Update-F5-binding-for-new-ThunarWindow-reload-signal.patch	2015-05-05 18:07:13 UTC (rev 238512)
@@ -1,29 +0,0 @@
-From fa3d7d32ec8b1614d4fc4afe733112b29c5c7593 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Mon, 27 Apr 2015 11:55:12 +0300
-Subject: [PATCH] Update F5 binding for new ThunarWindow::reload signal
-
-In commit b839b29d6dfa57aab9c3cec97eca7624a483a45e (Extend reload
-functions to allow a full reload) an extra parameter was added to
-reload functions that specifies whether file information should be
-reloaded as well.
----
- thunar/thunar-window.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
-index bc51b5e..e8b8b9d 100644
---- a/thunar/thunar-window.c
-+++ b/thunar/thunar-window.c
-@@ -623,7 +623,7 @@ thunar_window_class_init (ThunarWindowClass *klass)
-   /* setup the key bindings for the windows */
-   binding_set = gtk_binding_set_by_class (klass);
-   gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0, "back", 0);
--  gtk_binding_entry_add_signal (binding_set, GDK_F5, 0, "reload", 0);
-+  gtk_binding_entry_add_signal (binding_set, GDK_F5, 0, "reload", 1, G_TYPE_BOOLEAN, TRUE);
-   gtk_binding_entry_add_signal (binding_set, GDK_F9, 0, "toggle-sidepane", 0);
-   gtk_binding_entry_add_signal (binding_set, GDK_F10, 0, "toggle-menubar", 0);
-   gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, GDK_CONTROL_MASK, "zoom-in", 0);
--- 
-2.3.6
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-05 17:40:41 UTC (rev 238511)
+++ PKGBUILD	2015-05-05 18:07:13 UTC (rev 238512)
@@ -3,8 +3,8 @@
 # Contributor: Andrew Simmons <andrew.simmons at gmail.com>
 
 pkgname=thunar
-pkgver=1.6.7
-pkgrel=2
+pkgver=1.6.8
+pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://thunar.xfce.org"
@@ -20,21 +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-Do-not-perform-the-complete-folder-reload-in-idle-bu.patch
-        0001-Update-F5-binding-for-new-ThunarWindow-reload-signal.patch)
-sha256sums=('e35f05d5413ffd26bfe866f47b1d199045e3b42912da47c831d3689e12336ee5'
-            '08b0c01412b00c5d9011c8c3d03d436e57484538800179990e5742d49da2e43b'
-            '5b7d66872b4bab7ee4ef6ef439280f7b2bbef83190f2a8f624713065f2038a49')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
+sha256sums=('4079ccffe990cdccee48a0ae200d8a5bc9335c34721d7923b375795940cf79bb')
 
 prepare() {
   cd "$srcdir/Thunar-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=11849
-  patch -Np1 -i ../0001-Do-not-perform-the-complete-folder-reload-in-idle-bu.patch
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=11859
-  patch -Np1 -i ../0001-Update-F5-binding-for-new-ThunarWindow-reload-signal.patch
 }
 
 build() {