core.git: download.lst external/java_websocket

[Xisco Fauli (via logerrit)]

 download.lst   |4 ++--
 external/java_websocket/patches/no-slf4j.patch |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4527af4388dae61c4cc5feabd40c0a04e32c8a98
Author: Xisco Fauli 
AuthorDate: Wed May 15 13:03:48 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed May 15 18:17:25 2024 +0200

Java-WebSocket: Upgrade to 1.5.6

Downloaded from 
https://github.com/TooTallNate/Java-WebSocket/archive/refs/tags/v1.5.6.tar.gz

Change-Id: Ie6c86b3f7e41147133919daca699a6c96372e44f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167665
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index b03b332fcd70..de788488bbc6 100644
--- a/download.lst
+++ b/download.lst
@@ -324,8 +324,8 @@ ICU_DATA_TARBALL := icu4c-74_1-data.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-JAVA_WEBSOCKET_SHA256SUM := 
a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720
-JAVA_WEBSOCKET_TARBALL := Java-WebSocket-1.5.4.tar.gz
+JAVA_WEBSOCKET_SHA256SUM := 
167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f
+JAVA_WEBSOCKET_TARBALL := Java-WebSocket-1.5.6.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/java_websocket/patches/no-slf4j.patch 
b/external/java_websocket/patches/no-slf4j.patch
index 27296071eff7..cb6788b53405 100644
--- a/external/java_websocket/patches/no-slf4j.patch
+++ b/external/java_websocket/patches/no-slf4j.patch
@@ -326,7 +326,7 @@ diff -ru 
a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/ma
 +import java.util.logging.Logger;
  
  /**
-  * WebSocketServer is an abstract class that only takes care of the
+  * WebSocketServer is an abstract class that only takes care of 
the
 @@ -84,7 +83,7 @@
 *
 * @since 1.4.0

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bb2655206a1a2684ead8038601c70f4389a5d7aa
Author: Xisco Fauli 
AuthorDate: Tue May 14 09:53:07 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue May 14 16:09:31 2024 +0200

libcmis: upgrade to 0.6.2

Downloaded from 
https://github.com/tdf/libcmis/releases/download/v0.6.2/libcmis-0.6.2.tar.xz

Change-Id: I96f00da6a102bf720705060df009f57c6b93b1e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167626
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 19b2a9315ec9..b03b332fcd70 100644
--- a/download.lst
+++ b/download.lst
@@ -65,8 +65,8 @@ DTOA_TARBALL := dtoa-20180411.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBCMIS_SHA256SUM := 
d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074
-LIBCMIS_TARBALL := libcmis-0.6.1.tar.xz
+LIBCMIS_SHA256SUM := 
1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644
+LIBCMIS_TARBALL := libcmis-0.6.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 461dac862c6e8ceb71d4b46ae43c9073b344fcea
Author: Xisco Fauli 
AuthorDate: Tue May 14 09:33:15 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue May 14 14:19:38 2024 +0200

harfbuzz: Upgrade to 8.5.0

Downloaded from 
https://github.com/harfbuzz/harfbuzz/releases/download/8.5.0/harfbuzz-8.5.0.tar.xz

Change-Id: I1a6df8f5ecb91d93a88c9b6770e603c8df4bc2de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167623
Reviewed-by: Xisco Fauli 
Tested-by: Jenkins

diff --git a/download.lst b/download.lst
index 30346ac91206..19b2a9315ec9 100644
--- a/download.lst
+++ b/download.lst
@@ -292,8 +292,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e
-HARFBUZZ_TARBALL := harfbuzz-8.4.0.tar.xz
+HARFBUZZ_SHA256SUM := 
77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27
+HARFBUZZ_TARBALL := harfbuzz-8.5.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst external/poppler

[Xisco Fauli (via logerrit)]

 download.lst |4 +-
 external/poppler/UnpackedTarball_poppler.mk  |1 
 external/poppler/char_traits.patch   |   11 -
 external/poppler/disable-freetype.patch.1|4 +-
 external/poppler/disable-nss-and-gpgmepp.patch.1 |   45 +--
 5 files changed, 39 insertions(+), 26 deletions(-)

New commits:
commit 5265c69ed6aa2a5f88cf939c64683552e587e575
Author: Xisco Fauli 
AuthorDate: Mon May 13 11:14:06 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 22:41:45 2024 +0200

poppler: Upgrade 24.05.0

* external/poppler/char_traits.patch is no longer neeeded
after 
https://cgit.freedesktop.org/poppler/poppler/commit/cpp/poppler-global.h?id=b4ac7d9af7cb5edfcfcbda035ed8b8c218ba8564

* Adapt external/poppler/disable-nss-and-gpgmepp.patch.1
after 
https://cgit.freedesktop.org/poppler/poppler/commit/?id=d40bb7e308c9e3299e50d3e2880229cd6272587e

Downloaded from https://poppler.freedesktop.org/poppler-24.05.0.tar.xz

Change-Id: I87ed833f92e504f0a39b5f64c1db42d579050a37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167582
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index cf648eb74e60..30346ac91206 100644
--- a/download.lst
+++ b/download.lst
@@ -543,8 +543,8 @@ LIBTIFF_TARBALL := tiff-4.6.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
bafbf0db5713dec25b5d16eb2cd87e4a62351cdc40f050c3937cd8dd6882d446
-POPPLER_TARBALL := poppler-24.03.0.tar.xz
+POPPLER_SHA256SUM := 
d8c5eb30b50285ad9f0af8c6335cc2d3b9597fca475cbc2598a5479fa379f779
+POPPLER_TARBALL := poppler-24.05.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
index c6ddbf9785d3..784fc768e2a7 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -14,7 +14,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler
 $(eval $(call gb_UnpackedTarball_set_patchlevel,poppler,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
-   external/poppler/char_traits.patch \
external/poppler/disable-freetype.patch.1 \
external/poppler/disable-nss-and-gpgmepp.patch.1 \
external/poppler/poppler-config.patch.1 \
diff --git a/external/poppler/char_traits.patch 
b/external/poppler/char_traits.patch
deleted file mode 100644
index 3483f2fe22d8..
--- a/external/poppler/char_traits.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 cpp/poppler-global.h
-+++ cpp/poppler-global.h
-@@ -98,7 +98,7 @@
- #pragma warning(push)
- #pragma warning(disable : 4251) /* class 'A' needs to have dll interface 
for to be used by clients of class 'B'. */
- #endif
--class POPPLER_CPP_EXPORT ustring : public std::basic_string
-+class POPPLER_CPP_EXPORT ustring : public std::u16string
- {
- public:
- ustring();
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index d12374f088f9..2d4ce2f69c9c 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -22,13 +22,13 @@ disable freetype dependent code
  #include 
  
  // helper for using std::visit to get a dependent false for static_asserts
-@@ -2760,6 +2760,8 @@
+@@ -2840,6 +2840,8 @@
  
  Form::AddFontResult Form::addFontToDefaultResources(const std::string 
, int faceIndex, const std::string , const std::string 
, bool forceName)
  {
 +return {};
 +#if 0
- if (!GooString::endsWith(filepath, ".ttf") && 
!GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath, 
".otf")) {
+ if (!filepath.ends_with(".ttf") && !filepath.ends_with(".ttc") && 
!filepath.ends_with(".otf")) {
  error(errIO, -1, "We only support embedding ttf/ttc/otf fonts for 
now. The font file for {0:s} {1:s} was {2:s}", fontFamily.c_str(), 
fontStyle.c_str(), filepath.c_str());
  return {};
 @@ -2994,6 +2996,7 @@
diff --git a/external/poppler/disable-nss-and-gpgmepp.patch.1 
b/external/poppler/disable-nss-and-gpgmepp.patch.1
index 1d7f7f933433..1fc9ede6035c 100644
--- a/external/poppler/disable-nss-and-gpgmepp.patch.1
+++ b/external/poppler/disable-nss-and-gpgmepp.patch.1
@@ -11,9 +11,9 @@ disable NSS/GPGMEPP dependent code.
  #include "SignatureInfo.h"
  #include "CertificateInfo.h"
  #include "XRef.h"
-@@ -578,7 +578,7 @@
+@@ -584,7 +584,7 @@
  {
- return static_cast(field)->validateSignature(doVerifyCert, forceRevalidation, validationTime, 
ocspRevocationCheck, enableAIA);
+ return static_cast(field)->validateSignatureResult();
  }
 -
 +#if 0
@@ -60,19 +60,44 @@ disable NSS/GPGMEPP dependent code.
  }
 
  FormSignatureType 

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4133e187c99b19bd5986d0c8af923e9f1400f82b
Author: Xisco Fauli 
AuthorDate: Mon May 13 17:49:48 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 18:12:26 2024 +0200

lxml: fix --enable-python=fully-internal

Originally I downloaded the tar file from 
https://github.com/lxml/lxml/releases/download/lxml-5.2.2/lxml-5.2.2.tar.gz
and pushed it to extern
https://gerrit.libreoffice.org/c/extern/+/167571
Later I realized the lxml website was pointing to
another file https://lxml.de/files/lxml-5.2.2.tgz
which I also changed in extern 
https://gerrit.libreoffice.org/c/extern/+/167588
But make fails with

tar: This does not look like a tar archive
tar: Skipping to next header
tar: Exiting with failure status due to previous errors

so change download.lst back to point to the first tar file

The commit is extern was also reverted with
https://gerrit.libreoffice.org/c/extern/+/167606

Change-Id: I8f335d4a0b9d9b41c9c596f188f63bb0691ae11b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167607
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index da9a25814123..cf648eb74e60 100644
--- a/download.lst
+++ b/download.lst
@@ -441,8 +441,8 @@ LPSOLVE_TARBALL := 
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LXML_SHA256SUM := 
0e963eecfb0efa22ca826fd558d5701eb53a574811d2499f4d1a8c582007c83f
-LXML_TARBALL := lxml-5.2.2.tgz
+LXML_SHA256SUM := 
bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87
+LXML_TARBALL := lxml-5.2.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 96f74d85983fd693d349d593c4389a8f990fdaaa
Author: Xisco Fauli 
AuthorDate: Mon May 13 09:44:02 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 17:01:33 2024 +0200

lxml: Upgrade to 5.2.2

Downloaded from https://lxml.de/files/lxml-5.2.2.tgz

Change-Id: I0beaabac69029cb768eff10cf55c6691eb2d322d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167572
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 0c4553a37dd7..da9a25814123 100644
--- a/download.lst
+++ b/download.lst
@@ -441,8 +441,8 @@ LPSOLVE_TARBALL := 
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LXML_SHA256SUM := 
3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306
-LXML_TARBALL := lxml-5.2.1.tar.gz
+LXML_SHA256SUM := 
0e963eecfb0efa22ca826fd558d5701eb53a574811d2499f4d1a8c582007c83f
+LXML_TARBALL := lxml-5.2.2.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b6f9caeb081da2004f067ad9216875c86eead8b1
Author: Xisco Fauli 
AuthorDate: Mon May 13 13:27:33 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 16:42:41 2024 +0200

postgresql: Upgrade to 13.15

Downloaded from 
https://ftp.postgresql.org/pub/source/v13.15/postgresql-13.15.tar.bz2

Change-Id: I17d103c7b489645215b4a54d81f494506e9e90a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167590
Reviewed-by: Xisco Fauli 
Tested-by: Jenkins

diff --git a/download.lst b/download.lst
index b0a13eb37690..59d7ae0ee360 100644
--- a/download.lst
+++ b/download.lst
@@ -550,8 +550,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POSTGRESQL_SHA256SUM := 
b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed
-POSTGRESQL_TARBALL := postgresql-13.14.tar.bz2
+POSTGRESQL_SHA256SUM := 
42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925
+POSTGRESQL_TARBALL := postgresql-13.15.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 96698d3a72d8496358786ffedc7b6eb22af3648c
Author: Xisco Fauli 
AuthorDate: Wed May 8 12:15:59 2024 +0200
Commit: Eike Rathke 
CommitDate: Mon May 13 16:40:18 2024 +0200

Update language-subtag-registry to 2024-03-07

How the file was created:
mkdir data
cd data
wget

https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
cd ..
tar -cvjSf language-subtag-registry-2024-03-07.tar.bz2 data

Change-Id: If1bdeab0ee5853855949dcbbfb00170e897c80e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167341
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/download.lst b/download.lst
index 5acd40480231..b0a13eb37690 100644
--- a/download.lst
+++ b/download.lst
@@ -359,8 +359,8 @@ LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LANGTAGREG_SHA256SUM := 
59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb
-LANGTAGREG_TARBALL := language-subtag-registry-2023-08-02.tar.bz2
+LANGTAGREG_SHA256SUM := 
642c1c8e08aa79884f3d0fe15c0f5866e6fb6828af22c3c9c1fe3827f99e58cc
+LANGTAGREG_TARBALL := language-subtag-registry-2024-03-07.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 02dc762466c655e9ca6fb7cef92b1495915b34ed
Author: Xisco Fauli 
AuthorDate: Mon May 13 12:45:05 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 15:46:05 2024 +0200

libxml2: upgrade to 2.12.7

* Fixes CVE-2024-34459

Downloaded from 
https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.7.tar.xz

Change-Id: Ie45ad54b3f781a54a278e2542fccafb8d06542bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167585
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index aa98bee9730b..5acd40480231 100644
--- a/download.lst
+++ b/download.lst
@@ -424,8 +424,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb
-LIBXML_VERSION_MICRO := 6
+LIBXML_SHA256SUM := 
24ae78ff1363a973e6d8beba941a7945da2ac056e19b53956aeb6927fd6cfb56
+LIBXML_VERSION_MICRO := 7
 LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick

core.git: download.lst external/libmwaw

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 external/libmwaw/Library_mwaw.mk |3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 16357c68bdb2fb9c1b7eb77fdbcb50c41948c6db
Author: Xisco Fauli 
AuthorDate: Fri May 10 14:28:41 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri May 10 21:52:28 2024 +0200

libmwaw: Upgrade to 0.3.22

Change-Id: I95169f11e7b188ab9b4667b2d4736bd0d5a4a083
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167477
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index c8146984bbf3..aa98bee9730b 100644
--- a/download.lst
+++ b/download.lst
@@ -466,8 +466,8 @@ MSPUB_TARBALL := libmspub-0.1.4.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-MWAW_SHA256SUM := 
e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c
-MWAW_VERSION_MICRO := 21
+MWAW_SHA256SUM := 
a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32
+MWAW_VERSION_MICRO := 22
 MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 30e71443f5a0..2b7c2286fa51 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -201,9 +201,12 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTimeStruct \
UnpackedTarball/libmwaw/src/lib/RagTimeText \
+   UnpackedTarball/libmwaw/src/lib/ReadySetGoGraph \
UnpackedTarball/libmwaw/src/lib/ReadySetGoParser \
+   UnpackedTarball/libmwaw/src/lib/ReadySetGoStyleManager \
UnpackedTarball/libmwaw/src/lib/ScoopParser \
UnpackedTarball/libmwaw/src/lib/ScriptWriterParser \
+   UnpackedTarball/libmwaw/src/lib/SpringBoardParser \
UnpackedTarball/libmwaw/src/lib/StudentWritingCParser \
UnpackedTarball/libmwaw/src/lib/StyleParser \
UnpackedTarball/libmwaw/src/lib/SuperPaintParser \

core.git: download.lst external/librevenge

[Xisco Fauli (via logerrit)]

 download.lst|4 ++--
 external/librevenge/C2039-unique-shared_ptr.patch.0 |   11 +++
 external/librevenge/UnpackedTarball_librevenge.mk   |1 +
 external/librevenge/tdf63130-improve-perf.patch.0   |   16 
 4 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit 49a0203e7aa3a98bbed4412ab4364614505f88eb
Author: Xisco Fauli 
AuthorDate: Thu May 9 18:02:59 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri May 10 15:27:16 2024 +0200

librevenge: upgrade to 0.0.5

* Add C2039-unique-shared_ptr.patch.0 to fix


C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/librevenge/src/lib/RVNGBinaryData.cpp(96):
 error C2039: 'unique': is not a member of 
'std::shared_ptr'

C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/librevenge/src/lib/RVNGBinaryData.cpp(86):
 note: see declaration of 
'std::shared_ptr'
make[1]: *** 
[C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/solenv/gbuild/LinkTarget.mk:398:
 
C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/GenCxxObject/UnpackedTarball/librevenge/src/lib/RVNGBinaryData.o]
 Error 2

on Windows

Change-Id: I31023633426fc902e2298c696826d8371bb4d63b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167388
Reviewed-by: Xisco Fauli 
Tested-by: Jenkins

diff --git a/download.lst b/download.lst
index a7874c271ab2..c8146984bbf3 100644
--- a/download.lst
+++ b/download.lst
@@ -580,8 +580,8 @@ REDLAND_TARBALL := 
e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-REVENGE_SHA256SUM := 
c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf
-REVENGE_VERSION_MICRO := 4
+REVENGE_SHA256SUM := 
5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5
+REVENGE_VERSION_MICRO := 5
 REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
 # three static lines
 # so that git cherry-pick
diff --git a/external/librevenge/C2039-unique-shared_ptr.patch.0 
b/external/librevenge/C2039-unique-shared_ptr.patch.0
new file mode 100644
index ..0dcec5058e89
--- /dev/null
+++ b/external/librevenge/C2039-unique-shared_ptr.patch.0
@@ -0,0 +1,11 @@
+--- src/lib/RVNGBinaryData.cpp 2024-05-10 13:20:09.278288686 +0200
 src/lib/RVNGBinaryData.cpp 2024-05-10 13:23:14.365139906 +0200
+@@ -93,7 +93,7 @@
+ 
+ void RVNGBinaryDataImpl::makeUnique()
+ {
+-  if (!m_ptr.unique())
++  if (!(m_ptr.use_count() == 1))
+   {
+   std::shared_ptr ptr(new DataImpl());
+   ptr->m_buf = m_ptr->m_buf;
diff --git a/external/librevenge/UnpackedTarball_librevenge.mk 
b/external/librevenge/UnpackedTarball_librevenge.mk
index 5fcc2e33b060..316e961bd1ba 100644
--- a/external/librevenge/UnpackedTarball_librevenge.mk
+++ b/external/librevenge/UnpackedTarball_librevenge.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,librevenge,0))
 $(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
 external/librevenge/rpath.patch \
 external/librevenge/tdf63130-improve-perf.patch.0 \
+external/librevenge/C2039-unique-shared_ptr.patch.0 \
 ))
 
 ifneq ($(OS),MACOSX)
diff --git a/external/librevenge/tdf63130-improve-perf.patch.0 
b/external/librevenge/tdf63130-improve-perf.patch.0
index 02a8a6e1f94b..f8b972217c76 100644
--- a/external/librevenge/tdf63130-improve-perf.patch.0
+++ b/external/librevenge/tdf63130-improve-perf.patch.0
@@ -18,7 +18,7 @@
/** Create a new string from  s as escaped XML.
 --- src/lib/RVNGBinaryData.cpp 2023-05-17 15:48:15.373159469 +0200
 +++ src/lib/RVNGBinaryData.cpp 2023-05-17 15:49:00.773411873 +0200
-@@ -67,9 +67,9 @@
+@@ -68,9 +68,9 @@
boost::archive::iterators::transform_width::const_iterator, 6, 8 > > base64_encoder;
  
// Encode the buffer and create a string
@@ -30,14 +30,14 @@
  
result.append(numPadding, '=');  // add '=' for each padded character
  }
-@@ -150,10 +150,10 @@
+@@ -153,10 +153,10 @@
  {
m_binaryDataImpl->makeUnique();
  
 -  unsigned long previousSize = m_binaryDataImpl->m_ptr->m_buf.size();
 -  m_binaryDataImpl->m_ptr->m_buf.reserve(previousSize + 
data.m_binaryDataImpl->m_ptr->m_buf.size());
--  for (unsigned long i = 0; i < 
data.m_binaryDataImpl->m_ptr->m_buf.size(); i++)
--  
m_binaryDataImpl->m_ptr->m_buf.push_back(data.m_binaryDataImpl->m_ptr->m_buf[i]);
+-  const auto  = data.m_binaryDataImpl->m_ptr->m_buf;
+-  std::copy(src.begin(), src.end(), 
std::back_inserter(m_binaryDataImpl->m_ptr->m_buf));
 +  m_binaryDataImpl->m_ptr->m_buf.insert(
 +  m_binaryDataImpl->m_ptr->m_buf.end(),
 +  data.m_binaryDataImpl->m_ptr->m_buf.begin(),
@@ -45,7 +45,7 @@
  }
  
  void RVNGBinaryData::appendBase64Data(const RVNGString )
-@@ -231,8 +231,9 @@
+@@ -234,8 +234,9 @@
  const 

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0c7c6ba98fba651c8ae4015dbbf450c23611667a
Author: Xisco Fauli 
AuthorDate: Tue May 7 16:16:33 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue May 7 18:11:11 2024 +0200

libatomic_ops: Upgrade to 7.8.2

Change-Id: I7fcf8011cbb1fb5e5ba2f0a9737190bffa13114d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167287
Reviewed-by: Xisco Fauli 
Tested-by: Jenkins

diff --git a/download.lst b/download.lst
index e0f142b4d63d..a7874c271ab2 100644
--- a/download.lst
+++ b/download.lst
@@ -374,8 +374,8 @@ LIBASSUAN_TARBALL := libassuan-2.5.7.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBATOMIC_OPS_SHA256SUM := 
15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31
-LIBATOMIC_OPS_TARBALL := libatomic_ops-7.8.0.tar.gz
+LIBATOMIC_OPS_SHA256SUM := 
d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51
+LIBATOMIC_OPS_TARBALL := libatomic_ops-7.8.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst external/lxml

[Xisco Fauli (via logerrit)]

 download.lst   
 |4 
 
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 
|   31 ---
 external/lxml/UnpackedTarball_lxml.mk  
 |3 
 external/lxml/Wincompatible-function-pointer-types.patch   
 |   83 --
 external/lxml/Wincompatible-pointer-types.patch
 |   65 ---
 5 files changed, 2 insertions(+), 184 deletions(-)

New commits:
commit 606623d0fc5321754d9a054881ae9cac94cd9f04
Author: Xisco Fauli 
AuthorDate: Tue May 7 14:07:14 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue May 7 15:38:36 2024 +0200

lxml: upgrade to 5.2.1

* 0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 got
  obsoleted with 
https://github.com/lxml/lxml/commit/9686dd9c7670d18acff6360c8444520273d5f1b2

* Wincompatible-function-pointer-types.patch and
Wincompatible-pointer-types.patch got obsoleted with
https://github.com/lxml/lxml/commit/6bdf4c321b92e002123b4c162c75524dbeb4d54d

Change-Id: I8f0dcba3bd64a1766a2292b687c8959c739ced6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167278
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 27ffbbb97306..e0f142b4d63d 100644
--- a/download.lst
+++ b/download.lst
@@ -441,8 +441,8 @@ LPSOLVE_TARBALL := 
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LXML_SHA256SUM := 
2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67
-LXML_TARBALL := lxml-4.9.2.tgz
+LXML_SHA256SUM := 
3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306
+LXML_TARBALL := lxml-5.2.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
 
b/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
deleted file mode 100644
index ce1ec383cc63..
--- 
a/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9686dd9c7670d18acff6360c8444520273d5f1b2 Mon Sep 17 00:00:00 2001
-From: Jakub Wilk 
-Date: Fri, 16 Jun 2023 09:24:21 +0200
-Subject: [PATCH] Make regexp string raw to correct its escape sequence usage
- (GH-371)
-
-Fixes:
-
-$ python3 -Wd setup.py
-setup.py:117: DeprecationWarning: invalid escape sequence \.
-...

- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 709cbc68..7a3f46e5 100644
 a/setup.py
-+++ b/setup.py
-@@ -114,7 +114,7 @@ extra_options['packages'] = [
- 
- def setup_extra_options():
- is_interesting_package = re.compile('^(libxml|libxslt|libexslt)$').match
--is_interesting_header = re.compile('^(zconf|zlib|.*charset)\.h$').match
-+is_interesting_header = re.compile(r'^(zconf|zlib|.*charset)\.h$').match
- 
- def extract_files(directories, pattern='*'):
- def get_files(root, dir_path, files):
--- 
-2.39.2
-
diff --git a/external/lxml/UnpackedTarball_lxml.mk 
b/external/lxml/UnpackedTarball_lxml.mk
index 58905943c7ee..0216801cb1a8 100644
--- a/external/lxml/UnpackedTarball_lxml.mk
+++ b/external/lxml/UnpackedTarball_lxml.mk
@@ -14,10 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,lxml,$(LXML_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,lxml,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,lxml, \
-   
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 
\
external/lxml/replace-setuptools-with-distutils.patch.1 \
-   external/lxml/Wincompatible-function-pointer-types.patch \
-   external/lxml/Wincompatible-pointer-types.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/lxml/Wincompatible-function-pointer-types.patch 
b/external/lxml/Wincompatible-function-pointer-types.patch
deleted file mode 100644
index 644082fdc8bc..
--- a/external/lxml/Wincompatible-function-pointer-types.patch
+++ /dev/null
@@ -1,83 +0,0 @@
 src/lxml/etree.c
-+++ src/lxml/etree.c
-@@ -113118,7 +113118,7 @@
-  * self._orig_loader = _register_document_loader() if 
set_document_loader else NULL
-  * if self._validator is not None:
-  */
--  __pyx_v_self->_c_ctxt->sax->serror = 
__pyx_f_4lxml_5etree__receiveParserError;
-+  __pyx_v_self->_c_ctxt->sax->serror = 
(xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveParserError;
- 
-   /* "src/lxml/parser.pxi":587
-  * self._doc = None
-@@ -117606,7 +117606,7 @@
-  * sax.startElementNs = NULL
-  * sax.endElementNs = NULL
-  */
--__pyx_v_sax->serror = __pyx_f_4lxml_5etree__receiveParserError;
-+__pyx_v_sax->serror = 
(xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveParserError;
- 
- /* 

core.git: download.lst external/libgpg-error

[Xisco Fauli (via logerrit)]

 download.lst  |4 ++--
 external/libgpg-error/ExternalPackage_libgpg-error.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a5d75f487592d17c02fccbf21a0edef437067f30
Author: Xisco Fauli 
AuthorDate: Fri Apr 26 09:50:09 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri Apr 26 12:47:24 2024 +0200

libgpg-error: Upgrade to 1.49

Change-Id: I1bd83294e58952ebdbaaf0362bd8675c1911b9be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166697
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index df1a213bbb95..28538879f5ec 100644
--- a/download.lst
+++ b/download.lst
@@ -394,8 +394,8 @@ LIBFFI_TARBALL := libffi-3.4.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBGPGERROR_SHA256SUM := 
89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f
-LIBGPGERROR_TARBALL := libgpg-error-1.48.tar.bz2
+LIBGPGERROR_SHA256SUM := 
8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9
+LIBGPGERROR_TARBALL := libgpg-error-1.49.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk 
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index 2c64ba3b5cc6..262675acf6e6 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.35.0))
+$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.36.0))
 
 else ifeq ($(OS),MACOSX)
 

core.git: download.lst external/boost

[Stephan Bergmann (via logerrit)]

 download.lst |4 +-
 external/boost/UnpackedTarball_boost.mk  |3 -
 external/boost/Wundef.patch.0|   22 ---
 external/boost/boost-emscripten-noshm.patch.0|   11 -
 external/boost/boost_1_59_0.property_tree.wreturn-type.patch |   14 ---
 5 files changed, 2 insertions(+), 52 deletions(-)

New commits:
commit edd6243b1f607f5e60d1bbe869e2e236bc021177
Author: Stephan Bergmann 
AuthorDate: Thu Apr 25 22:58:56 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Apr 26 07:29:34 2024 +0200

Upgrade external/boost to latest Boost 1.85.0

 has been 
generated (on
Fedora 40) with

> $ wget 
https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.tar.bz2
> $ printf 
'7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617 
boost_1_85_0.tar.bz2' | sha256sum -c # cf. 

> boost_1_85_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_85_0.tar.bz2
> Unpacking boost_1_85_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_85_0.tar.xz ...
> Cleaning up ...
> 4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a  
boost_1_85_0.tar.xz
> Done.

Three patches failed to apply:

* external/boost/boost_1_59_0.property_tree.wreturn-type.patch ("aka MSVC
  warning C4715: not all control paths return a value") should no longer be
  necessary after
  

  "Use BOOST_UNREACHABLE_RETURN at the end of function" (the referenced
   appears to no longer be
  reachable, though).

* The boost/math parts of external/boost/Wundef.patch.0 are obsoleted by
  

  "Fix -Wundef warnings".

* external/boost/boost-emscripten-noshm.patch.0 is obsoleeted by
  

  "emscripten doesn't support shm".

Change-Id: Id2d86d25a60097f3f0852063b5ac2a8220f6b479
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166656
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/download.lst b/download.lst
index 9989521f9094..df1a213bbb95 100644
--- a/download.lst
+++ b/download.lst
@@ -14,8 +14,8 @@ ARGON2_TARBALL := phc-winner-argon2-20190702.tar.gz
 # so that git cherry-pick
 # will not run into conflicts
 # please repack the tarball using external/boost/repack_tarball.sh
-BOOST_SHA256SUM := 
fd4a2ee785ea0e4efc5221a4284e0cf51096e8409871fb70fdaced002eeffc0b
-BOOST_TARBALL := boost_1_84_0.tar.xz
+BOOST_SHA256SUM := 
4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a
+BOOST_TARBALL := boost_1_85_0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index c49a2bc099fc..1d555de9861e 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -20,8 +20,6 @@ boost_patches += rtti.patch.0
 
 # https://svn.boost.org/trac/boost/ticket/11505
 boost_patches += boost_1_59_0.mpl.config.wundef.patch
-# https://svn.boost.org/trac/boost/ticket/11501
-boost_patches += boost_1_59_0.property_tree.wreturn-type.patch
 
 boost_patches += clang-cl.patch.0
 
@@ -44,7 +42,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,boost,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,boost,\
$(foreach patch,$(boost_patches),external/boost/$(patch)) \
-external/boost/boost-emscripten-noshm.patch.0 \
 external/boost/boost-emscripten-nowasm.patch.0 \
 ))
 
diff --git a/external/boost/Wundef.patch.0 b/external/boost/Wundef.patch.0
index 63dfc4afde00..8cb546464373 100644
--- a/external/boost/Wundef.patch.0
+++ b/external/boost/Wundef.patch.0
@@ -31,25 +31,3 @@
  #pragma clang diagnostic pop
  #endif
  }}} // namespace boost::locale::detail
 boost/math/tools/config.hpp
-+++ boost/math/tools/config.hpp
-@@ -147,7 +147,7 @@
- #endif
- 
- // C++23
--#if __cplusplus > 202002L || _MSVC_LANG > 202002L
-+#if __cplusplus > 202002L || (defined _MSVC_LANG && _MSVC_LANG > 202002L)
- #  if __GNUC__ >= 13
-  // libstdc++3 only defines to/from_chars for std::float128_t when one of 
these defines are set
-  // otherwise we're right out of luck...
 boost/math/tools/promotion.hpp
-+++ boost/math/tools/promotion.hpp
-@@ -27,7 +27,7 @@
- #include 
- 
- #if defined __has_include
--#  if __cplusplus > 202002L || _MSVC_LANG > 202002L 
-+#  if __cplusplus > 202002L || (defined _MSVC_LANG && _MSVC_LANG > 202002L) 
- #if 

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e835642a93b6e63f168333dea1b4bc8c26275218
Author: Xisco Fauli 
AuthorDate: Wed Apr 24 17:43:27 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed Apr 24 19:07:28 2024 +0200

NotoSerifHebrew: upgrade to v2.004

Change-Id: I857889598ad68902635e2dd349118c503a4fa70f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166590
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index f3086c5cc3cb..cf984726c09e 100644
--- a/download.lst
+++ b/download.lst
@@ -177,8 +177,8 @@ FONT_NOTO_SERIF_TARBALL := NotoSerif-v2.013.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_NOTO_SERIF_HEBREW_SHA256SUM := 
e45c149d6c29b38b8981401f875ab4304e73a366312783c41c082eb5366d3921
-FONT_NOTO_SERIF_HEBREW_TARBALL := NotoSerifHebrew-v2.003.zip
+FONT_NOTO_SERIF_HEBREW_SHA256SUM := 
99523f4f21051495f18cbd5169ed0d1e9b395eefe770fece1844a4a7a00c46da
+FONT_NOTO_SERIF_HEBREW_TARBALL := NotoSerifHebrew-v2.004.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst external/pdfium

[Miklos Vajna (via logerrit)]

 download.lst   |4 +-
 external/pdfium/Library_pdfium.mk  |   11 ++-
 external/pdfium/UnpackedTarball_pdfium.mk  |7 +
 external/pdfium/build.patch.1  |   35 -
 external/pdfium/inc/pch/precompiled_pdfium.hxx |   28 ++--
 external/pdfium/include.patch  |   10 ---
 external/pdfium/windows7.patch.1   |   14 +-
 7 files changed, 30 insertions(+), 79 deletions(-)

New commits:
commit 116ac059a3c30146d7a30bd917e048256f7b3cd8
Author: Miklos Vajna 
AuthorDate: Mon Apr 22 08:17:09 2024 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 22 17:02:14 2024 +0200

Update pdfium to 6425

Drop parts of build.patch.1 and the entire include.patch, which are
probably obsolete and don't apply anymore.

Change-Id: I18c8d5e2ee97c7793e75ac0e47b5705b99585d59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166415
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 48e1cbde01a4..f3086c5cc3cb 100644
--- a/download.lst
+++ b/download.lst
@@ -523,8 +523,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PDFIUM_SHA256SUM := 
6bc4dac8f1ef646a9bbd50848cb3fb8a108087ed6b3973bbee5846dc371b646d
-PDFIUM_TARBALL := pdfium-6296.tar.bz2
+PDFIUM_SHA256SUM := 
fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c
+PDFIUM_TARBALL := pdfium-6425.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/pdfium/Library_pdfium.mk 
b/external/pdfium/Library_pdfium.mk
index 85f9d953b752..898cdd12cce1 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -433,6 +433,8 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fxcrt/cfx_read_only_vector_stream \
 UnpackedTarball/pdfium/core/fxcrt/fx_memory_malloc \
 UnpackedTarball/pdfium/core/fxcrt/widetext_buffer \
+UnpackedTarball/pdfium/core/fxcrt/debug/alias \
+UnpackedTarball/pdfium/core/fxcrt/string_template \
 ))
 
 # fxge
@@ -568,12 +570,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 ))
 endif
 
-# pdfium_base
-$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
-UnpackedTarball/pdfium/third_party/base/debug/alias \
-UnpackedTarball/pdfium/third_party/base/memory/aligned_memory \
-))
-
 $(eval $(call gb_Library_use_externals,pdfium,\
 libjpeg \
 lcms2 \
@@ -664,7 +660,8 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fxge/cfx_windowsrenderdevice \
 UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_windows \
 UnpackedTarball/pdfium/core/fxcrt/fx_folder_windows \
-UnpackedTarball/pdfium/third_party/base/win/win_util \
+UnpackedTarball/pdfium/core/fxcrt/win/win_util \
+UnpackedTarball/pdfium/core/fxcrt/code_point_view \
 UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_windowsrenderdevice \
 ))
 
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk 
b/external/pdfium/UnpackedTarball_pdfium.mk
index 340036822e88..6c5bce9b2e29 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -18,8 +18,6 @@ pdfium_patches += constexpr-template.patch
 
 pdfium_patches += system-abseil.diff
 
-pdfium_patches += include.patch
-
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,pdfium,$(PDFIUM_TARBALL)))
@@ -35,9 +33,8 @@ $(eval $(call gb_UnpackedTarball_set_post_action,pdfium,\
 mv third_party/bigint/BigIntegerUtils.cc 
third_party/bigint/BigIntegerUtils.cpp && \
 mv third_party/bigint/BigUnsigned.cc third_party/bigint/BigUnsigned.cpp && 
\
 mv third_party/bigint/BigUnsignedInABase.cc 
third_party/bigint/BigUnsignedInABase.cpp && \
-mv third_party/base/debug/alias.cc third_party/base/debug/alias.cpp && \
-mv third_party/base/memory/aligned_memory.cc 
third_party/base/memory/aligned_memory.cpp && \
-mv third_party/base/win/win_util.cc third_party/base/win/win_util.cpp && \
+mv core/fxcrt/debug/alias.cc core/fxcrt/debug/alias.cpp && \
+mv core/fxcrt/win/win_util.cc core/fxcrt/win/win_util.cpp && \
 mv third_party/libopenjpeg/opj_malloc.cc 
third_party/libopenjpeg/opj_malloc.cpp && \
 mv third_party/abseil-cpp/absl/types/bad_optional_access.cc 
third_party/abseil-cpp/absl/types/bad_optional_access.cpp && \
 mv third_party/abseil-cpp/absl/types/bad_variant_access.cc 
third_party/abseil-cpp/absl/types/bad_variant_access.cpp \
diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1
index 0e8472efe8c8..1a5a35f1cdc7 100644
--- a/external/pdfium/build.patch.1
+++ b/external/pdfium/build.patch.1
@@ -12,41 +12,6 @@ index 31564f45f..5858549ef 100644

core.git: download.lst external/libwebp

[Xisco Fauli (via logerrit)]

 download.lst   |4 ++--
 external/libwebp/Makefile.vc.patch |   21 -
 2 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit f1c880463666149bcb82a2f76a1f27db71b2ae52
Author: Xisco Fauli 
AuthorDate: Wed Apr 17 16:54:13 2024 +0200
Commit: Xisco Fauli 
CommitDate: Thu Apr 18 09:47:21 2024 +0200

libwebp: Upgrade to 1.4.0

Change-Id: I196316b0c7efbe27c06b8dfed90db5248db6dce4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166185
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index f36b5fe0da10..48e1cbde01a4 100644
--- a/download.lst
+++ b/download.lst
@@ -414,8 +414,8 @@ LIBTOMMATH_TARBALL := ltm-1.3.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBWEBP_SHA256SUM := 
2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4
-LIBWEBP_TARBALL := libwebp-1.3.2.tar.gz
+LIBWEBP_SHA256SUM := 
61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5
+LIBWEBP_TARBALL := libwebp-1.4.0.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libwebp/Makefile.vc.patch 
b/external/libwebp/Makefile.vc.patch
index 41c899921a1c..412ccf60b901 100644
--- a/external/libwebp/Makefile.vc.patch
+++ b/external/libwebp/Makefile.vc.patch
@@ -1,6 +1,6 @@
 --- Makefile.vc.sav2021-07-30 00:55:37.0 +0200
 +++ Makefile.vc2022-01-25 17:35:30.206117700 +0100
-@@ -8,11 +8,11 @@
+@@ -8,13 +8,13 @@
  LIBSHARPYUV_BASENAME = libsharpyuv
  
  !IFNDEF ARCH
@@ -10,12 +10,15 @@
 -!ELSE IF ! [ cl 2>&1 | find "x64" > NUL ]
 +!ELSE IF ! [ $(CC) 2>&1 | grep -q "x64" > NUL ]
  ARCH = x64
+-!ELSE IF ! [ cl 2>&1 | find "ARM64" > NUL ]
++!ELSE IF ! [ $(CC) 2>&1 | grep -q "ARM64" > NUL ]
+ ARCH = ARM64
 -!ELSE IF ! [ cl 2>&1 | find "ARM" > NUL ]
 +!ELSE IF ! [ $(CC) 2>&1 | grep -q "ARM" > NUL ]
  ARCH = ARM
  !ELSE
  !ERROR Unable to auto-detect toolchain architecture! \
-@@ -28,8 +28,8 @@
+@@ -30,8 +30,8 @@
  ## Nothing more to do below this line!
  
  NOLOGO = /nologo
@@ -26,7 +29,7 @@
  CFLAGS = /I. /Isrc $(NOLOGO) /W3 /EHsc /c
  CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN
  LDFLAGS= /LARGEADDRESSAWARE /MANIFEST:EMBED /NXCOMPAT /DYNAMICBASE
-@@ -67,7 +67,7 @@
+@@ -69,7 +69,7 @@
  RTLIB   = /MD
  RTLIBD  = /MDd
  !ENDIF
@@ -35,7 +38,7 @@
  DIROBJ = $(DIRBASE)\obj
  DIRLIB = $(DIRBASE)\lib
  DIRINC = $(DIRBASE)\include
-@@ -87,10 +87,10 @@
+@@ -89,10 +89,10 @@
  
  # Target configuration
  !IF "$(CFG)" == "release-static"
@@ -48,7 +51,7 @@
  RTLIB  = $(RTLIBD)
  STATICLIBBUILD = TRUE
  LIBWEBPDECODER_BASENAME = $(LIBWEBPDECODER_BASENAME)_debug
-@@ -99,11 +99,11 @@
+@@ -101,11 +101,11 @@
  LIBWEBPDEMUX_BASENAME = $(LIBWEBPDEMUX_BASENAME)_debug
  LIBSHARPYUV_BASENAME = $(LIBSHARPYUV_BASENAME)_debug
  !ELSE IF "$(CFG)" == "release-dynamic"
@@ -62,7 +65,7 @@
  RC= $(RCDEBUG)
  RTLIB = $(RTLIBD)
  DLLBUILD  = TRUE
-@@ -115,7 +115,7 @@
+@@ -117,7 +117,7 @@
  !ENDIF
  
  !IF "$(STATICLIBBUILD)" == "TRUE"
@@ -71,7 +74,7 @@
  CFGSET = TRUE
  LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME).lib
  LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME).lib
-@@ -123,7 +123,7 @@
+@@ -125,7 +125,7 @@
  LIBWEBPDEMUX = $(DIRLIB)\$(LIBWEBPDEMUX_BASENAME).lib
  LIBSHARPYUV = $(DIRLIB)\$(LIBSHARPYUV_BASENAME).lib
  !ELSE IF "$(DLLBUILD)" == "TRUE"
@@ -80,7 +83,7 @@
  LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME)_dll.lib
  LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME)_dll.lib
  LIBWEBPMUX = $(DIRLIB)\$(LIBWEBPMUX_BASENAME)_dll.lib
-@@ -434,7 +434,7 @@
+@@ -438,7 +438,7 @@
  
  !IF "$(DLLBUILD)" == "TRUE"
  {$(DIROBJ)}.c{$(DIROBJ)}.obj:
@@ -89,7 +92,7 @@
  
  {src}.rc{$(DIROBJ)}.res:
$(RC) /fo$@ $<
-@@ -467,41 +467,41 @@
+@@ -471,41 +471,41 @@
  # File-specific flag builds. Note batch rules take precedence over wildcards,
  # so for now name each file individually.
  $(DIROBJ)xamplesnim_diff.obj: examplesnim_diff.c

core.git: download.lst external/xmlsec

[Miklos Vajna (via logerrit)]

 download.lst | 
   4 -
 external/xmlsec/UnpackedTarball_xmlsec.mk| 
   2 
 external/xmlsec/xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1 | 
  33 --
 3 files changed, 2 insertions(+), 37 deletions(-)

New commits:
commit 1651ced348fa47de3f24650dcad8922121602da4
Author: Miklos Vajna 
AuthorDate: Fri Apr 12 08:36:05 2024 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 15 08:03:11 2024 +0200

Update libxmlsec to 1.3.4

Allows dropping
xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1, which was
a backport.

Change-Id: Ifdd0b5285daa79116a91ab2d122a9809f8effb5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166019
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index d8793dbeb620..f36b5fe0da10 100644
--- a/download.lst
+++ b/download.lst
@@ -419,8 +419,8 @@ LIBWEBP_TARBALL := libwebp-1.3.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-XMLSEC_SHA256SUM := 
ab5b9a9ffd6960f46f7466d9d91f174ec37e8c31989237ba6b9eacdd816464f2
-XMLSEC_TARBALL := xmlsec1-1.3.3.tar.gz
+XMLSEC_SHA256SUM := 
45ad9078d41ae76844ad2f8651600ffeec0fdd128ead988a8d69e907c57aee75
+XMLSEC_TARBALL := xmlsec1-1.3.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk 
b/external/xmlsec/UnpackedTarball_xmlsec.mk
index ad7b4b57c5f3..906aece5f7ed 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -12,8 +12,6 @@ xmlsec_patches :=
 xmlsec_patches += old-nss.patch.1
 # Remove this when Windows 7 is no longer supported
 xmlsec_patches += BCryptKeyDerivation.patch.1
-# Backport of https://github.com/lsh123/xmlsec/pull/754
-xmlsec_patches += xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 
diff --git 
a/external/xmlsec/xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1 
b/external/xmlsec/xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1
deleted file mode 100644
index bf397bfb9178..
--- 
a/external/xmlsec/xmlsec-nss-Ensure-NSS-algorithms-are-initialized-754.patch.1
+++ /dev/null
@@ -1,33 +0,0 @@
-From 356fdcfaf6e126835ac3bd7f410a3fa4d4a6877b Mon Sep 17 00:00:00 2001
-From: lsh123 
-Date: Sat, 13 Jan 2024 18:07:49 -0500
-Subject: [PATCH] (xmlsec-nss) Ensure NSS algorithms are initialized (#754)
-

- src/nss/crypto.c | 8 
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/nss/crypto.c b/src/nss/crypto.c
-index 6455ec72..7ba0c77a 100644
 a/src/nss/crypto.c
-+++ b/src/nss/crypto.c
-@@ -361,8 +361,16 @@ xmlSecCryptoGetFunctions_nss(void) {
- 
- static void
- xmlSecNssUpdateAvailableCryptoTransforms(xmlSecCryptoDLFunctionsPtr 
functions) {
-+SECStatus rv;
- xmlSecAssert(functions != NULL);
- 
-+/* in theory NSS should be already initialized but just in case */
-+rv = SECOID_Init();
-+if (rv != SECSuccess) {
-+xmlSecNssError("SECOID_Init", NULL);
-+return;
-+}
-+
- /*** AES /
- /* cbc */
- if (xmlSecNssCryptoCheckAlgorithm(SEC_OID_AES_128_CBC) == 0) {
--- 
-2.35.3
-

core.git: download.lst external/boost

[Stephan Bergmann (via logerrit)]

 download.lst   
  |4 
 
external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
 |   27 
 external/boost/UnpackedTarball_boost.mk
  |6 
 external/boost/Wundef.patch.0  
  |   55 
 external/boost/boost.between.warning.patch 
  |   22 +--
 external/boost/boost.noiconv.patch 
  |   66 +-
 external/boost/windows-no-utf8-locales.patch.0 
  |   28 +---
 7 files changed, 111 insertions(+), 97 deletions(-)

New commits:
commit f65d7265c63778ebf630b9d909617d064dce529e
Author: Stephan Bergmann 
AuthorDate: Thu Dec 21 20:39:17 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Apr 7 18:11:24 2024 +0200

Upgrade external/boost to latest Boost 1.84.0

 has been 
generated (on
Fedora 39) with

> $ wget 
https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.bz2
> $ printf 
'cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454 
boost_1_84_0.tar.bz2' | sha256sum -c # cf. 

> boost_1_84_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_84_0.tar.bz2
> Unpacking boost_1_84_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_84_0.tar.xz ...
> Cleaning up ...
> fd4a2ee785ea0e4efc5221a4284e0cf51096e8409871fb70fdaced002eeffc0b  
boost_1_84_0.tar.xz
> Done.

* 
external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
  was obsoleted by
  

  "avoid ODR by making this const".

* The modified external/boost/windows-no-utf8-locales.patch.0, whose 
original
  version no longer applied as-is, should hopefully still mitigate the issue
  described in 072a25e1ef4815bbef4f18f59f025862a0d8e876 "tdf#157135 
workaround:
  restore and update windows-no-utf8-locales.patch.0".

* external/boost/Wundef.patch.0 is needed to silence

> In file included from 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/throw_exception.hpp:24,
>  from 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/serialize_tracked_address.hpp:16,
>  from 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/fca.hpp:117,
>  from 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/implementation.hpp:17,
>  from 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/map.hpp:7,
>  from 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/unordered_map.hpp:17,
>  from 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered_map.hpp:17,
>  from 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/external/boost/include/boost/unordered_map.hpp:30,
>  from 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/configmgr/source/modifications.hxx:28,
>  from 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/configmgr/source/data.hxx:34,
>  from 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/configmgr/source/groupnode.cxx:26:
> 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/type_traits.hpp:51:22:
 error: "BOOST_LIBSTDCXX_VERSION_WORKAROUND_GUARD" is not defined, evaluates to 
0 [-Werror=undef]
>51 | #if BOOST_WORKAROUND(BOOST_LIBSTDCXX_VERSION, < 5)
>   |  ^~~
> 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/config/workaround.hpp:272:10:
 note: in definition of macro ‘BOOST_WORKAROUND’
>   272 |((symbol ## _WORKAROUND_GUARD + 0 == 0) && \
>   |  ^~
> 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/boost/boost/unordered/detail/type_traits.hpp:64:22:
 error: "BOOST_LIBSTDCXX_VERSION_WORKAROUND_GUARD" is not defined, evaluates to 
0 

core.git: download.lst external/rhino scripting/Jar_ScriptProviderForJavaScript.mk scripting/java

[Stephan Bergmann (via logerrit)]

 download.lst   
   |4 
 external/rhino/ExternalPackage_rhino.mk
   |2 
 external/rhino/ExternalProject_rhino.mk
   |   36 
 external/rhino/OfficeScriptInfo.java   
   |  118 -
 external/rhino/UnpackedTarball_rhino.mk
   |   11 
 external/rhino/filelist.txt
   |  330 +++
 external/rhino/rhino-classpath.patch.1 
   |   13 
 external/rhino/rhino1_5R5-find_swing.patch 
   |   16 
 external/rhino/rhino1_5R5-updateToolTip.patch  
   |   23 
 external/rhino/rhino1_5R5.patch
   | 1067 --
 scripting/Jar_ScriptProviderForJavaScript.mk   
   |6 
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
   |  319 --
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
 |   59 
 scripting/java/com/sun/star/script/framework/provider/javascript/template.js   
   |   54 
 14 files changed, 363 insertions(+), 1695 deletions(-)

New commits:
commit 58c4457a902c846229dc3383cc31bbc8f4b3aed9
Author: Stephan Bergmann 
AuthorDate: Fri Mar 22 15:53:49 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Apr 2 18:56:13 2024 +0200

Update to latest Rhino 1.7.14

...at the expense of losing, at least for now, the script editor for it 
(which
had been hacked into the old upstream sources in a hard-to-maintain way).

rhino-1.7.14.zip is taken from

.
Building it would now use Gradle, but instead just hack together an 
invocation
of javac and jar in external/rhino/ExternalProject_rhino.mk that effectively
generates the same jar as the upstream-built jar available at

.

All the various patches are no longer necessary:
* external/rhino/rhino1_5R5.patch and external/rhino/OfficeScriptInfo.java 
were
  mostly for the hacked-in script editor, which has been abandoned at least 
for
  now (see above).
* external/rhino/rhino1_5R5-find_swing.patch (originally from
  0a7f9346503a557f583bced269655fa1996550af "ause109: #i106296# make 
build.xml
  aware of TARFILE_LOCATION") appears to be obsolete.
* external/rhino/rhino1_5R5-updateToolTip.patch is covered by
  

  "Fix bug 414869: Rhino debugger fails to launch due to updates in mac os x
  leopard".
* external/rhino/rhino-classpath.patch.1 from
  bb58293296f843654045d7b0eba6899d11533a4a "rhino: unbreak build on Fedora 
34"
  was only relevant when building with Ant.

Change-Id: I5fca5915d785716f7aaf313ff2469a20f55f707a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165190
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/download.lst b/download.lst
index f0ab55c21f1c..af0e9f113ac4 100644
--- a/download.lst
+++ b/download.lst
@@ -586,8 +586,8 @@ REVENGE_TARBALL := 
librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-RHINO_SHA256SUM := 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
-RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+RHINO_SHA256SUM := 
bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c
+RHINO_TARBALL := rhino-1.7.14.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/rhino/ExternalPackage_rhino.mk 
b/external/rhino/ExternalPackage_rhino.mk
index 0ee1d60e309d..faac15c6978e 100644
--- a/external/rhino/ExternalPackage_rhino.mk
+++ b/external/rhino/ExternalPackage_rhino.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,rhino,rhino))
 
 $(eval $(call gb_ExternalPackage_use_external_project,rhino,rhino))
 
-$(eval $(call 
gb_ExternalPackage_add_file,rhino,$(LIBO_SHARE_JAVA_FOLDER)/js.jar,build/rhino1_5R5/js.jar))
+$(eval $(call 
gb_ExternalPackage_add_file,rhino,$(LIBO_SHARE_JAVA_FOLDER)/js.jar,build/js.jar))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/rhino/ExternalProject_rhino.mk 
b/external/rhino/ExternalProject_rhino.mk
index 6ef30ca34f24..3df0aaa4e2d9 100644
--- a/external/rhino/ExternalProject_rhino.mk
+++ 

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6027c219444ade7274841a5ba45e62bdc1ea3238
Author: Xisco Fauli 
AuthorDate: Mon Apr 1 21:16:19 2024 +0200
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Apr 2 02:27:46 2024 +0200

harfbuzz: upgrade to 8.4.0

Change-Id: Ie9b5e2fc85c3be588217a166f4230c87c3cb122e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165652
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 705d349ea566..f0ab55c21f1c 100644
--- a/download.lst
+++ b/download.lst
@@ -292,8 +292,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
f73e1eacd7e2ffae687bc3f056bb0c705b7a05aee86337686e09da8fc1c2030c
-HARFBUZZ_TARBALL := harfbuzz-8.3.1.tar.xz
+HARFBUZZ_SHA256SUM := 
af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e
+HARFBUZZ_TARBALL := harfbuzz-8.4.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3227466e7dc8bb247618a1d27126b4ab02f45672
Author: Xisco Fauli 
AuthorDate: Mon Apr 1 12:59:17 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 1 19:30:26 2024 +0200

libtommath: upgrade to 1.3.0

Change-Id: Ica9e2520c7c70a21721f7f389fd3cd8138bf550c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165609
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index c872b55c92df..705d349ea566 100644
--- a/download.lst
+++ b/download.lst
@@ -409,8 +409,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTOMMATH_SHA256SUM := 
986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f
-LIBTOMMATH_TARBALL := ltm-1.2.1.tar.xz
+LIBTOMMATH_SHA256SUM := 
296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08
+LIBTOMMATH_TARBALL := ltm-1.3.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst external/lcms2

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 +--
 external/lcms2/0001-Added-missing-export.patch.1 |   25 +++
 external/lcms2/ExternalPackage_lcms2.mk  |2 -
 external/lcms2/UnpackedTarball_lcms2.mk  |4 ++-
 external/lcms2/c++17.patch.1 |   13 ---
 5 files changed, 31 insertions(+), 17 deletions(-)

New commits:
commit c2db961ee69c4fe6a7f7162f2adf712651b6ffcc
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Mar 26 16:49:26 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Apr 1 00:58:52 2024 +0200

lcms2: upgrade to 2.16

* backport 0001-Added-missing-export.patch to fix the Windows build.
* drop c++17.patch.1, which fixed uptream.

Change-Id: Ib658ba3067c35ca5cd1ccb7b3f0f2f3bc9f82a43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165350
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 6e60d5f53234..c872b55c92df 100644
--- a/download.lst
+++ b/download.lst
@@ -364,8 +364,8 @@ LANGTAGREG_TARBALL := 
language-subtag-registry-2023-08-02.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LCMS2_SHA256SUM := 
b20cbcbd0f503433be2a4e81462106fa61050a35074dc24a4e356792d971ab39
-LCMS2_TARBALL := lcms2-2.15.tar.gz
+LCMS2_SHA256SUM := 
d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51
+LCMS2_TARBALL := lcms2-2.16.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/lcms2/0001-Added-missing-export.patch.1 
b/external/lcms2/0001-Added-missing-export.patch.1
new file mode 100644
index ..ad131e9533d3
--- /dev/null
+++ b/external/lcms2/0001-Added-missing-export.patch.1
@@ -0,0 +1,25 @@
+From f7b3c637c20508655f8b49935a4b556d52937b69 Mon Sep 17 00:00:00 2001
+From: Dirk Lemstra 
+Date: Sun, 10 Dec 2023 20:31:32 +0100
+Subject: [PATCH] Added missing export.
+
+---
+ src/cmsvirt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cmsvirt.c b/src/cmsvirt.c
+index 3d662b2..6615604 100644
+--- a/src/cmsvirt.c
 b/src/cmsvirt.c
+@@ -676,7 +676,7 @@ cmsHPROFILE CMSEXPORT cmsCreate_sRGBProfile(void)
+ * 
+ * This virtual profile cannot be saved as an ICC file
+ */
+-cmsHPROFILE cmsCreate_OkLabProfile(cmsContext ctx)
++cmsHPROFILE CMSEXPORT cmsCreate_OkLabProfile(cmsContext ctx)
+ {
+ cmsStage* XYZPCS = _cmsStageNormalizeFromXyzFloat(ctx);
+ cmsStage* PCSXYZ = _cmsStageNormalizeToXyzFloat(ctx);
+-- 
+2.44.0.windows.1
+
diff --git a/external/lcms2/ExternalPackage_lcms2.mk 
b/external/lcms2/ExternalPackage_lcms2.mk
index a2c051f6eb9a..62e2ebad8981 100644
--- a/external/lcms2/ExternalPackage_lcms2.mk
+++ b/external/lcms2/ExternalPackage_lcms2.mk
@@ -17,7 +17,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.2.dy
 else ifeq ($(COM),MSC)
 $(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2.dll))
 else
-$(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.15))
+$(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.16))
 endif
 endif # $(DISABLE_DYNLOADING)
 
diff --git a/external/lcms2/UnpackedTarball_lcms2.mk 
b/external/lcms2/UnpackedTarball_lcms2.mk
index 28b30ef3acee..745da1a0a782 100644
--- a/external/lcms2/UnpackedTarball_lcms2.mk
+++ b/external/lcms2/UnpackedTarball_lcms2.mk
@@ -15,10 +15,12 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,lcms2))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
 
+# external/lcms2/0001-Added-missing-export.patch.1:
+# backport of 
https://github.com/mm2/Little-CMS/commit/f7b3c637c20508655f8b49935a4b556d52937b69
 $(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
+   external/lcms2/0001-Added-missing-export.patch.1 \
external/lcms2/lcms2-2.4-windows.patch \
external/lcms2/lcms2-windows_aarch64_outdir.patch.1 \
-   external/lcms2/c++17.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/lcms2/c++17.patch.1 b/external/lcms2/c++17.patch.1
deleted file mode 100644
index dc5b2ccde46c..
--- a/external/lcms2/c++17.patch.1
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/include/lcms2.h b/include/lcms2.h
-index cf52014..926e2a0 100644
 a/include/lcms2.h
-+++ b/include/lcms2.h
-@@ -62,7 +62,7 @@
- // #define CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT
- 
- // Uncomment this to remove the "register" storage class
--// #define CMS_NO_REGISTER_KEYWORD 1
-+#define CMS_NO_REGISTER_KEYWORD 1
- 
- // ** End of configuration toggles **
- 

core.git: download.lst external/libgpg-error

[Xisco Fauli (via logerrit)]

 download.lst  |4 ++--
 external/libgpg-error/ExternalPackage_libgpg-error.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 65bee6317eafd4d0e449c779c160e9b3017b57ce
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 12:10:17 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 28 16:31:03 2024 +0100

libgpg-error: upgrade to release 1.48

Change-Id: I3920d10657a91b56f484a5a61017d2e2ba3291b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165457
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index b9cc043b434e..6e60d5f53234 100644
--- a/download.lst
+++ b/download.lst
@@ -394,8 +394,8 @@ LIBFFI_TARBALL := libffi-3.4.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBGPGERROR_SHA256SUM := 
9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb
-LIBGPGERROR_TARBALL := libgpg-error-1.47.tar.bz2
+LIBGPGERROR_SHA256SUM := 
89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f
+LIBGPGERROR_TARBALL := libgpg-error-1.48.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk 
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index fd887fb5776d..2c64ba3b5cc6 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.34.0))
+$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.35.0))
 
 else ifeq ($(OS),MACOSX)
 

core.git: download.lst external/libassuan

[Xisco Fauli (via logerrit)]

 download.lst|4 ++--
 external/libassuan/ExternalPackage_libassuan.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0343d7153e77ba79a59bc5f6c51159af9010813e
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 11:49:58 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 28 15:44:42 2024 +0100

libassuan: upgrade to 2.5.7

Change-Id: I6114c7a77395f14e83d2315ac6f9b6829ddb1c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165456
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 67021f67c762..b9cc043b434e 100644
--- a/download.lst
+++ b/download.lst
@@ -369,8 +369,8 @@ LCMS2_TARBALL := lcms2-2.15.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBASSUAN_SHA256SUM := 
e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426
-LIBASSUAN_TARBALL := libassuan-2.5.6.tar.bz2
+LIBASSUAN_SHA256SUM := 
0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76
+LIBASSUAN_TARBALL := libassuan-2.5.7.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libassuan/ExternalPackage_libassuan.mk 
b/external/libassuan/ExternalPackage_libassuan.mk
index 2df7b562d584..77dc05a665f1 100644
--- a/external/libassuan/ExternalPackage_libassuan.mk
+++ b/external/libassuan/ExternalPackage_libassuan.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.6))
+$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.7))
 
 else ifeq ($(OS),MACOSX)
 

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2c1a7cb13629177f824ed35138907aef10714e89
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 11:40:25 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 28 15:44:01 2024 +0100

curl: upgrade to release 8.7.1

Change-Id: I0064b4cf6baf1ccd951c95945539961fe72c2a28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165455
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 4f1f4ffe97bb..67021f67c762 100644
--- a/download.lst
+++ b/download.lst
@@ -80,8 +80,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15
-CURL_TARBALL := curl-8.6.0.tar.xz
+CURL_SHA256SUM := 
6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd
+CURL_TARBALL := curl-8.7.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst external/poppler

[Xisco Fauli (via logerrit)]

 download.lst |4 +-
 external/poppler/disable-nss-and-gpgmepp.patch.1 |   36 ---
 2 files changed, 21 insertions(+), 19 deletions(-)

New commits:
commit a3eefc0fbe7d9a9ed946979c97a41181cd043593
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 20:59:08 2024 +0100
Commit: Xisco Fauli 
CommitDate: Tue Mar 26 09:25:55 2024 +0100

poppler: upgrade to release 24.03.0

Change-Id: Icd063dcc9a034e88283ddf16be64091a32f3453f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165292
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 2b033727c322..4f1f4ffe97bb 100644
--- a/download.lst
+++ b/download.lst
@@ -543,8 +543,8 @@ LIBTIFF_TARBALL := tiff-4.6.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55
-POPPLER_TARBALL := poppler-23.09.0.tar.xz
+POPPLER_SHA256SUM := 
bafbf0db5713dec25b5d16eb2cd87e4a62351cdc40f050c3937cd8dd6882d446
+POPPLER_TARBALL := poppler-24.03.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/disable-nss-and-gpgmepp.patch.1 
b/external/poppler/disable-nss-and-gpgmepp.patch.1
index 01b442f53a1c..1d7f7f933433 100644
--- a/external/poppler/disable-nss-and-gpgmepp.patch.1
+++ b/external/poppler/disable-nss-and-gpgmepp.patch.1
@@ -11,7 +11,7 @@ disable NSS/GPGMEPP dependent code.
  #include "SignatureInfo.h"
  #include "CertificateInfo.h"
  #include "XRef.h"
-@@ -577,7 +577,7 @@
+@@ -578,7 +578,7 @@
  {
  return static_cast(field)->validateSignature(doVerifyCert, forceRevalidation, validationTime, 
ocspRevocationCheck, enableAIA);
  }
@@ -20,12 +20,12 @@ disable NSS/GPGMEPP dependent code.
  // update hash with the specified range of data from the file
  static bool hashFileRange(FILE *f, CryptoSign::SigningInterface *handler, 
Goffset start, Goffset end)
  {
-@@ -607,10 +607,12 @@
+@@ -608,10 +608,12 @@
  delete[] buf;
  return true;
  }
 +#endif
- 
+
  bool FormWidgetSignature::signDocument(const std::string , const 
std::string , const std::string , const GooString 
*reason, const GooString *location, const std::optional 
,
 const std::optional 
)
  {
@@ -33,44 +33,46 @@ disable NSS/GPGMEPP dependent code.
  auto backend = CryptoSign::Factory::createActive();
  if (!backend) {
  return false;
-@@ -698,6 +700,8 @@
+@@ -697,8 +699,8 @@
+ signatureField->setSignature(*signature);
+
  fclose(file);
- 
- return true;
+-
+-return true;
 +#endif
 +return false;
  }
- 
- bool FormWidgetSignature::signDocumentWithAppearance(const std::string 
, const std::string , const std::string , 
const GooString *reason, const GooString *location,
-@@ -2316,6 +2320,7 @@
- 
+
+ static std::tuple calculateDxDy(int rot, const PDFRectangle 
*rect)
+@@ -2355,6 +2357,7 @@
+
  void 
FormFieldSignature::hashSignedDataBlock(CryptoSign::VerificationInterface 
*handler, Goffset block_len)
  {
 +#if 0
  if (!handler) {
  return;
  }
-@@ -2335,6 +2340,7 @@
+@@ -2374,6 +2377,7 @@
  i += BLOCK_SIZE;
  }
  }
 +#endif
  }
- 
+
  FormSignatureType FormWidgetSignature::signatureType() const
-@@ -2349,6 +2355,7 @@
- 
+@@ -2388,6 +2392,7 @@
+
  SignatureInfo *FormFieldSignature::validateSignature(bool doVerifyCert, bool 
forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool 
enableAIA)
  {
 +#if 0
  auto backend = CryptoSign::Factory::createActive();
  if (!backend) {
  return signature_info;
-@@ -2425,6 +2432,7 @@
+@@ -2464,6 +2469,7 @@
  const CertificateValidationStatus cert_val_state = 
signature_handler->validateCertificate(std::chrono::system_clock::from_time_t(validationTime),
 ocspRevocationCheck, enableAIA);
  signature_info->setCertificateValStatus(cert_val_state);
- 
+
 +#endif
  return signature_info;
  }
- 
+

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a80258e11282c78ab3867c96e4c2575e83c5482b
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 13:45:24 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 25 20:43:29 2024 +0100

mariadb connector: upgrade to release 3.3.8

Change-Id: I21cf511a2b6c040d4a64ca720606af9312130045
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165284
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index d35bd6300748..2b033727c322 100644
--- a/download.lst
+++ b/download.lst
@@ -446,8 +446,8 @@ LXML_TARBALL := lxml-4.9.2.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-MARIADB_CONNECTOR_C_SHA256SUM := 
975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf
-MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.7-src.tar.gz
+MARIADB_CONNECTOR_C_SHA256SUM := 
f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8
+MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.8-src.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6d791e3d2577498affec491876a0afa441be002
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 10:56:38 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 25 20:42:40 2024 +0100

nss: upgrade to release 3.99

Change-Id: I77ccc45854b2d0aecc288f471d94c81ad9089f85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165273
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index f7cacf0c43aa..d35bd6300748 100644
--- a/download.lst
+++ b/download.lst
@@ -477,8 +477,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
59bb55a59b02e4004fc26ad0aa1a13fe8d73c6c90c447dd2f2efb73fb81083ed
-NSS_TARBALL := nss-3.98-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31
+NSS_TARBALL := nss-3.99-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9a0b37a5337faee5634cc9fce4955da204b95bf4
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 12:14:07 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 25 15:54:36 2024 +0100

openldap: upgrade to release 2.6.7

Change-Id: I7716a41114442ba7a57d81192b01cbeaaeca08b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165280
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 7064bd39bef3..f7cacf0c43aa 100644
--- a/download.lst
+++ b/download.lst
@@ -503,8 +503,8 @@ ONLINEUPDATE_TARBALL := 
onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENLDAP_SHA256SUM := 
082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
-OPENLDAP_TARBALL := openldap-2.6.6.tgz
+OPENLDAP_SHA256SUM := 
cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930
+OPENLDAP_TARBALL := openldap-2.6.7.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e6f000c64fa986a9539f68fe5fff096b0b4b7c48
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 11:23:27 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 25 15:13:19 2024 +0100

postgresql: upgrade to release 13.14

Change-Id: Ia9607fd9c8dad9d5936e867ad76b18a476f1057f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165278
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 643e9cc7f3f3..7064bd39bef3 100644
--- a/download.lst
+++ b/download.lst
@@ -550,8 +550,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POSTGRESQL_SHA256SUM := 
4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb
-POSTGRESQL_TARBALL := postgresql-13.11.tar.bz2
+POSTGRESQL_SHA256SUM := 
b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed
+POSTGRESQL_TARBALL := postgresql-13.14.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 +-
 external/expat/0001-Fix-compiler-warnings.patch |   47 
 external/expat/UnpackedTarball_expat.mk |3 -
 3 files changed, 2 insertions(+), 52 deletions(-)

New commits:
commit 370ca73a45b291e172918b4c8fcbc37ccaa434cf
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 13:43:14 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Mar 22 15:57:29 2024 +0100

Expat: upgrade to release 2.6.2

Fixes CVE-2024-28757

Change-Id: Id85044fa9d8eda922425e580e9d6979f6563e98a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165129
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 276d67276c07..643e9cc7f3f3 100644
--- a/download.lst
+++ b/download.lst
@@ -111,8 +111,8 @@ ETONYEK_TARBALL := 
libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-EXPAT_SHA256SUM := 
cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e
-EXPAT_TARBALL := expat-2.6.0.tar.xz
+EXPAT_SHA256SUM := 
ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364
+EXPAT_TARBALL := expat-2.6.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/expat/0001-Fix-compiler-warnings.patch 
b/external/expat/0001-Fix-compiler-warnings.patch
deleted file mode 100644
index adec5ed0d9be..
--- a/external/expat/0001-Fix-compiler-warnings.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3f60a47cb5716bb810789a12ef6024c1dc448164 Mon Sep 17 00:00:00 2001
-From: Taichi Haradaguchi <20001...@ymail.ne.jp>
-Date: Fri, 9 Feb 2024 19:28:35 +0900
-Subject: [PATCH] Fix compiler warnings
-
-> In file included from ./../lib/internal.h:149,
->  from codepage.c:38:
-> ./../lib/expat.h:1045:5: warning: "XML_GE" is not defined, evaluates to 0 
[-Wundef]
->  1045 | #if XML_GE == 1
->   | ^~
-> ./../lib/internal.h:158:5: warning: "XML_GE" is not defined, evaluates to 0 
[-Wundef]
->   158 | #if XML_GE == 1
->   | ^~

- expat/lib/expat.h| 2 +-
- expat/lib/internal.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/expat/lib/expat.h b/expat/lib/expat.h
-index 95464b0d..79bbfb61 100644
 a/expat/lib/expat.h
-+++ b/expat/lib/expat.h
-@@ -1042,7 +1042,7 @@ typedef struct {
- XMLPARSEAPI(const XML_Feature *)
- XML_GetFeatureList(void);
- 
--#if XML_GE == 1
-+#if defined(XML_GE) && XML_GE == 1
- /* Added in Expat 2.4.0 for XML_DTD defined and
-  * added in Expat 2.6.0 for XML_GE == 1. */
- XMLPARSEAPI(XML_Bool)
-diff --git a/expat/lib/internal.h b/expat/lib/internal.h
-index cce71e4c..208c6b67 100644
 a/expat/lib/internal.h
-+++ b/expat/lib/internal.h
-@@ -155,7 +155,7 @@ extern "C" {
- void _INTERNAL_trim_to_complete_utf8_characters(const char *from,
- const char **fromLimRef);
- 
--#if XML_GE == 1
-+#if defined(XML_GE) && XML_GE == 1
- unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);
- unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);
- const char *unsignedCharToPrintable(unsigned char c);
--- 
-2.43.1
-
diff --git a/external/expat/UnpackedTarball_expat.mk 
b/external/expat/UnpackedTarball_expat.mk
index 465105f2ca8c..5d4f41f6d147 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -13,10 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,expat,conftools))
 
-# * external/expat/0001-Fix-compiler-warnings.patch was sent to upstream as
-#    "Fix compiler warnings":
 $(eval $(call gb_UnpackedTarball_add_patches,expat,\
-   external/expat/0001-Fix-compiler-warnings.patch \
external/expat/expat-winapi.patch \
 ))
 

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 832b98cedda2cd1631651f9397a871fb50d9cb1f
Author: Xisco Fauli 
AuthorDate: Wed Mar 20 10:26:11 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 21 13:06:47 2024 +0100

libxml2: upgrade to release 2.12.6

Change-Id: I7372b276f74bc760c99580ffc509fde1031cb3a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165049
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 27391725e6a5..276d67276c07 100644
--- a/download.lst
+++ b/download.lst
@@ -424,8 +424,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.3.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21
-LIBXML_VERSION_MICRO := 5
+LIBXML_SHA256SUM := 
889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb
+LIBXML_VERSION_MICRO := 6
 LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c87f46492a41ebb2f9ac61ee8e1f0dd6d3dc90c7
Author: Xisco Fauli 
AuthorDate: Wed Mar 20 11:07:34 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Mar 20 19:30:26 2024 +0100

harfbuzz: upgrade to 8.3.1

Change-Id: I3dee68e397dc1c6dafa604e84bfcb619f2a33590
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165051
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 003d7b3929a5..8589b1fc 100644
--- a/download.lst
+++ b/download.lst
@@ -292,8 +292,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847
-HARFBUZZ_TARBALL := harfbuzz-8.3.0.tar.xz
+HARFBUZZ_SHA256SUM := 
f73e1eacd7e2ffae687bc3f056bb0c705b7a05aee86337686e09da8fc1c2030c
+HARFBUZZ_TARBALL := harfbuzz-8.3.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f29222eaf385891620d4868827b27e734752018e
Author: Xisco Fauli 
AuthorDate: Wed Mar 20 10:49:53 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Mar 20 17:44:02 2024 +0100

libpng: upgrade to 1.6.43

Change-Id: Ia1ddc21dc521cf97b75a64d806417cbfe5dec623
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165050
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 682ec1a0f256..003d7b3929a5 100644
--- a/download.lst
+++ b/download.lst
@@ -533,8 +533,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBPNG_SHA256SUM := 
c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450
-LIBPNG_TARBALL := libpng-1.6.42.tar.xz
+LIBPNG_SHA256SUM := 
6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c
+LIBPNG_TARBALL := libpng-1.6.43.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ace72e8c606aa5f32a425b4afa965a68a854bc85
Author: Xisco Fauli 
AuthorDate: Tue Mar 5 10:11:04 2024 +0100
Commit: Xisco Fauli 
CommitDate: Tue Mar 5 13:38:28 2024 +0100

liberation-fonts-ttf: upgrade to 2.1.5

Change-Id: Ib9cb2b735bac16f8d2385914b660a83e55060e89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164411
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 2a275d2618b2..682ec1a0f256 100644
--- a/download.lst
+++ b/download.lst
@@ -152,8 +152,8 @@ FONT_GENTIUM_TARBALL := 
1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
 # will not run into conflicts
 FONT_LIBERATION_NARROW_SHA256SUM := 
8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3
 FONT_LIBERATION_NARROW_TARBALL := liberation-narrow-fonts-ttf-1.07.6.tar.gz
-FONT_LIBERATION_SHA256SUM := 
26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef
-FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.1.4.tar.gz
+FONT_LIBERATION_SHA256SUM := 
7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0
+FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.1.5.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b50db5e7c822943599f9914f60b95328f2a1389
Author: Xisco Fauli 
AuthorDate: Tue Mar 5 10:25:04 2024 +0100
Commit: Xisco Fauli 
CommitDate: Tue Mar 5 12:34:50 2024 +0100

ReemKufi: upgrade to 1.7

Change-Id: I3ca9e6f973e642a6fade0ad0f9d4c902f8e8e2cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164412
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index f7ba383080b7..2a275d2618b2 100644
--- a/download.lst
+++ b/download.lst
@@ -252,8 +252,8 @@ FONT_AMIRI_TARBALL := Amiri-1.000.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_REEM_SHA256SUM := 
c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413
-FONT_REEM_TARBALL := ReemKufi-1.2.zip
+FONT_REEM_SHA256SUM := 
2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4
+FONT_REEM_TARBALL := ReemKufi-1.7.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst external/gpgmepp

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 +-
 external/gpgmepp/ExternalPackage_gpgmepp.mk |4 +-
 external/gpgmepp/Library_gpgmepp.mk |1 
 external/gpgmepp/Wincompatible-function-pointer-types.patch |4 +-
 external/gpgmepp/w32-build-fixes.patch.1|   19 ++--
 5 files changed, 23 insertions(+), 9 deletions(-)

New commits:
commit c9d3e68481e4db0e732b9186b75b582a5b41271b
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Feb 25 13:42:01 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Feb 27 14:03:51 2024 +0100

GPGME: upgrade to release 1.23.2

Change-Id: I56c419fbbe615ef57b7d8117ccdc32f0daddf95f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163840
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 8368b51258dd..f7ba383080b7 100644
--- a/download.lst
+++ b/download.lst
@@ -282,8 +282,8 @@ GLM_TARBALL := glm-0.9.9.8.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-GPGME_SHA256SUM := 
25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750
-GPGME_TARBALL := gpgme-1.20.0.tar.bz2
+GPGME_SHA256SUM := 
9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224
+GPGME_TARBALL := gpgme-1.23.2.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk 
b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index ef49c398d215..be32afd6b324 100644
--- a/external/gpgmepp/ExternalPackage_gpgmepp.mk
+++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk
@@ -15,8 +15,8 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.17.0))
-$(eval $(call 
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.29.0))
+$(eval $(call 
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.20.1))
+$(eval $(call 
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.32.1))
 
 else ifeq ($(OS),MACOSX)
 
diff --git a/external/gpgmepp/Library_gpgmepp.mk 
b/external/gpgmepp/Library_gpgmepp.mk
index ac71cf8b90ec..8191e55d4709 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -72,6 +72,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,gpgmepp,\
UnpackedTarball/gpgmepp/lang/cpp/src/keylistresult \
UnpackedTarball/gpgmepp/lang/cpp/src/scdgetinfoassuantransaction \
UnpackedTarball/gpgmepp/lang/cpp/src/signingresult \
+   UnpackedTarball/gpgmepp/lang/cpp/src/statusconsumerassuantransaction \
UnpackedTarball/gpgmepp/lang/cpp/src/swdbresult \
UnpackedTarball/gpgmepp/lang/cpp/src/tofuinfo \
UnpackedTarball/gpgmepp/lang/cpp/src/trustitem \
diff --git a/external/gpgmepp/Wincompatible-function-pointer-types.patch 
b/external/gpgmepp/Wincompatible-function-pointer-types.patch
index 050d2e55cfc7..cd4f1117fd06 100755
--- a/external/gpgmepp/Wincompatible-function-pointer-types.patch
+++ b/external/gpgmepp/Wincompatible-function-pointer-types.patch
@@ -20,8 +20,8 @@
(void)ctx;
 --- src/gpgme-w32spawn.c
 +++ src/gpgme-w32spawn.c
-@@ -243,7 +243,7 @@
-   handle = LoadLibrary ("user32.dll");
+@@ -24,7 +249,7 @@
+   handle = LoadLibraryA ("user32.dll");
if (handle)
  {
 -  func = GetProcAddress (handle, "AllowSetForegroundWindow");
diff --git a/external/gpgmepp/w32-build-fixes.patch.1 
b/external/gpgmepp/w32-build-fixes.patch.1
index 4d9428781cc5..250b2022c540 100644
--- a/external/gpgmepp/w32-build-fixes.patch.1
+++ b/external/gpgmepp/w32-build-fixes.patch.1
@@ -24,6 +24,19 @@ diff -ru gpgme.orig/src/dirinfo.c gpgme/src/dirinfo.c
  /* Constants used internally to select the data.  */
  enum
{
+diff -ru gpgme.orig/src/gpgme-w32spawn.c gpgme/src/gpgme-w32spawn.c
+--- gpgme.orig/src/gpgme-w32spawn.c2023-10-27 21:27:30.0 +0900
 gpgme/src/gpgme-w32spawn.c 2024-02-26 17:32:59.949338645 +0900
+@@ -52,6 +52,9 @@
+ #define mystderr stderr
+ #endif
+ 
++#ifdef _MSC_VER
++#define snwprintf _snwprintf
++#endif
+ 
+ 
+ static wchar_t *
 diff -ru gpgme.orig/src/mbox-util.c gpgme/src/mbox-util.c
 --- gpgme.orig/src/mbox-util.c 2016-11-16 13:22:41.0 +0100
 +++ gpgme/src/mbox-util.c  2017-09-30 08:18:29.270567500 +0200
@@ -53,16 +66,16 @@ diff -ru gpgme.orig/src/priv-io.h gpgme/src/priv-io.h
 diff -ru gpgme.orig/src/util.h gpgme/src/util.h
 --- gpgme.orig/src/util.h  2017-03-28 11:41:30.0 +0200
 +++ gpgme/src/util.h   2017-09-30 08:10:54.194049100 +0200
-@@ -35,6 +35,9 @@
- #ifdef HAVE_UNISTD_H
+@@ -36,6 +36,9 @@
  # include 
  #endif
+ 

core.git: download.lst external/more_fonts

[Khaled Hosny (via logerrit)]

 download.lst|4 ++--
 external/more_fonts/ExternalPackage_noto_kufi_arabic.mk |4 ++--
 external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a7e2f44d64e729027fac0cfeaa896d5d76385a6a
Author: Khaled Hosny 
AuthorDate: Sat Feb 24 11:27:27 2024 +0200
Commit: خالد حسني 
CommitDate: Sun Feb 25 13:21:02 2024 +0100

tdf#124591: upgrade NotoKufiArabic to v2.109

https://github.com/notofonts/arabic/releases/tag/NotoKufiArabic-v2.109

Change-Id: Ifc6d9b6ec3e41dac27406b7582734c2cfd173a5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163878
Tested-by: خالد حسني 
Reviewed-by: خالد حسني 

diff --git a/download.lst b/download.lst
index b5baf0eaab33..8368b51258dd 100644
--- a/download.lst
+++ b/download.lst
@@ -162,8 +162,8 @@ FONT_LINLIBERTINEG_TARBALL := 
e7a384790b13c29113e22e596ade9687-LinLibertineG-201
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_NOTO_KUFI_ARABIC_SHA256SUM := 
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
-FONT_NOTO_KUFI_ARABIC_TARBALL := noto-fonts-20171024.tar.gz
+FONT_NOTO_KUFI_ARABIC_SHA256SUM := 
1b6880e4b8df09c3b9e246d6084bfd94bf32a060cf2dcffd3622d0e2d79f
+FONT_NOTO_KUFI_ARABIC_TARBALL := NotoKufiArabic-v2.109.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk 
b/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
index 300e0c8efb53..2a9a053b4874 100644
--- a/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
+++ b/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
@@ -10,8 +10,8 @@
 $(eval $(call 
gb_ExternalPackage_ExternalPackage,fonts_noto_kufi_arabic,font_noto_kufi_arabic))
 
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto_kufi_arabic,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
-   NotoKufiArabic-Bold.ttf \
-   NotoKufiArabic-Regular.ttf \
+   NotoKufiArabic/full/ttf/NotoKufiArabic-Bold.ttf \
+   NotoKufiArabic/full/ttf/NotoKufiArabic-Regular.ttf \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk 
b/external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk
index 482727dd6246..f5e70d0c5e7a 100644
--- a/external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk
+++ b/external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk
@@ -9,6 +9,6 @@
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,font_noto_kufi_arabic))
 
-$(eval $(call 
gb_UnpackedTarball_set_tarball,font_noto_kufi_arabic,$(FONT_NOTO_KUFI_ARABIC_TARBALL)))
+$(eval $(call 
gb_UnpackedTarball_set_tarball,font_noto_kufi_arabic,$(FONT_NOTO_KUFI_ARABIC_TARBALL),0))
 
 # vim: set noet sw=4 ts=4:

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 922b0ecd52652e9f1bc558f846f4696f0c49b823
Author: Xisco Fauli 
AuthorDate: Fri Feb 23 12:30:32 2024 +0100
Commit: Xisco Fauli 
CommitDate: Sat Feb 24 00:37:21 2024 +0100

NotoSansGeorgian: upgrade to v2.005

Change-Id: I1af4057b070b482eb889597d5a3084afb6dc27ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163823
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index d40b11e5222b..b5baf0eaab33 100644
--- a/download.lst
+++ b/download.lst
@@ -207,8 +207,8 @@ FONT_NOTO_SERIF_ARMENIAN_TARBALL := 
NotoSerifArmenian-v2.008.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_NOTO_SANS_GEORGIAN_SHA256SUM := 
bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf
-FONT_NOTO_SANS_GEORGIAN_TARBALL := NotoSansGeorgian-v2.003.zip
+FONT_NOTO_SANS_GEORGIAN_SHA256SUM := 
10e85011008108308e6feab0408242acb07804da61ede3d3ff236461ae07ab1b
+FONT_NOTO_SANS_GEORGIAN_TARBALL := NotoSansGeorgian-v2.005.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 36de604067b5b76de90a09ab8a1760623c9a4afe
Author: Xisco Fauli 
AuthorDate: Fri Feb 23 12:35:35 2024 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 23 20:51:00 2024 +0100

NotoNaskhArabic: upgrade to v2.018

Change-Id: I213d743bd01d1e85044fe88e5061f53a79672776
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163824
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 55f0a2d7cdc8..d40b11e5222b 100644
--- a/download.lst
+++ b/download.lst
@@ -187,8 +187,8 @@ FONT_NOTO_SANS_ARABIC_TARBALL := NotoSansArabic-v2.010.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_NOTO_NASKH_ARABIC_SHA256SUM := 
2b6a3f30f21d27bc6b75b40a350221e12e64b753604d613bf3ddf71cdbe331ac
-FONT_NOTO_NASKH_ARABIC_TARBALL := NotoNaskhArabic-v2.016.zip
+FONT_NOTO_NASKH_ARABIC_SHA256SUM := 
3c5dce5eebe2b8bd9e2d208872c5b6d51d1a2a99bd77528d4d72651a00b164f0
+FONT_NOTO_NASKH_ARABIC_TARBALL := NotoNaskhArabic-v2.018.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dbe36ccb6ef1c23eafcadc070fab26c2b859e295
Author: Xisco Fauli 
AuthorDate: Fri Feb 23 11:54:55 2024 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 23 15:03:06 2024 +0100

freetype: upgrade to 2.13.2

Change-Id: I06fe1d1bdd1d7924213b219e25a9b3b9d8562a50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163817
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 5499159c1e00..55f0a2d7cdc8 100644
--- a/download.lst
+++ b/download.lst
@@ -267,8 +267,8 @@ FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FREETYPE_SHA256SUM := 
5ee23abd047636c24b2d43c6625dcafc1d1aca64dec9e0d05df29592624c
-FREETYPE_TARBALL := freetype-2.13.0.tar.xz
+FREETYPE_SHA256SUM := 
12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d
+FREETYPE_TARBALL := freetype-2.13.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b9615995847b40d0fc166aa3eb32bc319e8a605
Author: Xisco Fauli 
AuthorDate: Fri Feb 23 12:18:44 2024 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 23 14:27:09 2024 +0100

NotoSerif: upgrade to v2.013

Change-Id: I31643604b5e749bae0074b5fedd27d70aa3d5a78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163821
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 1fc69b36e8e8..5499159c1e00 100644
--- a/download.lst
+++ b/download.lst
@@ -172,8 +172,8 @@ FONT_NOTO_SANS_TARBALL := NotoSans-v2.013.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_NOTO_SERIF_SHA256SUM := 
3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a
-FONT_NOTO_SERIF_TARBALL := NotoSerif-v2.012.zip
+FONT_NOTO_SERIF_SHA256SUM := 
fb4c6c75f10365f63b5c8ad5a1864ebe46dd0c70c40d0461cb0dc1b1b7c13a35
+FONT_NOTO_SERIF_TARBALL := NotoSerif-v2.013.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f284d66e8b2ecee5a8333423c1288067803c80f6
Author: Xisco Fauli 
AuthorDate: Fri Feb 23 12:14:30 2024 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 23 14:21:22 2024 +0100

NotoSans: upgrade to v2.013

Change-Id: I89ba2a1e10117b74a136cba2f278dce79b480f0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163819
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index e24edd7298ff..1fc69b36e8e8 100644
--- a/download.lst
+++ b/download.lst
@@ -167,8 +167,8 @@ FONT_NOTO_KUFI_ARABIC_TARBALL := noto-fonts-20171024.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_NOTO_SANS_SHA256SUM := 
efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293
-FONT_NOTO_SANS_TARBALL := NotoSans-v2.012.zip
+FONT_NOTO_SANS_SHA256SUM := 
9fd595dd701d7ea103a9ba8a9cfdcf0c35c5574ef754fecabe718eadad8bccde
+FONT_NOTO_SANS_TARBALL := NotoSans-v2.013.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Michael Stahl (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4c3ee61e3eda0cbfd812443f80af89aa3a24ac73
Author: Michael Stahl 
AuthorDate: Thu Feb 22 11:57:37 2024 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 22 15:16:19 2024 +0100

libxml2: upgrade to release 2.12.5

Fixes CVE-2024-25062

Change-Id: I0e98fd919328e9633a602c4872de0b06eb972cc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163734
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index d8d440da06be..e24edd7298ff 100644
--- a/download.lst
+++ b/download.lst
@@ -424,8 +424,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.3.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
8c8f1092340a89ff32bc44ad5c9693aff9bc8a7a3e161bb239666e5d15ac9aaa
-LIBXML_VERSION_MICRO := 3
+LIBXML_SHA256SUM := 
a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21
+LIBXML_VERSION_MICRO := 5
 LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick

core.git: download.lst external/fontconfig

[Taichi Haradaguchi (via logerrit)]

 download.lst   |4 ++--
 external/fontconfig/ExternalPackage_fontconfig_data.mk |1 +
 external/fontconfig/README |2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit bbb0663813d0476b9a654207b7006315cb417c2e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Feb 20 20:10:39 2024 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Wed Feb 21 01:12:16 2024 +0100

Fontconfig: upgrade to release 2.15.0

Change-Id: Id50d82b4dc7c3e8000b7658a9f62efa0d6b39495
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163646
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index a3bd867ab6d8..d8d440da06be 100644
--- a/download.lst
+++ b/download.lst
@@ -121,8 +121,8 @@ FIREBIRD_TARBALL := Firebird-3.0.7.33374-0.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONTCONFIG_SHA256SUM := 
dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b
-FONTCONFIG_TARBALL := fontconfig-2.14.2.tar.xz
+FONTCONFIG_SHA256SUM := 
63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e
+FONTCONFIG_TARBALL := fontconfig-2.15.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/fontconfig/ExternalPackage_fontconfig_data.mk 
b/external/fontconfig/ExternalPackage_fontconfig_data.mk
index cc72312da430..63bcc8a2a3a2 100644
--- a/external/fontconfig/ExternalPackage_fontconfig_data.mk
+++ b/external/fontconfig/ExternalPackage_fontconfig_data.mk
@@ -35,6 +35,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fontconfig_data,$(LIBO_SHARE
 conf.d/11-lcdfilter-default.conf \
 conf.d/11-lcdfilter-legacy.conf \
 conf.d/11-lcdfilter-light.conf \
+conf.d/11-lcdfilter-none.conf \
 conf.d/20-unhint-small-vera.conf \
 conf.d/25-unhint-nonlatin.conf \
 conf.d/30-metric-aliases.conf \
diff --git a/external/fontconfig/README b/external/fontconfig/README
index 318d99594d89..5a1d998ada68 100644
--- a/external/fontconfig/README
+++ b/external/fontconfig/README
@@ -1,6 +1,6 @@
 This "bundled" fontconfig is usually built only in an Android build or a 
fuzzing build
 
 Fontconfig is a font configuration and customization library. It is designed 
to locate fonts
-within the system and select them according to requirements specified by 
applications. 
+within the system and select them according to requirements specified by 
applications.
 
 From [ https://www.freedesktop.org/wiki/Software/fontconfig/ ]

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7b2ddc88019852b7731b888e7b8eb669e760a8d7
Author: Xisco Fauli 
AuthorDate: Mon Feb 19 13:01:54 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Feb 19 14:24:13 2024 +0100

libpng: upgrade to 1.6.42

Change-Id: I03fccf59bb1c2fa51478e812e629ff2ffac0e893
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163593
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 16993b4c5afd..a3bd867ab6d8 100644
--- a/download.lst
+++ b/download.lst
@@ -533,8 +533,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBPNG_SHA256SUM := 
535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1
-LIBPNG_TARBALL := libpng-1.6.40.tar.xz
+LIBPNG_SHA256SUM := 
c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450
+LIBPNG_TARBALL := libpng-1.6.42.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst external/nss

[Michael Stahl (via logerrit)]

 download.lst|4 ++--
 external/nss/README |   26 +++---
 2 files changed, 13 insertions(+), 17 deletions(-)

New commits:
commit c5e7af92ebcde59cb72fda2a88d08dc6656dc2e2
Author: Michael Stahl 
AuthorDate: Fri Feb 16 10:34:54 2024 +0100
Commit: Michael Stahl 
CommitDate: Fri Feb 16 15:34:25 2024 +0100

nss: upgrade to release 3.98

Fixes CVE-2023-5388

Also update README, and remove obsolete documentation of Debian's
mangled SONAME; relevant Debian changelog:

  nss (2:3.13.4-2) unstable; urgency=low

  * debian/control, debian/libnss3*, debian/rules,
mozilla/security/coreconf/*, mozilla/security/nss/lib/*/manifest.mn:
Move to unversioned library. ABI compatibility is ensured upstream, and
the SO version, if it needed a change at any time, would be a change in
the library name. There is no reason to keep making compatibility more
difficult with other distros and upstream binary releases. While 
previous
versions were one-way compatible (binaries built against other distros 
or
upstream nspr could work on Debian), this approach works both ways.

  -- Mike Hommey   Thu, 17 May 2012 09:45:36 +0200

Change-Id: Ifc1eae68827fa88ae001a3903c8555af67b488ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163482
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 87350bfbcb8e..16993b4c5afd 100644
--- a/download.lst
+++ b/download.lst
@@ -477,8 +477,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce
-NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
59bb55a59b02e4004fc26ad0aa1a13fe8d73c6c90c447dd2f2efb73fb81083ed
+NSS_TARBALL := nss-3.98-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/nss/README b/external/nss/README
index 6997cea6ca06..09931f64ea20 100644
--- a/external/nss/README
+++ b/external/nss/README
@@ -1,5 +1,16 @@
 Contains the Network Security Services (NSS) libraries from Mozilla
 
+== ESR versions ==
+
+Upstream releases both regular and "ESR" versions, the latter go into Firefox
+ESR and Thunderbird.
+
+There is a new ESR version about once a year, and a ESR version gets micro
+updates only when there are security issues to fix, and it's not always obvious
+from the release notes of a regular release if there are security issues that
+are relevant to LibreOffice, hence it's probably best to bundle only the ESR
+versions and upgrade for every micro release (as recommended by upstream).
+
 == Fips 140 and signed libraries ==
 
 Fips 140 mode is not supported. That is, the *.chk files containing the
@@ -20,18 +31,3 @@ With all supported macOS SDK we use
 NSS_USE_SYSTEM_SQLITE=1
 to build using the system sqlite.
 
-== system NSS on Linux ==
-
-Note that different Linux distributions use different SONAMEs for the
-NSS libraries, so it is not possible to use --with-system-nss and build
-a portable generic LO installation set, despite NSS upstream apparently
-maintaining ABI compatibility.
-
-Debian Squeeze:
-0x000e (SONAME) Library soname: [libnss3.so.1d]
-Fedora 20:
-0x000e (SONAME) Library soname: [libnss3.so]
-
-For the record, the LSB specified SONAME is libnss3.so
-http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/libnss3.html
-

core.git: download.lst

[Andras Timar (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f25b7efba56757b085f7a836f57d9c2fc8fd14b8
Author: Andras Timar 
AuthorDate: Wed Feb 14 22:18:30 2024 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 16 09:48:51 2024 +0100

nss: upgrade to release 3.97

Change-Id: If0eaf6a93f57239d81491c635922745bf3f38fd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163410
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 15482ddb49b1..626891289b59 100644
--- a/download.lst
+++ b/download.lst
@@ -477,8 +477,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739
-NSS_TARBALL := nss-3.90-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce
+NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Xisco Fauli (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 59479de20242c7acf0e162e7c954899cb55419f3
Author: Xisco Fauli 
AuthorDate: Thu Feb 15 11:26:54 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 15 16:16:20 2024 +0100

zlib: upgrade to 1.3.1

Change-Id: I339b4e9c94ea50b3ddb41dfdac0e48d27939bc74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163432
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index b0e584ae5f40..6a6ed6ec3a27 100644
--- a/download.lst
+++ b/download.lst
@@ -640,8 +640,8 @@ XSLTML_TARBALL := 
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ZLIB_SHA256SUM := 
8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7
-ZLIB_TARBALL := zlib-1.3.tar.xz
+ZLIB_SHA256SUM := 
38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32
+ZLIB_TARBALL := zlib-1.3.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 +-
 external/expat/0001-Fix-compiler-warnings.patch |   47 
 external/expat/UnpackedTarball_expat.mk |3 +
 3 files changed, 52 insertions(+), 2 deletions(-)

New commits:
commit b7e4078033b064bfc3847db0916a4df389117817
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Thu Feb 15 09:48:37 2024 +0100

Expat: upgrade to release 2.6.0

Fixes CVE-2023-52425 and CVE-2023-52426.

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index f242427f172b..b0e584ae5f40 100644
--- a/download.lst
+++ b/download.lst
@@ -111,8 +111,8 @@ ETONYEK_TARBALL := 
libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-EXPAT_SHA256SUM := 
ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe
-EXPAT_TARBALL := expat-2.5.0.tar.xz
+EXPAT_SHA256SUM := 
cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e
+EXPAT_TARBALL := expat-2.6.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/expat/0001-Fix-compiler-warnings.patch 
b/external/expat/0001-Fix-compiler-warnings.patch
new file mode 100644
index ..adec5ed0d9be
--- /dev/null
+++ b/external/expat/0001-Fix-compiler-warnings.patch
@@ -0,0 +1,47 @@
+From 3f60a47cb5716bb810789a12ef6024c1dc448164 Mon Sep 17 00:00:00 2001
+From: Taichi Haradaguchi <20001...@ymail.ne.jp>
+Date: Fri, 9 Feb 2024 19:28:35 +0900
+Subject: [PATCH] Fix compiler warnings
+
+> In file included from ./../lib/internal.h:149,
+>  from codepage.c:38:
+> ./../lib/expat.h:1045:5: warning: "XML_GE" is not defined, evaluates to 0 
[-Wundef]
+>  1045 | #if XML_GE == 1
+>   | ^~
+> ./../lib/internal.h:158:5: warning: "XML_GE" is not defined, evaluates to 0 
[-Wundef]
+>   158 | #if XML_GE == 1
+>   | ^~
+---
+ expat/lib/expat.h| 2 +-
+ expat/lib/internal.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/expat/lib/expat.h b/expat/lib/expat.h
+index 95464b0d..79bbfb61 100644
+--- a/expat/lib/expat.h
 b/expat/lib/expat.h
+@@ -1042,7 +1042,7 @@ typedef struct {
+ XMLPARSEAPI(const XML_Feature *)
+ XML_GetFeatureList(void);
+ 
+-#if XML_GE == 1
++#if defined(XML_GE) && XML_GE == 1
+ /* Added in Expat 2.4.0 for XML_DTD defined and
+  * added in Expat 2.6.0 for XML_GE == 1. */
+ XMLPARSEAPI(XML_Bool)
+diff --git a/expat/lib/internal.h b/expat/lib/internal.h
+index cce71e4c..208c6b67 100644
+--- a/expat/lib/internal.h
 b/expat/lib/internal.h
+@@ -155,7 +155,7 @@ extern "C" {
+ void _INTERNAL_trim_to_complete_utf8_characters(const char *from,
+ const char **fromLimRef);
+ 
+-#if XML_GE == 1
++#if defined(XML_GE) && XML_GE == 1
+ unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);
+ unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);
+ const char *unsignedCharToPrintable(unsigned char c);
+-- 
+2.43.1
+
diff --git a/external/expat/UnpackedTarball_expat.mk 
b/external/expat/UnpackedTarball_expat.mk
index 5d4f41f6d147..465105f2ca8c 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -13,7 +13,10 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,expat,conftools))
 
+# * external/expat/0001-Fix-compiler-warnings.patch was sent to upstream as
+#    "Fix compiler warnings":
 $(eval $(call gb_UnpackedTarball_add_patches,expat,\
+   external/expat/0001-Fix-compiler-warnings.patch \
external/expat/expat-winapi.patch \
 ))
 

core.git: download.lst external/pdfium

[Miklos Vajna (via logerrit)]

 download.lst   |4 -
 external/pdfium/build.patch.1  |   83 +++--
 external/pdfium/inc/pch/precompiled_pdfium.hxx |8 --
 3 files changed, 18 insertions(+), 77 deletions(-)

New commits:
commit 192db287045bf9c6de4272845b36b0cda625a316
Author: Miklos Vajna 
AuthorDate: Wed Feb 14 08:22:37 2024 +0100
Commit: Miklos Vajna 
CommitDate: Wed Feb 14 15:19:14 2024 +0100

Update pdfium to 6296

- external/pdfium/build.patch.1: drop most hunks which no longer apply,
  assuming they were only relevant for the RHEL 7 / C++17 baseline.

Change-Id: Ida533485d81845a82d890f8c0b70fa61e201f880
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163329
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 15f67f8a409e..f242427f172b 100644
--- a/download.lst
+++ b/download.lst
@@ -523,8 +523,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PDFIUM_SHA256SUM := 
4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c
-PDFIUM_TARBALL := pdfium-6179.tar.bz2
+PDFIUM_SHA256SUM := 
6bc4dac8f1ef646a9bbd50848cb3fb8a108087ed6b3973bbee5846dc371b646d
+PDFIUM_TARBALL := pdfium-6296.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1
index 3dbd9427c037..0e8472efe8c8 100644
--- a/external/pdfium/build.patch.1
+++ b/external/pdfium/build.patch.1
@@ -1,61 +1,4 @@
 -*- Mode: diff -*-
-diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp 
b/core/fpdfapi/font/cpdf_cidfont.cpp
-index 7d2d549b8..c4864060a 100644
 a/core/fpdfapi/font/cpdf_cidfont.cpp
-+++ b/core/fpdfapi/font/cpdf_cidfont.cpp
-@@ -754,7 +754,7 @@ int CPDF_CIDFont::GlyphFromCharCode(uint32_t charcode, 
bool* pVertGlyph) {
- uint32_t maccode = CharCodeFromUnicodeForFreetypeEncoding(
- FT_ENCODING_APPLE_ROMAN, name_unicode);
- index = maccode ? FT_Get_Char_Index(face, maccode)
--: FT_Get_Name_Index(face, name);
-+: FT_Get_Name_Index(face, const_cast(name));
-   }
-   if (index == 0 || index == 0x)
- return charcode ? static_cast(charcode) : -1;
-diff --git a/core/fpdfapi/font/cpdf_truetypefont.cpp 
b/core/fpdfapi/font/cpdf_truetypefont.cpp
-index f19ace9d0..562b015f0 100644
 a/core/fpdfapi/font/cpdf_truetypefont.cpp
-+++ b/core/fpdfapi/font/cpdf_truetypefont.cpp
-@@ -90,7 +90,7 @@ void CPDF_TrueTypeFont::LoadGlyphMap() {
-   FT_ENCODING_APPLE_ROMAN,
-   m_Encoding.UnicodeFromCharCode(charcode));
-   if (!maccode) {
--m_GlyphIndex[charcode] = FT_Get_Name_Index(face, name);
-+m_GlyphIndex[charcode] = FT_Get_Name_Index(face, 
const_cast(name));
-   } else {
- m_GlyphIndex[charcode] = FT_Get_Char_Index(face, maccode);
-   }
-@@ -104,7 +104,7 @@ void CPDF_TrueTypeFont::LoadGlyphMap() {
- m_GlyphIndex[charcode] = FT_Get_Char_Index(face, 32);
- continue;
-   }
--  m_GlyphIndex[charcode] = FT_Get_Name_Index(face, name);
-+  m_GlyphIndex[charcode] = FT_Get_Name_Index(face, 
const_cast(name));
-   if (m_GlyphIndex[charcode] != 0 || !bToUnicode)
- continue;
- 
-diff --git a/core/fpdfapi/font/cpdf_type1font.cpp 
b/core/fpdfapi/font/cpdf_type1font.cpp
-index 55510e7d7..2f13f00b8 100644
 a/core/fpdfapi/font/cpdf_type1font.cpp
-+++ b/core/fpdfapi/font/cpdf_type1font.cpp
-@@ -263,7 +263,7 @@ void CPDF_Type1Font::LoadGlyphMap() {
-   static_cast(charcode));
-   if (name) {
- m_Encoding.SetUnicode(charcode, UnicodeFromAdobeName(name));
--m_GlyphIndex[charcode] = FT_Get_Name_Index(m_Font.GetFaceRec(), name);
-+m_GlyphIndex[charcode] = FT_Get_Name_Index(m_Font.GetFaceRec(), 
const_cast(name));
-   } else {
- m_GlyphIndex[charcode] = FT_Get_Char_Index(
- m_Font.GetFaceRec(), static_cast(charcode));
-@@ -294,7 +294,7 @@ void CPDF_Type1Font::LoadGlyphMap() {
-   continue;
- 
- m_Encoding.SetUnicode(charcode, UnicodeFromAdobeName(name));
--m_GlyphIndex[charcode] = FT_Get_Name_Index(m_Font.GetFaceRec(), name);
-+m_GlyphIndex[charcode] = FT_Get_Name_Index(m_Font.GetFaceRec(), 
const_cast(name));
- if (m_GlyphIndex[charcode] != 0)
-   continue;
- 
 diff --git a/core/fpdfdoc/cpdf_metadata.cpp b/core/fpdfdoc/cpdf_metadata.cpp
 index 31564f45f..5858549ef 100644
 --- a/core/fpdfdoc/cpdf_metadata.cpp
@@ -69,19 +12,6 @@ index 31564f45f..5858549ef 100644
  
std::vector unsupported;
CheckForSharedFormInternal(/*depth=*/0, doc->GetRoot(), );
-diff --git a/core/fxcodec/jpx/cjpx_decoder.cpp 
b/core/fxcodec/jpx/cjpx_decoder.cpp
-index 2e7a72aa1..65fb3deaa 100644
 a/core/fxcodec/jpx/cjpx_decoder.cpp
-+++ 

core.git: download.lst

[Michael Stahl (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9667ea7e274c4e29cf7c35d9e124a8fbcb2af3da
Author: Michael Stahl 
AuthorDate: Wed Jan 31 10:30:18 2024 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 31 11:47:38 2024 +0100

curl: upgrade to release 8.6.0

Fixes CVE-2024-0853

Change-Id: Iabba0748f7c48ee03a8223aef9ca81bf379738e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162793
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 968f734bb3a2..15f67f8a409e 100644
--- a/download.lst
+++ b/download.lst
@@ -80,8 +80,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb
-CURL_TARBALL := curl-8.5.0.tar.xz
+CURL_SHA256SUM := 
3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15
+CURL_TARBALL := curl-8.6.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst external/xmlsec xmlsecurity/Library_xsec_xmlsec.mk

[Miklos Vajna (via logerrit)]

 download.lst   |4 ++--
 external/xmlsec/old-nss.patch.1|   20 ++--
 xmlsecurity/Library_xsec_xmlsec.mk |1 +
 3 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 8ce222753a43d46e94d351069ce19cc3e2db333c
Author: Miklos Vajna 
AuthorDate: Fri Jan 12 08:30:53 2024 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 15 08:09:21 2024 +0100

Update libxmlsec to 1.3.3

Extend external/xmlsec/old-nss.patch.1, our bundled NSS in debug builds
has some assert failure in relatively new xmlsec code, just disable it
for now till it's clarified with upstream how to sort that out properly.

E.g. CppunitTest_filter_svg fails like this:

#1  0x777503e5 in abort () at /lib64/libc.so.6
#2  0x7679ca90 in PR_Assert (s=0x744fbfe5 "oidmechhash 
!= NULL", file=0x744fbfb6 "secoid.c", ln=2140) at 
../../../../pr/src/io/prlog.c:571
#3  0x744eaae0 in SECOID_FindOIDByMechanism (mechanism=307) 
at secoid.c:2140
#4  0x76660c65 in PK11_MechanismToAlgtag (type=307) at 
pk11mech.c:1745
#5  0x7fffe874e4ea in xmlSecNssCryptoCheckMechanism (type=307) 
at crypto.c:68
#6  0x7fffe874ec44 in xmlSecNssUpdateAvailableCryptoTransforms 
(functions=0x7fffe87ffbc0 ) at crypto.c:401
#7  0x7fffe874f13d in xmlSecNssInit () at crypto.c:552
#8  0x7fffe86b2c36 in initXmlSec() () at 
/home/vmiklos/git/libreoffice/core/xmlsecurity/source/xmlsec/xmlsec_init.cxx:42
#9  0x7fffdf3c54f2 in DocumentSignatureManager::init() 
(this=0x7fff3970) at 
/home/vmiklos/git/libreoffice/core/xmlsecurity/source/helper/documentsignaturemanager.cxx:79
#10 0x7fffdf43e3da in (anonymous 
namespace)::DocumentDigitalSignatures::ImplVerifySignatures(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Reference 
const&, DocumentSignatureMode)
 (this=0x1c07ac0, rxStorage=uno::Reference to (OStorage *) 
0x1944e18, xSignStream=empty uno::Reference, 
eMode=DocumentSignatureMode::Macros)
at 
/home/vmiklos/git/libreoffice/core/xmlsecurity/source/component/documentdigitalsignatures.cxx:486
#11 0x7fffdf43da17 in (anonymous 
namespace)::DocumentDigitalSignatures::verifyScriptingContentSignatures(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Reference 
const&) (this=0x1c07ac0, rxStorage=uno::Reference to (OStorage *) 0x1944e18, 
xSignInStream=empty uno::Reference)
at 
/home/vmiklos/git/libreoffice/core/xmlsecurity/source/component/documentdigitalsignatures.cxx:373
#12 0x7fffe6fa06df in 
SfxObjectShell::GetDocumentSignatureInformation(bool, 
com::sun::star::uno::Reference
 const&)
 (this=0x188c280, bScriptingContent=true, xSigner=empty 
uno::Reference) at 
/home/vmiklos/git/libreoffice/core/sfx2/source/doc/objserv.cxx:1847

Change-Id: I36dee0d2b128a6931875572aa4acc9df940ab623
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161951
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 8921f425cc67..0b20f2be83d0 100644
--- a/download.lst
+++ b/download.lst
@@ -419,8 +419,8 @@ LIBWEBP_TARBALL := libwebp-1.3.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-XMLSEC_SHA256SUM := 
4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf
-XMLSEC_TARBALL := xmlsec1-1.3.2.tar.gz
+XMLSEC_SHA256SUM := 
ab5b9a9ffd6960f46f7466d9d91f174ec37e8c31989237ba6b9eacdd816464f2
+XMLSEC_TARBALL := xmlsec1-1.3.3.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/xmlsec/old-nss.patch.1 b/external/xmlsec/old-nss.patch.1
index b46453586351..19ac8ffe6c5a 100644
--- a/external/xmlsec/old-nss.patch.1
+++ b/external/xmlsec/old-nss.patch.1
@@ -39,18 +39,19 @@ diff --git a/src/nss/crypto.c b/src/nss/crypto.c
 index 429d209f..e0296bda 100644
 --- a/src/nss/crypto.c
 +++ b/src/nss/crypto.c
-@@ -131,9 +131,11 @@ xmlSecCryptoGetFunctions_nss(void) {
+@@ -162,10 +162,12 @@ xmlSecCryptoGetFunctions_nss(void) {
  gXmlSecNssFunctions->transformAes192CbcGetKlass = 
xmlSecNssTransformAes192CbcGetKlass;
  gXmlSecNssFunctions->transformAes256CbcGetKlass = 
xmlSecNssTransformAes256CbcGetKlass;
  
 +#if 0
+ /* gcm */
  gXmlSecNssFunctions->transformAes128GcmGetKlass = 
xmlSecNssTransformAes128GcmGetKlass;
  gXmlSecNssFunctions->transformAes192GcmGetKlass = 
xmlSecNssTransformAes192GcmGetKlass;
  gXmlSecNssFunctions->transformAes256GcmGetKlass = 
xmlSecNssTransformAes256GcmGetKlass;
 +#endif
  
+ /* kw: uses AES ECB */
  gXmlSecNssFunctions->transformKWAes128GetKlass  = 
xmlSecNssTransformKWAes128GetKlass;
- gXmlSecNssFunctions->transformKWAes192GetKlass  = 
xmlSecNssTransformKWAes192GetKlass;
 diff --git 

core.git: download.lst external/libxml2 filter/source helpcompiler/source xmlsecurity/source

[Caolán McNamara (via logerrit)]

 download.lst|   14 +++---
 external/libxml2/ExternalPackage_libxml2.mk |2 +-
 external/libxml2/libxml2-global-symbols.patch   |8 +++-
 filter/source/xsltfilter/LibXSLTTransformer.cxx |   16 
 helpcompiler/source/HelpCompiler.cxx|   14 ++
 xmlsecurity/source/xmlsec/saxhelper.cxx |   15 ++-
 6 files changed, 59 insertions(+), 10 deletions(-)

New commits:
commit 6875c975f80d8b813b1829a530162869a1e2d92e
Author: Caolán McNamara 
AuthorDate: Wed Jan 3 20:45:14 2024 +
Commit: Caolán McNamara 
CommitDate: Fri Jan 5 11:05:36 2024 +0100

upgrade libxml2, libxslt & liblangtag

what I'm really after is some vexating not-reproducible oss-fuzz msan
warnings when using libxml2 in the fodt2pdf fuzzer. So lets upgrade
libxml2 to the latest, which requires bumping libxslt, and then requires
a newer liblangtag because of no longer implicit includes that it
depended on.

xmlKeepBlanksDefaultValue and xmlSubstituteEntitiesDefault are
deprecated, we should get around to updating those uses

Change-Id: I8fda0dffda0a7ea65407d246a3121875cb8ad4a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161598
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index bd17d1368c9e..bd5ded0d9793 100644
--- a/download.lst
+++ b/download.lst
@@ -399,8 +399,8 @@ LIBGPGERROR_TARBALL := libgpg-error-1.47.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBLANGTAG_SHA256SUM := 
1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd
-LIBLANGTAG_TARBALL := liblangtag-0.6.3.tar.bz2
+LIBLANGTAG_SHA256SUM := 
5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e
+LIBLANGTAG_TARBALL := liblangtag-0.6.7.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
@@ -424,14 +424,14 @@ XMLSEC_TARBALL := xmlsec1-1.3.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7
-LIBXML_VERSION_MICRO := 4
-LIBXML_TARBALL := libxml2-2.11.$(LIBXML_VERSION_MICRO).tar.xz
+LIBXML_SHA256SUM := 
8c8f1092340a89ff32bc44ad5c9693aff9bc8a7a3e161bb239666e5d15ac9aaa
+LIBXML_VERSION_MICRO := 3
+LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXSLT_SHA256SUM := 
1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1
-LIBXSLT_VERSION_MICRO := 38
+LIBXSLT_SHA256SUM := 
2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0
+LIBXSLT_VERSION_MICRO := 39
 LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/external/libxml2/ExternalPackage_libxml2.mk 
b/external/libxml2/ExternalPackage_libxml2.mk
index 3c399970cd5b..799044575f9a 100644
--- a/external/libxml2/ExternalPackage_libxml2.mk
+++ b/external/libxml2/ExternalPackage_libxml2.mk
@@ -21,7 +21,7 @@ else # COM=MSC
 $(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
 endif
 else # OS!=WNT
-$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.11.$(LIBXML_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.12.$(LIBXML_VERSION_MICRO)))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxml2/libxml2-global-symbols.patch 
b/external/libxml2/libxml2-global-symbols.patch
index cbbe5a622284..32146da4b3d7 100644
--- a/external/libxml2/libxml2-global-symbols.patch
+++ b/external/libxml2/libxml2-global-symbols.patch
@@ -13,7 +13,7 @@
  } LIBXML2_2.6.28;
  
  LIBXML2_2.6.32 {
-@@ -2231,3 +2231,49 @@
+@@ -2231,3 +2231,55 @@
xmlPopOutputCallbacks;
  } LIBXML2_2.9.8;
  
@@ -23,6 +23,12 @@
 +xmlNewSAXParserCtxt;
 +} LIBXML2_2.9.11;
 +
++LIBXML2_2.12.3 {
++global:
++xmlCtxtSetMaxAmplification;
++xmlTextReaderSetMaxAmplification;
++} LIBXML2_2.11.4;
++
 +# HACK: export global variable accessor functions (globals.h)
 +LIBXML2_GLOBAL_VARIABLES {
 +global:
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx 
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 1bd998e3f9f3..44dcf41dcdc5 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -503,7 +503,23 @@ namespace XSLT
 {   // backward compatibility for old clients using createInstance
 params = args;
 }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4996)
+#endif
 xmlSubstituteEntitiesDefault(0);
+#if 

core.git: download.lst

[Caolán McNamara (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 78027c68397f26aec9051b82388cd7452ec66e3d
Author: Caolán McNamara 
AuthorDate: Mon Jan 1 17:07:10 2024 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 2 00:36:54 2024 +0100

bump libexttextcat to latest release

Change-Id: I5fdde5668845f5b7c388322135b21adf41bd3d20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161521
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index d381fca12ef6..bd17d1368c9e 100644
--- a/download.lst
+++ b/download.lst
@@ -384,8 +384,8 @@ LIBEOT_TARBALL := libeot-0.01.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBEXTTEXTCAT_SHA256SUM := 
6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df
-LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.6.tar.xz
+LIBEXTTEXTCAT_SHA256SUM := 
df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd
+LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.7.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst external/zxing

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 -
 external/zxing/0001-add-ZXVersion-h.patch   |   21 +
 external/zxing/0001-android-Fix-build-with-NDK-26.patch |   64 
 external/zxing/README   |4 -
 external/zxing/StaticLibrary_zxing.mk   |6 -
 external/zxing/UnpackedTarball_zxing.mk |4 -
 6 files changed, 29 insertions(+), 74 deletions(-)

New commits:
commit 0ecedeea71d926f0aa3b2f121e6e896311e6250e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Dec 9 14:54:20 2023 +0900
Commit: Thorsten Behrens 
CommitDate: Sat Dec 23 09:52:25 2023 +0100

zxing-cpp: upgrade to release 2.2.1

* remove 0001-android-Fix-build-with-NDK-26.patch, which was merged 
upstream.
* remove DecodeHints from static lib, which according to upstream is not
  needed:
  https://github.com/zxing-cpp/zxing-cpp/issues/685#issuecomment-1853375179
* add a version header for client code
  generate/update via:
  * mkdir build && cd build && cmake ..
  * mv core/ZXVersion.h ../core/src/

Release Notes:
https://github.com/zxing-cpp/zxing-cpp/releases/tag/v2.2.1

Change-Id: Ic4811d4724970c984dd9ed3d59b5204c18aafc6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160528
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/download.lst b/download.lst
index 6191a35ab4bd..d381fca12ef6 100644
--- a/download.lst
+++ b/download.lst
@@ -655,8 +655,8 @@ ZXCVBN_C_TARBALL := zxcvbn-c-2.5.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ZXING_SHA256SUM := 
6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe
-ZXING_TARBALL := zxing-cpp-2.1.0.tar.gz
+ZXING_SHA256SUM := 
02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635
+ZXING_TARBALL := zxing-cpp-2.2.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/zxing/0001-add-ZXVersion-h.patch 
b/external/zxing/0001-add-ZXVersion-h.patch
new file mode 100644
index ..88b779e2cfd7
--- /dev/null
+++ b/external/zxing/0001-add-ZXVersion-h.patch
@@ -0,0 +1,21 @@
+--- /dev/null  2023-12-10 14:00:18.140142051 +0100
 a/core/src/ZXVersion.h 2023-12-22 21:38:22.466302568 +0100
+@@ -0,0 +1,18 @@
++/*
++* Copyright 2019 Nu-book Inc.
++* Copyright 2023 Axel Waggershauser
++*/
++// SPDX-License-Identifier: Apache-2.0
++
++#pragma once
++
++// Version numbering
++#define ZXING_VERSION_MAJOR 2
++#define ZXING_VERSION_MINOR 2
++#define ZXING_VERSION_PATCH 1
++
++namespace ZXing {
++
++constexpr const char* ZXING_VERSION_STR = "2.2.1";
++
++}
diff --git a/external/zxing/0001-android-Fix-build-with-NDK-26.patch 
b/external/zxing/0001-android-Fix-build-with-NDK-26.patch
deleted file mode 100644
index ad1269b4165c..
--- a/external/zxing/0001-android-Fix-build-with-NDK-26.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 295b193b0105e68bb24747aefbff2653df892b4c Mon Sep 17 00:00:00 2001
-From: Michael Weghorn 
-Date: Mon, 27 Nov 2023 14:28:34 +0100
-Subject: [PATCH] android: Fix build with NDK 26
-
-While the workarounds added in
-
-commit df0b9213017a136bf7253ea1d4aba5677c52d45c
-Author: axxel 
-Date:   Thu Dec 15 20:43:48 2022 +0100
-
-android: work around limitations of c++-20 support in NDK
-
-may be necessary for NDK 25, they are no longer for NDK 26,
-and even break the build with NDK 26:
-
-C/C++: .../zxing-cpp/core/src/Generator.h:103:7: error: reference to 
'default_sentinel_t' is ambiguous
-C/C++: std::default_sentinel_t end() { return {}; }
-C/C++:  ^
-C/C++: 
.../Android/Sdk/ndk/26.1.10909125/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/__iterator/default_sentinel.h:23:8:
 note: candidate found by name lookup is 'std::__ndk1::default_sentinel_t'
-C/C++: struct default_sentinel_t { };
-C/C++:^
-C/C++: .../zxing-cpp/core/src/Generator.h:15:9: note: candidate found by 
name lookup is 'std::default_sentinel_t'
-C/C++: struct default_sentinel_t {};
-C/C++:^
-C/C++: 2 errors generated.
-
-Restrict the workaround to NDK version < 26 to fix this.
-
-Fixes: #673

- core/src/Generator.h | 8 ++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/core/src/Generator.h b/core/src/Generator.h
-index 7a1fd179..a5083e9d 100644
 a/core/src/Generator.h
-+++ b/core/src/Generator.h
-@@ -5,8 +5,12 @@
- 
- #pragma once
- 
--#ifdef __cpp_impl_coroutine
- #ifdef __ANDROID__
-+#include 
-+#endif
-+
-+#ifdef __cpp_impl_coroutine
-+#if defined __ANDROID__ && __NDK_MAJOR__ < 26
- // NDK 25.1.8937393 can compile this code with c++20 but needs a few tweaks:
- #include 
- namespace std {
-@@ -25,7 +29,7 @@ namespace std {
- // this code is based on 
https://en.cppreference.com/w/cpp/coroutine/coroutine_handle#Example
- // 

core.git: download.lst external/pdfium

[Miklos Vajna (via logerrit)]

 download.lst   |4 ++--
 external/pdfium/Library_pdfium.mk  |1 +
 external/pdfium/UnpackedTarball_pdfium.mk  |1 -
 external/pdfium/inc/pch/precompiled_pdfium.hxx |5 +++--
 external/pdfium/ubsan.patch|   12 
 5 files changed, 6 insertions(+), 17 deletions(-)

New commits:
commit 918515d6fc6e2eaa000c4a997d604b7b00b492e3
Author: Miklos Vajna 
AuthorDate: Tue Dec 12 20:16:40 2023 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 13 08:09:43 2023 +0100

Update pdfium to 6179

- Remove ubsan.patch, upstream switched to FXSYS_memset() in this
  function, which does a similar length check as our patch did.

Change-Id: Ib418cd8e642d2be9f448c92f25f85bec25e34598
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160627
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index a3f3df786705..bb9ff13fd2d3 100644
--- a/download.lst
+++ b/download.lst
@@ -513,8 +513,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PDFIUM_SHA256SUM := 
021456a0ddfa473855651496e277b6e1493dbf9572fce4e3204f7580964b42c7
-PDFIUM_TARBALL := pdfium-6060.tar.bz2
+PDFIUM_SHA256SUM := 
4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c
+PDFIUM_TARBALL := pdfium-6179.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/pdfium/Library_pdfium.mk 
b/external/pdfium/Library_pdfium.mk
index 488c890da6ef..fc0903d873d1 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -442,6 +442,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fxge/dib/cfx_scanlinecompositor \
 UnpackedTarball/pdfium/core/fxge/dib/cstretchengine \
 UnpackedTarball/pdfium/core/fxge/dib/fx_dib \
+UnpackedTarball/pdfium/core/fxge/dib/blend \
 UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitDingbats \
 UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitFixed \
 UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitFixedBold \
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk 
b/external/pdfium/UnpackedTarball_pdfium.mk
index 79e93d24d439..924bbe23a8b8 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -8,7 +8,6 @@
 #
 
 pdfium_patches :=
-pdfium_patches += ubsan.patch
 # Fixes build on our baseline.
 pdfium_patches += build.patch.1
 # Avoids Windows 8 build dependency.
diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx 
b/external/pdfium/inc/pch/precompiled_pdfium.hxx
index 64795df4054d..c58757bc605d 100644
--- a/external/pdfium/inc/pch/precompiled_pdfium.hxx
+++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx
@@ -334,7 +334,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -375,6 +374,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -458,6 +458,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -478,8 +479,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
 #include 
 #include 
 #endif // PCH_LEVEL >= 3
diff --git a/external/pdfium/ubsan.patch b/external/pdfium/ubsan.patch
deleted file mode 100644
index 039505eda9cf..
--- a/external/pdfium/ubsan.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 core/fxge/cfx_glyphcache.cpp
-+++ core/fxge/cfx_glyphcache.cpp
-@@ -183,7 +183,8 @@ std::unique_ptr 
CFX_GlyphCache::RenderGlyph(
-   }
- }
-   } else {
--memset(pDestBuf, 0, dest_pitch * bmheight);
-+if (dest_pitch != 0 && bmheight != 0)
-+  memset(pDestBuf, 0, dest_pitch * bmheight);
- int rowbytes = std::min(abs(src_pitch), dest_pitch);
- for (int row = 0; row < bmheight; row++)
-   memcpy(pDestBuf + row * dest_pitch, pSrcBuf + row * src_pitch, 
rowbytes);

core.git: download.lst

[Michael Stahl (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0a2df11fb563177951db1e8890d67cee8d44246a
Author: Michael Stahl 
AuthorDate: Mon Dec 11 13:07:22 2023 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 11 15:14:52 2023 +0100

curl: upgrade to release 8.5.0

Fixes CVE-2023-46218 (cookies apparently used by libcmis)

Change-Id: I6f903ab63589d3318c0cc7d47f5183f7ae55f52b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160592
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 30f2b5c6ec56..a3f3df786705 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d
-CURL_TARBALL := curl-8.4.0.tar.xz
+CURL_SHA256SUM := 
42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb
+CURL_TARBALL := curl-8.5.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst external/lcms2

[Taichi Haradaguchi (via logerrit)]

 dev/null|binary
 download.lst|4 
 external/lcms2/ExternalPackage_lcms2.mk |   10 
 external/lcms2/README   |8 
 external/lcms2/UnpackedTarball_lcms2.mk |4 
 external/lcms2/lcms2-2.4-windows.patch  |   26 
 external/lcms2/lcms2-win-arm64.patch.1  | 1537 
 7 files changed, 28 insertions(+), 1561 deletions(-)

New commits:
commit e1473bc935b68147cb019572928e19a03f188f18
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Sep 14 00:05:04 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Dec 4 00:05:56 2023 +0100

Upgrade lcms2 to 2.15

Added Windows-ARM64 support in release 2.13, so 
external/lcms2/lcms2-win-arm64.patch.1
and external/lcms2/lcms2_sln are not neccesary now.

Fix external/lcms2/lcms2-2.4-windows.patch.

Change-Id: I3b1ca0e715a5f500966d58971188f95a1f232883
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157100
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 60ac664205f9..30f2b5c6ec56 100644
--- a/download.lst
+++ b/download.lst
@@ -359,8 +359,8 @@ LANGTAGREG_TARBALL := 
language-subtag-registry-2023-08-02.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LCMS2_SHA256SUM := 
18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5
-LCMS2_TARBALL := lcms2-2.12.tar.gz
+LCMS2_SHA256SUM := 
b20cbcbd0f503433be2a4e81462106fa61050a35074dc24a4e356792d971ab39
+LCMS2_TARBALL := lcms2-2.15.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/lcms2/ExternalPackage_lcms2.mk 
b/external/lcms2/ExternalPackage_lcms2.mk
index ede9e66acfa9..a2c051f6eb9a 100644
--- a/external/lcms2/ExternalPackage_lcms2.mk
+++ b/external/lcms2/ExternalPackage_lcms2.mk
@@ -14,15 +14,11 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,lcms2,lcms2))
 ifeq ($(DISABLE_DYNLOADING),)
 ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib))
-else ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-$(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2-2.dll,src/.libs/liblcms2-2.dll))
 else ifeq ($(COM),MSC)
 $(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2.dll))
-endif # $(COM)
-else  # $(OS) != WNT/MACOSX
-$(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.12))
-endif # $(OS)
+else
+$(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.15))
+endif
 endif # $(DISABLE_DYNLOADING)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/lcms2/README b/external/lcms2/README
index 10b18a5ad939..2d5fea93a384 100644
--- a/external/lcms2/README
+++ b/external/lcms2/README
@@ -1,3 +1,5 @@
-lcms2 (little cms engine)
-lcms2: Little cms is a small, speed optimized color management engine.
-with the new libcdr, writerperfect will depend on lcms2
\ No newline at end of file
+lcms2 (Little CMS color engine)
+lcms2: Little CMS is a small, speed optimized color management engine.
+With the new libcdr, writerperfect depends on lcms2.
+
+From [https://www.littlecms.com/color-engine/].
diff --git a/external/lcms2/UnpackedTarball_lcms2.mk 
b/external/lcms2/UnpackedTarball_lcms2.mk
index 932f8c63c81c..1aae4c3db254 100644
--- a/external/lcms2/UnpackedTarball_lcms2.mk
+++ b/external/lcms2/UnpackedTarball_lcms2.mk
@@ -18,10 +18,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
 $(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
external/lcms2/lcms2-2.4-windows.patch \
external/lcms2/c++17.patch.1 \
-   external/lcms2/lcms2-win-arm64.patch.1 \
 ))
 
-# Can't include in ARM64 patch, as diff fails to detect text in it
-$(eval $(call 
gb_UnpackedTarball_add_file,lcms2,Projects/VC2019/lcms2.sln,external/lcms2/lcms2_sln))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/lcms2/lcms2-2.4-windows.patch 
b/external/lcms2/lcms2-2.4-windows.patch
index 749a81200b11..0281a7769a91 100644
--- a/external/lcms2/lcms2-2.4-windows.patch
+++ b/external/lcms2/lcms2-2.4-windows.patch
@@ -1,20 +1,30 @@
-TODO: Is this still needed?
+This patch is neccesary for Windows (32-bit) build.
 
 misc/lcms2-2.4/include/lcms2.h 2011-12-15 16:45:47.0 +0100
-+++ misc/build/lcms2-2.4/include/lcms2.h   2012-03-17 22:53:28.731585981 
+0100
-@@ -192,6 +192,15 @@ typedef int  cmsBool;
+(In Jenkins' build message)
+> icc_transform.o : error LNK2019: unresolved external symbol 
_cmsGetColorSpace referenced in function "public: static class 
std::unique_ptr > __cdecl 
fxcodec::IccTransform::CreateTransformSRGB(class pdfium::span)" 

[Libreoffice-commits] core.git: download.lst external/liborcus

[Kohei Yoshida (via logerrit)]

 download.lst   |4 ++--
 external/liborcus/UnpackedTarball_liborcus.mk  |1 -
 external/liborcus/liborcus_newline.patch.1 |   17 -
 external/liborcus/windows-constants-hack.patch |2 +-
 4 files changed, 3 insertions(+), 21 deletions(-)

New commits:
commit e890b0f0a90316b69f49e0e9d3cb2b1b4528084a
Author: Kohei Yoshida 
AuthorDate: Thu Nov 9 20:26:47 2023 -0500
Commit: Kohei Yoshida 
CommitDate: Fri Nov 10 15:35:47 2023 +0100

Upgrade orcus to 0.19.2

Change-Id: I2cbf5f93c3b8b2235828affdef7309c3611b19b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159258
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/download.lst b/download.lst
index 468e2e39f1ec..d4c3eed3b9c6 100644
--- a/download.lst
+++ b/download.lst
@@ -503,8 +503,8 @@ OPENSSL_TARBALL := openssl-3.0.11.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ORCUS_SHA256SUM := 
6c9a8c03e8187f2749a84f2786d86a88ae45c99ed3a2d5fea36ba556b40c342d
-ORCUS_TARBALL := liborcus-0.19.1.tar.xz
+ORCUS_SHA256SUM := 
69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39
+ORCUS_TARBALL := liborcus-0.19.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 5968c7bb1845..3de24f0135d7 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
external/liborcus/libtool.patch.0 \
-   external/liborcus/liborcus_newline.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/liborcus_newline.patch.1 
b/external/liborcus/liborcus_newline.patch.1
deleted file mode 100644
index 5b2038d5cc12..
--- a/external/liborcus/liborcus_newline.patch.1
+++ /dev/null
@@ -1,17 +0,0 @@
-Add newline at end of KRHangulMapping.h
-
-without this, compiling output of GCC 11 -E -fdirectives-only fails with:
-
-ooxml_tokens.inl:3524:32: error: stray '#' in program
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100392
-
 liborcus/src/liborcus/ooxml_tokens.inl.orig2021-05-01 
18:12:37.490131155 +0200
-+++ liborcus/src/liborcus/ooxml_tokens.inl 2021-05-01 18:12:50.994119453 
+0200
-@@ -3521,4 +3521,4 @@
- "zoomToFit"  // 3517
- };
- 
--size_t token_name_count = 3518;
-\ No newline at end of file
-+size_t token_name_count = 3518;
diff --git a/external/liborcus/windows-constants-hack.patch 
b/external/liborcus/windows-constants-hack.patch
index 68e57857826d..28cf0997a168 100644
--- a/external/liborcus/windows-constants-hack.patch
+++ b/external/liborcus/windows-constants-hack.patch
@@ -9,7 +9,7 @@ index ae571f5..539ce18 100644
 -#include "constants.inl"
 +#define ORCUS_MAJOR_VERSION 0
 +#define ORCUS_MINOR_VERSION 19
-+#define ORCUS_MICRO_VERSION 0
++#define ORCUS_MICRO_VERSION 2
 
  namespace orcus {
 

[Libreoffice-commits] core.git: download.lst

[Miklos Vajna (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ca650cad8fccc7eb27c300ffb7aa7d961c83dc56
Author: Miklos Vajna 
AuthorDate: Mon Nov 6 19:59:02 2023 +0100
Commit: Miklos Vajna 
CommitDate: Tue Nov 7 09:23:01 2023 +0100

Update libxmlsec to 1.3.2

Keep external/xmlsec/old-nss.patch.1 for now, though the baseline has
been updated to RHEL 8 in the meantime, so probably it's not needed in
practice.

Change-Id: I4730f71f45937770ac3f78182f3f65eed64b5a6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159012
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index b94c3c7ad7ca..468e2e39f1ec 100644
--- a/download.lst
+++ b/download.lst
@@ -414,8 +414,8 @@ LIBWEBP_TARBALL := libwebp-1.3.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-XMLSEC_SHA256SUM := 
10f48384d4fd1afc05fea545b74fbf7c152582f0a895c189f164d55270400c63
-XMLSEC_TARBALL := xmlsec1-1.3.1.tar.gz
+XMLSEC_SHA256SUM := 
4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf
+XMLSEC_TARBALL := xmlsec1-1.3.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8326f1f54b2f4644b52fbfa7106eeeae6e5bb7b
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Oct 1 00:30:13 2023 +0900
Commit: Caolán McNamara 
CommitDate: Wed Nov 1 09:46:52 2023 +0100

Upgrade Harfbuzz to 8.2.2

Fix regression from 8.2.0 in parsing CSS-style feature strings.

(https://lists.freedesktop.org/archives/libreoffice/2023-September/091026.html)
(https://github.com/harfbuzz/harfbuzz/issues/4414)

Change-Id: Ifdaeb7b2a9a5da2866810e4d5298f57a0fd9bd9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157434
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index b85d4bd437e9..b94c3c7ad7ca 100644
--- a/download.lst
+++ b/download.lst
@@ -287,8 +287,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79
-HARFBUZZ_TARBALL := harfbuzz-8.0.0.tar.xz
+HARFBUZZ_SHA256SUM := 
e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3
+HARFBUZZ_TARBALL := harfbuzz-8.2.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst external/libtiff

[Caolán McNamara (via logerrit)]

 download.lst   
  |4 
 
external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch
 |   79 --
 external/libtiff/UnpackedTarball_libtiff.mk
  |1 
 3 files changed, 2 insertions(+), 82 deletions(-)

New commits:
commit 4273ebd28b9d3f50797f9e2dede0d9e8ce26e6f0
Author: Caolán McNamara 
AuthorDate: Sat Oct 28 17:16:27 2023 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 28 21:57:28 2023 +0200

upgrade libtiff to 4.6.0

Change-Id: I839f78e5431caac378ce936aa5e34357144ae6b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158593
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index f1f1ed87e036..d83931988bdd 100644
--- a/download.lst
+++ b/download.lst
@@ -528,8 +528,8 @@ LIBPNG_TARBALL := libpng-1.6.40.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTIFF_SHA256SUM := 
3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a
-LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
+LIBTIFF_SHA256SUM := 
e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2
+LIBTIFF_TARBALL := tiff-4.6.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch
 
b/external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch
deleted file mode 100644
index 68353bd9ed20..
--- 
a/external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 350ff161c8a61b6483a1e4689e09cd47dd0dd5f9 Mon Sep 17 00:00:00 2001
-From: Even Rouault 
-Date: Sat, 17 Jun 2023 16:22:38 +0200
-Subject: [PATCH] WebP decoder: validate WebP blob width, height, band count
- against TIFF parameters
-
-to avoid use of uninitialized variable, or decoding corrupted content
-without explicit error
-
-Fixes #581, fixes #582

- libtiff/tif_webp.c | 51 ++
- 1 file changed, 51 insertions(+)
-
-diff --git a/libtiff/tif_webp.c b/libtiff/tif_webp.c
-index 07db7cce..ce15391e 100644
 a/libtiff/tif_webp.c
-+++ b/libtiff/tif_webp.c
-@@ -149,6 +149,57 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t 
occ, uint16_t s)
- segment_height = td->td_rowsperstrip;
- }
- 
-+int webp_width, webp_height;
-+if (!WebPGetInfo(tif->tif_rawcp,
-+ tif->tif_rawcc > UINT32_MAX ? UINT32_MAX
-+ : 
(uint32_t)tif->tif_rawcc,
-+ _width, _height))
-+{
-+TIFFErrorExtR(tif, module, "WebPGetInfo() failed");
-+return 0;
-+}
-+if ((uint32_t)webp_width != segment_width ||
-+(uint32_t)webp_height != segment_height)
-+{
-+TIFFErrorExtR(
-+tif, module, "WebP blob dimension is %dx%d. Expected %ux%u",
-+webp_width, webp_height, segment_width, segment_height);
-+return 0;
-+}
-+
-+#if WEBP_DECODER_ABI_VERSION >= 0x0002
-+WebPDecoderConfig config;
-+if (!WebPInitDecoderConfig())
-+{
-+TIFFErrorExtR(tif, module, "WebPInitDecoderConfig() failed");
-+return 0;
-+}
-+
-+const bool bWebPGetFeaturesOK =
-+WebPGetFeatures(tif->tif_rawcp,
-+tif->tif_rawcc > UINT32_MAX
-+? UINT32_MAX
-+: (uint32_t)tif->tif_rawcc,
-+) == VP8_STATUS_OK;
-+
-+WebPFreeDecBuffer();
-+
-+if (!bWebPGetFeaturesOK)
-+{
-+TIFFErrorExtR(tif, module, "WebPInitDecoderConfig() failed");
-+return 0;
-+}
-+
-+const int webp_bands = config.input.has_alpha ? 4 : 3;
-+if (webp_bands != sp->nSamples)
-+{
-+TIFFErrorExtR(tif, module,
-+  "WebP blob band count is %d. Expected %d", 
webp_bands,
-+  sp->nSamples);
-+return 0;
-+}
-+#endif
-+
- buffer_size = segment_width * segment_height * sp->nSamples;
- if (occ == (tmsize_t)buffer_size)
- {
--- 
-2.41.0
-
diff --git a/external/libtiff/UnpackedTarball_libtiff.mk 
b/external/libtiff/UnpackedTarball_libtiff.mk
index 32ed699b7491..f7eeb6ace868 100644
--- a/external/libtiff/UnpackedTarball_libtiff.mk
+++ b/external/libtiff/UnpackedTarball_libtiff.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libtiff,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libtiff,\
 external/libtiff/libtiff.linknolibs.patch \
 external/libtiff/0001-ofz-54685-Timeout.patch \
-

[Libreoffice-commits] core.git: download.lst external/IAccessible2 external/Module_external.mk Makefile.fetch winaccessibility/CustomTarget_ia2_idl.mk winaccessibility/source

[Michael Weghorn (via logerrit)]

 Makefile.fetch|1 
 download.lst  |5 
 external/IAccessible2/ExternalProject_IAccessible2.mk |   26 
 external/IAccessible2/Module_IAccessible2.mk  |   17 
 external/IAccessible2/README  |5 
 external/IAccessible2/UnpackedTarball_IAccessible2.mk |   14 
 external/Module_external.mk   |1 
 winaccessibility/CustomTarget_ia2_idl.mk  |   21 
 winaccessibility/source/UAccCOMIDL/ia2_api_all.idl| 5476 --
 9 files changed, 90 insertions(+), 5476 deletions(-)

New commits:
commit 809409ca845ff1269d3d8f516678048404d8fea8
Author: Michael Weghorn 
AuthorDate: Wed Oct 25 16:19:33 2023 +0200
Commit: Michael Weghorn 
CommitDate: Wed Oct 25 20:48:07 2023 +0200

tdf#135586 a11y: Make IAccessible2 an external and update it

So far, there was an internal copy of the IAccessible2
IDL file added in 2013, and never updated since then
(except for cosmetic changes like formatting and typo
fixes), and therefore it e.g. doesn't have the
`IA2_ROLE_BLOCK_QUOTE` role needed for tdf#135586.

Drop the outdated internal copy and integrate an up to
date upstream version (current git master) instead.

Instead of duplicating things in an internal copy,
switch to using the usual mechanism for externals.

The IAccessible2 source contains separate .idl files
for the different interfaces, while the previous
interal copy was already the merged IDL file.

Call the IAccessible2 `./concatidl.sh` script to generate
the merged `ia2_api_all.idl`
(s. external/IAccessible2/ExternalProject_IAccessible2.mk)
and adapt the winaccessibility make files to use that
version instead of the internal copy.
(Add a dependency to the target that generates
`ia2_api_all.idl`.)

The tarball was generated from the master branch of the
IAccessible2 git repo [1] as of

commit 3d8c7f0b833453f761ded6b12d8be431507bfe0b (HEAD -> master, 
origin/master, origin/HEAD, mygithub/master)
Author: Michael Weghorn 
Date:   Fri Oct 13 04:16:03 2023 +0300

Update no longer working links (#26)

* Update link to Linux Foundation Trademark Policy
* Update link to Object Attributes specification

Signed-off-by: Michael Weghorn 

using this command:

$ git archive -o ../IAccessible2-1.3+git20231013.3d8c7f0.tar.gz 
--prefix=IAccessible2-1.3+git20231013.3d8c7f0/ master

Andrea Gelmini's typo fixes have been upstreamed in [2].

[1] https://github.com/LinuxA11y/IAccessible2
[2] https://github.com/LinuxA11y/IAccessible2/pull/21

Change-Id: I9f19ff55694da5d3a9a8750be8de387cbf6da785
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158427
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/Makefile.fetch b/Makefile.fetch
index 41d6a85d13c0..8cd2c543891f 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -134,6 +134,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,HSQLDB,HSQLDB_TARBALL) \
$(call fetch_Optional,HUNSPELL,HUNSPELL_TARBALL) \
$(call fetch_Optional,HYPHEN,HYPHEN_TARBALL) \
+   $(if $(filter WNT,$(OS)),IACCESSIBLE2_TARBALL) \
$(call fetch_Optional,ICU,ICU_TARBALL) \
$(call fetch_Optional,ICU,ICU_DATA_TARBALL) \
$(call fetch_Optional,JAVA_WEBSOCKET,JAVA_WEBSOCKET_TARBALL) \
diff --git a/download.lst b/download.lst
index 5aeeb74a6cdc..f1f1ed87e036 100644
--- a/download.lst
+++ b/download.lst
@@ -307,6 +307,11 @@ HYPHEN_TARBALL := 
5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
+IACCESSIBLE2_SHA256SUM := 
0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023
+IACCESSIBLE2_TARBALL := IAccessible2-1.3+git20231013.3d8c7f0.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 ICU_SHA256SUM := 
818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1
 ICU_TARBALL := icu4c-73_2-src.tgz
 ICU_DATA_SHA256SUM := 
ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701
diff --git a/external/IAccessible2/ExternalProject_IAccessible2.mk 
b/external/IAccessible2/ExternalProject_IAccessible2.mk
new file mode 100644
index ..0ef6c8fc6014
--- /dev/null
+++ b/external/IAccessible2/ExternalProject_IAccessible2.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at 

[Libreoffice-commits] core.git: download.lst external/liborcus

[Kohei Yoshida (via logerrit)]

 download.lst   |4 +-
 external/liborcus/UnpackedTarball_liborcus.mk  |2 -
 external/liborcus/gnumeric-set-grammar.patch.1 |   17 
 external/liborcus/msvc-int-narrowing.patch.1   |   50 -
 4 files changed, 2 insertions(+), 71 deletions(-)

New commits:
commit b5d194d1d37131f921853b78d659c63178de2bc6
Author: Kohei Yoshida 
AuthorDate: Tue Oct 24 18:31:52 2023 -0400
Commit: Kohei Yoshida 
CommitDate: Wed Oct 25 01:33:12 2023 +0200

Upgrade liborcus to 0.19.1

Change-Id: I2190419e88323bbf000602a7762e850a33b5dfdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158409
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/download.lst b/download.lst
index 07b4934cf760..5aeeb74a6cdc 100644
--- a/download.lst
+++ b/download.lst
@@ -498,8 +498,8 @@ OPENSSL_TARBALL := openssl-3.0.11.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ORCUS_SHA256SUM := 
1b68f54bb08face4c3dc83c912d921373c44aed817b37d879b7a4e47f2f15e09
-ORCUS_TARBALL := liborcus-0.19.0.tar.xz
+ORCUS_SHA256SUM := 
6c9a8c03e8187f2749a84f2786d86a88ae45c99ed3a2d5fea36ba556b40c342d
+ORCUS_TARBALL := liborcus-0.19.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 292435dfd00d..5968c7bb1845 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -20,8 +20,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/gcc9.patch.0 \
external/liborcus/libtool.patch.0 \
external/liborcus/liborcus_newline.patch.1 \
-   external/liborcus/msvc-int-narrowing.patch.1 \
-   external/liborcus/gnumeric-set-grammar.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/gnumeric-set-grammar.patch.1 
b/external/liborcus/gnumeric-set-grammar.patch.1
deleted file mode 100644
index 42bc46177737..
--- a/external/liborcus/gnumeric-set-grammar.patch.1
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/liborcus/orcus_gnumeric.cpp b/src/liborcus/orcus_gnumeric.cpp
-index 76c13682..849759ba 100644
 a/src/liborcus/orcus_gnumeric.cpp
-+++ b/src/liborcus/orcus_gnumeric.cpp
-@@ -144,6 +144,12 @@ void orcus_gnumeric::read_stream(std::string_view stream)
- if (!decompress_gzip(stream.data(), stream.size(), file_content))
- return;
- 
-+if (auto* gs = mp_impl->mp_factory->get_global_settings(); gs)
-+{
-+gs->set_origin_date(1899, 12, 30);
-+
gs->set_default_formula_grammar(spreadsheet::formula_grammar_t::gnumeric);
-+}
-+
- mp_impl->read_content_xml(file_content, get_config());
- mp_impl->mp_factory->finalize();
- }
diff --git a/external/liborcus/msvc-int-narrowing.patch.1 
b/external/liborcus/msvc-int-narrowing.patch.1
deleted file mode 100644
index 1075cebfdef3..
--- a/external/liborcus/msvc-int-narrowing.patch.1
+++ /dev/null
@@ -1,50 +0,0 @@
-Fix
-
-  error C2398: Element '2': conversion from 'int' to 'const 
std::basic_string_view>::size_type'
-  requires a narrowing conversion
-
-diff --git a/src/liborcus/gnumeric_value_format_parser.cpp 
b/src/liborcus/gnumeric_value_format_parser.cpp
-index 822c1ba1..014068e9 100644
 a/src/liborcus/gnumeric_value_format_parser.cpp
-+++ b/src/liborcus/gnumeric_value_format_parser.cpp
-@@ -12,6 +12,10 @@
- #include 
- #include 
-
-+#include 
-+
-+using boost::numeric_cast;
-+
- namespace orcus {
-
- std::size_t gnumeric_value_format_parser::get_pos() const
-@@ -41,7 +45,8 @@ void gnumeric_value_format_parser::segment()
- if (pos != 2)
- throw parse_error("value format segment is not formatted 
properly", get_pos());
-
--std::string_view s{p0, std::distance(p0, m_cur)};
-+auto n = std::distance(p0, m_cur);
-+std::string_view s{p0, numeric_cast(n)};
- if (s.empty())
- throw parse_error("segment value is empty", get_pos());
-
-@@ -51,7 +56,8 @@ void gnumeric_value_format_parser::segment()
- }
- case '=':
- {
--std::string_view s{p0, std::distance(p0, m_cur)};
-+auto n = std::distance(p0, m_cur);
-+std::string_view s{p0, numeric_cast(n)};
- seg.type = to_gnumeric_value_format_type(s);
- if (seg.type == gnumeric_value_format_type::unknown)
- {
-@@ -65,7 +71,8 @@ void gnumeric_value_format_parser::segment()
- }
- case ':':
- {
--std::string_view s{p0, std::distance(p0, m_cur)};
-+auto n = std::distance(p0, m_cur);
-+std::string_view s{p0, numeric_cast(n)};
-
- switch (pos)
- {

[Libreoffice-commits] core.git: download.lst external/mariadb-connector-c RepositoryExternal.mk

[Mike Kaganski (via logerrit)]

 RepositoryExternal.mk |1 +
 download.lst  |4 ++--
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |8 
+++-
 external/mariadb-connector-c/configs/wnt_ma_config.h  |4 
 4 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 5a0498ded11d514c21e3124333a3560da1373202
Author: Mike Kaganski 
AuthorDate: Fri Oct 20 08:52:46 2023 +0300
Commit: Mike Kaganski 
CommitDate: Sat Oct 21 08:43:44 2023 +0200

mariadb connector: upgrade to release 3.3.7 (fixes tdf#157826)

Change-Id: I053b827b7bc14535760236fcb057c154c359f4dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158252
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 82a3478a1ac4..744353b58fe3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -312,6 +312,7 @@ $(call gb_LinkTarget_use_system_win32_libs,$(1),\
kernel32 \
shlwapi \
crypt32 \
+   bcrypt \
 )
 
 endef
diff --git a/download.lst b/download.lst
index ad03e50a6ad4..07b4934cf760 100644
--- a/download.lst
+++ b/download.lst
@@ -436,8 +436,8 @@ LXML_TARBALL := lxml-4.9.2.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-MARIADB_CONNECTOR_C_SHA256SUM := 
431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
-MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.1.8-src.tar.gz
+MARIADB_CONNECTOR_C_SHA256SUM := 
975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf
+MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.7-src.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 3458089ce99e..b8802e16695e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -21,12 +21,10 @@ $(eval $(call 
gb_StaticLibrary_set_include,mariadb-connector-c,\
 # This is needed for MSVC 2008: it somehow finds a dlopen somewhere
 # but the static library then contains unreferenced symbols.
 # This macro enables a re-definition to native Win32 APIs in my_global.h.
-## TODO missing enable: -D HAVE_COMPRESS
-## (but then need to add "-lz" to mysqlcppconn linking)
-$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -D 
ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1))
+$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN 
-DHAVE_COMPRESS -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD 
-DSQLITE_ENABLE_COLUMN_METADATA=1))
 
 ifeq ($(OS),WNT)
-$(eval $(call 
gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED 
-DHAVE_STRTOULL))
+$(eval $(call 
gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED 
-DHAVE_STRTOULL -DHAVE_WINCRYPT))
 $(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
$$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/win-iconv \
@@ -46,7 +44,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/ma_default \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_dtoa \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_errmsg \
-   UnpackedTarball/mariadb-connector-c/libmariadb/ma_hash \
+   UnpackedTarball/mariadb-connector-c/libmariadb/ma_hashtbl \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_init \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_io \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_list \
diff --git a/external/mariadb-connector-c/configs/wnt_ma_config.h 
b/external/mariadb-connector-c/configs/wnt_ma_config.h
index d06393509881..acd08c125a95 100644
--- a/external/mariadb-connector-c/configs/wnt_ma_config.h
+++ b/external/mariadb-connector-c/configs/wnt_ma_config.h
@@ -72,11 +72,7 @@
 # define HAVE_LONG 1
 #endif
 
-#ifdef _M_X64
 #define SIZEOF_LONG_LONG 8
-#else
-#define SIZEOF_LONG_LONG 4
-#endif
 #if defined(SIZEOF_LONG_LONG)
 # define HAVE_LONG_LONG 1
 #endif

[Libreoffice-commits] core.git: download.lst external/lxml

[Taichi Haradaguchi (via logerrit)]

 download.lst   
 |4 -
 
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 
|   31 ++
 external/lxml/README   
 |6 -
 external/lxml/UnpackedTarball_lxml.mk  
 |5 -
 external/lxml/Wincompatible-function-pointer-types.patch   
 |   20 --
 external/lxml/replace-setuptools-with-distutils.patch.0
 |   11 +++
 6 files changed, 49 insertions(+), 28 deletions(-)

New commits:
commit a4b4a90557f9fc1839fc0eb297f4c6a4e94c761a
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jul 2 14:54:23 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Oct 20 02:23:12 2023 +0200

lxml: upgrade to release 4.9.2

* external/lxml/Wincompatible-function-pointer-types.patch: fixed upstream.
* backport 
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
  from .

Changelog: https://lxml.de/4.9/changes-4.9.2.html

Change-Id: I8ea947b3b1fb30b9427d066bd41a5d4693ceedbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153863
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 0a113753fbf9..ad03e50a6ad4 100644
--- a/download.lst
+++ b/download.lst
@@ -431,8 +431,8 @@ LPSOLVE_TARBALL := 
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LXML_SHA256SUM := 
940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
-LXML_TARBALL := lxml-4.1.1.tgz
+LXML_SHA256SUM := 
2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67
+LXML_TARBALL := lxml-4.9.2.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
 
b/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
new file mode 100644
index ..ce1ec383cc63
--- /dev/null
+++ 
b/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
@@ -0,0 +1,31 @@
+From 9686dd9c7670d18acff6360c8444520273d5f1b2 Mon Sep 17 00:00:00 2001
+From: Jakub Wilk 
+Date: Fri, 16 Jun 2023 09:24:21 +0200
+Subject: [PATCH] Make regexp string raw to correct its escape sequence usage
+ (GH-371)
+
+Fixes:
+
+$ python3 -Wd setup.py
+setup.py:117: DeprecationWarning: invalid escape sequence \.
+...
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 709cbc68..7a3f46e5 100644
+--- a/setup.py
 b/setup.py
+@@ -114,7 +114,7 @@ extra_options['packages'] = [
+ 
+ def setup_extra_options():
+ is_interesting_package = re.compile('^(libxml|libxslt|libexslt)$').match
+-is_interesting_header = re.compile('^(zconf|zlib|.*charset)\.h$').match
++is_interesting_header = re.compile(r'^(zconf|zlib|.*charset)\.h$').match
+ 
+ def extract_files(directories, pattern='*'):
+ def get_files(root, dir_path, files):
+-- 
+2.39.2
+
diff --git a/external/lxml/README b/external/lxml/README
index ad9f0952c6b3..be90f0a862ce 100644
--- a/external/lxml/README
+++ b/external/lxml/README
@@ -1,7 +1,7 @@
-LXML XML processing python Library from [http://lxml.de/].
+LXML XML processing python Library from [https://lxml.de/].
 
 This library is used for the .ui accessibility checker bin/gla11y
 
 The archive was downloaded from:
-[http://lxml.de/files/lxml-4.1.1.tgz]
-on 2018-02-22.
+[https://lxml.de/files/lxml-4.9.2.tgz]
+on 2023-07-17.
diff --git a/external/lxml/UnpackedTarball_lxml.mk 
b/external/lxml/UnpackedTarball_lxml.mk
index 3f4180404870..8d032e70dd90 100644
--- a/external/lxml/UnpackedTarball_lxml.mk
+++ b/external/lxml/UnpackedTarball_lxml.mk
@@ -11,10 +11,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,lxml))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,lxml,$(LXML_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,lxml,0))
-
 $(eval $(call gb_UnpackedTarball_add_patches,lxml, \
-external/lxml/Wincompatible-function-pointer-types.patch \
+   
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 
\
+   external/lxml/replace-setuptools-with-distutils.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/lxml/Wincompatible-function-pointer-types.patch 
b/external/lxml/Wincompatible-function-pointer-types.patch
deleted file mode 100644
index bb9c7a02918b..
--- a/external/lxml/Wincompatible-function-pointer-types.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 src/lxml/etree.c
-+++ src/lxml/etree.c
-@@ -6810,7 +6810,7 @@
- static void __pyx_f_4lxml_5etree__xpath_function_call(xmlXPathParserContext 
*, int); /*proto*/
- 

[Libreoffice-commits] core.git: download.lst external/libffi external/python3

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 ++--
 external/libffi/ExternalPackage_libffi.mk   |2 +-
 external/python3/UnpackedTarball_python3.mk |2 ++
 external/python3/python-3.8-msvc-libffi.patch.1 |   16 
 4 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 7359700d5dc847accd360e70f7dcc45d119577be
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Oct 14 11:30:48 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Oct 14 15:51:09 2023 +0200

Upgrade libffi to 3.4.4

Change-Id: I417abc5d76db235c23195abff22d3d27f9c0fa77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157972
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index ef42c2555cbf..0a113753fbf9 100644
--- a/download.lst
+++ b/download.lst
@@ -379,8 +379,8 @@ LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.6.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBFFI_SHA256SUM := 
72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
-LIBFFI_TARBALL := libffi-3.3.tar.gz
+LIBFFI_SHA256SUM := 
d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676
+LIBFFI_TARBALL := libffi-3.4.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libffi/ExternalPackage_libffi.mk 
b/external/libffi/ExternalPackage_libffi.mk
index 61b0a1ca460c..c524ef90289f 100644
--- a/external/libffi/ExternalPackage_libffi.mk
+++ b/external/libffi/ExternalPackage_libffi.mk
@@ -13,7 +13,7 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,libffi,libffi))
 
 ifeq ($(COM),MSC)
 $(eval $(call 
gb_ExternalPackage_add_files,libffi,$(LIBO_LIB_FOLDER)/python-core-$(PYTHON_VERSION)/lib,
 \
-$(HOST_PLATFORM)/.libs/libffi-7.dll \
+$(HOST_PLATFORM)/.libs/libffi-8.dll \
 ))
 endif
 
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 127dea4a8ee4..93cb9015c9a6 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,python3))
 $(eval $(call 
gb_UnpackedTarball_set_tarball,python3,$(PYTHON_TARBALL),,python3))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
+   PCbuild/libffi.props \
PCbuild/pcbuild.sln \
 ))
 
@@ -19,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
external/python3/python-3.3.0-darwin.patch.1 \
external/python3/python-3.8-msvc-sdk.patch.1 \
+   external/python3/python-3.8-msvc-libffi.patch.1 \
external/python3/python-3.7.6-msvc-ssl.patch.1 \
external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/ubsan.patch.0 \
diff --git a/external/python3/python-3.8-msvc-libffi.patch.1 
b/external/python3/python-3.8-msvc-libffi.patch.1
new file mode 100644
index ..7a4490cd2f34
--- /dev/null
+++ b/external/python3/python-3.8-msvc-libffi.patch.1
@@ -0,0 +1,16 @@
+--- python3/PCbuild/libffi.props.orig  2023-08-25 04:36:32.0 +0900
 python3/PCbuild/libffi.props   2023-10-14 15:13:24.850511531 +0900
+@@ -6,11 +6,11 @@
+ 
+ 
+   
$(libffiOutDir);%(AdditionalLibraryDirectories)
+-  
libffi-7.lib;%(AdditionalDependencies)
++  
libffi-8.lib;%(AdditionalDependencies)
+ 
+   
+   
+-<_LIBFFIDLL Include="$(libffiOutDir)\libffi-7.dll" />
++<_LIBFFIDLL Include="$(libffiOutDir)\libffi-8.dll" />
+   
+   
+ 

[Libreoffice-commits] core.git: download.lst

[Eike Rathke (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1f43a341885412b89dc3d6e9bc2bbc5f9f086a84
Author: Eike Rathke 
AuthorDate: Fri Oct 13 17:35:38 2023 +0200
Commit: Eike Rathke 
CommitDate: Fri Oct 13 22:07:27 2023 +0200

Update language-subtag-registry to 2023-08-02

Change-Id: I61e7e6c0a7010ff6f8db61a72b57a57de3e61c74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157943
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/download.lst b/download.lst
index 33e691aebdb3..ef42c2555cbf 100644
--- a/download.lst
+++ b/download.lst
@@ -349,8 +349,8 @@ LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LANGTAGREG_SHA256SUM := 
9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da
-LANGTAGREG_TARBALL := language-subtag-registry-2023-05-11.tar.bz2
+LANGTAGREG_SHA256SUM := 
59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb
+LANGTAGREG_TARBALL := language-subtag-registry-2023-08-02.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst external/pdfium

[Miklos Vajna (via logerrit)]

 download.lst  |4 +--
 external/pdfium/build.patch.1 |   50 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit faa590cf41a08169306ec369948b31d0401518a3
Author: Miklos Vajna 
AuthorDate: Wed Oct 11 20:06:04 2023 +0200
Commit: Miklos Vajna 
CommitDate: Thu Oct 12 08:21:10 2023 +0200

Update to pdfium 6060

- external/pdfium/build.patch.1: re-generate with 'patch -p1' + 'git
  diff'

Change-Id: I9258d6d0130620523d64fcd0854c4d96fc98a4bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157846
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 26d9ab95c04a..33e691aebdb3 100644
--- a/download.lst
+++ b/download.lst
@@ -508,8 +508,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PDFIUM_SHA256SUM := 
9a9ce3f62de525cdfd8373a155ac549579c2c8067c6050716ca4b5cd5c11f655
-PDFIUM_TARBALL := pdfium-5941.tar.bz2
+PDFIUM_SHA256SUM := 
021456a0ddfa473855651496e277b6e1493dbf9572fce4e3204f7580964b42c7
+PDFIUM_TARBALL := pdfium-6060.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1
index 4853e4f90a45..3dbd9427c037 100644
--- a/external/pdfium/build.patch.1
+++ b/external/pdfium/build.patch.1
@@ -1,9 +1,9 @@
 -*- Mode: diff -*-
 diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp 
b/core/fpdfapi/font/cpdf_cidfont.cpp
-index f5a51b24e..8b308d0a6 100644
+index 7d2d549b8..c4864060a 100644
 --- a/core/fpdfapi/font/cpdf_cidfont.cpp
 +++ b/core/fpdfapi/font/cpdf_cidfont.cpp
-@@ -755,7 +755,7 @@ int CPDF_CIDFont::GlyphFromCharCode(uint32_t charcode, 
bool* pVertGlyph) {
+@@ -754,7 +754,7 @@ int CPDF_CIDFont::GlyphFromCharCode(uint32_t charcode, 
bool* pVertGlyph) {
  uint32_t maccode = CharCodeFromUnicodeForFreetypeEncoding(
  FT_ENCODING_APPLE_ROMAN, name_unicode);
  index = maccode ? FT_Get_Char_Index(face, maccode)
@@ -13,10 +13,10 @@ index f5a51b24e..8b308d0a6 100644
if (index == 0 || index == 0x)
  return charcode ? static_cast(charcode) : -1;
 diff --git a/core/fpdfapi/font/cpdf_truetypefont.cpp 
b/core/fpdfapi/font/cpdf_truetypefont.cpp
-index 0a59b54eb..a96e11759 100644
+index f19ace9d0..562b015f0 100644
 --- a/core/fpdfapi/font/cpdf_truetypefont.cpp
 +++ b/core/fpdfapi/font/cpdf_truetypefont.cpp
-@@ -91,7 +91,7 @@ void CPDF_TrueTypeFont::LoadGlyphMap() {
+@@ -90,7 +90,7 @@ void CPDF_TrueTypeFont::LoadGlyphMap() {
FT_ENCODING_APPLE_ROMAN,
m_Encoding.UnicodeFromCharCode(charcode));
if (!maccode) {
@@ -25,7 +25,7 @@ index 0a59b54eb..a96e11759 100644
} else {
  m_GlyphIndex[charcode] = FT_Get_Char_Index(face, maccode);
}
-@@ -105,7 +105,7 @@ void CPDF_TrueTypeFont::LoadGlyphMap() {
+@@ -104,7 +104,7 @@ void CPDF_TrueTypeFont::LoadGlyphMap() {
  m_GlyphIndex[charcode] = FT_Get_Char_Index(face, 32);
  continue;
}
@@ -57,7 +57,7 @@ index 55510e7d7..2f13f00b8 100644
continue;
  
 diff --git a/core/fpdfdoc/cpdf_metadata.cpp b/core/fpdfdoc/cpdf_metadata.cpp
-index 228a0c137..bf512beb3 100644
+index 31564f45f..5858549ef 100644
 --- a/core/fpdfdoc/cpdf_metadata.cpp
 +++ b/core/fpdfdoc/cpdf_metadata.cpp
 @@ -87,7 +87,7 @@ std::vector 
CPDF_Metadata::CheckForSharedForm() const {
@@ -70,10 +70,10 @@ index 228a0c137..bf512beb3 100644
std::vector unsupported;
CheckForSharedFormInternal(/*depth=*/0, doc->GetRoot(), );
 diff --git a/core/fxcodec/jpx/cjpx_decoder.cpp 
b/core/fxcodec/jpx/cjpx_decoder.cpp
-index 9391d61ab..490ce2230 100644
+index 2e7a72aa1..65fb3deaa 100644
 --- a/core/fxcodec/jpx/cjpx_decoder.cpp
 +++ b/core/fxcodec/jpx/cjpx_decoder.cpp
-@@ -75,7 +75,7 @@ absl::optional alloc_rgb(size_t size) {
+@@ -74,7 +74,7 @@ absl::optional alloc_rgb(size_t size) {
if (!data.b)
  return absl::nullopt;
  
@@ -82,21 +82,8 @@ index 9391d61ab..490ce2230 100644
  }
  
  void sycc_to_rgb(int offset,
-diff --git a/third_party/base/numerics/safe_conversions_impl.h 
b/third_party/base/numerics/safe_conversions_impl.h
-index 44c921a14..0152a89b7 100644
 a/third_party/base/numerics/safe_conversions_impl.h
-+++ b/third_party/base/numerics/safe_conversions_impl.h
-@@ -89,7 +89,7 @@ constexpr typename std::make_unsigned::type 
SafeUnsignedAbs(T value) {
- 
- // TODO(jschuh): Switch to std::is_constant_evaluated() once C++20 is 
supported.
- // Alternately, the usage could be restructured for "consteval if" in C++23.
--#define IsConstantEvaluated() (__builtin_is_constant_evaluated())
-+#define IsConstantEvaluated() (false)
- 
- // TODO(jschuh): Debug builds don't reliably propagate constants, so we 
restrict
- // some accelerated runtime paths to release builds until this can be forced
 diff --git 

[Libreoffice-commits] core.git: download.lst

[Thorsten Behrens (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8252568859e8296c36c6e4dbb291f208e5f8766c
Author: Thorsten Behrens 
AuthorDate: Wed Oct 11 10:00:26 2023 +0200
Commit: Caolán McNamara 
CommitDate: Wed Oct 11 12:46:09 2023 +0200

curl: upgrade to release 8.4.0

Fixes CVE-2023-38546 and CVE-2023-38545

Minor amount of bugfixes, nothing that immediately affects us. New
feature: IPFS protocols via HTTP gateway now supported, with the right
URL.

Change-Id: I24af4d17b570685081aa031c50a87bb8dcf1833d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157807
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 1325df09339e..26d9ab95c04a 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63
-CURL_TARBALL := curl-8.3.0.tar.xz
+CURL_SHA256SUM := 
16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d
+CURL_TARBALL := curl-8.4.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst external/openssl

[Taichi Haradaguchi (via logerrit)]

 download.lst   |4 ++--
 external/openssl/configurable-z-option.patch.0 |   14 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit d059aebd99f717d846e7746d5ff5b99d507a3160
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Sep 30 23:54:06 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Oct 3 12:32:14 2023 +0200

openssl: upgrade to release 3.0.11

Change-Id: I80c6fde3b6ae526f46b6bc346f09b287cc88b032
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157433
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index c22d6d8b2056..9f79c240847a 100644
--- a/download.lst
+++ b/download.lst
@@ -493,8 +493,8 @@ OPENLDAP_TARBALL := openldap-2.6.6.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENSSL_SHA256SUM := 
1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323
-OPENSSL_TARBALL := openssl-3.0.10.tar.gz
+OPENSSL_SHA256SUM := 
b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55
+OPENSSL_TARBALL := openssl-3.0.11.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/openssl/configurable-z-option.patch.0 
b/external/openssl/configurable-z-option.patch.0
index 9a4426edd5d2..d9478b6a9701 100644
--- a/external/openssl/configurable-z-option.patch.0
+++ b/external/openssl/configurable-z-option.patch.0
@@ -1,15 +1,15 @@
 Configurations/10-main.conf.sav2021-08-24 13:38:47.0 +
-+++ Configurations/10-main.conf2021-11-02 22:20:44.377653700 +
-@@ -13,7 +13,7 @@
+--- Configurations/10-main.conf.sav2023-09-19 22:02:31.0 +0900
 Configurations/10-main.conf2023-09-30 23:47:49.734377000 +0900
+@@ -14,7 +14,7 @@
  } elsif ($disabled{asm}) {
  # assembler is still used to compile uplink shim
  $vc_win64a_info = { AS=> "ml64",
 -ASFLAGS   => "/nologo /Zi",
 +ASFLAGS   => "/nologo $$(DEBUG_FLAGS_VALUE)",
  asflags   => "/c /Cp /Cx",
- asoutflag => "/Fo" };
- } else {
-@@ -41,7 +41,7 @@
+ asoutflag => "/Fo",
+ perlasm_scheme => "masm" };
+@@ -44,7 +44,7 @@
  } elsif ($disabled{asm}) {
  # not actually used, uplink shim is inlined into C code
  $vc_win32_info = { AS=> "ml",
@@ -18,7 +18,7 @@
 asflags   => "/Cp /coff /c /Cx",
 asoutflag => "/Fo",
 perlasm_scheme => "win32" };
-@@ -1323,10 +1323,10 @@
+@@ -1333,10 +1333,10 @@
  "UNICODE", "_UNICODE",
  "_CRT_SECURE_NO_DEPRECATE",
  "_WINSOCK_DEPRECATED_NO_WARNINGS"),

[Libreoffice-commits] core.git: download.lst

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 271491c338bd1f0faad627c8d43076e6e6d2a754
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 13 23:37:13 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Sep 29 01:53:06 2023 +0200

upgrade zlib to 1.3

Change-Id: I474d1f3bc0ae804bd579d32712ed9e2fba4e89e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157378
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index b5418e4a8862..c22d6d8b2056 100644
--- a/download.lst
+++ b/download.lst
@@ -625,8 +625,8 @@ XSLTML_TARBALL := 
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ZLIB_SHA256SUM := 
d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98
-ZLIB_TARBALL := zlib-1.2.13.tar.xz
+ZLIB_SHA256SUM := 
8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7
+ZLIB_TARBALL := zlib-1.3.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst external/liborcus

[Kohei Yoshida (via logerrit)]

 download.lst  |6 +--
 external/liborcus/Library_orcus-parser.mk |1 
 external/liborcus/Library_orcus.mk|   10 -
 external/liborcus/UnpackedTarball_liborcus.mk |2 -
 external/liborcus/fix-pch.patch.0 |   11 -
 external/liborcus/msvc-int-narrowing.patch.1  |   50 ++
 6 files changed, 62 insertions(+), 18 deletions(-)

New commits:
commit a593e018d4e3033ae95353a5ac3063a8c651a158
Author: Kohei Yoshida 
AuthorDate: Wed Sep 27 22:15:22 2023 -0400
Commit: Kohei Yoshida 
CommitDate: Fri Sep 29 01:46:30 2023 +0200

Upgrade liborcus to 0.19.0

Change-Id: I57b92a86a155f244742fd70b1ab9a1acbc206a29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157345
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/download.lst b/download.lst
index 7ded51ff5450..b5418e4a8862 100644
--- a/download.lst
+++ b/download.lst
@@ -498,8 +498,8 @@ OPENSSL_TARBALL := openssl-3.0.10.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ORCUS_SHA256SUM := 
6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb
-ORCUS_TARBALL := liborcus-0.18.1.tar.xz
+ORCUS_SHA256SUM := 
1b68f54bb08face4c3dc83c912d921373c44aed817b37d879b7a4e47f2f15e09
+ORCUS_TARBALL := liborcus-0.19.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
@@ -577,7 +577,7 @@ RHINO_TARBALL := 
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 # so that git cherry-pick
 # will not run into conflicts
 SKIA_SHA256SUM := 
2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01
-SKIA_TARBALL := skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 
+SKIA_TARBALL := skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/liborcus/Library_orcus-parser.mk 
b/external/liborcus/Library_orcus-parser.mk
index f26657756273..b7b459f36b7f 100644
--- a/external/liborcus/Library_orcus-parser.mk
+++ b/external/liborcus/Library_orcus-parser.mk
@@ -54,7 +54,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,orcus-parser,\
UnpackedTarball/liborcus/src/parser/json_parser_thread \
UnpackedTarball/liborcus/src/parser/parser_base \
UnpackedTarball/liborcus/src/parser/parser_global \
-   UnpackedTarball/liborcus/src/parser/pstring \
UnpackedTarball/liborcus/src/parser/sax_parser_base \
UnpackedTarball/liborcus/src/parser/sax_token_parser \
UnpackedTarball/liborcus/src/parser/sax_token_parser_thread \
diff --git a/external/liborcus/Library_orcus.mk 
b/external/liborcus/Library_orcus.mk
index 785cd440aab1..28ef13612260 100644
--- a/external/liborcus/Library_orcus.mk
+++ b/external/liborcus/Library_orcus.mk
@@ -62,11 +62,15 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,orcus,\
UnpackedTarball/liborcus/src/liborcus/gnumeric_cell_context \
UnpackedTarball/liborcus/src/liborcus/gnumeric_context \
UnpackedTarball/liborcus/src/liborcus/gnumeric_detection_handler \
+   UnpackedTarball/liborcus/src/liborcus/gnumeric_filter_context \
UnpackedTarball/liborcus/src/liborcus/gnumeric_handler \
-   UnpackedTarball/liborcus/src/liborcus/gnumeric_helper \
+   UnpackedTarball/liborcus/src/liborcus/gnumeric_names_context \
UnpackedTarball/liborcus/src/liborcus/gnumeric_namespace_types \
UnpackedTarball/liborcus/src/liborcus/gnumeric_sheet_context \
+   UnpackedTarball/liborcus/src/liborcus/gnumeric_styles_context \
UnpackedTarball/liborcus/src/liborcus/gnumeric_tokens \
+   UnpackedTarball/liborcus/src/liborcus/gnumeric_types \
+   UnpackedTarball/liborcus/src/liborcus/gnumeric_value_format_parser \
UnpackedTarball/liborcus/src/liborcus/info \
UnpackedTarball/liborcus/src/liborcus/interface \
UnpackedTarball/liborcus/src/liborcus/json_document_tree \
@@ -75,6 +79,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,orcus,\
UnpackedTarball/liborcus/src/liborcus/json_structure_tree \
UnpackedTarball/liborcus/src/liborcus/json_util \
UnpackedTarball/liborcus/src/liborcus/measurement \
+   UnpackedTarball/liborcus/src/liborcus/number_utils \
UnpackedTarball/liborcus/src/liborcus/odf_document_styles_context \
UnpackedTarball/liborcus/src/liborcus/odf_helper \
UnpackedTarball/liborcus/src/liborcus/odf_namespace_types \
@@ -114,7 +119,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,orcus,\
UnpackedTarball/liborcus/src/liborcus/string_helper \
UnpackedTarball/liborcus/src/liborcus/xlsx_autofilter_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_conditional_format_context \
-   UnpackedTarball/liborcus/src/liborcus/xlsx_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_drawing_context \

[Libreoffice-commits] core.git: download.lst external/curl

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 ++--
 external/curl/ExternalProject_curl.mk|   26 +-
 external/curl/UnpackedTarball_curl.mk|   12 
 external/curl/asan-poison-nsspem.patch.0 |   11 ---
 external/curl/curl-nss.patch.1   |   17 -
 5 files changed, 7 insertions(+), 63 deletions(-)

New commits:
commit c2930ebff82c4f7ffe8377ab82627131f8544226
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 13 18:25:13 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Wed Sep 27 06:08:20 2023 +0200

curl: upgrade to release 8.3.0

Fixes CVE-2023-38039

* NSS support was removed in this release, so NSS related patches are not 
necessary now.
* add configure options for curl.

Change-Id: I71e09bac3c69ce4b13deee770a32225f39f79c46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156917
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 20b9e5d754aa..7ded51ff5450 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894
-CURL_TARBALL := curl-8.2.1.tar.xz
+CURL_SHA256SUM := 
376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63
+CURL_TARBALL := curl-8.3.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index a4029c2fc4b2..5f72e4807394 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -10,21 +10,10 @@
 $(eval $(call gb_ExternalProject_ExternalProject,curl))
 
 $(eval $(call gb_ExternalProject_use_externals,curl,\
+   $(if $(ENABLE_OPENSSL),openssl) \
zlib \
 ))
 
-ifeq ($(TLS),NSS)
-$(eval $(call gb_ExternalProject_use_externals,curl,\
-   nss3 \
-))
-else
-ifeq ($(TLS),OPENSSL)
-$(eval $(call gb_ExternalProject_use_externals,curl,\
-   openssl \
-))
-endif
-endif
-
 $(eval $(call gb_ExternalProject_register_targets,curl,\
build \
 ))
@@ -41,18 +30,14 @@ curl_LDFLAGS += -L$(SYSBASE)/usr/lib
 endif
 endif
 
-# there are 2 include paths, the other one is passed to --with-nss below
-ifeq ($(SYSTEM_NSS),)
-curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss
-endif
-
 # use --with-secure-transport on macOS >10.5 and iOS to get a native UI for 
SSL certs for CMIS usage
-# use --with-nss/--with-openssl only on platforms other than macOS and iOS
+# use --with-openssl only on platforms other than macOS and iOS
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_Trace_StartRange,curl,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(gb_RUN_CONFIGURE) ./configure \
-   --without-nss --without-openssl --without-gnutls 
--without-mbedtls \
+   --without-amissl --without-bearssl --without-gnutls \
+   --without-mbedtls --without-rustls --without-wolfssl \
--enable-ftp --enable-http --enable-ipv6 \
--without-libidn2 --without-libpsl --without-librtmp \
--without-libssh2 --without-nghttp2 \
@@ -66,8 +51,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--disable-tftp  \
$(if $(filter iOS MACOSX,$(OS)),\
--with-secure-transport,\
-   $(if $(filter NSS,$(TLS)),--with-nss$(if 
$(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out") 
--with-nss-deprecated)) \
-   $(if $(filter 
OPENSSL,$(TLS)),--with-openssl$(if $(SYSTEM_OPENSSL),,="$(call 
gb_UnpackedTarball_get_dir,openssl)")) \
+   $(if $(ENABLE_OPENSSL),--with-openssl$(if 
$(SYSTEM_OPENSSL),,="$(call gb_UnpackedTarball_get_dir,openssl)"))) \
$(if $(filter LINUX,$(OS)),--without-ca-bundle 
--without-ca-path) \
$(gb_CONFIGURE_PLATFORMS) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index e78adabb8d07..4412857d36a0 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -27,22 +27,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/configurable-z-option.patch.0 \
 ))
 
-ifeq ($(SYSTEM_NSS),)
-$(eval $(call gb_UnpackedTarball_add_patches,curl,\
-   external/curl/curl-nss.patch.1 \
-))
-endif
-
 ifeq ($(OS)-$(COM_IS_CLANG),WNT-TRUE)
 $(eval $(call 

[Libreoffice-commits] core.git: download.lst external/poppler

[Michael Stahl (via logerrit)]

 download.lst  |4 ++--
 external/poppler/StaticLibrary_poppler.mk |6 +-
 external/poppler/disable-freetype.patch.1 |2 +-
 external/poppler/poppler-config.patch.1   |   27 +++
 4 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 3d31dfa9b99d0df5e400c1a6d7e8df6c46129b3c
Author: Michael Stahl 
AuthorDate: Mon Sep 25 15:50:43 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon Sep 25 17:06:25 2023 +0200

poppler: upgrade to release 23.09.0

Fixes CVE-2023-34872

Change-Id: I289b3016695a01aff7d393cb09d66cd726d9b592
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157247
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index decd950eace6..a046718e0151 100644
--- a/download.lst
+++ b/download.lst
@@ -463,8 +463,8 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
-POPPLER_TARBALL := poppler-23.06.0.tar.xz
+POPPLER_SHA256SUM := 
80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55
+POPPLER_TARBALL := poppler-23.09.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/StaticLibrary_poppler.mk 
b/external/poppler/StaticLibrary_poppler.mk
index c8c2e47c43d1..7b6f958245ac 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -13,7 +13,10 @@ $(eval $(call gb_StaticLibrary_use_unpacked,poppler,poppler))
 
 $(eval $(call 
gb_StaticLibrary_set_precompiled_header,poppler,external/poppler/inc/pch/precompiled_poppler))
 
-$(eval $(call gb_StaticLibrary_use_external,poppler,libjpeg))
+$(eval $(call gb_StaticLibrary_use_externals,poppler,\
+   libjpeg \
+   zlib \
+))
 
 $(eval $(call gb_StaticLibrary_set_warnings_disabled,poppler))
 
@@ -92,6 +95,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
UnpackedTarball/poppler/poppler/FDPDFDocBuilder \
UnpackedTarball/poppler/poppler/FILECacheLoader \
UnpackedTarball/poppler/poppler/FileSpec \
+   UnpackedTarball/poppler/poppler/FlateEncoder \
UnpackedTarball/poppler/poppler/FontEncodingTables \
UnpackedTarball/poppler/poppler/FontInfo \
UnpackedTarball/poppler/poppler/Form \
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index 77c643de40f5..3c4d1d0f7a8a 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -19,9 +19,9 @@ disable freetype dependent code
 -#include FT_FREETYPE_H
 +//#include 
 +//#include FT_FREETYPE_H
+ #include 
  
  // helper for using std::visit to get a dependent false for static_asserts
- // to help get compile errors if one ever extends variants
 @@ -2760,6 +2760,8 @@
  
  Form::AddFontResult Form::addFontToDefaultResources(const std::string 
, int faceIndex, const std::string , const std::string 
, bool forceName)
diff --git a/external/poppler/poppler-config.patch.1 
b/external/poppler/poppler-config.patch.1
index be8fc98556a7..8f71e987b2b9 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -2,7 +2,7 @@
 
 note: to get the 3rd one, use -DENABLE_CPP=on
 
-mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB=off -DENABLE_ZLIB_UNCOMPRESS=off 
-DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off 
-DENABLE_SPLASH=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off 
-DENABLE_QT6
+mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_GPGME=off 
-DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=off 
-DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off 
-DENABLE_QT6=off
 
 manually disabled these because cmake failed to do it:
 HAVE_CAIRO
@@ -37,9 +37,6 @@ index 0fbd336a..451213f8 100644
 +/* Do not hardcode the library location */
 +/* #undef ENABLE_RELOCATABLE */
 +
-+/* Build against zlib. */
-+/* #undef ENABLE_ZLIB */
-+
 +/* Use zlib instead of builtin zlib decoder to uncompress flate streams. */
 +/* #undef ENABLE_ZLIB_UNCOMPRESS */
 +
@@ -182,7 +179,7 @@ index 0fbd336a..451213f8 100644
 +#define PACKAGE_NAME "poppler"
 +
 +/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "poppler 23.06.0"
++#define PACKAGE_STRING 

[Libreoffice-commits] core.git: download.lst

[Michael Stahl (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3daab618c759be2b93ad337061ef347c76229a22
Author: Michael Stahl 
AuthorDate: Mon Sep 25 14:22:40 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon Sep 25 16:07:12 2023 +0200

libtommath: upgrade to release 1.2.1

Fixes CVE-2023-36328.

Change-Id: I1193f5df789c7dd10855e35936fc2697697c464e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157246
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 71ab2bd818d5..decd950eace6 100644
--- a/download.lst
+++ b/download.lst
@@ -334,8 +334,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTOMMATH_SHA256SUM := 
b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1
-LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
+LIBTOMMATH_SHA256SUM := 
986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f
+LIBTOMMATH_TARBALL := ltm-1.2.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst

[Caolán McNamara (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 39dc34d33bb01f595fbea214bf3ea315cea5f707
Author: Caolán McNamara 
AuthorDate: Thu Sep 14 08:23:53 2023 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 14 10:18:29 2023 +0200

tdf#157231 CVE-2023-4863 upgrade to libwebp-1.3.2.tar.gz

Change-Id: Ib60466a59069b59fa884654167f33ccc58e59330
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156906
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 8bdd7d7bf9ed..1c65320be412 100644
--- a/download.lst
+++ b/download.lst
@@ -339,8 +339,8 @@ LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBWEBP_SHA256SUM := 
b3779627c2dfd31e3d8c4485962c2efe17785ef975e2be5c8c0c9e6cd3c4ef66
-LIBWEBP_TARBALL := libwebp-1.3.1.tar.gz
+LIBWEBP_SHA256SUM := 
2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4
+LIBWEBP_TARBALL := libwebp-1.3.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst external/libgpg-error

[Taichi Haradaguchi (via logerrit)]

 download.lst  |4 -
 external/libgpg-error/ExternalPackage_libgpg-error.mk |2 
 external/libgpg-error/ExternalProject_libgpg-error.mk |5 -
 external/libgpg-error/UnpackedTarball_libgpg-error.mk |1 
 external/libgpg-error/w32-build-fixes-2.patch.1   |   24 +-
 external/libgpg-error/w32-build-fixes-3.patch.1   |   57 --
 external/libgpg-error/w32-build-fixes-5.patch |   70 +-
 7 files changed, 49 insertions(+), 114 deletions(-)

New commits:
commit 380348d7188fcdd9e5a4427771e1d226455bee9a
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Jan 6 20:55:53 2023 +0900
Commit: Thorsten Behrens 
CommitDate: Sat Sep 9 23:52:27 2023 +0200

libgpg-error: upgrade to release 1.47

* Remove external/libgpg-error/w32-build-fixes-3.patch.1, which has
  redundant contents with a part of 
external/libgpg-error/w32-build-fixes-5.patch.

Change-Id: I330b5f92717c1c5f6c0637940dfe7c3ac7e58b21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145169
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/download.lst b/download.lst
index 212077f775b6..8bdd7d7bf9ed 100644
--- a/download.lst
+++ b/download.lst
@@ -319,8 +319,8 @@ LIBFFI_TARBALL := libffi-3.3.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBGPGERROR_SHA256SUM := 
a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf
-LIBGPGERROR_TARBALL := libgpg-error-1.43.tar.bz2
+LIBGPGERROR_SHA256SUM := 
9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb
+LIBGPGERROR_TARBALL := libgpg-error-1.47.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk 
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index 7ee849d2369c..fd887fb5776d 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.32.1))
+$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.34.0))
 
 else ifeq ($(OS),MACOSX)
 
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk 
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index 055cd3cbe394..88b9b2be504a 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -39,9 +39,8 @@ $(call 
gb_ExternalProject_get_state_target,libgpg-error,build):
--disable-rpath \
--disable-languages \
--disable-doc \
-   CFLAGS=" $(CFLAGS) $(call 
gb_ExternalProject_get_build_flags,libgpg-error)" \
-   CPPFLAGS=" $(SOLARINC)" \
-   $(if $(filter MSC,$(COM)),--force_use_syscfg=true) \
+   CFLAGS="$(CFLAGS) $(call 
gb_ExternalProject_get_build_flags,libgpg-error)" \
+   CPPFLAGS="$(SOLARINC)" \
$(gb_CONFIGURE_PLATFORMS) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk 
b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index 72ff13069c76..698c41997326 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -16,7 +16,6 @@ $(eval $(call 
gb_UnpackedTarball_set_patchlevel,libgpg-error,0))
 $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \
$(if $(filter 
MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \
-   $(if $(filter 
MSC,$(COM)),external/libgpg-error/w32-build-fixes-3.patch.1) \
$(if $(filter 
MSC,$(COM)),external/libgpg-error/w32-disable-dllinit.patch.1) \
external/libgpg-error/w32-build-fixes-4.patch \
$(if $(filter 
MSC,$(COM)),external/libgpg-error/w32-build-fixes-5.patch) \
diff --git a/external/libgpg-error/w32-build-fixes-2.patch.1 
b/external/libgpg-error/w32-build-fixes-2.patch.1
index 0f8a8b36ef1c..5f2a7b925842 100644
--- a/external/libgpg-error/w32-build-fixes-2.patch.1
+++ b/external/libgpg-error/w32-build-fixes-2.patch.1
@@ -1,17 +1,7 @@
 diff -ru libgpg-error.orig/src/Makefile.in libgpg-error/src/Makefile.in
 libgpg-error.orig/src/Makefile.in  2017-09-12 08:18:29.376536700 +0200
-+++ libgpg-error/src/Makefile.in   2017-09-12 08:57:11.648083800 

[Libreoffice-commits] core.git: download.lst external/pdfium

[Miklos Vajna (via logerrit)]

 download.lst   |4 +-
 external/pdfium/Library_pdfium.mk  |8 -
 external/pdfium/build.patch.1  |   40 +++--
 external/pdfium/inc/pch/precompiled_pdfium.hxx |   19 ++-
 external/pdfium/ubsan.patch|   21 -
 5 files changed, 18 insertions(+), 74 deletions(-)

New commits:
commit 4afd83245b6ab2232032c74b1d242122fc734352
Author: Miklos Vajna 
AuthorDate: Mon Aug 14 19:59:32 2023 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 15 11:00:12 2023 +0200

Update pdfium to 5941

- Remove part of ubsan.patch, upstream switched to FXSYS_memcpy() in
  those two functions, which does the same length check as our patch
  did.

- Part of build.patch.1 doesn't apply anymore, remove the FXFT_Free()
  part and just assume that the new FT_Done_MM_Var() introduced in
  freetype-2.9 is something we can use unconditionally (at least the
  almalinux 8 has freetype-2.9.1).

Change-Id: I77efc9921e76957edbcb68e8f3861ab5194b31e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155678
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 15cffa81d5f9..4e3f1f3798be 100644
--- a/download.lst
+++ b/download.lst
@@ -438,8 +438,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PDFIUM_SHA256SUM := 
b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06
-PDFIUM_TARBALL := pdfium-5778.tar.bz2
+PDFIUM_SHA256SUM := 
9a9ce3f62de525cdfd8373a155ac549579c2c8067c6050716ca4b5cd5c11f655
+PDFIUM_TARBALL := pdfium-5941.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/pdfium/Library_pdfium.mk 
b/external/pdfium/Library_pdfium.mk
index bdab04c6861d..488c890da6ef 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -414,14 +414,12 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fxcrt/cfx_datetime \
 UnpackedTarball/pdfium/core/fxcrt/bytestring \
 UnpackedTarball/pdfium/core/fxcrt/cfx_bitstream \
-UnpackedTarball/pdfium/core/fxcrt/cfx_utf8decoder \
 UnpackedTarball/pdfium/core/fxcrt/fx_random \
 UnpackedTarball/pdfium/core/fxcrt/fx_string \
 UnpackedTarball/pdfium/core/fxcrt/widestring \
 UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssdata \
 UnpackedTarball/pdfium/core/fxcrt/fx_codepage \
 UnpackedTarball/pdfium/core/fxcrt/fx_number \
-UnpackedTarball/pdfium/core/fxcrt/cfx_utf8encoder \
 UnpackedTarball/pdfium/core/fxcrt/observed_ptr \
 UnpackedTarball/pdfium/core/fxcrt/string_data_template \
 UnpackedTarball/pdfium/core/fxcrt/binary_buffer \
@@ -436,7 +434,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fxge/dib/cfx_bitmapcomposer \
 UnpackedTarball/pdfium/core/fxge/dib/cfx_bitmapstorer \
-UnpackedTarball/pdfium/core/fxge/dib/cfx_dibextractor \
 UnpackedTarball/pdfium/core/fxge/dib/cfx_dibitmap \
 UnpackedTarball/pdfium/core/fxge/cfx_drawutils \
 UnpackedTarball/pdfium/core/fxge/dib/cfx_imagerenderer \
@@ -571,11 +568,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/third_party/base/memory/aligned_memory \
 ))
 
-# skia_shared
-$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
-UnpackedTarball/pdfium/third_party/skia_shared/SkFloatToDecimal \
-))
-
 $(eval $(call gb_Library_use_externals,pdfium,\
 libjpeg \
 lcms2 \
diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1
index 2c177b3b61a4..4853e4f90a45 100644
--- a/external/pdfium/build.patch.1
+++ b/external/pdfium/build.patch.1
@@ -60,7 +60,7 @@ diff --git a/core/fpdfdoc/cpdf_metadata.cpp 
b/core/fpdfdoc/cpdf_metadata.cpp
 index 228a0c137..bf512beb3 100644
 --- a/core/fpdfdoc/cpdf_metadata.cpp
 +++ b/core/fpdfdoc/cpdf_metadata.cpp
-@@ -77,7 +77,7 @@ std::vector 
CPDF_Metadata::CheckForSharedForm() const {
+@@ -87,7 +87,7 @@ std::vector 
CPDF_Metadata::CheckForSharedForm() const {
CFX_XMLParser parser(stream);
std::unique_ptr doc = parser.Parse();
if (!doc)
@@ -68,7 +68,7 @@ index 228a0c137..bf512beb3 100644
 +return std::vector();
  
std::vector unsupported;
-   CheckForSharedFormInternal(doc->GetRoot(), );
+   CheckForSharedFormInternal(/*depth=*/0, doc->GetRoot(), );
 diff --git a/core/fxcodec/jpx/cjpx_decoder.cpp 
b/core/fxcodec/jpx/cjpx_decoder.cpp
 index 9391d61ab..490ce2230 100644
 --- a/core/fxcodec/jpx/cjpx_decoder.cpp
@@ -82,36 +82,6 @@ index 9391d61ab..490ce2230 100644
  }
  
  void sycc_to_rgb(int offset,
-diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp
-index a2a44df39..d6cedee46 100644
 

[Libreoffice-commits] core.git: download.lst external/openldap

[Taichi Haradaguchi (via logerrit)]

 download.lst  |4 ++--
 external/openldap/UnpackedTarball_openldap.mk |2 --
 external/openldap/Wint-conversion.patch   |   11 ---
 external/openldap/configure-c99.patch |   11 ---
 external/openldap/openldap-2.4.44.patch.1 |2 +-
 5 files changed, 3 insertions(+), 27 deletions(-)

New commits:
commit af3e5bef6c4e6b3158a7ab5a97c22909a7a1faa5
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Aug 7 17:01:24 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Wed Aug 9 09:57:15 2023 +0200

openldap: upgrade to release 2.6.6

* remove Wint-conversion.patch and configure-c99.patch, which were fixed 
upstream.

Change-Id: Ia93b0190e60ab3420fe79c5446f22a1573b1ea6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155441
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 1a7a617d4e6b..15cffa81d5f9 100644
--- a/download.lst
+++ b/download.lst
@@ -418,8 +418,8 @@ OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENLDAP_SHA256SUM := 
d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
-OPENLDAP_TARBALL := openldap-2.6.4.tgz
+OPENLDAP_SHA256SUM := 
082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
+OPENLDAP_TARBALL := openldap-2.6.6.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/openldap/UnpackedTarball_openldap.mk 
b/external/openldap/UnpackedTarball_openldap.mk
index 98c88a28ccc5..61a083ddcd8a 100644
--- a/external/openldap/UnpackedTarball_openldap.mk
+++ b/external/openldap/UnpackedTarball_openldap.mk
@@ -20,8 +20,6 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,openldap,\
 
 $(eval $(call gb_UnpackedTarball_add_patches,openldap,\
external/openldap/openldap-2.4.44.patch.1 \
-   external/openldap/configure-c99.patch \
-   external/openldap/Wint-conversion.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/openldap/Wint-conversion.patch 
b/external/openldap/Wint-conversion.patch
deleted file mode 100644
index 60e14c991cc0..
--- a/external/openldap/Wint-conversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 configure
-+++ configure
-@@ -19241,7 +19241,7 @@
- int
- main ()
- {
--pthread_detach(NULL);
-+pthread_t t; pthread_detach(t);
-   ;
-   return 0;
- }
diff --git a/external/openldap/configure-c99.patch 
b/external/openldap/configure-c99.patch
deleted file mode 100644
index f1c3da6c4c23..
--- a/external/openldap/configure-c99.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 configure
-+++ configure
-@@ -14691,7 +14691,7 @@
- #include 
- #include 
- static char *pattern, *string;
--main()
-+int main()
- {
-   int rc;
-   regex_t re;
diff --git a/external/openldap/openldap-2.4.44.patch.1 
b/external/openldap/openldap-2.4.44.patch.1
index 1521e86a2664..2dfaf355afb0 100644
--- a/external/openldap/openldap-2.4.44.patch.1
+++ b/external/openldap/openldap-2.4.44.patch.1
@@ -11,7 +11,7 @@
  INSTALLDIRS= 
  
 @@ -32,7 +32,3 @@
-   $(RM) config.status libtool stamp-h stamp-h.in
+   $(RM) config.status libtool stamp-h stamp-h.in 
libraries/libldap/ldap.pc libraries/liblber/lber.pc
  
  distclean: veryclean FORCE
 -

[Libreoffice-commits] core.git: download.lst

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 72f28e12b15823197e42265af1f8dda21224c90a
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Aug 6 01:57:31 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Aug 6 07:53:37 2023 +0200

openssl: upgrade to release 3.0.10

Change-Id: Iee5716bdd111e2f30cb38d48a86104da52872dd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155382
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 1b8cc5531204..1a7a617d4e6b 100644
--- a/download.lst
+++ b/download.lst
@@ -423,8 +423,8 @@ OPENLDAP_TARBALL := openldap-2.6.4.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENSSL_SHA256SUM := 
eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90
-OPENSSL_TARBALL := openssl-3.0.9.tar.gz
+OPENSSL_SHA256SUM := 
1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323
+OPENSSL_TARBALL := openssl-3.0.10.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst

[Stephan Bergmann (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 85c07891ad9424661d8e1adb8e93364e3964ce34
Author: Stephan Bergmann 
AuthorDate: Mon Jul 31 21:34:49 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 1 08:20:06 2023 +0200

Update to curl-8.2.1.tar.xz

...obtained from 

Change-Id: I7260f79e2f72501869ff58c77f0d9dfa3ebdece1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155116
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/download.lst b/download.lst
index 0d5deef073aa..1b8cc5531204 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6
-CURL_TARBALL := curl-8.1.2.tar.xz
+CURL_SHA256SUM := 
dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894
+CURL_TARBALL := curl-8.2.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst external/harfbuzz

[Taichi Haradaguchi (via logerrit)]

 download.lst  |4 ++--
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |2 --
 external/harfbuzz/tdf137553.patch.1   |   16 
 3 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 21d0534d8ca6ec5362848fb29b6f1ead7d1643d6
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jul 9 13:56:23 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Wed Jul 12 02:20:53 2023 +0200

Upgrade Harfbuzz to 8.0.0

Change-Id: I04d81509c50f0335d201b5286460989f526b58f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154233
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 903cae0237e8..0d5deef073aa 100644
--- a/download.lst
+++ b/download.lst
@@ -222,8 +222,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb
-HARFBUZZ_TARBALL := harfbuzz-7.3.0.tar.xz
+HARFBUZZ_SHA256SUM := 
1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79
+HARFBUZZ_TARBALL := harfbuzz-8.0.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index b2e1f5145dc7..9bc9e326b426 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -15,9 +15,7 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,harfbuzz))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
-# https://github.com/harfbuzz/harfbuzz/pull/4314
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-   external/harfbuzz/tdf137553.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/tdf137553.patch.1 
b/external/harfbuzz/tdf137553.patch.1
deleted file mode 100644
index 807001e497b2..
--- a/external/harfbuzz/tdf137553.patch.1
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur harfbuzz.org/src/hb-graphite2.cc harfbuzz/src/hb-graphite2.cc
 harfbuzz.org/src/hb-graphite2.cc   2023-07-08 12:33:00
-+++ harfbuzz/src/hb-graphite2.cc   2023-07-08 12:37:46
-@@ -363,9 +363,10 @@
-   }
-   else
-   {
-+  auto origin_X = gr_slot_origin_X (is) * xscale;
-   c->advance = 0;
--  clusters[ci].advance += gr_slot_origin_X(is) * xscale - curradv;
--  curradv += clusters[ci].advance;
-+  clusters[ci].advance += origin_X - curradv;
-+  curradv = origin_X;
-   }
-   ci++;
- }

[Libreoffice-commits] core.git: download.lst external/libtommath

[Taichi Haradaguchi (via logerrit)]

 download.lst  |4 ++--
 external/libtommath/README|2 +-
 external/libtommath/UnpackedTarball_libtommath.mk |2 --
 external/libtommath/clang-cl.patch|   16 
 external/libtommath/libtommath-msvc.patch |   12 
 5 files changed, 3 insertions(+), 33 deletions(-)

New commits:
commit 13bc0489d98b1f49a4f82fccb89d640439db4f4e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 17:27:57 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Jul 11 14:05:49 2023 +0200

LibTomMath: upgrade to release 1.2.0

* external/libtommath/clang-cl.patch: removed "typedef unsigned __int128
mp_word" from tommmath.h
* external/libtommath/libtommath-msvc.patch: fixed upstream

Change-Id: I38fe730ff0e9649c6a0ad8d64b723a27e3434012
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153871
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 18cba62be184..903cae0237e8 100644
--- a/download.lst
+++ b/download.lst
@@ -329,8 +329,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
-LIBTOMMATH_TARBALL := ltm-1.0.zip
+LIBTOMMATH_SHA256SUM := 
b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1
+LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libtommath/README b/external/libtommath/README
index a028ff733161..41f91970a71b 100644
--- a/external/libtommath/README
+++ b/external/libtommath/README
@@ -3,4 +3,4 @@ integer library written entirely in C.
 
 Used by embedded firebird (external/firebird).
 
-https://www.libtom.net/LibTomMath/
+From [https://www.libtom.net/LibTomMath/].
diff --git a/external/libtommath/UnpackedTarball_libtommath.mk 
b/external/libtommath/UnpackedTarball_libtommath.mk
index bb0b9e352930..8961a46162c5 100644
--- a/external/libtommath/UnpackedTarball_libtommath.mk
+++ b/external/libtommath/UnpackedTarball_libtommath.mk
@@ -14,8 +14,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libtommath,$(LIBTOMMATH_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libtommath,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libtommath,\
-   external/libtommath/libtommath-msvc.patch \
-   external/libtommath/clang-cl.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libtommath/clang-cl.patch 
b/external/libtommath/clang-cl.patch
deleted file mode 100644
index 1cc92d380c62..
--- a/external/libtommath/clang-cl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 tommath.h
-+++ tommath.h
-@@ -15,6 +15,13 @@
- #ifndef BN_H_
- #define BN_H_
- 
-+// Work around clang-cl issue when mp_word is a typedef for unsigned 
__int128, see
-+//  "Clang-cl generates a call 
to an undefined symbol
-+// _udivti3":
-+#if defined _WIN32 && defined __clang__
-+#define MP_8BIT
-+#endif
-+
- #include 
- #include 
- #include 
diff --git a/external/libtommath/libtommath-msvc.patch 
b/external/libtommath/libtommath-msvc.patch
deleted file mode 100644
index 07884871aac9..
--- a/external/libtommath/libtommath-msvc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 makefile.msvc  2016-02-05 23:25:32.0 +0100
-+++ makefile.msvc  2016-07-21 11:34:20.618390100 +0200
-@@ -38,3 +38,9 @@
- 
- library: $(OBJECTS)
-   lib /out:tommath.lib $(OBJECTS)
-+
-+.cc.obj:
-+  $(CC) /nologo $(CFLAGS) /c $<
-+
-+.c.obj:
-+  $(CC) /nologo $(CFLAGS) /c $<

[Libreoffice-commits] core.git: download.lst external/libatomic_ops

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 ++--
 external/libatomic_ops/ExternalProject_libatomic_ops.mk |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 63a331b3118c62541dfec809b9cf35d258e78f2b
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 17:56:42 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Jul 4 02:11:02 2023 +0200

libatomic_ops: upgrade release to 7.8.0

use new configure option (--disable-gpl) added in 7.8.0
to skip building libatomic_ops_gpl.

Change-Id: If4b3b1994399099906b306fb2ea22fa47a87300b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153886
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index e77744b9ebbf..87821c543946 100644
--- a/download.lst
+++ b/download.lst
@@ -294,8 +294,8 @@ LIBASSUAN_TARBALL := libassuan-2.5.6.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBATOMIC_OPS_SHA256SUM := 
1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665
-LIBATOMIC_OPS_TARBALL := libatomic_ops-7.6.8.tar.gz
+LIBATOMIC_OPS_SHA256SUM := 
15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31
+LIBATOMIC_OPS_TARBALL := libatomic_ops-7.8.0.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libatomic_ops/ExternalProject_libatomic_ops.mk 
b/external/libatomic_ops/ExternalProject_libatomic_ops.mk
index 143eed2c075a..4f848f72 100644
--- a/external/libatomic_ops/ExternalProject_libatomic_ops.mk
+++ b/external/libatomic_ops/ExternalProject_libatomic_ops.mk
@@ -25,6 +25,7 @@ $(call 
gb_ExternalProject_get_state_target,libatomic_ops,build) :
CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) 
$(gb_VISIBILITY_FLAGS_CXX) $(call 
gb_ExternalProject_get_build_flags,libatomic_ops)" \
LDFLAGS="$(call 
gb_ExternalProject_get_link_flags,libatomic_ops)") \
$(gb_RUN_CONFIGURE) ./configure \
+   --disable-gpl \
$(gb_CONFIGURE_PLATFORMS) \
&& $(MAKE) \
)

[Libreoffice-commits] core.git: download.lst

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2c733d79d8d1ce630711c5b9bcceb2b6f99eb51a
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 22:01:59 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Jul 4 01:48:43 2023 +0200

libpng: upgrade to release 1.6.40

Change-Id: I2f366045097a6f063e26703b4132710573a40e65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153879
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 065875be0707..e77744b9ebbf 100644
--- a/download.lst
+++ b/download.lst
@@ -448,8 +448,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBPNG_SHA256SUM := 
1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937
-LIBPNG_TARBALL := libpng-1.6.39.tar.xz
+LIBPNG_SHA256SUM := 
535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1
+LIBPNG_TARBALL := libpng-1.6.40.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst external/libxslt

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 ++--
 external/libxslt/README |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 362dfc50a28a918ec73609a00d2851eb3058375d
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 18:38:33 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Jul 3 13:53:36 2023 +0200

libxslt: upgrade to release 1.1.38

Change-Id: I0534d7e02c9486b3d58f56e1a26fe6846b4a20b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153874
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 9b3b7692c869..065875be0707 100644
--- a/download.lst
+++ b/download.lst
@@ -350,8 +350,8 @@ LIBXML_TARBALL := 
libxml2-2.11.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXSLT_SHA256SUM := 
8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79
-LIBXSLT_VERSION_MICRO := 35
+LIBXSLT_SHA256SUM := 
1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1
+LIBXSLT_VERSION_MICRO := 38
 LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/external/libxslt/README b/external/libxslt/README
index dd69a9d732c3..2eb71661b903 100644
--- a/external/libxslt/README
+++ b/external/libxslt/README
@@ -1 +1 @@
-Gnome xslt library written in C, from [http://xmlsoft.org/xslt/]
+libxslt is an XSLT processor based on libxml2, from 
[https://gitlab.gnome.org/GNOME/libxslt/]

[Libreoffice-commits] core.git: download.lst external/harfbuzz

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 ++--
 external/harfbuzz/README |6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 8492195582a546b607bb15bc61adb64dcd74b904
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Jun 28 19:03:16 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Jul 1 07:10:25 2023 +0200

Upgrade Harfbuzz to 7.3.0

Release Notes:
https://github.com/harfbuzz/harfbuzz/releases/tag/7.2.0 (v7.2.0)
https://github.com/harfbuzz/harfbuzz/releases/tag/7.3.0 (v7.3.0)

Change-Id: I4f57b7e829f2356b5e2b442ff00df555121c0e66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153729
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 8504c86a4d87..9b3b7692c869 100644
--- a/download.lst
+++ b/download.lst
@@ -222,8 +222,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b
-HARFBUZZ_TARBALL := harfbuzz-7.1.0.tar.xz
+HARFBUZZ_SHA256SUM := 
20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb
+HARFBUZZ_TARBALL := harfbuzz-7.3.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/harfbuzz/README b/external/harfbuzz/README
index 149da5566ab9..557c0a724ce8 100644
--- a/external/harfbuzz/README
+++ b/external/harfbuzz/README
@@ -1 +1,5 @@
-HarfBuzz is an OpenType text shaping engine. From 
[https://harfbuzz.github.io/].
+HarfBuzz is an OpenType text shaping engine.
+
+From [https://harfbuzz.github.io/].
+
+Release archives at [https://github.com/harfbuzz/harfbuzz/releases].

[Libreoffice-commits] core.git: download.lst external/libwebp

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 +-
 external/libwebp/CVE-2023-1999.patch.1  |   52 
 external/libwebp/UnpackedTarball_libwebp.mk |1 
 3 files changed, 2 insertions(+), 55 deletions(-)

New commits:
commit c1fe534ae49e7e97b5965a5d1fbf910598215102
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Jul 1 11:56:32 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Jul 1 06:53:29 2023 +0200

upgrade libwebp to 1.3.1

Fixes CVE-2023-1999.

Change-Id: I3d0f5f718242977156729521d14efb1a8d71aee4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153819
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index ade9c5e5e737..8504c86a4d87 100644
--- a/download.lst
+++ b/download.lst
@@ -334,8 +334,8 @@ LIBTOMMATH_TARBALL := ltm-1.0.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBWEBP_SHA256SUM := 
64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c
-LIBWEBP_TARBALL := libwebp-1.3.0.tar.gz
+LIBWEBP_SHA256SUM := 
b3779627c2dfd31e3d8c4485962c2efe17785ef975e2be5c8c0c9e6cd3c4ef66
+LIBWEBP_TARBALL := libwebp-1.3.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libwebp/CVE-2023-1999.patch.1 
b/external/libwebp/CVE-2023-1999.patch.1
deleted file mode 100644
index 65c2cf75fb79..
--- a/external/libwebp/CVE-2023-1999.patch.1
+++ /dev/null
@@ -1,52 +0,0 @@
-From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001
-From: James Zern 
-Date: Wed, 22 Feb 2023 22:15:47 -0800
-Subject: [PATCH] EncodeAlphaInternal: clear result->bw on error
-
-This avoids a double free should the function fail prior to
-VP8BitWriterInit() and a previous trial result's buffer carried over.
-Previously in ApplyFiltersAndEncode() trial.bw (with a previous
-iteration's buffer) would be freed, followed by best.bw pointing to the
-same buffer.
-
-Since:
-187d379d add a fallback to ALPHA_NO_COMPRESSION
-
-In addition, check the return value of VP8BitWriterInit() in this
-function.
-
-Bug: webp:603
-Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910

- src/enc/alpha_enc.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c
-index f7c02690e3..7d205586fe 100644
 a/src/enc/alpha_enc.c
-+++ b/src/enc/alpha_enc.c
-@@ -13,6 +13,7 @@
- 
- #include 
- #include 
-+#include 
- 
- #include "src/enc/vp8i_enc.h"
- #include "src/dsp/dsp.h"
-@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, 
int width, int height,
-   }
- } else {
-   VP8LBitWriterWipeOut(_bw);
-+  memset(>bw, 0, sizeof(result->bw));
-   return 0;
- }
-   }
-@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, 
int width, int height,
-   header = method | (filter << 2);
-   if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4;
- 
--  VP8BitWriterInit(>bw, ALPHA_HEADER_LEN + output_size);
-+  if (!VP8BitWriterInit(>bw, ALPHA_HEADER_LEN + output_size)) ok = 0;
-   ok = ok && VP8BitWriterAppend(>bw, , ALPHA_HEADER_LEN);
-   ok = ok && VP8BitWriterAppend(>bw, output, output_size);
- 
diff --git a/external/libwebp/UnpackedTarball_libwebp.mk 
b/external/libwebp/UnpackedTarball_libwebp.mk
index 78761793174e..67f797157717 100644
--- a/external/libwebp/UnpackedTarball_libwebp.mk
+++ b/external/libwebp/UnpackedTarball_libwebp.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwebp,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libwebp,\
external/libwebp/Makefile.vc.patch \
-   external/libwebp/CVE-2023-1999.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:

[Libreoffice-commits] core.git: download.lst external/postgresql

[Taichi Haradaguchi (via logerrit)]

 download.lst   |4 ++--
 external/postgresql/README |6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit a815a1dbc765df464a36f120ff32c2a834c1fc8f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Jun 28 18:58:58 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Jun 30 10:05:54 2023 +0200

postgresql: upgrade to release 13.11

CVE-2023-2454 and CVE-2023-2455 don't affect LibreOffice.

Release Notes: https://www.postgresql.org/docs/release/13.11/

Change-Id: I1de521b6aa9af1e6d84ea794b0f4f5d62de377f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153728
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index c25d371f47e7..ade9c5e5e737 100644
--- a/download.lst
+++ b/download.lst
@@ -465,8 +465,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POSTGRESQL_SHA256SUM := 
5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2
-POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2
+POSTGRESQL_SHA256SUM := 
4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb
+POSTGRESQL_TARBALL := postgresql-13.11.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/postgresql/README b/external/postgresql/README
index edc3d5df2781..a04037993690 100644
--- a/external/postgresql/README
+++ b/external/postgresql/README
@@ -1,3 +1,7 @@
 PostgreSQL object-relational database management system
 
-We use some pieces of this code for the postgresql database connector.
\ No newline at end of file
+We use some pieces of this code for the postgresql database connector.
+
+From [https://www.postgresql.org/].
+
+Release archives at [https://www.postgresql.org/ftp/source/].

[Libreoffice-commits] core.git: download.lst

[Eike Rathke (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bc82afbfd320ecf5e7ed5dc87d1606b97dd10821
Author: Eike Rathke 
AuthorDate: Tue Jun 27 13:39:13 2023 +0200
Commit: Eike Rathke 
CommitDate: Tue Jun 27 16:56:29 2023 +0200

Update language-subtag-registry to 2023-05-11

Change-Id: Ieb1c3eab66c06c8e7b3d9751d9e4548dbd7efc04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153643
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/download.lst b/download.lst
index d38c37f48cf3..c25d371f47e7 100644
--- a/download.lst
+++ b/download.lst
@@ -279,8 +279,8 @@ LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LANGTAGREG_SHA256SUM := 
e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00
-LANGTAGREG_TARBALL := language-subtag-registry-2022-08-08.tar.bz2
+LANGTAGREG_SHA256SUM := 
9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da
+LANGTAGREG_TARBALL := language-subtag-registry-2023-05-11.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst external/gpgmepp

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 
 external/gpgmepp/0001-cpp-Fix-building-with-C-11.patch.1 |   72 ---
 external/gpgmepp/ExternalPackage_gpgmepp.mk  |4 
 external/gpgmepp/UnpackedTarball_gpgmepp.mk  |3 
 external/gpgmepp/gcc9.patch  |   10 --
 external/gpgmepp/macos-include.patch |   10 --
 external/gpgmepp/ubsan.patch |   12 --
 external/gpgmepp/w32-build-fixes.patch.1 |   24 ++---
 8 files changed, 20 insertions(+), 119 deletions(-)

New commits:
commit 97c67afac1ec9351d0a64011a7ddfb7dfa876484
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Jun 24 09:49:59 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Jun 26 16:53:40 2023 +0200

Update gpgme to 1.20.0

* remove external/gpgmepp/0001-cpp-Fix-building-with-C-11.patch.1
  and external/gpgmepp/gcc9.patch that were applied upstream.
* remove unneccesary external/gpgmepp/macos-include.patch.
* remove a bit of external/gpgmepp/w32-build-fixes.patch.1
  that was applied upstream.

Change-Id: I9982a3a47e62a5e06e3c04ddc3ee3f247eefa8ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153544
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi  <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 0ca3d6dfa325..fce7592c6370 100644
--- a/download.lst
+++ b/download.lst
@@ -212,8 +212,8 @@ GLM_TARBALL := glm-0.9.9.8.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-GPGME_SHA256SUM := 
361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
-GPGME_TARBALL := gpgme-1.18.0.tar.bz2
+GPGME_SHA256SUM := 
25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750
+GPGME_TARBALL := gpgme-1.20.0.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/gpgmepp/0001-cpp-Fix-building-with-C-11.patch.1 
b/external/gpgmepp/0001-cpp-Fix-building-with-C-11.patch.1
deleted file mode 100755
index c7b288d7240a..
--- a/external/gpgmepp/0001-cpp-Fix-building-with-C-11.patch.1
+++ /dev/null
@@ -1,72 +0,0 @@
-From f02c20cc9c5756690b07abfd02a43533547ba2ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= 
-Date: Fri, 19 Aug 2022 11:05:37 +0200
-Subject: [PATCH] cpp: Fix building with C++11
-
-* lang/cpp/src/importresult.cpp (ImportResult::mergeWith): Replace
-'auto' in lambdas with the actual type.
---
-
-Generic lambdas require C++14.
-
-GnuPG-bug-id: 6141

- lang/cpp/src/importresult.cpp | 14 +++---
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/lang/cpp/src/importresult.cpp b/lang/cpp/src/importresult.cpp
-index 06258729..0a7ad03d 100644
 a/lang/cpp/src/importresult.cpp
-+++ b/lang/cpp/src/importresult.cpp
-@@ -152,17 +152,17 @@ void GpgME::ImportResult::mergeWith(const ImportResult 
)
- }
- // was this key also considered during the first import
- const auto consideredInFirstImports =
--std::any_of(std::begin(d->imports), std::end(d->imports), 
[fpr](const auto i) {
-+std::any_of(std::begin(d->imports), std::end(d->imports), 
[fpr](const gpgme_import_status_t i) {
- return i->fpr && !strcmp(i->fpr, fpr);
- });
- // did we see this key already in the list of keys of the other import
- const auto consideredInPreviousOtherImports =
--std::any_of(std::begin(other.d->imports), it, [fpr](const auto i) 
{
-+std::any_of(std::begin(other.d->imports), it, [fpr](const 
gpgme_import_status_t i) {
- return i->fpr && !strcmp(i->fpr, fpr);
- });
- // was anything added to this key during the other import
- const auto changedInOtherImports =
--std::any_of(std::begin(other.d->imports), 
std::end(other.d->imports), [fpr](const auto i) {
-+std::any_of(std::begin(other.d->imports), 
std::end(other.d->imports), [fpr](const gpgme_import_status_t i) {
- return i->fpr && !strcmp(i->fpr, fpr) && (i->status != 0);
- });
- if (consideredInFirstImports && !consideredInPreviousOtherImports) {
-@@ -177,15 +177,15 @@ void GpgME::ImportResult::mergeWith(const ImportResult 
)
- 
- // now do the same for the secret key counts
- const auto secretKeyConsideredInFirstImports =
--std::any_of(std::begin(d->imports), std::end(d->imports), 
[fpr](const auto i) {
-+std::any_of(std::begin(d->imports), std::end(d->imports), 
[fpr](const gpgme_import_status_t i) {
- return i->fpr && !strcmp(i->fpr, fpr) && (i->status & 
GPGME_IMPORT_SECRET);
- });
- const auto secretKeyConsideredInPreviousOtherImports =
--std::any_of(std::begin(other.d->imports), it, [fpr](const auto i) 
{
-+   

[Libreoffice-commits] core.git: download.lst external/libassuan

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 ++--
 external/libassuan/ExternalPackage_libassuan.mk |2 +-
 external/libassuan/w32-build-fixes.patch.1  |   14 --
 3 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit 88019e3ac34e35c193df0ae682722f6ec3ba5133
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Jun 24 10:18:55 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Jun 24 05:29:19 2023 +0200

Update libassuan to 2.5.6

Change-Id: Iea5af01231e67c24d34287929a54f5ec86af47ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153545
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi  <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 536f73bb6b4f..16c58a1c13c9 100644
--- a/download.lst
+++ b/download.lst
@@ -289,8 +289,8 @@ LCMS2_TARBALL := lcms2-2.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBASSUAN_SHA256SUM := 
8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
-LIBASSUAN_TARBALL := libassuan-2.5.5.tar.bz2
+LIBASSUAN_SHA256SUM := 
e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426
+LIBASSUAN_TARBALL := libassuan-2.5.6.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libassuan/ExternalPackage_libassuan.mk 
b/external/libassuan/ExternalPackage_libassuan.mk
index 0f24e5e2dec4..2df7b562d584 100644
--- a/external/libassuan/ExternalPackage_libassuan.mk
+++ b/external/libassuan/ExternalPackage_libassuan.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.5))
+$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.6))
 
 else ifeq ($(OS),MACOSX)
 
diff --git a/external/libassuan/w32-build-fixes.patch.1 
b/external/libassuan/w32-build-fixes.patch.1
index ebf98c5f5093..8d77eef37cd5 100644
--- a/external/libassuan/w32-build-fixes.patch.1
+++ b/external/libassuan/w32-build-fixes.patch.1
@@ -33,20 +33,6 @@ diff -ru libassuan.orig/src/Makefile.am 
libassuan/src/Makefile.am
   `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
   sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
  
-@@ -148,10 +148,10 @@
-   $(DESTDIR)$(bindir)/gpgcedev.dll
- endif
- 
-+mkheader$(EXEEXT): mkheader.c Makefile
--mkheader: mkheader.c Makefile
-   $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \
-   $(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
- 
-+assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h)
-+  ./mkheader$(EXEEXT) $(host_os) $(srcdir)/assuan.h.in \
--assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
--  ./mkheader $(host_os) $(srcdir)/assuan.h.in \
-$(PACKAGE_VERSION) $(VERSION_NUMBER) >$@
 diff -ru libassuan.orig/src/assuan-handler.c libassuan/src/assuan-handler.c
 --- libassuan.orig/src/assuan-handler.c 2016-06-25 16:27:49.0 +0200
 +++ libassuan/src/assuan-handler.c  2017-09-24 15:32:51.200956200 +0200

[Libreoffice-commits] core.git: download.lst external/poppler

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 -
 external/poppler/README  |2 
 external/poppler/UnpackedTarball_poppler.mk  |1 
 external/poppler/disable-freetype.patch.1|   18 ++---
 external/poppler/disable-nss-and-gpgmepp.patch.1 |   76 +++
 external/poppler/gcc7-EntityInfo.patch.1 |   43 +++--
 external/poppler/inc/pch/precompiled_poppler.hxx |   30 -
 external/poppler/poppler-config.patch.1  |   27 +---
 8 files changed, 161 insertions(+), 40 deletions(-)

New commits:
commit 27e1c198a504deb4634f5f6673a77b5944c9f8cc
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Jun 14 09:58:15 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Wed Jun 21 00:18:53 2023 +0200

poppler: upgrade to release 23.06.0

Add external/poppler/disable-nss-and-gpgmepp.patch.1 to get rid of
some code that requires NSS or GPGMEPP.

Update external/poppler/inc/pch/precompiled_poppler.hxx.

Change-Id: I5e61371776c64962452022516446b5079c3840e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153097
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index b0cfdf278d08..fc3a240f5f94 100644
--- a/download.lst
+++ b/download.lst
@@ -458,8 +458,8 @@ LIBTIFF_TARBALL := tiff-4.5.0rc3.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4
-POPPLER_TARBALL := poppler-23.03.0.tar.xz
+POPPLER_SHA256SUM := 
d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
+POPPLER_TARBALL := poppler-23.06.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/README b/external/poppler/README
index 35a640264618..08d3612c3542 100644
--- a/external/poppler/README
+++ b/external/poppler/README
@@ -1 +1 @@
-From [http://poppler.freedesktop.org/]. Not modified.  PDF rendering library 
based on the xpdf-3.0 code base. 
+From [https://poppler.freedesktop.org/]. Not modified.  PDF rendering library 
based on the xpdf-3.0 code base.
diff --git a/external/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
index 6cbed9e103ec..73265d8ec65b 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,poppler,0))
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/char_traits.patch \
external/poppler/disable-freetype.patch.1 \
+   external/poppler/disable-nss-and-gpgmepp.patch.1 \
external/poppler/gcc7-EntityInfo.patch.1 \
external/poppler/gcc7-GfxFont.patch.1 \
external/poppler/poppler-config.patch.1 \
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index 710742206925..77c643de40f5 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -1,8 +1,8 @@
 disable freetype dependent code
 
 poppler/poppler/Form.cc.orig   2022-09-14 15:46:48.588316681 +0200
-+++ poppler/poppler/Form.cc2022-09-14 15:48:01.468274551 +0200
-@@ -46,7 +46,7 @@
+--- poppler/poppler/Form.cc.orig   2023-06-05 19:29:14.0 +0900
 poppler/poppler/Form.cc2023-06-14 18:50:22.232312300 +0900
+@@ -48,7 +48,7 @@
  #include 
  #include 
  #include 
@@ -11,7 +11,7 @@ disable freetype dependent code
  #include "goo/gmem.h"
  #include "goo/gfile.h"
  #include "goo/GooString.h"
-@@ -77,8 +77,8 @@
+@@ -78,8 +78,8 @@
  #include "fofi/FoFiTrueType.h"
  #include "fofi/FoFiIdentifier.h"
  
@@ -20,18 +20,18 @@ disable freetype dependent code
 +//#include 
 +//#include FT_FREETYPE_H
  
- // return a newly allocated char* containing an UTF16BE string of size length
- char *pdfDocEncodingToUTF16(const std::string , int *length)
-@@ -2743,6 +2743,8 @@
+ // helper for using std::visit to get a dependent false for static_asserts
+ // to help get compile errors if one ever extends variants
+@@ -2760,6 +2760,8 @@
  
- Form::AddFontResult Form::addFontToDefaultResources(const std::string 
, int faceIndex, const std::string , const std::string 
)
+ Form::AddFontResult Form::addFontToDefaultResources(const std::string 
, int faceIndex, const std::string , const std::string 
, bool forceName)
  {
 +return {};
 +#if 0
  if (!GooString::endsWith(filepath, ".ttf") && 
!GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath, 
".otf")) {
  error(errIO, -1, "We only support embedding ttf/ttc/otf fonts for 
now. The font file for {0:s} {1:s} was {2:s}", fontFamily.c_str(), 
fontStyle.c_str(), filepath.c_str());
  return 

[Libreoffice-commits] core.git: download.lst

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3f6bb9565d4edce563dbd938c655ae853926d362
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Jun 15 07:09:06 2023 +0900
Commit: Michael Stahl 
CommitDate: Thu Jun 15 11:44:23 2023 +0200

nss: upgrade to release 3.90

Change-Id: Ic446f33abd5355886b8c8c181a088c07ea4605c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153096
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index ac149a0d3873..80edf6a84a49 100644
--- a/download.lst
+++ b/download.lst
@@ -392,8 +392,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a
-NSS_TARBALL := nss-3.88.1-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739
+NSS_TARBALL := nss-3.90-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst external/openssl

[Taichi Haradaguchi (via logerrit)]

 download.lst   
|4 
 
external/openssl/0001-x509-excessive-resource-use-verifying-policy-constra.patch.1
 |  221 --
 external/openssl/README
|2 
 external/openssl/UnpackedTarball_openssl.mk
|2 
 external/openssl/openssl-no-_umul128-on-aarch64.patch.1
|   58 --
 5 files changed, 3 insertions(+), 284 deletions(-)

New commits:
commit 2137d04d1ddb80691c29de0df99fc2ba58820ce0
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jun 11 17:36:54 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Jun 13 08:36:22 2023 +0200

openssl: upgrade to release 3.0.9

Fixes CVE-2023-1255, CVE-2023-2650 and 3 more CVEs that
probably don't affect LibreOffice.

Change-Id: Ic615b008298471267121a0f4deb227ddb3a0409e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152851
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi  <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 4ceea56e14a2..ac149a0d3873 100644
--- a/download.lst
+++ b/download.lst
@@ -418,8 +418,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENSSL_SHA256SUM := 
6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e
-OPENSSL_TARBALL := openssl-3.0.8.tar.gz
+OPENSSL_SHA256SUM := 
eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90
+OPENSSL_TARBALL := openssl-3.0.9.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/openssl/0001-x509-excessive-resource-use-verifying-policy-constra.patch.1
 
b/external/openssl/0001-x509-excessive-resource-use-verifying-policy-constra.patch.1
deleted file mode 100644
index d96d1d76883e..
--- 
a/external/openssl/0001-x509-excessive-resource-use-verifying-policy-constra.patch.1
+++ /dev/null
@@ -1,221 +0,0 @@
-From 959c59c7a0164117e7f8366466a32bb1f8d77ff1 Mon Sep 17 00:00:00 2001
-From: Pauli 
-Date: Wed, 8 Mar 2023 15:28:20 +1100
-Subject: [PATCH] x509: excessive resource use verifying policy constraints
-
-A security vulnerability has been identified in all supported versions
-of OpenSSL related to the verification of X.509 certificate chains
-that include policy constraints.  Attackers may be able to exploit this
-vulnerability by creating a malicious certificate chain that triggers
-exponential use of computational resources, leading to a denial-of-service
-(DoS) attack on affected systems.
-
-Fixes CVE-2023-0464
-
-Reviewed-by: Tomas Mraz 
-Reviewed-by: Shane Lontis 
-(Merged from https://github.com/openssl/openssl/pull/20568)

- crypto/x509/pcy_local.h |  8 +++-
- crypto/x509/pcy_node.c  | 12 +---
- crypto/x509/pcy_tree.c  | 36 ++--
- 3 files changed, 42 insertions(+), 14 deletions(-)
-
-diff --git a/crypto/x509/pcy_local.h b/crypto/x509/pcy_local.h
-index 18b53cc09e..cba107ca03 100644
 a/crypto/x509/pcy_local.h
-+++ b/crypto/x509/pcy_local.h
-@@ -111,6 +111,11 @@ struct X509_POLICY_LEVEL_st {
- };
- 
- struct X509_POLICY_TREE_st {
-+/* The number of nodes in the tree */
-+size_t node_count;
-+/* The maximum number of nodes in the tree */
-+size_t node_maximum;
-+
- /* This is the tree 'level' data */
- X509_POLICY_LEVEL *levels;
- int nlevel;
-@@ -157,7 +162,8 @@ X509_POLICY_NODE 
*ossl_policy_tree_find_sk(STACK_OF(X509_POLICY_NODE) *sk,
- X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
-  X509_POLICY_DATA *data,
-  X509_POLICY_NODE *parent,
-- X509_POLICY_TREE *tree);
-+ X509_POLICY_TREE *tree,
-+ int extra_data);
- void ossl_policy_node_free(X509_POLICY_NODE *node);
- int ossl_policy_node_match(const X509_POLICY_LEVEL *lvl,
-const X509_POLICY_NODE *node, const ASN1_OBJECT 
*oid);
-diff --git a/crypto/x509/pcy_node.c b/crypto/x509/pcy_node.c
-index 9d9a7ea179..450f95a655 100644
 a/crypto/x509/pcy_node.c
-+++ b/crypto/x509/pcy_node.c
-@@ -59,10 +59,15 @@ X509_POLICY_NODE *ossl_policy_level_find_node(const 
X509_POLICY_LEVEL *level,
- X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
-  X509_POLICY_DATA *data,
-  X509_POLICY_NODE *parent,
-- X509_POLICY_TREE *tree)
-+ X509_POLICY_TREE *tree,
-+ int extra_data)
- {
- X509_POLICY_NODE *node;
- 
-+/* 

[Libreoffice-commits] core.git: download.lst external/curl

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 ++--
 external/curl/README |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dc19ef0d42e89edffcc21795194eb1eeb5957d0f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Jun 10 15:57:28 2023 +0900
Commit: Michael Stahl 
CommitDate: Mon Jun 12 11:17:05 2023 +0200

curl: upgrade to release 8.1.2

Fixes CVE-2023-28321, CVE-2023-28322, and 2 more CVEs that
probably don't affect LibreOffice

Change-Id: If8720ba3647216063bffc8678aa64dad9a317128
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152809
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi  <20001...@ymail.ne.jp>
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index fb5226385dee..4ceea56e14a2 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0
-CURL_TARBALL := curl-8.0.1.tar.xz
+CURL_SHA256SUM := 
31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6
+CURL_TARBALL := curl-8.1.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/curl/README b/external/curl/README
index 292e4edf57b6..8dab66f98296 100644
--- a/external/curl/README
+++ b/external/curl/README
@@ -1 +1 @@
-A URL manipulation engine from [http://curl.haxx.se/].
+A URL manipulation engine from [https://curl.haxx.se/].