From d4d15ed16049ecad96ec560fe369da24cdfd482a Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Sun, 8 Apr 2018 13:06:03 +0200 Subject: [PATCH] expat: update to 2.2.5 --- expat/build.sh | 12 ++++++++---- expat/meta/ChangeLog | 3 +++ expat/src/expat-2.2.5-no-stdint_h.patch | 11 +++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 expat/src/expat-2.2.5-no-stdint_h.patch diff --git a/expat/build.sh b/expat/build.sh index a055b6b..477f2c5 100755 --- a/expat/build.sh +++ b/expat/build.sh @@ -6,11 +6,11 @@ ########################################################### # Check the following 4 variables before running the script topdir=expat -version=2.1.0 +version=2.2.5 pkgver=1 -source[0]=http://downloads.sourceforge.net/project/expat/expat/${version}/$topdir-$version.tar.gz +source[0]=https://downloads.sourceforge.net/project/expat/expat/${version}/$topdir-$version.tar.bz2 # If there are no patches, simply comment this -#patch[0]= +patch[0]=expat-2.2.5-no-stdint_h.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions @@ -23,6 +23,8 @@ reg prep prep() { generic_prep + setdir source + ${__gsed} -i 's/fgrep -q/fgrep -s/' configure } reg build @@ -41,7 +43,9 @@ reg install install() { generic_install DESTDIR - doc COPYING Changes README + doc COPYING Changes README.md AUTHORS + compat expat 2.1.0 1 1 + ${__rm} -rf ${stagedir}${prefix}/share/doc/expat } reg pack diff --git a/expat/meta/ChangeLog b/expat/meta/ChangeLog index 0f9e45c..7298ab7 100644 --- a/expat/meta/ChangeLog +++ b/expat/meta/ChangeLog @@ -1,5 +1,8 @@ CHANGELOG --------- +* 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/src/expat-2.2.5-no-stdint_h.patch b/expat/src/expat-2.2.5-no-stdint_h.patch new file mode 100644 index 0000000..9f50960 --- /dev/null +++ b/expat/src/expat-2.2.5-no-stdint_h.patch @@ -0,0 +1,11 @@ +--- expat-2.2.5/lib/siphash.h.stdint_h 2017-09-03 16:47:40.000000000 +0200 ++++ expat-2.2.5/lib/siphash.h 2018-04-08 12:52:11.539331000 +0200 +@@ -93,7 +93,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 + +