From 60b56bc99ce68a3c6d9a16679d8c4cd2108e93c8 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 6 May 2019 10:29:45 +0200 Subject: exo: upgrade 0.12.4 -> 0.12.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a bugfix and cleanup release [1] [1] https://mail.xfce.org/pipermail/xfce/2019-May/036395.html Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../exo/exo/reduce-build-to-exo-csource-only.patch | 29 ++++++++++------- meta-xfce/recipes-xfce/exo/exo_0.12.4.bb | 36 --------------------- meta-xfce/recipes-xfce/exo/exo_0.12.5.bb | 37 ++++++++++++++++++++++ 3 files changed, 54 insertions(+), 48 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/exo/exo_0.12.4.bb create mode 100644 meta-xfce/recipes-xfce/exo/exo_0.12.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 0764775818..8c950299f7 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 @@ -1,6 +1,6 @@ From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 28 Mar 2013 23:41:03 +0100 +Date: Sat, 4 May 2019 14:50:11 +0200 Subject: [PATCH] reduce build to exo-csource only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -16,11 +16,11 @@ Signed-off-by: Andreas Müller --- Makefile.am | 10 +--------- - configure.ac | 22 ---------------------- - 2 files changed, 1 insertion(+), 31 deletions(-) + configure.ac | 20 -------------------- + 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 62ad18d..bdc5fae 100644 +index 62ad18d..8934f1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,7 @@ @@ -41,10 +41,10 @@ index 62ad18d..bdc5fae 100644 distclean-local: rm -rf *.cache *~ diff --git a/configure.ac b/configure.ac -index 3f92d1b..0d4cc38 100644 +index 4e4eb5e..237184c 100644 --- a/configure.ac +++ b/configure.ac -@@ -116,15 +116,6 @@ AC_PROG_CC() +@@ -120,15 +120,6 @@ AC_PROG_CC() AM_PROG_CC_C_O() AC_PROG_INSTALL() IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml]) @@ -60,26 +60,31 @@ index 3f92d1b..0d4cc38 100644 dnl *************************************** dnl *** Check for standard header files *** -@@ -171,19 +162,6 @@ dnl *********************************** +@@ -175,12 +166,6 @@ dnl *********************************** dnl *** Check for required packages *** dnl *********************************** 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([GTK3], [gtk+-3.0], [3.22.0]) -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) --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 *** Optional support for a GTK+2 version of the library *** +@@ -190,11 +175,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([GTK2], + [GTK+ 2 support]) + AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"]) + -dnl ********************* -dnl *** Check for X11 *** -dnl ********************* -XDT_CHECK_LIBX11_REQUIRE() - +- dnl ************************* dnl *** Check for gtk-doc *** + dnl ************************* -- -2.14.3 +2.20.1 diff --git a/meta-xfce/recipes-xfce/exo/exo_0.12.4.bb b/meta-xfce/recipes-xfce/exo/exo_0.12.4.bb deleted file mode 100644 index 7b7edfe1bc..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo_0.12.4.bb +++ /dev/null @@ -1,36 +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] = "962bbccb38db0aecd4151ca97f6a39bc" -SRC_URI[sha256sum] = "b0af60816bdb572ce53f19462fb1f3a5895a04017a878893dc03c166ea2050af" - -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_exo-csource += "${bindir}/exo-csource" - -BBCLASSEXTEND = "native" diff --git a/meta-xfce/recipes-xfce/exo/exo_0.12.5.bb b/meta-xfce/recipes-xfce/exo/exo_0.12.5.bb new file mode 100644 index 0000000000..7d61e8f83b --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo_0.12.5.bb @@ -0,0 +1,37 @@ +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] = "1de1d539262847d49474d20cbebc78ea" +SRC_URI[sha256sum] = "e8f434d6436ae647dd1614e8a24aba23c83f70cb14037b5bc98652f558be43e8" + +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* \ +" + +FILES_exo-csource += "${bindir}/exo-csource" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf