libreoffice: Rebase patch for libxml2 build

libreoffice-24.2.yaml

@@ -122,7 +122,7 @@ pipeline:
 
   - uses: patch
     with:
-      patches: 2b27f0eb5858a4fd296170fb7e4533e5fc7aa3e9.patch # fix build issue with xml2, this patch is in main upstream but not released yet
+      patches: 0001-libxml2-upgrade-to-2.13.1.patch # fix build issue with xml2, this patch is in main upstream but not released yet
 
   - runs: |
       cat > autogen.input <<EOF

libreoffice-24.2/2b27f0eb5858a4fd296170fb7e4533e5fc7aa3e9.patch → libreoffice-24.2/0001-libxml2-upgrade-to-2.13.1.patch

@@ -1,4 +1,4 @@
-From 2b27f0eb5858a4fd296170fb7e4533e5fc7aa3e9 Mon Sep 17 00:00:00 2001
+From 5b6e08e212ae421c7038c10a1a1abe51879c1cac Mon Sep 17 00:00:00 2001
 From: Xisco Fauli <[email protected]>
 Date: Fri, 21 Jun 2024 11:58:36 +0200
 Subject: [PATCH] libxml2: upgrade to 2.13.1
@@ -36,15 +36,15 @@ Tested-by: Jenkins
  6 files changed, 17 insertions(+), 17 deletions(-)
 
 diff --git a/download.lst b/download.lst
-index 5ba08be058977..1b4ebfb4bbe93 100644
+index f5b548e3cdd9..4e2fd427990b 100644
 --- a/download.lst
 +++ b/download.lst
-@@ -424,9 +424,9 @@ XMLSEC_TARBALL := xmlsec1-1.3.4.tar.gz
+@@ -424,9 +424,9 @@ XMLSEC_TARBALL := xmlsec1-1.3.2.tar.gz
  # three static lines
  # so that git cherry-pick
  # will not run into conflicts
--LIBXML_SHA256SUM := 43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93
--LIBXML_VERSION_MICRO := 8
+-LIBXML_SHA256SUM := 59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590
+-LIBXML_VERSION_MICRO := 9
 -LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
 +LIBXML_SHA256SUM := 25239263dc37f5f55a5393eff27b35f0b7d9ea4b2a7653310598ea8299e3b741
 +LIBXML_VERSION_MICRO := 1
@@ -53,7 +53,7 @@ index 5ba08be058977..1b4ebfb4bbe93 100644
  # so that git cherry-pick
  # will not run into conflicts
 diff --git a/external/libxml2/ExternalPackage_libxml2.mk b/external/libxml2/ExternalPackage_libxml2.mk
-index 799044575f9a3..17190c77fd185 100644
+index 799044575f9a..17190c77fd18 100644
 --- a/external/libxml2/ExternalPackage_libxml2.mk
 +++ b/external/libxml2/ExternalPackage_libxml2.mk
 @@ -21,7 +21,7 @@ else # COM=MSC
@@ -66,7 +66,7 @@ index 799044575f9a3..17190c77fd185 100644
  endif # DISABLE_DYNLOADING
 
 diff --git a/external/libxml2/libxml2-XMLCALL-redefine.patch.0 b/external/libxml2/libxml2-XMLCALL-redefine.patch.0
-index d9ca23be7ce49..57d23d885943d 100644
+index d9ca23be7ce4..57d23d885943 100644
 --- a/external/libxml2/libxml2-XMLCALL-redefine.patch.0
 +++ b/external/libxml2/libxml2-XMLCALL-redefine.patch.0
 @@ -1,11 +1,11 @@
@@ -86,7 +86,7 @@ index d9ca23be7ce49..57d23d885943d 100644
 +   #define LIBXML_DLL_IMPORT XMLPUBVAR
   #endif
 diff --git a/external/libxml2/libxml2-icu-sym.patch.0 b/external/libxml2/libxml2-icu-sym.patch.0
-index 07676228da194..d89a1c4c544be 100644
+index 07676228da19..d89a1c4c544b 100644
 --- a/external/libxml2/libxml2-icu-sym.patch.0
 +++ b/external/libxml2/libxml2-icu-sym.patch.0
 @@ -3,14 +3,14 @@ Find bundled ICU in workdir and use debug .libs when needed
@@ -109,7 +109,7 @@ index 07676228da194..d89a1c4c544be 100644
   # The linker and its options.
   LD = link.exe
 diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0
-index 84197763f878e..85ce8b3aba2ba 100644
+index 84197763f878..85ce8b3aba2b 100644
 --- a/external/libxml2/libxml2-icu.patch.0
 +++ b/external/libxml2/libxml2-icu.patch.0
 @@ -3,14 +3,14 @@ Find bundled ICU in workdir and use debug .libs when needed
@@ -132,7 +132,7 @@ index 84197763f878e..85ce8b3aba2ba 100644
   # The linker and its options.
   LD = link.exe
 diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
-index 8ac05880766b3..5bfab78deba80 100644
+index 74759c65be31..ad957acc24e7 100644
 --- a/external/redland/ExternalProject_raptor.mk
 +++ b/external/redland/ExternalProject_raptor.mk
 @@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
@@ -144,3 +144,6 @@ index 8ac05880766b3..5bfab78deba80 100644
  			--without-xslt-config \
  			$(gb_CONFIGURE_PLATFORMS) \
  			$(if $(CROSS_COMPILING),$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \
+-- 
+2.46.2
+