Skip to content

Commit 2f06259

Browse files
committed
Update Expat XML parser to v2.7.0
1 parent b8f52d1 commit 2f06259

3 files changed

Lines changed: 415 additions & 151 deletions

File tree

ExternData/Resources/C-Sources/expat/README.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
> at the top of the `Changes` file.
1212
1313

14-
# Expat, Release 2.6.4
14+
# Expat, Release 2.7.0
1515

1616
This is Expat, a C99 library for parsing
1717
[XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by
@@ -22,9 +22,9 @@ are called when the parser discovers the associated structures in the
2222
document being parsed. A start tag is an example of the kind of
2323
structures for which you may register handlers.
2424

25-
Expat supports the following compilers:
25+
Expat supports the following C99 compilers:
2626

27-
- GNU GCC >=4.5
27+
- GNU GCC >=4.5 (for use from C) or GNU GCC >=4.8.1 (for use from C++)
2828
- LLVM Clang >=3.5
2929
- Microsoft Visual Studio >=16.0/2019 (rolling `${today} minus 5 years`)
3030

@@ -52,7 +52,7 @@ This approach leverages CMake's own [module `FindEXPAT`](https://cmake.org/cmake
5252
Notice the *uppercase* `EXPAT` in the following example:
5353

5454
```cmake
55-
cmake_minimum_required(VERSION 3.0) # or 3.10, see below
55+
cmake_minimum_required(VERSION 3.10)
5656
5757
project(hello VERSION 1.0.0)
5858
@@ -62,12 +62,7 @@ add_executable(hello
6262
hello.c
6363
)
6464
65-
# a) for CMake >=3.10 (see CMake's FindEXPAT docs)
6665
target_link_libraries(hello PUBLIC EXPAT::EXPAT)
67-
68-
# b) for CMake >=3.0
69-
target_include_directories(hello PRIVATE ${EXPAT_INCLUDE_DIRS})
70-
target_link_libraries(hello PUBLIC ${EXPAT_LIBRARIES})
7166
```
7267

7368
### b) `find_package` with Config Mode
@@ -85,7 +80,7 @@ or
8580
Notice the *lowercase* `expat` in the following example:
8681

8782
```cmake
88-
cmake_minimum_required(VERSION 3.0)
83+
cmake_minimum_required(VERSION 3.10)
8984
9085
project(hello VERSION 1.0.0)
9186
@@ -295,7 +290,7 @@ EXPAT_ENABLE_INSTALL:BOOL=ON
295290
// Use /MT flag (static CRT) when compiling in MSVC
296291
EXPAT_MSVC_STATIC_CRT:BOOL=OFF
297292

298-
// Build fuzzers via ossfuzz for the expat library
293+
// Build fuzzers via OSS-Fuzz for the expat library
299294
EXPAT_OSSFUZZ_BUILD:BOOL=OFF
300295

301296
// Build a shared expat library

ExternData/Resources/C-Sources/expat/lib/expat.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
1212
Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
1313
Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
14-
Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org>
14+
Copyright (c) 2016-2025 Sebastian Pipping <sebastian@pipping.org>
1515
Copyright (c) 2016 Cristian Rodríguez <crrodriguez@opensuse.org>
1616
Copyright (c) 2016 Thomas Beutlich <tc@tbeu.de>
1717
Copyright (c) 2017 Rhodri James <rhodri@wildebeest.org.uk>
@@ -1067,8 +1067,8 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
10671067
See https://semver.org
10681068
*/
10691069
#define XML_MAJOR_VERSION 2
1070-
#define XML_MINOR_VERSION 6
1071-
#define XML_MICRO_VERSION 4
1070+
#define XML_MINOR_VERSION 7
1071+
#define XML_MICRO_VERSION 0
10721072

10731073
#ifdef __cplusplus
10741074
}

0 commit comments

Comments
 (0)