From 3417b3e098f1426f736ccacd9bc50aa8f5b7e35c Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 24 Mar 2021 19:26:06 +0100 Subject: [PATCH] Bump version from 2.2.10 to 2.3.0 --- expat/CMake.README | 12 ++++++------ expat/CMakeLists.txt | 2 +- expat/README.md | 2 +- expat/lib/expat.h | 4 ++-- expat/lib/xmlparse.c | 2 +- expat/tests/runtests.c | 2 +- expat/win32/expat.iss | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/expat/CMake.README b/expat/CMake.README index aa098b4f..a512a7b7 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.2.10 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.3.0 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.2.10$ mkdir build && cd build -~/expat-2.2.10/build$ +~/expat-2.3.0$ mkdir build && cd build +~/expat-2.3.0/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.2.10/build$ cmake .. +~/expat-2.3.0/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.2.10/build +-- Build files have been written to: /home/patrick/expat-2.3.0/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.2.10/build$ make && make test && make install +~/expat-2.3.0/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 d6c1618d..e3564691 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -33,7 +33,7 @@ endif() project(expat VERSION - 2.2.10 + 2.3.0 LANGUAGES C ) diff --git a/expat/README.md b/expat/README.md index e2eafc3b..6e4b4226 100644 --- a/expat/README.md +++ b/expat/README.md @@ -3,7 +3,7 @@ [![Packaging status](https://repology.org/badge/tiny-repos/expat.svg)](https://repology.org/metapackage/expat/versions) -# Expat, Release 2.2.10 +# Expat, Release 2.3.0 This is Expat, a C library for parsing XML, started by [James Clark](https://en.wikipedia.org/wiki/James_Clark_(programmer)) in 1997. diff --git a/expat/lib/expat.h b/expat/lib/expat.h index 7b24df90..a4a8ef74 100644 --- a/expat/lib/expat.h +++ b/expat/lib/expat.h @@ -1016,8 +1016,8 @@ XML_GetFeatureList(void); See http://semver.org. */ #define XML_MAJOR_VERSION 2 -#define XML_MINOR_VERSION 2 -#define XML_MICRO_VERSION 10 +#define XML_MINOR_VERSION 3 +#define XML_MICRO_VERSION 0 #ifdef __cplusplus } diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index b9320732..e953d3f3 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* 5cd169f2942b85c05e0b1b96f9990f91ac3d07e470ad7ce906ac8590c8ed4f35 (2.2.10+) +/* d667b5f8e56e24fdfaf5e38596d419d924a9fadceb987d81d5613ecb7ca51b0e (2.3.0+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index 3d3afa7b..91ab4f21 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.c @@ -7347,7 +7347,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.2.10"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.3.0"))) /* 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 ef95f175..0d5533f1 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -4,7 +4,7 @@ ; This script was contributed by Tim Peters. ; It was designed for Inno Setup 2.0.19 but works with later versions as well. -#define expatVer "2.2.10" +#define expatVer "2.3.0" [Setup] AppName=Expat