change libxml2 deprecated since libxml2 2.10

diff --git a/builder/builder b/builder/builder
index db6377fae981fd08ecd1a0c542d7d79f1f7ddaa0..c73759405a66e30ed239048ba3d50238568cebf4 100755 (executable)
--- a/builder/builder
+++ b/builder/builder
@@ -33,7 +33,7 @@ run_build_container()
 
 main()
 {
-       local distros="debian:oldstable debian:stable debian:testing"
+       local distros="debian:oldstable debian:stable debian:testing ubuntu:latest ubuntu:rolling"
        mkdir -p build
        cp builder/run build/run
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 79d3c6a934c4e9b9a2e7effd1e809efc032ad960..b5088f8f641a07610afa290bce150f9ce1155700 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,9 +7,9 @@ include(GNUInstallDirs)
 find_package(LibXml2 REQUIRED)
 message(STATUS "find LibXml2: " ${LIBXML2_LIBRARY})
 
-if(${LIBXML2_VERSION_STRING} VERSION_GREATER_EQUAL "2.15.0")
-       message(STATUS "define LIBXML2_15")
-       add_compile_definitions(LIBXML2_15)
+if(${LIBXML2_VERSION_STRING} VERSION_GREATER_EQUAL 2.10)
+       message(STATUS "define LIBXML2_10")
+       add_compile_definitions(LIBXML2_10)
 endif()
 
 message(STATUS "CMAKE_INSTALL_PREFIX " ${CMAKE_INSTALL_PREFIX})

diff --git a/src/xml.c b/src/xml.c
index 5917561c83d1b2c2d535ef1e16a7eaa7223e8d52..20af6c5caedc52b8267fe292c19a743d8067ca31 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -295,7 +295,7 @@ void init_time_acount(const uint8_t hour, const uint8_t min)
        xmlFreeTextWriter(xmlWriter);
        xmlWriter = NULL;
 
-#ifdef LIBXML2_15
+#ifdef LIBXML2_10
        xmlCleanupParser();
 #else
        xmlDictCleanup();
@@ -356,7 +356,7 @@ void add_entry(const char* date,
        xmlFreeTextReader(xmlreader);
        xmlreader = NULL;
 
-#ifdef LIBXML2_15
+#ifdef LIBXML2_10
        xmlCleanupParser();
 #else
        xmlCleanupCharEncodingHandlers();
@@ -425,7 +425,7 @@ void merge(const char* dir)
 
        xmlFreeTextWriter(xmlwriter);
        xmlwriter = NULL;
-#ifdef LIBXML2_15
+#ifdef LIBXML2_10
        xmlCleanupParser();
 #else
        xmlCleanupCharEncodingHandlers();