summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2022-02-20 16:05:01 +0100
committerSebastian Pipping <sebastian@pipping.org>2022-02-20 16:09:26 +0100
commit28f74546b4cea31c8c690ced8fc215307052c9b8 (patch)
tree9bc4a4f15bfc64e3ccc3837b38a1a48f32ef9b9e
parent45732df416c157fe2994824ec52ad6ea6d00c924 (diff)
downloadlibexpat-git-28f74546b4cea31c8c690ced8fc215307052c9b8.tar.gz
Bump version to 2.4.6
-rw-r--r--expat/CMake.README12
-rw-r--r--expat/CMakeLists.txt2
-rw-r--r--expat/README.md2
-rw-r--r--expat/doc/reference.html2
-rw-r--r--expat/lib/expat.h2
-rw-r--r--expat/lib/xmlparse.c2
-rw-r--r--expat/tests/runtests.c2
-rw-r--r--expat/win32/expat.iss2
8 files changed, 13 insertions, 13 deletions
diff --git a/expat/CMake.README b/expat/CMake.README
index e61aed1c..37f7c539 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.5 is the source directory of expat, add a subdirectory
+Assuming ~/expat-2.4.6 is the source directory of expat, add a subdirectory
build and change into that directory:
-~/expat-2.4.5$ mkdir build && cd build
-~/expat-2.4.5/build$
+~/expat-2.4.6$ mkdir build && cd build
+~/expat-2.4.6/build$
From that directory, call cmake first, then call make, make test and
make install in the usual way:
-~/expat-2.4.5/build$ cmake ..
+~/expat-2.4.6/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.5/build
+-- Build files have been written to: /home/patrick/expat-2.4.6/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.5/build$ make && make test && make install
+~/expat-2.4.6/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 ed24f67b..a36b1d06 100644
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -64,7 +64,7 @@ endif()
project(expat
VERSION
- 2.4.5
+ 2.4.6
LANGUAGES
C
)
diff --git a/expat/README.md b/expat/README.md
index 469b1dd8..959c4a6e 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.5
+# Expat, Release 2.4.6
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 ea8f7106..26db5a63 100644
--- a/expat/doc/reference.html
+++ b/expat/doc/reference.html
@@ -49,7 +49,7 @@
<div>
<h1>
The Expat XML Parser
- <small>Release 2.4.5</small>
+ <small>Release 2.4.6</small>
</h1>
</div>
<div class="content">
diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index 55e5131b..46a0e1bc 100644
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -1041,7 +1041,7 @@ XML_SetBillionLaughsAttackProtectionActivationThreshold(
*/
#define XML_MAJOR_VERSION 2
#define XML_MINOR_VERSION 4
-#define XML_MICRO_VERSION 5
+#define XML_MICRO_VERSION 6
#ifdef __cplusplus
}
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 84885b5a..7db28d07 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1,4 +1,4 @@
-/* 042615face2b8727e23bb27cf4f56baa292a1f91df47c1bca8f09dff49067888 (2.4.5+)
+/* a30d2613dcfdef81475a9d1a349134d2d42722172fdaa7d5bb12ed2aa74b9596 (2.4.6+)
__ __ _
___\ \/ /_ __ __ _| |_
/ _ \\ /| '_ \ / _` | __|
diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index e28670d2..6d6f6690 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -7588,7 +7588,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.5"))) /* needs bump on releases */
+ if (xcstrcmp(version_text, XCS("expat_2.4.6"))) /* 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 e04eaa52..2bbfdab7 100644
--- a/expat/win32/expat.iss
+++ b/expat/win32/expat.iss
@@ -36,7 +36,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.5"
+#define expatVer "2.4.6"
[Setup]
AppName=Expat