forked from amazingfate/loongoffice
935c3ecc89
* In712a31abe4some members used by Libreoffice were marked as deprecated. Add deprecated.patch.0 to undeprecate them for now. Meanwhile https://gitlab.gnome.org/GNOME/libxml2/-/issues/936#note_2461334 has been opened to discuss it. The necessary code changes will be addressed in a follow-up commit * Inbfe6af2eedmain() was moved from xmllint.c to lintmain.c. Add makefile.msvc-entry-point.patch.0 to address that * 0001-parser-Fix-custom-SAX-parsers-without-cdataBlock-han.patch.1 fixes https://gitlab.gnome.org/GNOME/libxml2/-/issues/934 * Sincef070acc564android builds in Jenkins fail with "configure: error: libiconv not found" Run configure with --without-iconv. Same as in Windows * Adapt testLeadingTabHTML since The HTML parser normalizes newlines according to HTML5 now See https://gitlab.gnome.org/GNOME/libxml2/-/issues/938#note_2463720 Downloaded from https://download.gnome.org/sources/libxml2/2.14/libxml2-2.14.3.tar.xz Change-Id: Ie010c236f5dad5156f7f4204033d0c02928742ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184501 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186640 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
33 lines
1.1 KiB
Plaintext
33 lines
1.1 KiB
Plaintext
--- win32/Makefile.msvc 2025-06-06 10:57:06.219160687 +0200
|
|
+++ win32/Makefile.msvc 2025-06-06 11:01:45.213981862 +0200
|
|
@@ -235,17 +235,7 @@
|
|
!endif
|
|
|
|
# Xmllint and friends executables.
|
|
-UTILS = $(BINDIR)\xmllint.exe\
|
|
- $(BINDIR)\xmlcatalog.exe\
|
|
- $(BINDIR)\testModule.exe\
|
|
- $(BINDIR)\runtest.exe\
|
|
- $(BINDIR)\runsuite.exe\
|
|
- $(BINDIR)\runxmlconf.exe\
|
|
- $(BINDIR)\testapi.exe\
|
|
- $(BINDIR)\testchar.exe\
|
|
- $(BINDIR)\testdict.exe\
|
|
- $(BINDIR)\testlimits.exe\
|
|
- $(BINDIR)\testrecurse.exe
|
|
+UTILS = $(BINDIR)\xmllint.exe
|
|
|
|
!if "$(VCMANIFEST)" == "1"
|
|
_VC_MANIFEST_EMBED_EXE= if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
|
|
@@ -396,8 +386,8 @@
|
|
@$(_VC_MANIFEST_EMBED_EXE)
|
|
!else
|
|
{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe:
|
|
- $(CC) $(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $<
|
|
- $(LD) $(LDFLAGS) /OUT:$@ $(XML_IMP) $(LIBS) $(UTILS_INTDIR)\$(<B).obj
|
|
+ $(CC) $(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $< ..\lintmain.c ..\shell.c
|
|
+ $(LD) $(LDFLAGS) /OUT:$@ $(XML_IMP) $(LIBS) $(UTILS_INTDIR)\$(<B).obj $(UTILS_INTDIR)\lintmain.obj $(UTILS_INTDIR)\shell.obj
|
|
@$(_VC_MANIFEST_EMBED_EXE)
|
|
!endif
|
|
|