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

[Evangelos Foutras]

    Date: Monday, October 6, 2014 @ 16:07:23
  Author: foutrelis
Revision: 120267

upgpkg: pcmanfm 1.2.2-3

Remove previous patch for glib >= 2.41; application order shouldn't
matter in this instance.

A patch will be added to libfm though, to properly detect the default
application in the File Properties dialog.

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

-------------------------------------------------------------+
 0001-Fix-Open-With-default-application-with-glib-2.41.patch |   56 ----------
 PKGBUILD                                                    |   13 --
 2 files changed, 3 insertions(+), 66 deletions(-)

Deleted: 0001-Fix-Open-With-default-application-with-glib-2.41.patch
===================================================================
--- 0001-Fix-Open-With-default-application-with-glib-2.41.patch	2014-10-06 14:05:32 UTC (rev 120266)
+++ 0001-Fix-Open-With-default-application-with-glib-2.41.patch	2014-10-06 14:07:23 UTC (rev 120267)
@@ -1,56 +0,0 @@
-From dffe9a095a788c879f5c8b4561516a5478361166 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
-Date: Mon, 6 Oct 2014 14:02:01 +0200
-Subject: [PATCH] Fix "Open With" default application with glib >= 2.41
-
----
- src/volume-manager.c | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/src/volume-manager.c b/src/volume-manager.c
-index 8df1b36..6dd4263 100644
---- a/src/volume-manager.c
-+++ b/src/volume-manager.c
-@@ -138,6 +138,30 @@ static void on_dlg_response(GtkDialog* dlg, int res, gpointer user_data)
-     pcmanfm_unref();
- }
- 
-+static GList * pcmanfm_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;
-+}
-+
- static void on_content_type_finished(GObject* src_obj, GAsyncResult* res, gpointer user_data)
- {
-     AutoRun* data = (AutoRun*)user_data;
-@@ -185,7 +209,7 @@ static void on_content_type_finished(GObject* src_obj, GAsyncResult* res, gpoint
- _do_types:
-             for(type=types;*type;++type)
-             {
--                l = g_app_info_get_all_for_type(*type);
-+                l = pcmanfm_g_app_info_get_all_for_type(*type);
-                 if(l)
-                     apps = g_list_concat(apps, l);
-             }
--- 
-2.1.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-06 14:05:32 UTC (rev 120266)
+++ PKGBUILD	2014-10-06 14:07:23 UTC (rev 120267)
@@ -7,7 +7,7 @@
 
 pkgname=pcmanfm
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Extremely fast and lightweight file manager'
 arch=('i686' 'x86_64')
 url='http://pcmanfm.sourceforge.net/'
@@ -18,16 +18,9 @@
 optdepends=('gvfs: for trash support, mounting with udisks and remote filesystems'
             'udisks: alternative for mounting volumes')
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz
-        0001-Fix-Open-With-default-application-with-glib-2.41.patch)
-md5sums=('ac0ba2f8e2b4d47014a62ccf43388e0f'
-         'a63df1e714980eb4300f0028aa99f654')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz)
+md5sums=('ac0ba2f8e2b4d47014a62ccf43388e0f')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../0001-Fix-Open-With-default-application-with-glib-2.41.patch
-}
-
 build() {
   cd $pkgname-$pkgver
   ./configure --sysconfdir=/etc --prefix=/usr