Skip to content

Commit 47be5db

Browse files
committed
Updated libxml to 2.13.1
1 parent de4e5f3 commit 47be5db

File tree

460 files changed

+31947
-42147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

460 files changed

+31947
-42147
lines changed

.ImageMagick/ImageMagick.version.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#define DELEGATE_VERSION_NUM 2,12,7
2-
#define DELEGATE_VERSION_STRING "2.12.7 (2024-05-13)"
1+
#define DELEGATE_VERSION_NUM 2,13,1
2+
#define DELEGATE_VERSION_STRING "2.13.1 (2024-06-19)"

.editorconfig

+4-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22

33
root = true
44

5-
[Makefile*]
6-
indent_style = tab
7-
8-
[CMakeLists.txt]
9-
indent_style = tab
10-
indent_size = 4
11-
12-
[*.{c,h}]
5+
[*]
136
indent_style = space
147
indent_size = 4
158
tab_width = 8
9+
10+
[Makefile*]
11+
indent_style = tab

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*.pyc
66

77
# Executables
8-
/example/gjobread
98
/xmlcatalog
109
/xmllint
1110

@@ -48,15 +47,18 @@ Makefile.in
4847
/autom4te.cache
4948
/compile
5049
/config.guess
50+
/config.guess~
5151
/config.h.in
5252
/config.h.in~
5353
/config.log
5454
/config.status
5555
/config.sub
56+
/config.sub~
5657
/configure
5758
/configure~
5859
/depcomp
5960
/install-sh
61+
/install-sh~
6062
/libtool
6163
/ltmain.sh
6264
/missing

.gitlab-ci.yml

+13-3
Original file line numberDiff line numberDiff line change
@@ -274,12 +274,22 @@ cmake:msvc:v141:x86:static:
274274
BUILD_SHARED_LIBS: "OFF"
275275
SUFFIX: static
276276

277+
meson:
278+
image: registry.gitlab.gnome.org/gnome/libxml2
279+
script:
280+
- sh .gitlab-ci/test_meson.sh
281+
282+
cmake:linux:gcc:shared:
283+
extends: .cmake:linux
284+
variables:
285+
BUILD_SHARED_LIBS: "ON"
286+
CC: gcc
287+
SUFFIX: linux-gcc-shared
288+
277289
pages:
278290
script:
279291
- mkdir -p public
280-
- cp -r doc/devhelp doc/tutorial doc/xmllint.html doc/xmlcatalog.html public
281-
- mkdir -p public/examples
282-
- cp doc/examples/*.html doc/examples/*.c public/examples
292+
- cp -r doc/devhelp doc/xmllint.html doc/xmlcatalog.html public
283293
artifacts:
284294
paths:
285295
- public

.gitlab-ci/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# The image is also used for libxslt, that's why we need git and
22
# libgcrypt-dev.
33

4-
FROM ubuntu:22.10
4+
FROM ubuntu:23.10
55
ENV DEBIAN_FRONTEND=noninteractive
66
RUN apt-get update && \
77
apt-get upgrade -y && \
88
apt-get install -y --no-install-recommends \
99
curl git ca-certificates \
1010
autoconf automake libtool pkg-config \
11-
make gcc clang llvm \
11+
make gcc clang llvm libclang-rt-dev \
1212
zlib1g-dev liblzma-dev libgcrypt-dev \
13-
python2-dev python3-dev \
14-
cmake
13+
python3-dev \
14+
cmake meson
1515
WORKDIR /tests
1616
RUN curl https://www.w3.org/XML/Test/xmlts20080827.tar.gz |tar xz

.gitlab-ci/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
set -e
44

55
cd libxml2-build
6-
sh ../autogen.sh $BASE_CONFIG $CONFIG
6+
sh ../autogen.sh $BASE_CONFIG $CONFIG || cat config.log
77
make -j$(nproc) V=1 CFLAGS="$CFLAGS -Werror"
88
make CFLAGS="$CFLAGS -Werror" check

.gitlab-ci/test_meson.sh

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/sh
2+
3+
set -e
4+
5+
# compile with the following warnings:
6+
# --warnlevel 3 : passes to the compiler -Wall -Wextra -Wpedantic
7+
# --werror : passes to the compiler -Werror
8+
# --default-library : can be 'shared', 'static' or 'both'
9+
meson setup \
10+
--warnlevel 3 \
11+
--werror \
12+
--buildtype=debugoptimized \
13+
--default-library shared \
14+
builddir
15+
16+
ninja -C builddir test
17+

0 commit comments

Comments
 (0)