Skip to content

Commit ac5873f

Browse files
bgilbertneheb
authored andcommitted
libxml2: update from 2.14.6 to 2.15.0
Python support is now disabled by default.
1 parent d827c64 commit ac5873f

File tree

3 files changed

+14
-23
lines changed

3 files changed

+14
-23
lines changed

ci_config.json

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,13 @@
9292
"cairo": {
9393
"_comment": [
9494
"- Force-enable fontconfig to avoid https://gitlab.freedesktop.org/cairo/cairo/-/issues/862",
95-
"- Prevent libxml2 from requiring iconv or Python",
95+
"- Prevent libxml2 from requiring iconv",
9696
"- fontconfig warns on v1 wraps; fixed in next release",
9797
"- Some tests fails and they are still run despite -Dtests=disabled"
9898
],
9999
"build_options": [
100100
"cairo:fontconfig=enabled",
101-
"libxml2:iconv=disabled",
102-
"libxml2:python=disabled"
101+
"libxml2:iconv=disabled"
103102
],
104103
"fatal_warnings": false,
105104
"skip_tests": true
@@ -277,8 +276,7 @@
277276
"bash"
278277
],
279278
"build_options": [
280-
"libxml2:iconv=disabled",
281-
"libxml2:python=disabled"
279+
"libxml2:iconv=disabled"
282280
],
283281
"fatal_warnings": false
284282
},
@@ -819,22 +817,18 @@
819817
},
820818
"libxml2": {
821819
"_comment": [
822-
"Upstream removed autodetection of iconv and other deps; see discussion on https://gitlab.gnome.org/GNOME/libxml2/-/commit/c2ccbc0fed36de1d8c595867acb5e298c9a143f6",
823-
"Python fails on 32-bit MSVC because we don't have 32-bit Python, and on other MSVC because we try to do a debug build against a release Python"
820+
"Upstream removed autodetection of iconv and other deps; see discussion on https://gitlab.gnome.org/GNOME/libxml2/-/commit/c2ccbc0fed36de1d8c595867acb5e298c9a143f6"
824821
],
825822
"build_options": [
826-
"libxml2:iconv=disabled",
827-
"libxml2:python=disabled"
823+
"libxml2:iconv=disabled"
828824
],
829825
"msys_packages": [
830826
"diffutils"
831827
]
832828
},
833829
"libxmlpp": {
834-
"_comment": "Python fails on MSVC because we try to do a debug build against a release Python",
835830
"build_options": [
836-
"libxml2:iconv=disabled",
837-
"libxml2:python=disabled"
831+
"libxml2:iconv=disabled"
838832
]
839833
},
840834
"libxkbcommon": {
@@ -880,10 +874,8 @@
880874
]
881875
},
882876
"libxslt": {
883-
"_comment": "Python fails on MSVC because we try to do a debug build against a release Python",
884877
"build_options": [
885-
"libxml2:iconv=disabled",
886-
"libxml2:python=disabled"
878+
"libxml2:iconv=disabled"
887879
]
888880
},
889881
"libxv": {
@@ -1136,14 +1128,12 @@
11361128
"pango": {
11371129
"_comment": [
11381130
"- Avoid sysprof build errors on Windows",
1139-
"- Prevent libxml2 from requiring Python",
11401131
"- fontconfig warns on v1 wraps; fixed in next release",
11411132
"- skip dependency checks for optionally provided dependencies",
11421133
"- Known test failure: https://gitlab.gnome.org/GNOME/pango/-/issues/682"
11431134
],
11441135
"build_options": [
1145-
"glib:sysprof=disabled",
1146-
"libxml2:python=disabled"
1136+
"glib:sysprof=disabled"
11471137
],
11481138
"fatal_warnings": false,
11491139
"skip_dependency_check": [

releases.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2534,6 +2534,7 @@
25342534
"libxml-2.0"
25352535
],
25362536
"versions": [
2537+
"2.15.0-1",
25372538
"2.14.6-1",
25382539
"2.14.5-1",
25392540
"2.14.4-1",

subprojects/libxml2.wrap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[wrap-file]
2-
directory = libxml2-2.14.6
3-
source_url = https://download.gnome.org/sources/libxml2/2.14/libxml2-2.14.6.tar.xz
4-
source_fallback_url = https://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.14/libxml2-2.14.6.tar.xz
5-
source_filename = libxml2-2.14.6.tar.xz
6-
source_hash = 7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a
2+
directory = libxml2-2.15.0
3+
source_url = https://download.gnome.org/sources/libxml2/2.15/libxml2-2.15.0.tar.xz
4+
source_fallback_url = https://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.15/libxml2-2.15.0.tar.xz
5+
source_filename = libxml2-2.15.0.tar.xz
6+
source_hash = 5abc766497c5b1d6d99231f662e30c99402a90d03b06c67b62d6c1179dedd561
77

88
[provide]
99
dependency_names = libxml-2.0

0 commit comments

Comments
 (0)