Update to expat-2.4.8.

This commit is contained in:
Jonas 'Sortie' Termansen 2022-06-19 23:59:35 +02:00
parent 579b494170
commit 31d8c5d828
3 changed files with 7 additions and 49 deletions

View File

@ -1,45 +0,0 @@
diff -Paur --no-dereference -- libexpat.upstream/conftools/config.sub libexpat/conftools/config.sub
--- libexpat.upstream/conftools/config.sub
+++ libexpat/conftools/config.sub
@@ -1326,7 +1326,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* | -aros* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff -Paur --no-dereference -- libexpat.upstream/Makefile.in libexpat/Makefile.in
--- libexpat.upstream/Makefile.in
+++ libexpat/Makefile.in
@@ -45,7 +45,7 @@
APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
LIBRARY = libexpat.la
-DESTDIR = $(INSTALL_ROOT)
+DESTDIR ?= $(INSTALL_ROOT)
default: buildlib xmlwf/xmlwf@EXEEXT@
diff -Paur --no-dereference -- libexpat.upstream/xmlwf/readfilemap.c libexpat/xmlwf/readfilemap.c
--- libexpat.upstream/xmlwf/readfilemap.c
+++ libexpat/xmlwf/readfilemap.c
@@ -8,17 +8,7 @@
#include <stdlib.h>
#include <stdio.h>
-#ifdef __WATCOMC__
-#ifndef __LINUX__
-#include <io.h>
-#else
#include <unistd.h>
-#endif
-#endif
-
-#ifdef __BEOS__
-#include <unistd.h>
-#endif
#ifndef S_ISREG
#ifndef S_IFREG

View File

@ -1,14 +1,15 @@
NAME=libexpat
BUILD_LIBRARIES=
VERSION_MAJOR=2
VERSION_MINOR=1
VERSION_PATCH=0
VERSION_MINOR=4
VERSION_PATCH=8
VERSION=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH
DISTNAME=expat-$VERSION
COMPRESSION=tar.gz
COMPRESSION=tar.xz
ARCHIVE=$DISTNAME.$COMPRESSION
SHA256SUM=823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
SHA256SUM=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25
UPSTREAM_SITE=https://github.com/libexpat/libexpat/releases/download/R_${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}
UPSTREAM_ARCHIVE=$ARCHIVE
LICENSE=MIT
BUILD_SYSTEM=configure
POST_INSTALL=tix-eradicate-libtool-la

View File

@ -0,0 +1,2 @@
rm -rf -- 'doc/xmlwf.1'
rm -rf -- 'expat_config.h'