Update 4 packages

mingw-w64-i686-expat (2.6.0-1 -> 2.6.1-2) mingw-w64-i686-nghttp2 (1.59.0-1 -> 1.60.0-1) mingw-w64-x86_64-expat (2.6.0-1 -> 2.6.1-2) mingw-w64-x86_64-nghttp2 (1.59.0-1 -> 1.60.0-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
git-for-windows · Mar 3, 2024 · b8616e8 · b8616e8
1 parent 486188a
commit b8616e8
Show file tree

Hide file tree

Showing 83 changed files with 2,697 additions and 325 deletions.
diff --git a/mingw32/bin/libexpat-1.dll b/mingw32/bin/libexpat-1.dll
diff --git a/mingw32/bin/libnghttp2-14.dll b/mingw32/bin/libnghttp2-14.dll
diff --git a/mingw32/bin/xmlwf.exe b/mingw32/bin/xmlwf.exe
diff --git a/mingw32/include/expat.h b/mingw32/include/expat.h
@@ -18,6 +18,7 @@
    Copyright (c) 2022      Thijs Schreijer <[email protected]>
    Copyright (c) 2023      Hanno Böck <[email protected]>
    Copyright (c) 2023      Sony Corporation / Snild Dolkow <[email protected]>
+   Copyright (c) 2024      Taichi Haradaguchi <[email protected]>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -1042,7 +1043,7 @@ typedef struct {
 XMLPARSEAPI(const XML_Feature *)
 XML_GetFeatureList(void);
 
-#if XML_GE == 1
+#if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)
 /* Added in Expat 2.4.0 for XML_DTD defined and
  * added in Expat 2.6.0 for XML_GE == 1. */
 XMLPARSEAPI(XML_Bool)
@@ -1065,7 +1066,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/mingw32/include/expat_config.h b/mingw32/include/expat_config.h
@@ -83,7 +83,7 @@
 #define PACKAGE_NAME "expat"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.6.0"
+#define PACKAGE_STRING "expat 2.6.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "expat"
@@ -92,18 +92,15 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.6.0"
-
-/* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 4
+#define PACKAGE_VERSION "2.6.1"
 
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "2.6.0"
+#define VERSION "2.6.1"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */