[packages/xfdesktop] - up to 4.13.4
baggins
baggins at pld-linux.org
Sun Jun 9 22:12:14 CEST 2019
commit 40886110a42252dd65a2673f173ca7000cf5788c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jun 9 22:11:50 2019 +0200
- up to 4.13.4
thunarx-3.patch | 131 --------------------------------------------------------
xfdesktop.spec | 8 ++--
2 files changed, 3 insertions(+), 136 deletions(-)
---
diff --git a/xfdesktop.spec b/xfdesktop.spec
index 3ee14ae..2e0f5f3 100644
--- a/xfdesktop.spec
+++ b/xfdesktop.spec
@@ -1,14 +1,13 @@
Summary: Desktop manager for the Xfce Desktop Environment
Summary(pl.UTF-8): Zarządca pulpitu dla środowiska Xfce
Name: xfdesktop
-Version: 4.13.1
+Version: 4.13.4
Release: 1
License: GPL v2+
Group: X11/Applications
Source0: http://archive.xfce.org/src/xfce/xfdesktop/4.13/%{name}-%{version}.tar.bz2
-# Source0-md5: 9e7d04e79053cf9ec077f55425f234c6
+# Source0-md5: d1174af12148141a07b62cc051c43c84
URL: http://www.xfce.org/projects/xfdesktop
-Patch0: thunarx-3.patch
BuildRequires: Thunar-devel >= 1.8.0
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.8
@@ -51,8 +50,6 @@ xfdesktop zawiera zarządcę pulpitu dla środowiska Xfce.
%prep
%setup -q
-%patch0 -p1
-
%build
%configure \
@@ -75,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT
%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{fa_IR,fa}
# just a copy of ur (.po files differ only by trailing junk)
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ie
%find_lang %{name}
diff --git a/thunarx-3.patch b/thunarx-3.patch
deleted file mode 100644
index e2bbd95..0000000
--- a/thunarx-3.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 4c77522252500818869654832594a2d38c3dc291 Mon Sep 17 00:00:00 2001
-From: Andre Miranda <andreldm at xfce.org>
-Date: Fri, 3 Nov 2017 15:39:17 +0300
-Subject: Use the new Thunarx-3 API
-
-Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
----
- src/xfdesktop-file-icon-manager.c | 80 ++++++++++++++++++++++++++++-----------
- 1 file changed, 58 insertions(+), 22 deletions(-)
-
-diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
-index fa8cbe3..48045c1 100644
---- a/src/xfdesktop-file-icon-manager.c
-+++ b/src/xfdesktop-file-icon-manager.c
-@@ -1269,19 +1269,55 @@ xfdesktop_file_icon_menu_fill_template_menu(GtkWidget *menu,
- }
-
- #ifdef HAVE_THUNARX
-+static void
-+thunarx_action_callback (GtkAction *action,
-+ gpointer callback_data)
-+{
-+ thunarx_menu_item_activate (THUNARX_MENU_ITEM (callback_data));
-+}
-+
-+
-+
-+static GtkWidget*
-+xfdesktop_menu_create_menu_item_from_thunarx_menu_item (GObject *item)
-+{
-+ gchar *label, *icon_name;
-+ GtkWidget *mi, *img;
-+
-+ g_return_val_if_fail (THUNARX_IS_MENU_ITEM (item), NULL);
-+
-+ g_object_get (G_OBJECT (item),
-+ "label", &label,
-+ "icon", &icon_name,
-+ NULL);
-+
-+ img = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_MENU);
-+ mi = xfdesktop_menu_create_menu_item_with_mnemonic (label, img);
-+
-+ g_signal_connect_data (mi, "activate",
-+ G_CALLBACK (thunarx_action_callback),
-+ g_object_ref (item),
-+ (GClosureNotify) g_object_unref, 0);
-+
-+ g_free (label);
-+ g_free (icon_name);
-+
-+ return mi;
-+}
-+
-+
-+
- static inline void
--xfdesktop_menu_shell_append_action_list(GtkMenuShell *menu_shell,
-- GList *actions)
-+xfdesktop_menu_shell_append_thunarx_menu_item_list(GtkMenuShell *menu_shell,
-+ GList *items)
- {
- GList *l;
-- GtkAction *action;
- GtkWidget *mi;
--
-- for(l = actions; l; l = l->next) {
-- action = GTK_ACTION(l->data);
-- mi = gtk_action_create_menu_item(action);
-+
-+ for(l = items; l; l = l->next) {
-+ mi = xfdesktop_menu_create_menu_item_from_thunarx_menu_item (l->data);
- gtk_widget_show(mi);
-- gtk_menu_shell_append(menu_shell, mi);
-+ gtk_menu_shell_append(menu_shell, mi);
- }
- }
- #endif
-@@ -1751,35 +1787,35 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
-
- #ifdef HAVE_THUNARX
- if(!multi_sel_special && fmanager->priv->thunarx_menu_providers) {
-- GList *menu_actions = NULL;
-+ GList *menu_items = NULL;
- ThunarxMenuProvider *provider;
-
- if(selected->data == fmanager->priv->desktop_icon) {
- /* click on the desktop itself, only show folder actions */
- for(l = fmanager->priv->thunarx_menu_providers; l; l = l->next) {
- provider = THUNARX_MENU_PROVIDER(l->data);
-- menu_actions = g_list_concat(menu_actions,
-- thunarx_menu_provider_get_folder_actions(provider,
-- toplevel,
-- THUNARX_FILE_INFO(file_icon)));
-+ menu_items = g_list_concat(menu_items,
-+ thunarx_menu_provider_get_folder_menu_items(provider,
-+ toplevel,
-+ THUNARX_FILE_INFO(file_icon)));
- }
- } else {
- /* thunar file specific actions (allows them to operate on folders
- * that are on the desktop as well) */
- for(l = fmanager->priv->thunarx_menu_providers; l; l = l->next) {
- provider = THUNARX_MENU_PROVIDER(l->data);
-- menu_actions = g_list_concat(menu_actions,
-- thunarx_menu_provider_get_file_actions(provider,
-- toplevel,
-- selected));
-+ menu_items = g_list_concat(menu_items,
-+ thunarx_menu_provider_get_file_menu_items(provider,
-+ toplevel,
-+ selected));
- }
- }
-
-- if(menu_actions) {
-- xfdesktop_menu_shell_append_action_list(GTK_MENU_SHELL(menu),
-- menu_actions);
-- g_list_foreach(menu_actions, (GFunc)g_object_unref, NULL);
-- g_list_free(menu_actions);
-+ if(menu_items) {
-+ xfdesktop_menu_shell_append_thunarx_menu_item_list(GTK_MENU_SHELL(menu),
-+ menu_items);
-+ g_list_foreach(menu_items, (GFunc)g_object_unref, NULL);
-+ g_list_free(menu_items);
-
- mi = gtk_separator_menu_item_new();
- gtk_widget_show(mi);
---
-cgit v1.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfdesktop.git/commitdiff/40886110a42252dd65a2673f173ca7000cf5788c
More information about the pld-cvs-commit
mailing list