diff --git a/expat/build.sh b/expat/build.sh index 1a895f8..a8a2c56 100755 --- a/expat/build.sh +++ b/expat/build.sh @@ -6,12 +6,12 @@ ########################################################### # Check the following 4 variables before running the script topdir=expat -version=2.4.8 +version=2.5.0 pkgver=1 -source[0]=https://github.com/libexpat/libexpat/releases/download/R_2_4_8/${topdir}-${version}.tar.lz +source[0]=https://github.com/libexpat/libexpat/releases/download/R_2_5_0/${topdir}-${version}.tar.lz # If there are no patches, simply comment this patch[0]=expat-2.4.8-no-stdint_h.patch -patch[1]=expat-2.4.8-no-strtof.patch +patch[1]=expat-2.5.0-no-strtof.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions @@ -48,6 +48,7 @@ install() compat expat 2.1.0 1 1 compat expat 2.2.5 1 1 compat expat 2.2.9 1 1 + compat expat 2.4.8 1 1 } reg pack diff --git a/expat/meta/ChangeLog b/expat/meta/ChangeLog index 05a7b05..995c9f8 100644 --- a/expat/meta/ChangeLog +++ b/expat/meta/ChangeLog @@ -1,5 +1,8 @@ CHANGELOG --------- +* Sun Jan 15 2023 Tom G. Christensen - 2.5.0-1 +- Update to 2.5.0 + * Sun Apr 10 2022 Tom G. Christensen - 2.4.8-1 - Update to 2.4.8 diff --git a/expat/src/expat-2.4.8-no-strtof.patch b/expat/src/expat-2.5.0-no-strtof.patch similarity index 56% rename from expat/src/expat-2.4.8-no-strtof.patch rename to expat/src/expat-2.5.0-no-strtof.patch index 7b1f8b1..4405714 100644 --- a/expat/src/expat-2.4.8-no-strtof.patch +++ b/expat/src/expat-2.5.0-no-strtof.patch @@ -1,5 +1,5 @@ ---- expat-2.4.8/xmlwf/xmltchar.h.strtof 2022-03-28 16:51:41.000000000 +0000 -+++ expat-2.4.8/xmlwf/xmltchar.h 2022-04-10 15:29:32.600005000 +0000 +--- expat-2.5.0/xmlwf/xmltchar.h.strtof 2022-10-24 18:32:57.000000000 +0000 ++++ expat-2.5.0/xmlwf/xmltchar.h 2023-01-15 13:10:45.819376000 +0000 @@ -74,6 +74,6 @@ # define tmain main # define tremove remove @@ -8,18 +8,18 @@ +# define tcstof strtod # define tcstoull strtoull #endif /* not XML_UNICODE */ ---- expat-2.4.8/tests/runtests.c.strtof 2022-04-10 15:26:11.240002000 +0000 -+++ expat-2.4.8/tests/runtests.c 2022-04-10 15:30:05.040002000 +0000 -@@ -11765,12 +11765,12 @@ +--- expat-2.5.0/tests/runtests.c.strtof 2023-01-15 13:09:44.309378000 +0000 ++++ expat-2.5.0/tests/runtests.c 2023-01-15 13:10:18.989378000 +0000 +@@ -12002,12 +12002,12 @@ static float - portableNAN() { + portableNAN(void) { - return strtof("nan", NULL); + return strtod("nan", NULL); } static float - portableINFINITY() { + portableINFINITY(void) { - return strtof("infinity", NULL); + return strtod("infinity", NULL); }