From 44c2a9470a24cb45973b83f95fcd0c361431ab17 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 28 Mar 2022 15:59:19 +0200 Subject: Bump version info from 9:7:8 to 9:8:8 See https://verbump.de/ for what these numbers do --- expat/CMakeLists.txt | 2 +- expat/Changes | 2 ++ expat/configure.ac | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index ef0890f3..ca6c705f 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -414,7 +414,7 @@ if(EXPAT_WITH_LIBBSD) endif() set(LIBCURRENT 9) # sync -set(LIBREVISION 7) # with +set(LIBREVISION 8) # with set(LIBAGE 8) # configure.ac! math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") diff --git a/expat/Changes b/expat/Changes index 6cfd4ed5..369ef7c2 100644 --- a/expat/Changes +++ b/expat/Changes @@ -10,6 +10,8 @@ Release x.x.x xxx xxxx xx xxxx "-compatibility_version " and "-current_version " in a way compatible with GNU Libtool + #590 #591 Version info bumped from 9:7:8 to 9:8:8; + see https://verbump.de/ for what these numbers do Infrastructure: #589 CI: Upgrade Clang from 13 to 14 diff --git a/expat/configure.ac b/expat/configure.ac index 7a7f013f..48640256 100644 --- a/expat/configure.ac +++ b/expat/configure.ac @@ -82,7 +82,7 @@ dnl If the API changes incompatibly set LIBAGE back to 0 dnl LIBCURRENT=9 # sync -LIBREVISION=7 # with +LIBREVISION=8 # with LIBAGE=8 # CMakeLists.txt! AC_CONFIG_HEADERS([expat_config.h]) -- cgit v1.2.1 From 24ae16273bce6fb57f13ca864cf9b8d28974fc6e Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 28 Mar 2022 16:48:01 +0200 Subject: Bump version to 2.4.8 --- expat/CMake.README | 12 ++++++------ expat/CMakeLists.txt | 2 +- expat/README.md | 2 +- expat/doc/reference.html | 2 +- expat/lib/expat.h | 2 +- expat/lib/xmlparse.c | 2 +- expat/tests/runtests.c | 2 +- expat/win32/expat.iss | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/expat/CMake.README b/expat/CMake.README index df40089e..be805e45 100644 --- a/expat/CMake.README +++ b/expat/CMake.README @@ -3,25 +3,25 @@ The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual Studio) and should work on all other platform cmake supports. -Assuming ~/expat-2.4.7 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.4.8 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.4.7$ mkdir build && cd build -~/expat-2.4.7/build$ +~/expat-2.4.8$ mkdir build && cd build +~/expat-2.4.8/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.4.7/build$ cmake .. +~/expat-2.4.8/build$ cmake .. -- The C compiler identification is GNU -- The CXX compiler identification is GNU .... -- Configuring done -- Generating done --- Build files have been written to: /home/patrick/expat-2.4.7/build +-- Build files have been written to: /home/patrick/expat-2.4.8/build If you want to specify the install location for your files, append -DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call. -~/expat-2.4.7/build$ make && make test && make install +~/expat-2.4.8/build$ make && make test && make install Scanning dependencies of target expat [ 5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o [ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index ca6c705f..6797fd43 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -65,7 +65,7 @@ endif() project(expat VERSION - 2.4.7 + 2.4.8 LANGUAGES C ) diff --git a/expat/README.md b/expat/README.md index 6bfbf130..332ac955 100644 --- a/expat/README.md +++ b/expat/README.md @@ -5,7 +5,7 @@ [![Downloads GitHub](https://img.shields.io/github/downloads/libexpat/libexpat/total?label=Downloads%20GitHub)](https://github.com/libexpat/libexpat/releases) -# Expat, Release 2.4.7 +# Expat, Release 2.4.8 This is Expat, a C library for parsing XML, started by [James Clark](https://en.wikipedia.org/wiki/James_Clark_%28programmer%29) in 1997. diff --git a/expat/doc/reference.html b/expat/doc/reference.html index 87ace02d..031c943e 100644 --- a/expat/doc/reference.html +++ b/expat/doc/reference.html @@ -50,7 +50,7 @@

The Expat XML Parser - Release 2.4.7 + Release 2.4.8

