diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-05-23 21:15:52 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2024-02-22 21:08:01 +0100 |
| commit | f942172f65f3fea9a5c81dc166d790617961c139 (patch) | |
| tree | 1e4c83e7a96fc8e13202c74b8ce589f8085fe422 /external/redland/UnpackedTarball_raptor.mk | |
| parent | upgrade liblangtag to 0.6.3 (diff) | |
| download | core-f942172f65f3fea9a5c81dc166d790617961c139.tar.gz core-f942172f65f3fea9a5c81dc166d790617961c139.zip | |
upgrade to libxml2-2.11.4
'checked' field removed with:
https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce76ebfd1312459951d555ad9d87fb9a89eede55
win32 'run_debug' removed with:
https://gitlab.gnome.org/GNOME/libxml2/-/commit/59f2f60e3eff07324f1c7cd861a444d714be750b
add libxml2-XMLCALL-redefine.patch.0 to avoid:
UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): error C2220: the following warning is treated as an error
UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): warning C4005: 'XMLCALL': macro redefinition
UnpackedTarball\expat\lib\expat_external.h(69): note: see previous definition of 'XMLCALL'
Change-Id: Ia9b1540dc1b4eccf91662c8d995c036f71de6fc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152176
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit fd6cbd983a3021d22321854d0414bdc42c6cb1b7)
Diffstat (limited to 'external/redland/UnpackedTarball_raptor.mk')
| -rw-r--r-- | external/redland/UnpackedTarball_raptor.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk index fbdc8b6f5510..92bc586a3e60 100644 --- a/external/redland/UnpackedTarball_raptor.mk +++ b/external/redland/UnpackedTarball_raptor.mk @@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,raptor,\ external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 \ external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 \ external/redland/raptor/libtool.patch \ + external/redland/raptor/raptor-libxml2-11.patch.1 \ )) # vim: set noet sw=4 ts=4: |