From 18799992ef406d7a2006d4aaaaee070c30d1402f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 20 Feb 2022 17:34:18 -0800 Subject: libxml++: Upgrade to 2.42.1 release Signed-off-by: Khem Raj --- .../libxml/libxml++/libxml++_ptest.patch | 26 ++++++++--------- meta-oe/recipes-core/libxml/libxml++_2.40.1.bb | 28 ------------------ meta-oe/recipes-core/libxml/libxml++_2.42.1.bb | 33 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 43 deletions(-) delete mode 100644 meta-oe/recipes-core/libxml/libxml++_2.40.1.bb create mode 100644 meta-oe/recipes-core/libxml/libxml++_2.42.1.bb diff --git a/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch b/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch index 0d1a5186a6..dc6198fe98 100644 --- a/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch +++ b/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch @@ -1,20 +1,16 @@ -Index: libxml++-2.40.1/Makefile.am -=================================================================== ---- libxml++-2.40.1.orig/Makefile.am -+++ libxml++-2.40.1/Makefile.am -@@ -24,5 +24,8 @@ dist_noinst_SCRIPTS = autogen.sh - - DISTCLEANFILES = MSVC_Net2010/libxml++/libxml++config.h +--- a/Makefile.am ++++ b/Makefile.am +@@ -40,5 +40,8 @@ EXTRA_DIST = \ + tools/conf_tests/have_exception_ptr.cc \ + untracked/README +install-ptest: + make -C examples install-ptest + # Optional: auto-generate the ChangeLog file from the git log on make dist include $(top_srcdir)/build/dist-changelog.am -Index: libxml++-2.40.1/examples/Makefile.am -=================================================================== ---- libxml++-2.40.1.orig/examples/Makefile.am -+++ libxml++-2.40.1/examples/Makefile.am +--- a/examples/Makefile.am ++++ b/examples/Makefile.am @@ -19,6 +19,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_ AM_CXXFLAGS = $(LIBXMLXX_WXXFLAGS) LDADD = $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS) @@ -51,10 +47,10 @@ Index: libxml++-2.40.1/examples/Makefile.am @@ -154,10 +173,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 $@ + $(AM_V_GEN)echo '# Generated and used by "make check"' >$@ +- $(AM_V_at)echo 'dom_read_write/dom_read_write "$(srcdir)/dom_read_write/example.xml" dom_read_write/example_output.xml >/dev/null' >>$@ ++ $(AM_V_at)echo 'cd dom_read_write && .libs/dom_read_write "example.xml" example_output.xml >/dev/null' >>$@ + $(AM_V_at)chmod +x $@ -script_template = cd "$(srcdir)/" && "$(abs_builddir)//" >/dev/null +script_template = cd "" && ".libs/" >/dev/null diff --git a/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb b/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb deleted file mode 100644 index 7e08263ca4..0000000000 --- a/meta-oe/recipes-core/libxml/libxml++_2.40.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 = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ - file://libxml++_ptest.patch \ - file://run-ptest \ -" -SRC_URI[md5sum] = "377a87bea899f2b4ff62df2418c3d8a6" -SRC_URI[sha256sum] = "4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9" - -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.42.1.bb b/meta-oe/recipes-core/libxml/libxml++_2.42.1.bb new file mode 100644 index 0000000000..6065333d9a --- /dev/null +++ b/meta-oe/recipes-core/libxml/libxml++_2.42.1.bb @@ -0,0 +1,33 @@ +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 = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" +SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ + file://libxml++_ptest.patch \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "9b59059abe5545d28ceb388a55e341095f197bd219c73e6623aeb6d801e00be8" + +DEPENDS = "libxml2 glibmm mm-common-native" + +inherit autotools pkgconfig ptest + +EXTRA_OECONF = "--disable-documentation" + +do_configure:prepend() { + mm-common-prepare --copy --force ${S} +} + +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 v1.2.3-54-g00ecf