From aaa395cbb2d37ac23432b4b049ec62ec5b4d9029 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Sun, 10 Apr 2022 15:37:16 +0200 Subject: [PATCH] expat: update to 2.4.8 --- expat/build.sh | 10 ++++---- expat/meta/ChangeLog | 6 +++-- expat/meta/pkgdef | 5 ++-- expat/src/expat-2.2.9-no-stdint_h.patch | 11 --------- expat/src/expat-2.4.8-no-stdint_h.patch | 33 +++++++++++++++++++++++++ expat/src/expat-2.4.8-no-strtof.patch | 27 ++++++++++++++++++++ 6 files changed, 72 insertions(+), 20 deletions(-) delete mode 100644 expat/src/expat-2.2.9-no-stdint_h.patch create mode 100644 expat/src/expat-2.4.8-no-stdint_h.patch create mode 100644 expat/src/expat-2.4.8-no-strtof.patch diff --git a/expat/build.sh b/expat/build.sh index 19c4bfb..1a895f8 100755 --- a/expat/build.sh +++ b/expat/build.sh @@ -6,11 +6,12 @@ ########################################################### # Check the following 4 variables before running the script topdir=expat -version=2.2.9 +version=2.4.8 pkgver=1 -source[0]=https://downloads.sourceforge.net/project/expat/expat/${version}/$topdir-$version.tar.lz +source[0]=https://github.com/libexpat/libexpat/releases/download/R_2_4_8/${topdir}-${version}.tar.lz # If there are no patches, simply comment this -patch[0]=expat-2.2.9-no-stdint_h.patch +patch[0]=expat-2.4.8-no-stdint_h.patch +patch[1]=expat-2.4.8-no-strtof.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions @@ -23,8 +24,6 @@ reg prep prep() { generic_prep - setdir source - ${__gsed} -i 's/fgrep -q/fgrep -s/' configure } reg build @@ -48,6 +47,7 @@ install() compat expat 2.1.0 1 1 compat expat 2.2.5 1 1 + compat expat 2.2.9 1 1 } reg pack diff --git a/expat/meta/ChangeLog b/expat/meta/ChangeLog index 04e9445..05a7b05 100644 --- a/expat/meta/ChangeLog +++ b/expat/meta/ChangeLog @@ -1,11 +1,13 @@ CHANGELOG --------- +* Sun Apr 10 2022 Tom G. Christensen - 2.4.8-1 +- Update to 2.4.8 + * Sat Feb 08 2020 Tom G. Christensen - 2.2.9-1 -- Update to 2.2.29 +- Update to 2.2.9 * Sun Apr 08 2018 Tom G. Christensen - 2.2.5-1 - Update to 2.2.5 * Sun Nov 17 2013 Tom G. Christensen - 2.1.0-1 - Import from tgcware v2 -- diff --git a/expat/meta/pkgdef b/expat/meta/pkgdef index 7834c7e..d8197dc 100644 --- a/expat/meta/pkgdef +++ b/expat/meta/pkgdef @@ -2,7 +2,7 @@ pkgname="${pkgprefix}${topdir}" name="$topdir - an XML parser library" pkgcat="system" -pkgvendor="http://expat.sourceforge.net/" +pkgvendor="https://libexpat.github.io/" pkgdesc="An XML parser library" pkgver="$pkgver" files(-,root,bin) @@ -14,7 +14,7 @@ $_vdocdir pkgname="${pkgprefix}${topdir}d" name="expat-devel - Development support" pkgcat="system" -pkgvendor="http://expat.sourceforge.net/" +pkgvendor="https://libexpat.github.io/" pkgdesc="Files needed for developing with expat" pkgver="$pkgver" files(-,root,bin) @@ -22,4 +22,5 @@ $_includedir $_libdir/libexpat.so $_libdir/libexpat.a $_libdir/pkgconfig/expat.pc +$_libdir/cmake/expat-${version} diff --git a/expat/src/expat-2.2.9-no-stdint_h.patch b/expat/src/expat-2.2.9-no-stdint_h.patch deleted file mode 100644 index 18e226e..0000000 --- a/expat/src/expat-2.2.9-no-stdint_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- expat-2.2.9/lib/siphash.h.stdint_h 2019-09-21 17:23:24.000000000 +0000 -+++ expat-2.2.9/lib/siphash.h 2020-02-08 21:15:30.156684000 +0000 -@@ -103,7 +103,7 @@ - typedef unsigned __int32 uint32_t; - typedef unsigned __int64 uint64_t; - #else --# include /* uint64_t uint32_t uint8_t */ -+# include /* uint64_t uint32_t uint8_t */ - #endif - - /* diff --git a/expat/src/expat-2.4.8-no-stdint_h.patch b/expat/src/expat-2.4.8-no-stdint_h.patch new file mode 100644 index 0000000..e695b38 --- /dev/null +++ b/expat/src/expat-2.4.8-no-stdint_h.patch @@ -0,0 +1,33 @@ +--- expat-2.4.8/tests/runtests.c.stdint 2022-03-28 23:11:43.000000000 +0000 ++++ expat-2.4.8/tests/runtests.c 2022-04-10 15:25:45.480002000 +0000 +@@ -53,7 +53,7 @@ + #include /* ptrdiff_t */ + #include + #include +-#include /* intptr_t uint64_t */ ++#include /* intptr_t uint64_t */ + + #if ! defined(__cplusplus) + # include +--- expat-2.4.8/lib/siphash.h.stdint 2022-04-10 15:24:46.740007000 +0000 ++++ expat-2.4.8/lib/siphash.h 2022-04-10 15:25:09.120002000 +0000 +@@ -99,7 +99,7 @@ + #define SIPHASH_H + + #include /* size_t */ +-#include /* uint64_t uint32_t uint8_t */ ++#include /* uint64_t uint32_t uint8_t */ + + /* + * Workaround to not require a C++11 compiler for using ULL suffix +--- expat-2.4.8/lib/xmlparse.c.stdint 2022-03-28 23:11:43.000000000 +0000 ++++ expat-2.4.8/lib/xmlparse.c 2022-04-10 15:25:17.180022000 +0000 +@@ -78,7 +78,7 @@ + #include /* UINT_MAX */ + #include /* fprintf */ + #include /* getenv, rand_s */ +-#include /* uintptr_t */ ++#include /* uintptr_t */ + #include /* isnan */ + + #ifdef _WIN32 diff --git a/expat/src/expat-2.4.8-no-strtof.patch b/expat/src/expat-2.4.8-no-strtof.patch new file mode 100644 index 0000000..7b1f8b1 --- /dev/null +++ b/expat/src/expat-2.4.8-no-strtof.patch @@ -0,0 +1,27 @@ +--- 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 +@@ -74,6 +74,6 @@ + # define tmain main + # define tremove remove + # define tchar char +-# define tcstof strtof ++# 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 @@ + + static float + portableNAN() { +- return strtof("nan", NULL); ++ return strtod("nan", NULL); + } + + static float + portableINFINITY() { +- return strtof("infinity", NULL); ++ return strtod("infinity", NULL); + } + + START_TEST(test_billion_laughs_attack_protection_api) {