From 18d9ac032014280e3f4c24959b42a8b039f902c8 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 2 Mar 2015 00:12:04 +0100 Subject: exo: update to 0.10.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../exo/exo/reduce-build-to-exo-csource-only.patch | 26 ++++++++------- meta-xfce/recipes-xfce/exo/exo_0.10.2.bb | 37 ---------------------- meta-xfce/recipes-xfce/exo/exo_0.10.3.bb | 36 +++++++++++++++++++++ 3 files changed, 50 insertions(+), 49 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/exo/exo_0.10.2.bb create mode 100644 meta-xfce/recipes-xfce/exo/exo_0.10.3.bb 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 84b2370967..246511cef1 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 @@ -14,15 +14,17 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller --- - Makefile.am | 10 +--------- - configure.ac | 20 -------------------- - 2 files changed, 1 insertions(+), 29 deletions(-) + Makefile.am | 10 +--------- + configure.ac | 20 -------------------- + 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/Makefile.am b/Makefile.am -index c2e3fff..79b0931 100644 +index ad7c6ce..3acd94a 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -1,13 +1,5 @@ +@@ -1,15 +1,7 @@ + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + SUBDIRS = \ - exo \ - exo-csource \ @@ -35,16 +37,16 @@ index c2e3fff..79b0931 100644 - po + exo-csource - AUTOMAKE_OPTIONS = \ - 1.9 \ + distclean-local: + rm -rf *.cache *~ diff --git a/configure.ac b/configure.ac -index efcd62e..aac2495 100644 +index bb9be05..23471d0 100644 --- a/configure.ac +++ b/configure.ac -@@ -110,15 +110,6 @@ AC_PROG_CC() +@@ -116,15 +116,6 @@ AC_PROG_CC() AM_PROG_CC_C_O() AC_PROG_INSTALL() - AC_PROG_INTLTOOL([0.31], [no-xml]) + IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml]) -AC_CHECK_PROGS([PERL], [perl5 perl]) - -dnl *************************************** @@ -57,7 +59,7 @@ index efcd62e..aac2495 100644 dnl *************************************** dnl *** Check for standard header files *** -@@ -165,17 +156,6 @@ dnl *********************************** +@@ -171,17 +162,6 @@ dnl *********************************** dnl *** Check for required packages *** dnl *********************************** XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0]) @@ -76,5 +78,5 @@ index efcd62e..aac2495 100644 dnl ************************* dnl *** Check for gtk-doc *** -- -1.7.4.4 +1.9.3 diff --git a/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb deleted file mode 100644 index ef8e55fa64..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb +++ /dev/null @@ -1,37 +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" -PR = "r4" - -inherit xfce pythonnative perlnative gtk-doc - -# 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] = "c70f2a217811bfba2e62f938d4b8f748" -SRC_URI[sha256sum] = "b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce" - -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.10.3.bb b/meta-xfce/recipes-xfce/exo/exo_0.10.3.bb new file mode 100644 index 0000000000..f11f0493d5 --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo_0.10.3.bb @@ -0,0 +1,36 @@ +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 + +# 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] = "d45b7e18e3a73e4a7b2ec6ef7943de17" +SRC_URI[sha256sum] = "95704b14ef9065268c3aa9a7c0bacbe0ddb490a183a4f5ab13bba4a1722826bd" + +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