upg libxml2

This commit is contained in:
joborun linux 2023-07-04 04:37:59 +03:00
parent 3649efd0c0
commit f9802be8f3
3 changed files with 42 additions and 32 deletions

View file

@ -0,0 +1,27 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Tue, 11 Apr 2023 21:59:24 +0000
Subject: [PATCH] HACK: Don't run fuzzing tests
They take way too long.
---
Makefile.am | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5bc401813e6b..0d69d2cdf235 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,11 +6,8 @@ SUBDIRS = include . doc example xstc
if WITH_PYTHON
SUBDIRS += python
endif
-if WITH_GLOB
-SUBDIRS += fuzz
-endif
-DIST_SUBDIRS = include . doc example fuzz python xstc
+DIST_SUBDIRS = include . doc example python xstc
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include -DSYSCONFDIR='"$(sysconfdir)"'

View file

@ -5,13 +5,11 @@
# Website : https://pozol.eu # Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |--------------------------------------- #-----------------------------------------| DESCRIPTION |---------------------------------------
### *** this is from staging rebuilt on icu from staging DO NOT USE YET *** ###
#pkgbase=libxml2 #pkgbase=libxml2
#pkgname=(libxml2 libxml2-docs) #pkgname=(libxml2 libxml2-docs)
pkgname=libxml2 pkgname=libxml2
pkgver=2.10.4 pkgver=2.11.4
pkgrel=06 pkgrel=01
# mixup between jobcore and staging 4/22 rebuild on jobcore used staging PKGBUILD-arch # mixup between jobcore and staging 4/22 rebuild on jobcore used staging PKGBUILD-arch
# so staging pkgrel is bumped up one to distinguish from jobcore's build # so staging pkgrel is bumped up one to distinguish from jobcore's build
pkgdesc="XML C parser and toolkit" pkgdesc="XML C parser and toolkit"
@ -21,11 +19,10 @@ makedepends=(python git)
optdepends=('python: Python bindings') optdepends=('python: Python bindings')
provides=(libxml2.so) provides=(libxml2.so)
#options=(debug) ## uncomment this to have the debug pkg produced #options=(debug) ## uncomment this to have the debug pkg produced
_commit=223cb03a5d27b1b2393b266a8657443d046139d6 # tags/v2.10.4^0 _commit=2e9f7860a9cb8be29eca90b7409ef0278d30ef10 # tags/v2.11.4^0
source=( source=(
"git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit" "git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
0001-Fix-python3-unicode-errors.patch 0001-HACK-Don-t-run-fuzzing-tests.patch
0002-HACK-Don-t-run-fuzzing-tests.patch
https://www.w3.org/XML/Test/xmlts20130923.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz
) )
@ -40,11 +37,8 @@ prepare() {
# Use xmlconf from conformance test suite # Use xmlconf from conformance test suite
ln -s ../xmlconf ln -s ../xmlconf
# https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
git apply -3 ../0001-Fix-python3-unicode-errors.patch
# Do not run fuzzing tests # Do not run fuzzing tests
git apply -3 ../0002-HACK-Don-t-run-fuzzing-tests.patch git apply -3 ../0001-HACK-Don-t-run-fuzzing-tests.patch
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
} }
@ -97,16 +91,10 @@ arch=(x86_64)
# license=(MIT) ... 2.9.14 # license=(MIT) ... 2.9.14
license=(custom:MIT) # 2.10.1 license=(custom:MIT) # 2.10.1
b2sums=('SKIP'
'ec5a0955906c5fdd4bc65248bdb46f315460f4b2208bf37c49f55ef7468585786bdf563aa3e9357370d4f1ff947a6d4467869eeb2ca6b77ca5e40ffa45213a13'
'ec247c8caad963307d8f487176fde518cfb087bbff3f10c2a5846b90a04c9909c2f0e6aaf8ded4784f46586eafb16df493caf1debc20ff10014f03b1f1f8241d'
'63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be')
sha256sums=(SKIP sha256sums=(SKIP
161208f5f3ca000438c8d55d2f977bbd187205d2e70ce72b3fdbd59df4837a39 # 0001-Fix-python3-unicode-errors.patch 60921b7894753a079659369b49b718c83d09edd49de76503850e5560af778c3a # 0001-HACK-Don-t-run-fuzzing-tests.patch
4c426ffa9c8f397929ff575748fbed9a2db036033a3738d95c1d5309e666de59 # 0002-HACK-Don-t-run-fuzzing-tests.patch
9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f) # xmlts20130923.tar.gz 9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f) # xmlts20130923.tar.gz
## bfb32da211ceae95615a07a03da970ea8a6b6076f2aa7c6160acaecf9ffa71fd libxml2-2.10.4-06-x86_64.pkg.tar.lz ## 3c8b465985eedc9145fa47b5a079a8e65ce058847f5f25bbed54824c64a951e3 libxml2-2.11.4-01-x86_64.pkg.tar.lz
bfb32da211ceae95615a07a03da970ea8a6b6076f2aa7c6160acaecf9ffa71fd libxml2-2.10.4-06-x86_64.pkg.tar.lz
9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f xmlts20130923.tar.gz

View file

@ -9,8 +9,8 @@ pkgname=(
libxml2 libxml2
libxml2-docs libxml2-docs
) )
pkgver=2.10.4 pkgver=2.11.4
pkgrel=6 pkgrel=1
pkgdesc="XML C parser and toolkit" pkgdesc="XML C parser and toolkit"
url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
arch=(x86_64) arch=(x86_64)
@ -26,16 +26,14 @@ makedepends=(
git git
python python
) )
_commit=223cb03a5d27b1b2393b266a8657443d046139d6 # tags/v2.10.4^0 _commit=2e9f7860a9cb8be29eca90b7409ef0278d30ef10 # tags/v2.11.4^0
source=( source=(
"git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit" "git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
0001-Fix-python3-unicode-errors.patch 0001-HACK-Don-t-run-fuzzing-tests.patch
0002-HACK-Don-t-run-fuzzing-tests.patch
https://www.w3.org/XML/Test/xmlts20130923.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz
) )
b2sums=('SKIP' b2sums=('SKIP'
'ec5a0955906c5fdd4bc65248bdb46f315460f4b2208bf37c49f55ef7468585786bdf563aa3e9357370d4f1ff947a6d4467869eeb2ca6b77ca5e40ffa45213a13' '5f47a4949e9485c40b5685840d48aef87aa7919eb7e0afd679b598ee054392f18a657947c10c627d3239937e53611f8263c47312d26b093aa5973854307f53aa'
'ec247c8caad963307d8f487176fde518cfb087bbff3f10c2a5846b90a04c9909c2f0e6aaf8ded4784f46586eafb16df493caf1debc20ff10014f03b1f1f8241d'
'63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be') '63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be')
pkgver() { pkgver() {
@ -49,11 +47,8 @@ prepare() {
# Use xmlconf from conformance test suite # Use xmlconf from conformance test suite
ln -s ../xmlconf ln -s ../xmlconf
# https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
git apply -3 ../0001-Fix-python3-unicode-errors.patch
# Do not run fuzzing tests # Do not run fuzzing tests
git apply -3 ../0002-HACK-Don-t-run-fuzzing-tests.patch git apply -3 ../0001-HACK-Don-t-run-fuzzing-tests.patch
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
} }