From 734698ba6ab3305cddc286c37bd7ac3beba38823 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Tue, 16 Mar 2021 18:27:32 +0100 Subject: [PATCH 1/2] Changes: Fix inconsistent double blank line --- expat/Changes | 1 - 1 file changed, 1 deletion(-) diff --git a/expat/Changes b/expat/Changes index 92598629..41a1e0f8 100644 --- a/expat/Changes +++ b/expat/Changes @@ -25,7 +25,6 @@ Release x.x.xx xxx xxxxxxx xx xxxx and Clang 11 UBSan and the Clang team - Release 2.2.10 Sat October 3 2020 Bug fixes: #390 #395 #398 Fix undefined behavior during parsing caused by From 1955a4092e07620b83a134d257b0b7d488aaee70 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Tue, 16 Mar 2021 18:34:06 +0100 Subject: [PATCH 2/2] Bump version infro from 7:12:6 to 8:0:7 --- expat/CMakeLists.txt | 6 +++--- expat/Changes | 3 +++ expat/configure.ac | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 20b48fd8..241bab04 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -335,9 +335,9 @@ if(EXPAT_WITH_LIBBSD) target_link_libraries(expat ${LIB_BSD}) endif() -set(LIBCURRENT 7) # sync -set(LIBREVISION 12) # with -set(LIBAGE 6) # configure.ac! +set(LIBCURRENT 8) # sync +set(LIBREVISION 0) # with +set(LIBAGE 7) # configure.ac! math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") set_property(TARGET expat PROPERTY OUTPUT_NAME "${_EXPAT_OUTPUT_NAME}") diff --git a/expat/Changes b/expat/Changes index 41a1e0f8..1f98d3b5 100644 --- a/expat/Changes +++ b/expat/Changes @@ -18,6 +18,9 @@ Release x.x.xx xxx xxxxxxx xx xxxx failures, as well. #442 CMake: Call "enable_language(CXX)" prior to tinkering with CMAKE_CXX_* variables + Version info bumped from 7:12:6 to 8:0:7 + due to addition of error code XML_ERROR_NO_BUFFER + (see https://verbump.de/ for what these numbers do) Special thanks to: Alexander Richardson diff --git a/expat/configure.ac b/expat/configure.ac index 71194eaa..114ef23b 100644 --- a/expat/configure.ac +++ b/expat/configure.ac @@ -48,9 +48,9 @@ dnl dnl If the API changes incompatibly set LIBAGE back to 0 dnl -LIBCURRENT=7 # sync -LIBREVISION=12 # with -LIBAGE=6 # CMakeLists.txt! +LIBCURRENT=8 # sync +LIBREVISION=0 # with +LIBAGE=7 # CMakeLists.txt! AX_APPEND_FLAG([-DHAVE_EXPAT_CONFIG_H], [AM_CPPFLAGS]) AC_CONFIG_HEADER([expat_config.h])