diff --git a/expat/CMake.README b/expat/CMake.README index f712dd7d..2adae7c2 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.6.0 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.6.1 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.6.0$ mkdir build && cd build -~/expat-2.6.0/build$ +~/expat-2.6.1$ mkdir build && cd build +~/expat-2.6.1/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.6.0/build$ cmake .. +~/expat-2.6.1/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.6.0/build +-- Build files have been written to: /home/patrick/expat-2.6.1/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.6.0/build$ make && make test && make install +~/expat-2.6.1/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 23c62883..4f482b28 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -38,7 +38,7 @@ cmake_minimum_required(VERSION 3.5.0) project(expat VERSION - 2.6.0 + 2.6.1 LANGUAGES C ) diff --git a/expat/README.md b/expat/README.md index 43c4f4f3..9b6ca08f 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.6.0 +# Expat, Release 2.6.1 This is Expat, a C99 library for parsing [XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by diff --git a/expat/doc/reference.html b/expat/doc/reference.html index 3cfe4779..1fd4c14b 100644 --- a/expat/doc/reference.html +++ b/expat/doc/reference.html @@ -52,7 +52,7 @@

The Expat XML Parser - Release 2.6.0 + Release 2.6.1

diff --git a/expat/lib/expat.h b/expat/lib/expat.h index 5a8f5178..cf160cf5 100644 --- a/expat/lib/expat.h +++ b/expat/lib/expat.h @@ -1065,7 +1065,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled); */ #define XML_MAJOR_VERSION 2 #define XML_MINOR_VERSION 6 -#define XML_MICRO_VERSION 0 +#define XML_MICRO_VERSION 1 #ifdef __cplusplus } diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 0451e693..b884d82b 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* 628e24d4966bedbd4800f6ed128d06d29703765b4bce12d3b7f099f90f842fc9 (2.6.0+) +/* dd2a9703e301882afe16d198a82689ab225277057f5eab9d079d8606eab736b4 (2.6.1+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| diff --git a/expat/tests/misc_tests.c b/expat/tests/misc_tests.c index b5212f58..2df5d96f 100644 --- a/expat/tests/misc_tests.c +++ b/expat/tests/misc_tests.c @@ -208,7 +208,7 @@ START_TEST(test_misc_version) { if (! versions_equal(&read_version, &parsed_version)) fail("Version mismatch"); - if (xcstrcmp(version_text, XCS("expat_2.6.0"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.6.1"))) /* needs bump on releases */ fail("XML_*_VERSION in expat.h out of sync?\n"); } END_TEST diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss index 90786bef..1aec6418 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.6.0" +#define expatVer "2.6.1" [Setup] AppName=Expat