From 1085a4d1dec2dbe0ef6c594f8747383e2ed676b6 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 6 Dec 2016 23:40:40 +0100 Subject: exo: update to 0.11.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Martin Jansa --- ...e-fix-for-Thunar-detailed-view-Xfce-12916.patch | 36 ------------------- meta-xfce/recipes-xfce/exo/exo_0.11.1.bb | 40 ---------------------- meta-xfce/recipes-xfce/exo/exo_0.11.2.bb | 39 +++++++++++++++++++++ 3 files changed, 39 insertions(+), 76 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/exo/exo/0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch delete mode 100644 meta-xfce/recipes-xfce/exo/exo_0.11.1.bb create mode 100644 meta-xfce/recipes-xfce/exo/exo_0.11.2.bb (limited to 'meta-xfce') 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 16f12feaf3..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo/0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fea2619e6d07ac72b2eff6f408bb3daa2dbdf671 Mon Sep 17 00:00:00 2001 -From: Sean Davis -Date: Thu, 27 Oct 2016 20:31:36 -0400 -Subject: [PATCH] Probable fix for Thunar detailed view (Xfce #12916) - -Upstream-Status: Pending [1-2] - -[1] https://git.xfce.org/xfce/exo/commit/?id=fea2619e6d07ac72b2eff6f408bb3daa2dbdf671 -[2] https://bugzilla.xfce.org/show_bug.cgi?id=12916 - ---- - exo/exo-tree-view.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c -index 8c8564f..2d0fc04 100644 ---- a/exo/exo-tree-view.c -+++ b/exo/exo-tree-view.c -@@ -385,13 +385,9 @@ exo_tree_view_button_press_event (GtkWidget *widget, - } - } - -- /* see bug http://bugzilla.xfce.org/show_bug.cgi?id=6230 for more information */ - if (G_LIKELY (gtk_tree_selection_get_select_function (selection) == (GtkTreeSelectionFunc) exo_noop_false)) - { -- /* just reset the select function (previously set to exo_noop_false), -- * there's no clean way to do this, so what the heck. -- */ -- gtk_tree_selection_set_select_function (selection, NULL, NULL, NULL); -+ gtk_tree_selection_set_select_function (selection, (GtkTreeSelectionFunc) exo_noop_true, NULL, NULL); - } - - /* release the path (if any) */ --- -2.5.5 - diff --git a/meta-xfce/recipes-xfce/exo/exo_0.11.1.bb b/meta-xfce/recipes-xfce/exo/exo_0.11.1.bb deleted file mode 100644 index c145ce0925..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo_0.11.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION="Application library for the Xfce desktop environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gtk+ libxfce4util libxfce4ui virtual/libx11 liburi-perl-native cairo" -DEPENDS_class-native = "glib-2.0-native xfce4-dev-tools-native intltool-native" - -inherit xfce pythonnative perlnative gtk-doc distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" -REQUIRED_DISTRO_FEATURES_class-native = "" - -# SRC_URI must follow inherited one -SRC_URI += " \ - file://exo-no-tests-0.8.patch \ - file://configure.patch \ - file://0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch \ -" - -SRC_URI_append_class-native = " \ - file://reduce-build-to-exo-csource-only.patch \ -" - -SRC_URI[md5sum] = "866292556586facb034191aa66431697" -SRC_URI[sha256sum] = "c70c47f690284a5cb4f507dd89088efbdd8123506f924e33a5f97aab74eb97d4" - -PACKAGES =+ "exo-csource" - -# Note: python bindings did not work in oe-dev and are about to be moved to -# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 -FILES_${PN} += "${datadir}/xfce4/ \ - ${libdir}/xfce4/exo-1 \ -" - -FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \ -" - -FILES_exo-csource += "${bindir}/exo-csource" - -BBCLASSEXTEND = "native" diff --git a/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb new file mode 100644 index 0000000000..cb29c34a48 --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb @@ -0,0 +1,39 @@ +DESCRIPTION="Application library for the Xfce desktop environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gtk+ libxfce4util libxfce4ui virtual/libx11 liburi-perl-native cairo" +DEPENDS_class-native = "glib-2.0-native xfce4-dev-tools-native intltool-native" + +inherit xfce pythonnative perlnative gtk-doc distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES_class-native = "" + +# SRC_URI must follow inherited one +SRC_URI += " \ + file://exo-no-tests-0.8.patch \ + file://configure.patch \ +" + +SRC_URI_append_class-native = " \ + file://reduce-build-to-exo-csource-only.patch \ +" + +SRC_URI[md5sum] = "0b036c8042a2ed5d3767d1177a4213a2" +SRC_URI[sha256sum] = "76bd1c4229503ff3c301485de3a41c55dec93e98de1a9eef1be77fe502ca4f77" + +PACKAGES =+ "exo-csource" + +# Note: python bindings did not work in oe-dev and are about to be moved to +# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 +FILES_${PN} += "${datadir}/xfce4/ \ + ${libdir}/xfce4/exo-1 \ +" + +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \ +" + +FILES_exo-csource += "${bindir}/exo-csource" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg