From a518a2c10c47f26f1ddfb500c9347a034f3326bc Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sun, 9 Feb 2020 14:54:46 +0100
Subject: [PATCH] expat: update to 2.2.9

---
 expat/build.sh                          | 12 +++++++-----
 expat/meta/ChangeLog                    |  3 +++
 expat/meta/pkgdef                       |  1 -
 expat/src/expat-2.2.5-no-stdint_h.patch | 11 -----------
 expat/src/expat-2.2.9-no-stdint_h.patch | 11 +++++++++++
 5 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 100644 expat/src/expat-2.2.5-no-stdint_h.patch
 create mode 100644 expat/src/expat-2.2.9-no-stdint_h.patch

diff --git a/expat/build.sh b/expat/build.sh
index 477f2c5..19c4bfb 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.2.5
+version=2.2.9
 pkgver=1
-source[0]=https://downloads.sourceforge.net/project/expat/expat/${version}/$topdir-$version.tar.bz2
+source[0]=https://downloads.sourceforge.net/project/expat/expat/${version}/$topdir-$version.tar.lz
 # If there are no patches, simply comment this
-patch[0]=expat-2.2.5-no-stdint_h.patch
+patch[0]=expat-2.2.9-no-stdint_h.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
@@ -43,9 +43,11 @@ reg install
 install()
 {
     generic_install DESTDIR
-    doc COPYING Changes README.md AUTHORS
-    compat expat 2.1.0 1 1
+    doc COPYING Changes README.md AUTHORS doc/reference.html doc/expat.png doc/style.css
     ${__rm} -rf ${stagedir}${prefix}/share/doc/expat
+
+    compat expat 2.1.0 1 1
+    compat expat 2.2.5 1 1
 }
 
 reg pack
diff --git a/expat/meta/ChangeLog b/expat/meta/ChangeLog
index 7298ab7..04e9445 100644
--- a/expat/meta/ChangeLog
+++ b/expat/meta/ChangeLog
@@ -1,5 +1,8 @@
 CHANGELOG
 ---------
+* Sat Feb 08 2020 Tom G. Christensen <swpkg@jupiterrise.com> - 2.2.9-1
+- Update to 2.2.29
+
 * Sun Apr 08 2018 Tom G. Christensen <swpkg@jupiterrise.com> - 2.2.5-1
 - Update to 2.2.5
 
diff --git a/expat/meta/pkgdef b/expat/meta/pkgdef
index 52442d1..7834c7e 100644
--- a/expat/meta/pkgdef
+++ b/expat/meta/pkgdef
@@ -8,7 +8,6 @@ pkgver="$pkgver"
 files(-,root,bin)
 $_bindir/xmlwf
 $_libdir/libexpat.so.*
-$_mandir/man1/xmlwf.1*
 $_vdocdir
 
 [expat-devel]
diff --git a/expat/src/expat-2.2.5-no-stdint_h.patch b/expat/src/expat-2.2.5-no-stdint_h.patch
deleted file mode 100644
index 9f50960..0000000
--- a/expat/src/expat-2.2.5-no-stdint_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 <stdint.h> /* uint64_t uint32_t uint8_t */
-+ #include <sys/types.h> /* uint64_t uint32_t uint8_t */
- #endif
- 
- 
diff --git a/expat/src/expat-2.2.9-no-stdint_h.patch b/expat/src/expat-2.2.9-no-stdint_h.patch
new file mode 100644
index 0000000..18e226e
--- /dev/null
+++ b/expat/src/expat-2.2.9-no-stdint_h.patch
@@ -0,0 +1,11 @@
+--- 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 <stdint.h> /* uint64_t uint32_t uint8_t */
++#  include <sys/types.h> /* uint64_t uint32_t uint8_t */
+ #endif
+ 
+ /*