summaryrefslogtreecommitdiffstats
path: root/meta-xfce
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2016-12-06 23:40:40 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-12-13 11:19:34 +0100
commit1085a4d1dec2dbe0ef6c594f8747383e2ed676b6 (patch)
treed2ab8b48f069d4faac42cb68e61c7cb518243d2d /meta-xfce
parent3d383cce9a697a8854047a7af74e9d4e56738678 (diff)
downloadmeta-openembedded-1085a4d1dec2dbe0ef6c594f8747383e2ed676b6.tar.gz
exo: update to 0.11.2
0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch was applied upstream [1] [1] https://git.xfce.org/xfce/exo/commit/?id=fea2619e6d07ac72b2eff6f408bb3daa2dbdf671 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-xfce')
-rw-r--r--meta-xfce/recipes-xfce/exo/exo/0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch36
-rw-r--r--meta-xfce/recipes-xfce/exo/exo_0.11.2.bb (renamed from meta-xfce/recipes-xfce/exo/exo_0.11.1.bb)5
2 files changed, 2 insertions, 39 deletions
diff --git a/meta-xfce/recipes-xfce/exo/exo/0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch b/meta-xfce/recipes-xfce/exo/exo/0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch
deleted file mode 100644
index 16f12feaf..000000000
--- a/meta-xfce/recipes-xfce/exo/exo/0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From fea2619e6d07ac72b2eff6f408bb3daa2dbdf671 Mon Sep 17 00:00:00 2001
2From: Sean Davis <smd.seandavis@gmail.com>
3Date: Thu, 27 Oct 2016 20:31:36 -0400
4Subject: [PATCH] Probable fix for Thunar detailed view (Xfce #12916)
5
6Upstream-Status: Pending [1-2]
7
8[1] https://git.xfce.org/xfce/exo/commit/?id=fea2619e6d07ac72b2eff6f408bb3daa2dbdf671
9[2] https://bugzilla.xfce.org/show_bug.cgi?id=12916
10
11---
12 exo/exo-tree-view.c | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-)
14
15diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c
16index 8c8564f..2d0fc04 100644
17--- a/exo/exo-tree-view.c
18+++ b/exo/exo-tree-view.c
19@@ -385,13 +385,9 @@ exo_tree_view_button_press_event (GtkWidget *widget,
20 }
21 }
22
23- /* see bug http://bugzilla.xfce.org/show_bug.cgi?id=6230 for more information */
24 if (G_LIKELY (gtk_tree_selection_get_select_function (selection) == (GtkTreeSelectionFunc) exo_noop_false))
25 {
26- /* just reset the select function (previously set to exo_noop_false),
27- * there's no clean way to do this, so what the heck.
28- */
29- gtk_tree_selection_set_select_function (selection, NULL, NULL, NULL);
30+ gtk_tree_selection_set_select_function (selection, (GtkTreeSelectionFunc) exo_noop_true, NULL, NULL);
31 }
32
33 /* release the path (if any) */
34--
352.5.5
36
diff --git a/meta-xfce/recipes-xfce/exo/exo_0.11.1.bb b/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb
index c145ce092..cb29c34a4 100644
--- a/meta-xfce/recipes-xfce/exo/exo_0.11.1.bb
+++ b/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb
@@ -14,15 +14,14 @@ REQUIRED_DISTRO_FEATURES_class-native = ""
14SRC_URI += " \ 14SRC_URI += " \
15 file://exo-no-tests-0.8.patch \ 15 file://exo-no-tests-0.8.patch \
16 file://configure.patch \ 16 file://configure.patch \
17 file://0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch \
18" 17"
19 18
20SRC_URI_append_class-native = " \ 19SRC_URI_append_class-native = " \
21 file://reduce-build-to-exo-csource-only.patch \ 20 file://reduce-build-to-exo-csource-only.patch \
22" 21"
23 22
24SRC_URI[md5sum] = "866292556586facb034191aa66431697" 23SRC_URI[md5sum] = "0b036c8042a2ed5d3767d1177a4213a2"
25SRC_URI[sha256sum] = "c70c47f690284a5cb4f507dd89088efbdd8123506f924e33a5f97aab74eb97d4" 24SRC_URI[sha256sum] = "76bd1c4229503ff3c301485de3a41c55dec93e98de1a9eef1be77fe502ca4f77"
26 25
27PACKAGES =+ "exo-csource" 26PACKAGES =+ "exo-csource"
28 27