From 2681ad6688bd40121426231484b82b2a3041fc10 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 8 Aug 2017 23:38:13 +0200 Subject: exo: update 0.11.2 -> 0.11.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- .../exo/exo/reduce-build-to-exo-csource-only.patch | 40 ++++++++-------------- meta-xfce/recipes-xfce/exo/exo_0.11.2.bb | 39 --------------------- meta-xfce/recipes-xfce/exo/exo_0.11.5.bb | 39 +++++++++++++++++++++ 3 files changed, 54 insertions(+), 64 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/exo/exo_0.11.2.bb create mode 100644 meta-xfce/recipes-xfce/exo/exo_0.11.5.bb (limited to 'meta-xfce') diff --git a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch index 8073fcaa47..99318d5aa1 100644 --- a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch +++ b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller --- Makefile.am | 10 +--------- - configure.ac | 26 -------------------------- - 2 files changed, 1 insertion(+), 35 deletions(-) + configure.ac | 22 ---------------------- + 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 9979b36..05d594e 100644 +index 62ad18d..bdc5fae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,7 @@ @@ -40,7 +40,7 @@ index 9979b36..05d594e 100644 distclean-local: rm -rf *.cache *~ diff --git a/configure.ac b/configure.ac -index b66c92b..5243132 100644 +index ba5395d..2605067 100644 --- a/configure.ac +++ b/configure.ac @@ -116,15 +116,6 @@ AC_PROG_CC() @@ -59,36 +59,26 @@ index b66c92b..5243132 100644 dnl *************************************** dnl *** Check for standard header files *** -@@ -171,29 +162,12 @@ dnl *********************************** +@@ -171,19 +162,6 @@ dnl *********************************** dnl *** Check for required packages *** dnl *********************************** - XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0]) --XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0]) + XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) +-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) --XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0]) +-XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0]) +-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) --XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) --XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0], [gio-unix], [GIO-Unix features]) - - dnl *********************************************************** - dnl *** Optional support for a GTK+3 version of the library *** - dnl *********************************************************** --XDT_CHECK_OPTIONAL_PACKAGE([GTK3], -- [gtk+-3.0], [3.6.0], [gtk3], -- [GTK+ 3 support]) --XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4UI2], -- [libxfce4ui-2], [4.12.0], [libxfce4ui2], -- [GTK+ 3 support: libxfce4ui-2]) - AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test "x$GTK3_FOUND" = "xyes" && test "x$LIBXFCE4UI2_FOUND" = "xyes" ]) - +-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) +-XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features]) +- -dnl ********************* -dnl *** Check for X11 *** -dnl ********************* -XDT_CHECK_LIBX11_REQUIRE() -- + dnl ************************* dnl *** Check for gtk-doc *** - dnl ************************* -- -2.5.5 +2.9.4 diff --git a/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb deleted file mode 100644 index cb29c34a48..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb +++ /dev/null @@ -1,39 +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 \ -" - -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" diff --git a/meta-xfce/recipes-xfce/exo/exo_0.11.5.bb b/meta-xfce/recipes-xfce/exo/exo_0.11.5.bb new file mode 100644 index 0000000000..d5508c0a54 --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo_0.11.5.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] = "2e560edfa8ddf77e21c4787a6f600171" +SRC_URI[sha256sum] = "8e8629f33783eba1ce6d092a42c28217458a0cc3d1ad7474097b9187054955c1" + +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