From d7ebc8c36cc2dce7077bde774ea97fa2df06800e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 1 Mar 2015 09:46:21 +0100 Subject: [PATCH] xfdesktop: update to 4.12.0. --- .../patch-src_xfdesktop-file-icon-manager_c | 37 ------------------- srcpkgs/xfdesktop/template | 11 +++--- 2 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 srcpkgs/xfdesktop/patches/patch-src_xfdesktop-file-icon-manager_c diff --git a/srcpkgs/xfdesktop/patches/patch-src_xfdesktop-file-icon-manager_c b/srcpkgs/xfdesktop/patches/patch-src_xfdesktop-file-icon-manager_c deleted file mode 100644 index 2529e7f3eb6..00000000000 --- a/srcpkgs/xfdesktop/patches/patch-src_xfdesktop-file-icon-manager_c +++ /dev/null @@ -1,37 +0,0 @@ -$OpenBSD: patch-src_xfdesktop-file-icon-manager_c,v 1.1 2014/11/18 20:45:17 landry Exp $ - -http://git.xfce.org/xfce/xfdesktop/commit/?id=a4d701b2836724f101d319c11205fa03201134fb -https://bugzilla.xfce.org/show_bug.cgi?id=11306 - -Default application not respected with glib >= 2.41 - ---- src/xfdesktop-file-icon-manager.c.orig Sat Mar 2 17:37:34 2013 -+++ src/xfdesktop-file-icon-manager.c Tue Nov 18 21:39:57 2014 -@@ -1564,7 +1564,26 @@ xfdesktop_file_icon_manager_populate_context_menu(Xfce - - 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); diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template index 7b1b9b1c700..049ae7e66d0 100644 --- a/srcpkgs/xfdesktop/template +++ b/srcpkgs/xfdesktop/template @@ -1,16 +1,15 @@ # Template file for 'xfdesktop' pkgname=xfdesktop -version=4.10.3 -revision=2 +version=4.12.0 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel" -makedepends="xfconf-devel libxfce4ui-devel exo-devel gtk+-devel - libxfce4util-devel libnotify-devel libwnck2-devel garcon-devel - Thunar-devel dbus-glib-devel" +makedepends="libxfce4ui-devel>=4.12 exo-devel Thunar-devel garcon-devel + libnotify-devel libwnck2-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="Desktop manager for the XFce Desktop Environment" maintainer="Juan RP " license="GPL-2" homepage="http://xfce.org" distfiles="http://archive.xfce.org/src/xfce/xfdesktop/${version%.*}/$pkgname-$version.tar.bz2" -checksum=09ca2ba554d8b724b4bbb34b6fb3523de36b556efa4f28ecd802c9c5ba3272ce +checksum=6e7a8b87317762214b6407576f6e2c1efcc176c136b4c7b869d18a74c87b7fc7