From 3de656662187954878edd0cfe675c57d795507d4 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Wed, 12 Oct 2016 01:46:46 +0200 Subject: [PATCH] xfdesktop: patch to fix regression introduced by gtk+ 2.24.31 See https://bugzilla.xfce.org/show_bug.cgi?id=12832. --- ...ngs-Allow-directories-to-be-selected.patch | 30 +++++++++++++++++++ srcpkgs/xfdesktop/template | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xfdesktop/patches/0001-Settings-Allow-directories-to-be-selected.patch diff --git a/srcpkgs/xfdesktop/patches/0001-Settings-Allow-directories-to-be-selected.patch b/srcpkgs/xfdesktop/patches/0001-Settings-Allow-directories-to-be-selected.patch new file mode 100644 index 00000000000..5dcba1597c2 --- /dev/null +++ b/srcpkgs/xfdesktop/patches/0001-Settings-Allow-directories-to-be-selected.patch @@ -0,0 +1,30 @@ +From 726b34c0b37e778a4983866602cc20cfa4172b99 Mon Sep 17 00:00:00 2001 +From: Eric Koegel +Date: Mon, 13 Jun 2016 15:08:11 +0300 +Subject: Settings: Allow directories to be selected (Bug #12832) + +Gtk 2.24.31 imported some Gtk3 code that breaks directory +selection when using a file filter while in directory mode. +We need to add directories to the filter for the +GtkFileChooser, otherwise you can't select directories +while in directory mode... +Cherry-picked from: +https://git.xfce.org/users/eric/xfdesktop/commit/?h=the-long-road-to-gtk3&id=cc311b61b82b7510a3a6cb0952d3a331e3551e05 + +diff --git settings/main.c settings/main.c +index 2b17617..d44c6ef 100644 +--- settings/main.c ++++ settings/main.c +@@ -1857,6 +1857,9 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder *main_gxml, + filter = gtk_file_filter_new(); + gtk_file_filter_set_name(filter, _("Image files")); + gtk_file_filter_add_pixbuf_formats(filter); ++ gtk_file_filter_add_mime_type(filter, "inode/directory"); ++ gtk_file_filter_add_mime_type(filter, "application/x-directory"); ++ gtk_file_filter_add_mime_type(filter, "text/directory"); + gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(panel->btn_folder), filter); + + /* Change the title of the file chooser dialog */ +-- +cgit v0.10.1 + diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template index 15287cdcba3..6287ea132e9 100644 --- a/srcpkgs/xfdesktop/template +++ b/srcpkgs/xfdesktop/template @@ -1,7 +1,7 @@ # Template file for 'xfdesktop' pkgname=xfdesktop version=4.12.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel" makedepends="libxfce4ui-devel exo-devel Thunar-devel garcon-devel