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

Evangelos Foutras foutrelis at archlinux.org
Fri Oct 3 04:32:49 UTC 2014


    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 <evangelos at 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
===================================================================
--- PKGBUILD	2014-10-02 22:35:30 UTC (rev 223792)
+++ PKGBUILD	2014-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')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
-sha256sums=('9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d')
+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'
+            '3af91403bb9ccb6844df5062bb3f6f8a54698a1ebf504234c44f5a3bc269941d')
 
+prepare() {
+  cd "$srcdir/Thunar-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=11212
+  patch -Np1 -i ../0001-Fix-Open-With-default-app-with-glib-2.41.patch
+}
+
 build() {
   cd "$srcdir/Thunar-$pkgver"
 



More information about the arch-commits mailing list