libxml2: Update to 2.11.4
libxml2-disable-version-script.patch: fixed upstream the rest just removed because we are not in the business of fixing compiler warnings Fixes #17228
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
--- libxml2-2.9.0/threads.c.orig 2013-03-31 15:27:37 +0400
|
||||
+++ libxml2-2.9.0/threads.c 2013-03-31 15:29:58 +0400
|
||||
@@ -1007,6 +1007,9 @@
|
||||
ATTRIBUTE_UNUSED LPVOID lpvReserved)
|
||||
#endif
|
||||
{
|
||||
+ /* Unused */
|
||||
+ (void)(hinstDLL);
|
||||
+ (void)(lpvReserved);
|
||||
switch (fdwReason) {
|
||||
case DLL_THREAD_DETACH:
|
||||
if (globalkey != TLS_OUT_OF_INDEXES) {
|
||||
@@ -1,11 +0,0 @@
|
||||
--- libxml2-2.9.0/runtest.c.orig 2013-03-31 14:51:01 +0400
|
||||
+++ libxml2-2.9.0/runtest.c 2013-03-31 15:48:15 +0400
|
||||
@@ -147,6 +147,8 @@
|
||||
char directory[500];
|
||||
int len;
|
||||
|
||||
+ (void) flags;
|
||||
+ (void) errfunc;
|
||||
if ((pattern == NULL) || (pglob == NULL)) return(-1);
|
||||
|
||||
strncpy(directory, pattern, 499);
|
||||
@@ -1,24 +0,0 @@
|
||||
--- libxml2-2.9.5/xmlmemory.c.orig 2017-09-25 22:45:17.523292500 -0400
|
||||
+++ libxml2-2.9.5/xmlmemory.c 2017-09-25 22:57:31.306998000 -0400
|
||||
@@ -43,6 +43,10 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#ifdef __MINGW32__
|
||||
+#include <stdint.h> /* might be a good idea for other platforms */
|
||||
+#endif
|
||||
+
|
||||
#include <libxml/globals.h> /* must come before xmlmemory.h */
|
||||
#include <libxml/xmlmemory.h>
|
||||
#include <libxml/xmlerror.h>
|
||||
--- libxml2-2.9.5/timsort.h.orig 2017-09-26 00:19:41.192760300 -0400
|
||||
+++ libxml2-2.9.5/timsort.h 2017-09-26 00:26:28.440138000 -0400
|
||||
@@ -402,7 +402,7 @@ static int TIM_SORT_COLLAPSE(SORT_TYPE *
|
||||
}
|
||||
|
||||
/* if this is the last merge, just do it */
|
||||
- if ((stack_curr == 2) && (stack[0].length + stack[1].length == size)) {
|
||||
+ if ((stack_curr == 2) && ((size_t)(stack[0].length + stack[1].length) == size)) {
|
||||
TIM_SORT_MERGE(dst, stack, stack_curr, store);
|
||||
stack[0].length += stack[1].length;
|
||||
stack_curr--;
|
||||
@@ -5,7 +5,7 @@ _realname=libxml2
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
"${MINGW_PACKAGE_PREFIX}-${_realname}-docs")
|
||||
pkgver=2.10.4
|
||||
pkgver=2.11.4
|
||||
pkgrel=1
|
||||
arch=('any')
|
||||
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
|
||||
@@ -17,30 +17,21 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
|
||||
"${MINGW_PACKAGE_PREFIX}-autotools"
|
||||
"${MINGW_PACKAGE_PREFIX}-python")
|
||||
optdepends=("${MINGW_PACKAGE_PREFIX}-python: Python bindings")
|
||||
options=('strip' 'staticlibs')
|
||||
license=('spdx:MIT')
|
||||
url="http://www.xmlsoft.org/"
|
||||
url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
|
||||
install=${_realname}-${MSYSTEM}.install
|
||||
source=("https://download.gnome.org/sources/libxml2/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"
|
||||
https://www.w3.org/XML/Test/xmlts20130923.tar.gz
|
||||
0015-fix-unused-parameters-warning.all.patch
|
||||
0019-unused-flags.all.patch
|
||||
0020-fix-warnings.patch
|
||||
0027-decoding-segfault.patch
|
||||
0029-xml2-config-win-paths.patch
|
||||
0030-pkgconfig-add-Cflags-private.patch
|
||||
0031-apply-msvc-relocation.patch
|
||||
libxml2-disable-version-script.patch)
|
||||
sha256sums=('ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45'
|
||||
0031-apply-msvc-relocation.patch)
|
||||
sha256sums=('737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7'
|
||||
'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f'
|
||||
'a9457b1a5e7d9499270ccfdeabbf0ca75b0e4643c111a42a5da0d113bae485c5'
|
||||
'3f025f34bf0c9b084905d24a7195315bccba45a617a02cd051cd5ee791fad098'
|
||||
'4e8377b8bd163cc29056e45f59598e36dc6f00029166bdce4c78a88f1f9b3ed4'
|
||||
'0391a4b267ba7251ca74ff2e98bf4c0332a14b618e8147a9341ec5617e45d9d9'
|
||||
'278b4531da3d2aabda080c412c5122b471202dd6df67768b38bb0c31c7a0e508'
|
||||
'06c0afaf1b8dec10d6f23dec983026cddf992528ffbc1cc50418302fabf9dee0'
|
||||
'b4e3cf5faf0ba1100e2ae6b632dc429c0b25c8caca327e0888b41341d6ddbf9a'
|
||||
'96f5b4de10b56563da0cb3c8b9ee9a88f89e5385acd66cadf4acab9628dc9848')
|
||||
'b4e3cf5faf0ba1100e2ae6b632dc429c0b25c8caca327e0888b41341d6ddbf9a')
|
||||
|
||||
# Helper macros to help make tasks easier #
|
||||
apply_patch_with_msg() {
|
||||
@@ -56,14 +47,11 @@ prepare() {
|
||||
cd ${_realname}-${pkgver}
|
||||
|
||||
apply_patch_with_msg \
|
||||
0015-fix-unused-parameters-warning.all.patch \
|
||||
0019-unused-flags.all.patch \
|
||||
0020-fix-warnings.patch \
|
||||
0030-pkgconfig-add-Cflags-private.patch \
|
||||
0031-apply-msvc-relocation.patch \
|
||||
libxml2-disable-version-script.patch
|
||||
0031-apply-msvc-relocation.patch
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
|
||||
# https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/15
|
||||
# https://github.com/msys2/MINGW-packages/issues/7955
|
||||
apply_patch_with_msg \
|
||||
0027-decoding-segfault.patch
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
--- libxml2-2.9.10/configure.ac.orig 2021-01-19 18:13:14.649265300 -0800
|
||||
+++ libxml2-2.9.10/configure.ac 2021-01-19 22:34:30.711808300 -0800
|
||||
@@ -78,14 +78,6 @@
|
||||
dnl then add it
|
||||
dnl
|
||||
VERSION_SCRIPT_FLAGS=
|
||||
-# lt_cv_prog_gnu_ld is from libtool 2.+
|
||||
-if test "$lt_cv_prog_gnu_ld" = yes; then
|
||||
- VERSION_SCRIPT_FLAGS=-Wl,--version-script=
|
||||
-else
|
||||
- case $host in
|
||||
- *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,";;
|
||||
- esac
|
||||
-fi
|
||||
AC_SUBST(VERSION_SCRIPT_FLAGS)
|
||||
AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
|
||||
|
||||
Reference in New Issue
Block a user