From 9b956d24b54a396472a506f7ed0647400e13d427 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Fri, 22 Apr 2016 13:28:12 -0400 Subject: libxml++: update to the latest stable version (2.38.1) Signed-off-by: Derek Straka Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster --- .../libxml/libxml++-2.37.1/libxml++_ptest.patch | 82 ---------------------- .../recipes-core/libxml/libxml++-2.37.1/run-ptest | 3 - .../libxml/libxml++/libxml++_ptest.patch | 82 ++++++++++++++++++++++ meta-oe/recipes-core/libxml/libxml++/run-ptest | 3 + meta-oe/recipes-core/libxml/libxml++_2.37.1.bb | 28 -------- meta-oe/recipes-core/libxml/libxml++_2.38.1.bb | 28 ++++++++ 6 files changed, 113 insertions(+), 113 deletions(-) delete mode 100644 meta-oe/recipes-core/libxml/libxml++-2.37.1/libxml++_ptest.patch delete mode 100644 meta-oe/recipes-core/libxml/libxml++-2.37.1/run-ptest create mode 100644 meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch create mode 100644 meta-oe/recipes-core/libxml/libxml++/run-ptest delete mode 100644 meta-oe/recipes-core/libxml/libxml++_2.37.1.bb create mode 100644 meta-oe/recipes-core/libxml/libxml++_2.38.1.bb diff --git a/meta-oe/recipes-core/libxml/libxml++-2.37.1/libxml++_ptest.patch b/meta-oe/recipes-core/libxml/libxml++-2.37.1/libxml++_ptest.patch deleted file mode 100644 index 82960f1120..0000000000 --- a/meta-oe/recipes-core/libxml/libxml++-2.37.1/libxml++_ptest.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index d4aadb1..0e36756 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -253,5 +253,8 @@ post-html: docs/index.html - rsync $(rsync_args) -r docs/index.html $$USER,libxmlplusplus@web.sourceforge.net:$(web_path_project) - rsync $(rsync_args) -r examples $$USER,libxmlplusplus@web.sourceforge.net:$(web_path_project) - -+install-ptest: -+ make -C examples install-ptest -+ - # Optional: auto-generate the ChangeLog file from the git log on make dist - include $(top_srcdir)/macros/dist-changelog.am -diff --git a/examples/Makefile.am b/examples/Makefile.am -index d9541ca..c27e088 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -19,6 +19,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I. $(LIBXMLXX_CFLAGS) - AM_CXXFLAGS = $(LIBXMLXX_WXXFLAGS) - LDADD = $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS) - -+LOG_DRIVER = $(SHELL) ../macros/test-driver -+ - check_PROGRAMS = \ - dom_build/dom_build \ - dom_parse_entities/dom_parse_entities \ -@@ -36,6 +38,23 @@ check_PROGRAMS = \ - schemavalidation/schemavalidation \ - textreader/textreader - -+check_DOTLIBS = \ -+ dom_build/.libs/dom_build \ -+ dom_parse_entities/.libs/dom_parse_entities \ -+ dom_parser/.libs/dom_parser \ -+ dom_parser_raw/.libs/dom_parser_raw \ -+ dom_read_write/.libs/dom_read_write \ -+ dom_xinclude/.libs/dom_xinclude \ -+ dom_xpath/.libs/dom_xpath \ -+ dtdvalidation/.libs/dtdvalidation \ -+ import_node/.libs/import_node \ -+ sax_exception/.libs/sax_exception \ -+ sax_parser/.libs/sax_parser \ -+ sax_parser_build_dom/.libs/sax_parser_build_dom \ -+ sax_parser_entities/.libs/sax_parser_entities \ -+ schemavalidation/.libs/schemavalidation \ -+ textreader/.libs/textreader -+ - # Shell scripts that call the example programs. - check_SCRIPTS = \ - dom_build/make_check.sh \ -@@ -147,10 +166,10 @@ dist_noinst_DATA = \ - # file are located in different directories. - dom_read_write/make_check.sh: Makefile - echo '# Generated and used by "make check"' >$@ -- echo 'dom_read_write/dom_read_write "$(srcdir)/dom_read_write/example.xml" dom_read_write/example_output.xml >/dev/null' >>$@ -+ echo 'cd dom_read_write && .libs/dom_read_write "example.xml" example_output.xml >/dev/null' >>$@ - chmod +x $@ - --script_template = cd "$(srcdir)/" && "$(abs_builddir)//" >/dev/null -+script_template = cd "" && ".libs/" >/dev/null - standard_scripts = $(filter-out dom_read_write/make_check.sh,$(check_SCRIPTS)) - - # All other script files are generated like so: -@@ -162,3 +181,18 @@ $(standard_scripts): Makefile - CLEANFILES = \ - dom_read_write/example_output.xml \ - $(check_SCRIPTS) -+ -+buildtest: all -+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) -+ $(MAKE) $(AM_MAKEFLAGS) buildtest-TESTS -+ -+install-ptest: -+ $(MKDIR_P) $(DESTDIR)/examples -+ cp --parents $(check_DOTLIBS) $(DESTDIR)/examples -+ cp --parents $(check_SCRIPTS) $(DESTDIR)/examples -+ cd $(srcdir) && cp --parents $(dist_noinst_DATA) $(DESTDIR)/examples -+ cp Makefile $(DESTDIR)/examples -+ $(MKDIR_P) $(DESTDIR)/macros -+ cp $(srcdir)/../macros/test-driver $(DESTDIR)/macros -+ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/examples/Makefile -+ diff --git a/meta-oe/recipes-core/libxml/libxml++-2.37.1/run-ptest b/meta-oe/recipes-core/libxml/libxml++-2.37.1/run-ptest deleted file mode 100644 index 236f667538..0000000000 --- a/meta-oe/recipes-core/libxml/libxml++-2.37.1/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd examples -make -k check-TESTS diff --git a/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch b/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch new file mode 100644 index 0000000000..82960f1120 --- /dev/null +++ b/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch @@ -0,0 +1,82 @@ +diff --git a/Makefile.am b/Makefile.am +index d4aadb1..0e36756 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -253,5 +253,8 @@ post-html: docs/index.html + rsync $(rsync_args) -r docs/index.html $$USER,libxmlplusplus@web.sourceforge.net:$(web_path_project) + rsync $(rsync_args) -r examples $$USER,libxmlplusplus@web.sourceforge.net:$(web_path_project) + ++install-ptest: ++ make -C examples install-ptest ++ + # Optional: auto-generate the ChangeLog file from the git log on make dist + include $(top_srcdir)/macros/dist-changelog.am +diff --git a/examples/Makefile.am b/examples/Makefile.am +index d9541ca..c27e088 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -19,6 +19,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I. $(LIBXMLXX_CFLAGS) + AM_CXXFLAGS = $(LIBXMLXX_WXXFLAGS) + LDADD = $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS) + ++LOG_DRIVER = $(SHELL) ../macros/test-driver ++ + check_PROGRAMS = \ + dom_build/dom_build \ + dom_parse_entities/dom_parse_entities \ +@@ -36,6 +38,23 @@ check_PROGRAMS = \ + schemavalidation/schemavalidation \ + textreader/textreader + ++check_DOTLIBS = \ ++ dom_build/.libs/dom_build \ ++ dom_parse_entities/.libs/dom_parse_entities \ ++ dom_parser/.libs/dom_parser \ ++ dom_parser_raw/.libs/dom_parser_raw \ ++ dom_read_write/.libs/dom_read_write \ ++ dom_xinclude/.libs/dom_xinclude \ ++ dom_xpath/.libs/dom_xpath \ ++ dtdvalidation/.libs/dtdvalidation \ ++ import_node/.libs/import_node \ ++ sax_exception/.libs/sax_exception \ ++ sax_parser/.libs/sax_parser \ ++ sax_parser_build_dom/.libs/sax_parser_build_dom \ ++ sax_parser_entities/.libs/sax_parser_entities \ ++ schemavalidation/.libs/schemavalidation \ ++ textreader/.libs/textreader ++ + # Shell scripts that call the example programs. + check_SCRIPTS = \ + dom_build/make_check.sh \ +@@ -147,10 +166,10 @@ dist_noinst_DATA = \ + # file are located in different directories. + dom_read_write/make_check.sh: Makefile + echo '# Generated and used by "make check"' >$@ +- echo 'dom_read_write/dom_read_write "$(srcdir)/dom_read_write/example.xml" dom_read_write/example_output.xml >/dev/null' >>$@ ++ echo 'cd dom_read_write && .libs/dom_read_write "example.xml" example_output.xml >/dev/null' >>$@ + chmod +x $@ + +-script_template = cd "$(srcdir)/" && "$(abs_builddir)//" >/dev/null ++script_template = cd "" && ".libs/" >/dev/null + standard_scripts = $(filter-out dom_read_write/make_check.sh,$(check_SCRIPTS)) + + # All other script files are generated like so: +@@ -162,3 +181,18 @@ $(standard_scripts): Makefile + CLEANFILES = \ + dom_read_write/example_output.xml \ + $(check_SCRIPTS) ++ ++buildtest: all ++ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) ++ $(MAKE) $(AM_MAKEFLAGS) buildtest-TESTS ++ ++install-ptest: ++ $(MKDIR_P) $(DESTDIR)/examples ++ cp --parents $(check_DOTLIBS) $(DESTDIR)/examples ++ cp --parents $(check_SCRIPTS) $(DESTDIR)/examples ++ cd $(srcdir) && cp --parents $(dist_noinst_DATA) $(DESTDIR)/examples ++ cp Makefile $(DESTDIR)/examples ++ $(MKDIR_P) $(DESTDIR)/macros ++ cp $(srcdir)/../macros/test-driver $(DESTDIR)/macros ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/examples/Makefile ++ diff --git a/meta-oe/recipes-core/libxml/libxml++/run-ptest b/meta-oe/recipes-core/libxml/libxml++/run-ptest new file mode 100644 index 0000000000..236f667538 --- /dev/null +++ b/meta-oe/recipes-core/libxml/libxml++/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh +cd examples +make -k check-TESTS diff --git a/meta-oe/recipes-core/libxml/libxml++_2.37.1.bb b/meta-oe/recipes-core/libxml/libxml++_2.37.1.bb deleted file mode 100644 index 0ed8ee3992..0000000000 --- a/meta-oe/recipes-core/libxml/libxml++_2.37.1.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "C++ wrapper for libxml library" -DESCRIPTION = "C++ wrapper for libxml library" -HOMEPAGE = "http://libxmlplusplus.sourceforge.net" -BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml%2B%2B" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " - -SHRT_VER = "${@d.getVar('PV',True).split('.')[0]}.${@d.getVar('PV',True).split('.')[1]}" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ - file://libxml++_ptest.patch \ - file://run-ptest \ -" -SRC_URI[md5sum] = "2f9372a6eba6e40206c11f558a8fbc32" -SRC_URI[sha256sum] = "f3b183600532a92af355719210223f858857092b8b1531c7907155c59a6db39f" - -DEPENDS = "libxml2 glibmm" - -inherit autotools pkgconfig ptest - -do_compile_ptest() { - oe_runmake -C examples buildtest -} - -FILES_${PN}-doc += "${datadir}/devhelp" -FILES_${PN}-dev += "${libdir}/libxml++-2.6/include/libxml++config.h" - -RDEPENDS_${PN}-ptest += "make" diff --git a/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb b/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb new file mode 100644 index 0000000000..20313fe56a --- /dev/null +++ b/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "C++ wrapper for libxml library" +DESCRIPTION = "C++ wrapper for libxml library" +HOMEPAGE = "http://libxmlplusplus.sourceforge.net" +BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml%2B%2B" +SECTION = "libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " + +SHRT_VER = "${@d.getVar('PV',True).split('.')[0]}.${@d.getVar('PV',True).split('.')[1]}" +SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ + file://libxml++_ptest.patch \ + file://run-ptest \ +" +SRC_URI[md5sum] = "6b16aac575725a9bc0e9d96489e9251f" +SRC_URI[sha256sum] = "882529189b03db6c69925b3f579ab1941feb4f02b5fe2612504ee7e498a4a05f" + +DEPENDS = "libxml2 glibmm" + +inherit autotools pkgconfig ptest + +do_compile_ptest() { + oe_runmake -C examples buildtest +} + +FILES_${PN}-doc += "${datadir}/devhelp" +FILES_${PN}-dev += "${libdir}/libxml++-2.6/include/libxml++config.h" + +RDEPENDS_${PN}-ptest += "make" -- cgit 1.2.3-korg