diff --git a/expat/lib/expat.h b/expat/lib/expat.h index c9214f64..e2020a4a 100644 --- a/expat/lib/expat.h +++ b/expat/lib/expat.h @@ -1055,7 +1055,7 @@ XML_SetBillionLaughsAttackProtectionActivationThreshold( */ #define XML_MAJOR_VERSION 2 #define XML_MINOR_VERSION 4 -#define XML_MICRO_VERSION 7 +#define XML_MICRO_VERSION 8 #ifdef __cplusplus } diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 05216d99..e986156e 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* fcb1a62fefa945567301146eb98e3ad3413e823a41c4378e84e8b6b6f308d824 (2.4.7+) +/* 2722de33b8d95adcfb16db05afdec6ed1d40d51565cda2176c61806b5350eafe (2.4.8+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index 3309bbaa..ea371b42 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.c @@ -7589,7 +7589,7 @@ START_TEST(test_misc_version) { fail("Version mismatch"); #if ! defined(XML_UNICODE) || defined(XML_UNICODE_WCHAR_T) - if (xcstrcmp(version_text, XCS("expat_2.4.7"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.4.8"))) /* needs bump on releases */ fail("XML_*_VERSION in expat.h out of sync?\n"); #else /* If we have XML_UNICODE defined but not XML_UNICODE_WCHAR_T diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss index 0c0c53b4..0cbfbc75 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -37,7 +37,7 @@ ; OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE ; USE OR OTHER DEALINGS IN THE SOFTWARE. -#define expatVer "2.4.7" +#define expatVer "2.4.8" [Setup] AppName=Expat -- cgit v1.2.1 From 8a2372147541171de35cf126f8419ddd7479af5d Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 28 Mar 2022 16:52:39 +0200 Subject: Sync file headers --- .github/workflows/autotools-cmake.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/cppcheck.yml | 2 +- .github/workflows/expat_config_h.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/valid-xml.yml | 2 +- .travis.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/autotools-cmake.yml b/.github/workflows/autotools-cmake.yml index b10ae831..b99ae8dc 100644 --- a/.github/workflows/autotools-cmake.yml +++ b/.github/workflows/autotools-cmake.yml @@ -5,7 +5,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021 Sebastian Pipping +# Copyright (c) 2021-2022 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a253ef4b..1826ab22 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -5,7 +5,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021 Sebastian Pipping +# Copyright (c) 2021-2022 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index 0beed0d8..2a0b7758 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -5,7 +5,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021 Sebastian Pipping +# Copyright (c) 2021-2022 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/expat_config_h.yml b/.github/workflows/expat_config_h.yml index 1517c17c..1c87f381 100644 --- a/.github/workflows/expat_config_h.yml +++ b/.github/workflows/expat_config_h.yml @@ -5,7 +5,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2020-2021 Sebastian Pipping +# Copyright (c) 2020-2022 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c2e3cb36..1023e515 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -5,7 +5,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2020-2021 Sebastian Pipping +# Copyright (c) 2020-2022 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/valid-xml.yml b/.github/workflows/valid-xml.yml index f68db48e..09308ee7 100644 --- a/.github/workflows/valid-xml.yml +++ b/.github/workflows/valid-xml.yml @@ -5,7 +5,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021 Sebastian Pipping +# Copyright (c) 2021-2022 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.travis.sh b/.travis.sh index fe6d8fc5..79430ed8 100755 --- a/.travis.sh +++ b/.travis.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2017-2021 Sebastian Pipping +# Copyright (c) 2017-2022 Sebastian Pipping # Copyright (c) 2017 Rolf Eike Beer # Copyright (c) 2019 Mohammed Khajapasha # Copyright (c) 2019 Philippe Antoine -- cgit v1.2.1 From 8902f86c3916cce6189b7b2be90c37942b9b0e42 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 28 Mar 2022 16:57:36 +0200 Subject: Set expected release date for 2.4.8 --- expat/Changes | 2 +- expat/doc/xmlwf.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/expat/Changes b/expat/Changes index 369ef7c2..918c939d 100644 --- a/expat/Changes +++ b/expat/Changes @@ -2,7 +2,7 @@ NOTE: We are looking for help with a few things: https://github.com/libexpat/libexpat/labels/help%20wanted If you can help, please get in touch. Thanks! -Release x.x.x xxx xxxx xx xxxx +Release 2.4.8 Mon March 28 2022 Other changes: #587 pkg-config: Move "-lm" to section "Libs.private" #587 CMake|MSVC: Fix pkg-config section "Libs" diff --git a/expat/doc/xmlwf.xml b/expat/doc/xmlwf.xml index 8b43a11e..48714b8c 100644 --- a/expat/doc/xmlwf.xml +++ b/expat/doc/xmlwf.xml @@ -21,7 +21,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ Scott"> Bronson"> - March 4, 2022"> + March 28, 2022"> 1"> bronson@rinspin.com"> -- cgit v1.2.1