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

[Evangelos Foutras]

    Date: Sunday, March 1, 2015 @ 08:23:11
  Author: foutrelis
Revision: 232159

upgpkg: xfdesktop 4.12.0-1

New upstream release.

Modified:
  xfdesktop/trunk/PKGBUILD
Deleted:
  xfdesktop/trunk/0001-Default-application-not-respected-with-glib-2.41-Bug.patch

-----------------------------------------------------------------+
 0001-Default-application-not-respected-with-glib-2.41-Bug.patch |   50 ----------
 PKGBUILD                                                        |   17 ---
 2 files changed, 4 insertions(+), 63 deletions(-)

Deleted: 0001-Default-application-not-respected-with-glib-2.41-Bug.patch
===================================================================
--- 0001-Default-application-not-respected-with-glib-2.41-Bug.patch	2015-03-01 07:19:30 UTC (rev 232158)
+++ 0001-Default-application-not-respected-with-glib-2.41-Bug.patch	2015-03-01 07:23:11 UTC (rev 232159)
@@ -1,50 +0,0 @@
-From a4d701b2836724f101d319c11205fa03201134fb Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel at gmail.com>
-Date: Sun, 16 Nov 2014 16:35:26 +0300
-Subject: [PATCH] Default application not respected with glib >= 2.41 (Bug
- #11306)
-
-Ensure xfdesktop's right click menu has the default
-application as the first element of the returned list. This is
-just a copy of Thunar's patch adapted for xfdesktop. See:
-https://bugzilla.xfce.org/show_bug.cgi?id=11212 and
-http://git.xfce.org/xfce/thunar/commit/?id=4b142af9dfe19f90ffe5529e2f099dc55298ecef
----
- src/xfdesktop-file-icon-manager.c | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
-index 3d02d51..ccfd91e 100644
---- a/src/xfdesktop-file-icon-manager.c
-+++ b/src/xfdesktop-file-icon-manager.c
-@@ -1539,7 +1539,26 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
-                 
-                 app_infos = g_app_info_get_all_for_type(g_file_info_get_content_type(info));
-                 if(app_infos) {
--                    GAppInfo *app_info = G_APP_INFO(app_infos->data);
-+                    GAppInfo *app_info, *default_application;
-+                    GList *ap;
-+
-+                    /* move any default application in front of the list */
-+                    default_application = g_app_info_get_default_for_type (g_file_info_get_content_type(info), FALSE);
-+                    if (G_LIKELY (default_application != NULL))
-+                    {
-+                        for (ap = app_infos; ap != NULL; ap = ap->next)
-+                        {
-+                            if (g_app_info_equal (ap->data, default_application))
-+                            {
-+                                g_object_unref (ap->data);
-+                                app_infos = g_list_delete_link (app_infos, ap);
-+                                break;
-+                            }
-+                        }
-+                        app_infos = g_list_prepend (app_infos, default_application);
-+                    }
-+
-+                    app_info = G_APP_INFO(app_infos->data);
-                     
-                     mi = xfdesktop_menu_item_from_app_info(fmanager, file_icon,
-                                                            app_info, TRUE, TRUE);
--- 
-2.1.3
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-01 07:19:30 UTC (rev 232158)
+++ PKGBUILD	2015-03-01 07:23:11 UTC (rev 232159)
@@ -3,8 +3,8 @@
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfdesktop
-pkgver=4.10.3
-pkgrel=2
+pkgver=4.12.0
+pkgrel=1
 pkgdesc="A desktop manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -15,18 +15,9 @@
 conflicts=('xfce4-menueditor')
 replaces=('xfce4-menueditor')
 install=xfdesktop.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        0001-Default-application-not-respected-with-glib-2.41-Bug.patch)
-sha256sums=('09ca2ba554d8b724b4bbb34b6fb3523de36b556efa4f28ecd802c9c5ba3272ce'
-            '0dc0be760c2e36f50c42fd58bbbc8b0a6e3feedcfcb303db333b35459e4d1c59')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('6e7a8b87317762214b6407576f6e2c1efcc176c136b4c7b869d18a74c87b7fc7')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=11306
-  patch -Np1 -i ../0001-Default-application-not-respected-with-glib-2.41-Bug.patch
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"