core.git: Branch 'libreoffice-26-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit afe6cac3b0b216bf1216ac898640829924e6b2fc Author: Xisco Fauli AuthorDate: Tue Feb 10 09:11:33 2026 +0100 Commit: Xisco Fauli CommitDate: Tue Feb 10 13:48:53 2026 +0100 libpng: upgrade to 1.6.55 Downloaded from https://sourceforge.net/projects/libpng/files/libpng16/1.6.55/libpng-1.6.55.tar.xz/download Change-Id: Ieef76e5e408add87ffdccfbfacbedc3ef58a5aea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199022 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit e8572b7d946834c0f7775b0489327f7b9f62c69d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199051 Reviewed-by: Michael Stahl diff --git a/download.lst b/download.lst index 72ecff4fc202..bcaa8863d479 100644 --- a/download.lst +++ b/download.lst @@ -589,8 +589,8 @@ PIXMAN_TARBALL := pixman-0.46.4.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 01c9d8a303c941ec2c511c14312a3b1d36cedb41e2f5168ccdaa85d53b887805 -LIBPNG_TARBALL := libpng-1.6.54.tar.xz +LIBPNG_SHA256SUM := d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d +LIBPNG_TARBALL := libpng-1.6.55.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
core.git: Branch 'libreoffice-26-2' - download.lst external/poppler sdext/source
download.lst |4 -
external/poppler/disable-freetype.patch.1 | 40 +-
external/poppler/poppler-config.patch.1 | 12 ++---
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 22 +
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 21 +
5 files changed, 69 insertions(+), 30 deletions(-)
New commits:
commit 340eedb564dcfc7ecdc5baa8a80a44cf0744622d
Author: Xisco Fauli
AuthorDate: Fri Feb 6 00:53:12 2026 +0100
Commit: Caolán McNamara
CommitDate: Tue Feb 10 11:26:12 2026 +0100
poppler: upgrade to 26.02.0
* external/poppler/missinginclude.patch has been fixed upstream
Downloaded from https://poppler.freedesktop.org/poppler-26.02.0.tar.x
Change-Id: I7641b7b544e853a86563dbe312af4b36444dea8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198803
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198958
Reviewed-by: Caolán McNamara
diff --git a/download.lst b/download.lst
index 15d422a08c65..72ecff4fc202 100644
--- a/download.lst
+++ b/download.lst
@@ -599,8 +599,8 @@ LIBTIFF_TARBALL := tiff-4.7.1.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-POPPLER_SHA256SUM :=
1cb944a4b88847f5fb6551683bc799db59f04990f5d8be07aba2acbf38601089
-POPPLER_TARBALL := poppler-26.01.0.tar.xz
+POPPLER_SHA256SUM :=
dded8621f7b2f695c91063aab1558691c8418374cd583501e89ed39487e7ab77
+POPPLER_TARBALL := poppler-26.02.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-freetype.patch.1
b/external/poppler/disable-freetype.patch.1
index 98e00cd4b406..49a76ec41426 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -32,25 +32,25 @@ disable freetype dependent code
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 @@
+@@ -2974,6 +2974,7 @@
}
- return { dictFontName, fontDictRef };
+ return { .fontName = dictFontName, .ref = fontDictRef };
+#endif
}
std::string Form::getFallbackFontForChar(Unicode uChar, const GfxFont
&fontToEmulate) const
--- poppler/splash/SplashFontEngine.cc.orig2024-02-21 01:28:10.479645185
+
+++ popller/splash/SplashFontEngine.cc 2023-09-05 22:15:14.0 +0100
-@@ -66,7 +66,7 @@
+@@ -59,8 +59,6 @@
+ for (auto *font : fontCache) {
delete font;
}
-
+-
-delete ftEngine;
-+//delete ftEngine;
}
- SplashFontFile *SplashFontEngine::getFontFile(const SplashFontFileID &id)
+ std::shared_ptr SplashFontEngine::getFontFile(const
SplashFontFileID &id)
--- poppler/splash/SplashFTFontEngine.h.orig 2023-09-05 22:15:14.0
+0100
+++ poppler/splash/SplashFTFontEngine.h2024-02-21 13:53:29.715423742
+
@@ -27,8 +27,6 @@
@@ -71,23 +71,23 @@ disable freetype dependent code
~SplashFTFontEngine();
-@@ -51,22 +49,20 @@
+@@ -49,22 +49,20 @@
SplashFTFontEngine &operator=(const SplashFTFontEngine &) = delete;
// Load fonts.
--SplashFontFile *loadType1Font(std::unique_ptr idA,
SplashFontSrc *src, const char **enc, int faceIndex);
--SplashFontFile *loadType1CFont(std::unique_ptr idA,
SplashFontSrc *src, const char **enc, int faceIndex);
--SplashFontFile *loadOpenTypeT1CFont(std::unique_ptr
idA, SplashFontSrc *src, const char **enc, int faceIndex);
--SplashFontFile *loadCIDFont(std::unique_ptr idA,
SplashFontSrc *src, int faceIndex);
--SplashFontFile *loadOpenTypeCFFFont(std::unique_ptr
idA, SplashFontSrc *src, std::vector &&codeToGID, int faceIndex);
--SplashFontFile *loadTrueTypeFont(std::unique_ptr idA,
SplashFontSrc *src, std::vector &&codeToGID, int faceIndex);
-+SplashFontFile *loadType1Font(std::unique_ptr idA,
SplashFontSrc *src, const char **enc, int faceIndex) { return nullptr; };
-+SplashFontFile *loadType1CFont(std::unique_ptr idA,
SplashFontSrc *src, const char **enc, int faceIndex) { return nullptr; };
-+SplashFontFile *loadOpenTypeT1CFont(std::unique_ptr
idA, SplashFontSrc *src, const char **enc, int faceIndex) { return nullptr; };
-+SplashFontFile *loadCIDFont(std::unique_ptr idA,
SplashFontSrc *src, int faceIndex) { return nullptr; };
-+SplashFontFile *loadOpenTypeCFFFont(std::unique_ptr
idA, SplashFontSrc *src, std::vector &&codeToGID, int faceIndex) { return
nullptr; };
-+SplashFontFile *loadTrueTypeFont(std::unique_ptr id
core.git: Branch 'libreoffice-26-2' - download.lst external/expat
download.lst |4 ++-- external/expat/expat-winapi.patch |5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) New commits: commit cef1891dda3b3d3148725e905953799a8b59051a Author: Xisco Fauli AuthorDate: Mon Feb 2 10:28:30 2026 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon Feb 2 14:45:13 2026 +0100 expat: upgrade to 2.7.4 Downloaded from https://github.com/libexpat/libexpat/releases/download/R_2_7_4/expat-2.7.4.tar.xz Change-Id: I7058df85bf0fbac6608b83967b635382859e4db6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198521 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 79631c2369df3dcd858abd725bb1c7fd1459652b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198531 Reviewed-by: Adolfo Jayme Barrientos diff --git a/download.lst b/download.lst index 03425972ae5f..15d422a08c65 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 := 71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f -EXPAT_TARBALL := expat-2.7.3.tar.xz +EXPAT_SHA256SUM := 9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0 +EXPAT_TARBALL := expat-2.7.4.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/expat/expat-winapi.patch b/external/expat/expat-winapi.patch index 5cef970a2bf2..8abe65ae7cf1 100644 --- a/external/expat/expat-winapi.patch +++ b/external/expat/expat-winapi.patch @@ -1,11 +1,10 @@ --- misc/expat-2.5.0/lib/expat_external.h 2022-10-25 01:32:54.0 +0900 +++ misc/build/expat-2.5.0/lib/expat_external.h2022-10-30 23:09:47.339459134 +0900 -@@ -88,11 +88,6 @@ +@@ -88,10 +88,6 @@ #ifndef XML_BUILDING_EXPAT /* using Expat from an application */ --# if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) \ -- && ! defined(__CYGWIN__) +-# if defined(_MSC_VER) && ! defined(__BEOS__) && ! defined(__CYGWIN__) -#define XMLIMPORT __declspec(dllimport) -# endif -
core.git: Branch 'libreoffice-26-2' - download.lst external/openldap
download.lst |4 +-
external/openldap/0001-const-up-oids.patch.1 | 44 --
external/openldap/UnpackedTarball_openldap.mk |1
3 files changed, 2 insertions(+), 47 deletions(-)
New commits:
commit 15f2dd93b0c39f46c81db026fb1b7b7c8931e062
Author: Xisco Fauli
AuthorDate: Fri Jan 30 09:39:52 2026 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Sun Feb 1 04:25:56 2026 +0100
openldap: upgrade to 2.6.12
* 0001-const-up-oids.patch.1 has been fixed upstream
Downloaded from
https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.6.12.tgz
Change-Id: I253858a6f7b60218f30352ec751cd18fa6dfdf09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198401
Reviewed-by: Xisco Fauli
Tested-by: Jenkins
(cherry picked from commit 0e38fd3a3f2453048b68a24c5af3dd0534ab5b66)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198409
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/download.lst b/download.lst
index 1ed4d7f6afbc..03425972ae5f 100644
--- a/download.lst
+++ b/download.lst
@@ -549,8 +549,8 @@ ONLINEUPDATE_TARBALL :=
onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.
# three static lines
# so that git cherry-pick
# will not run into conflicts
-OPENLDAP_SHA256SUM :=
c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516
-OPENLDAP_TARBALL := openldap-2.6.10.tgz
+OPENLDAP_SHA256SUM :=
1716ad779e85d743694c3e3b05277fb71b6a5eadca43c7a958aa62683b22208e
+OPENLDAP_TARBALL := openldap-2.6.12.tgz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/openldap/0001-const-up-oids.patch.1
b/external/openldap/0001-const-up-oids.patch.1
deleted file mode 100644
index 53d6df075325..
--- a/external/openldap/0001-const-up-oids.patch.1
+++ /dev/null
@@ -1,44 +0,0 @@
-From c7571ffd4d17825a9054e2e204ee61127bedb0b0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?=
-Date: Sat, 26 Jul 2025 21:00:50 +0100
-Subject: [PATCH] const up oids
-
-to move it out of the .data section
- libraries/libldap/tls2.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index 1bda3fb2aa..1fb878aab8 100644
a/libraries/libldap/tls2.c
-+++ b/libraries/libldap/tls2.c
-@@ -51,7 +51,7 @@ typedef struct oid_name {
- struct berval name;
- } oid_name;
-
--static oid_name oids[] = {
-+static const oid_name oids[] = {
- { BER_BVC("2.5.4.3"), BER_BVC("cn") },
- { BER_BVC("2.5.4.4"), BER_BVC("sn") },
- { BER_BVC("2.5.4.6"), BER_BVC("c") },
-@@ -1394,7 +1394,7 @@ ldap_start_tls_s ( LDAP *ld,
- #define LBER_TAG_UNIVERSAL ((ber_tag_t) 0x1cUL)
- #define LBER_TAG_BMP((ber_tag_t) 0x1eUL)
-
--static oid_name *
-+static const oid_name *
- find_oid( struct berval *oid )
- {
- int i;
-@@ -1519,7 +1519,7 @@ ldap_X509dn2bv( void *x509_name, struct berval *bv,
LDAPDN_rewrite_func *func,
- int csize;
- ber_tag_t tag;
- ber_len_t len;
-- oid_name *oidname;
-+ const oid_name *oidname;
-
- struct berval Oid, Val, oid2, *in = x509_name;
-
---
-2.49.0
-
diff --git a/external/openldap/UnpackedTarball_openldap.mk
b/external/openldap/UnpackedTarball_openldap.mk
index a5b365535b2e..661d509187f9 100644
--- a/external/openldap/UnpackedTarball_openldap.mk
+++ b/external/openldap/UnpackedTarball_openldap.mk
@@ -24,7 +24,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/0001-const-up-oids.patch.1 \
))
# vim: set noet sw=4 ts=4:
core.git: Branch 'libreoffice-26-2' - download.lst external/openssl
download.lst|4
external/openssl/0001-const-up-ERR_str_libraries.patch |6 -
external/openssl/0001-const-up-various-low-hanging-things.patch | 48
+-
3 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 2637fff4bad23587bf6fa3549c49efeb5f5f1e0a
Author: Xisco Fauli
AuthorDate: Tue Jan 27 16:54:28 2026 +0100
Commit: Christian Lohmaier
CommitDate: Tue Jan 27 19:39:44 2026 +0100
openssl: upgrade to 3.5.5
Downloaded from
https://github.com/openssl/openssl/releases/download/openssl-3.5.5/openssl-3.5.5.tar.gz
Change-Id: I91a184822a1c1b5f08440068642185060e0dcfda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198214
Reviewed-by: Christian Lohmaier
Tested-by: Jenkins
diff --git a/download.lst b/download.lst
index b783a79c6c20..1ed4d7f6afbc 100644
--- a/download.lst
+++ b/download.lst
@@ -554,8 +554,8 @@ OPENLDAP_TARBALL := openldap-2.6.10.tgz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-OPENSSL_SHA256SUM :=
967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99
-OPENSSL_TARBALL := openssl-3.5.4.tar.gz
+OPENSSL_SHA256SUM :=
b28c91532a8b65a1f983b4c28b7488174e4a01008e29ce8e69bd789f28bc2a89
+OPENSSL_TARBALL := openssl-3.5.5.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/openssl/0001-const-up-ERR_str_libraries.patch
b/external/openssl/0001-const-up-ERR_str_libraries.patch
index 1ec8c60da8ab..0551c59f9ca5 100644
--- a/external/openssl/0001-const-up-ERR_str_libraries.patch
+++ b/external/openssl/0001-const-up-ERR_str_libraries.patch
@@ -18,9 +18,9 @@ index 167b66ed6b..e9228d66a3 100644
#ifndef OPENSSL_NO_ERR
-static ERR_STRING_DATA ERR_str_libraries[] = {
+static const ERR_STRING_DATA ERR_str_libraries[] = {
- {ERR_PACK(ERR_LIB_NONE, 0, 0), "unknown library"},
- {ERR_PACK(ERR_LIB_SYS, 0, 0), "system library"},
- {ERR_PACK(ERR_LIB_BN, 0, 0), "bignum routines"},
+ { ERR_PACK(ERR_LIB_NONE, 0, 0), "unknown library" },
+ { ERR_PACK(ERR_LIB_SYS, 0, 0), "system library" },
+ { ERR_PACK(ERR_LIB_BN, 0, 0), "bignum routines" },
--
2.49.0
diff --git a/external/openssl/0001-const-up-various-low-hanging-things.patch
b/external/openssl/0001-const-up-various-low-hanging-things.patch
index 93ca76d83768..dc0926ad81a3 100644
--- a/external/openssl/0001-const-up-various-low-hanging-things.patch
+++ b/external/openssl/0001-const-up-various-low-hanging-things.patch
@@ -57,22 +57,22 @@ diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c
index a3b6258f52..223ac28663 100644
--- a/crypto/cmp/cmp_msg.c
+++ b/crypto/cmp/cmp_msg.c
-@@ -65,7 +65,7 @@ OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const
OSSL_CMP_MSG *msg)
+@@ -73,7 +73,7 @@
const char *ossl_cmp_bodytype_to_string(int type)
{
-static const char *type_names[] = {
+static const char *const type_names[] = {
- "IR", "IP", "CR", "CP", "P10CR",
- "POPDECC", "POPDECR", "KUR", "KUP",
- "KRR", "KRP", "RR", "RP", "CCR", "CCP",
+ "IR",
+ "IP",
+ "CR",
diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index 59b26d7369..a7c6930162 100644
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c
-@@ -39,7 +39,7 @@ static int dsa_finish(DSA *dsa);
+@@ -39,7 +39,7 @@
static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q,
- BN_CTX *ctx);
+ BN_CTX *ctx);
-static DSA_METHOD openssl_dsa_meth = {
+static const DSA_METHOD openssl_dsa_meth = {
@@ -83,41 +83,41 @@ diff --git a/crypto/err/err.c b/crypto/err/err.c
index 63a1bf192a..a127988a0d 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
-@@ -86,7 +86,7 @@ static const ERR_STRING_DATA ERR_str_libraries[] = {
+@@ -85,7 +85,7 @@
* Should make sure that all ERR_R_ reasons defined in
include/openssl/err.h.in
* are listed. For maintainability, please keep all reasons in the same
order.
*/
-static ERR_STRING_DATA ERR_str_reasons[] = {
+static const ERR_STRING_DATA ERR_str_reasons[] = {
- {ERR_R_SYS_LIB, "system lib"},
- {ERR_R_BN_LIB, "BN lib"},
- {ERR_R_RSA_LIB, "RSA lib"},
+ { ERR_R_SYS_LIB, "system lib" },
+ { ERR_R_BN_LIB, "BN lib" },
+ { ERR_R_RSA_LIB, "RSA lib" },
diff --git a/crypto/evp/e_chacha20_poly1305.c
b/crypto/evp/e_chacha20_poly1305.c
index a06e9a6682..03bf63b502 100644
--- a/crypto/evp/e_chacha20_poly1305.c
+++ b/crypto/evp/e_chacha20_poly1305.c
-@@ -609,7 +609,7 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int
type, int arg,
+@@ -605,7 +605,7 @@
}
}
-static EVP_CIPHER chacha20_poly1305 = {
+static const EVP_CIPHER chacha20_poly1305 = {
NID_chacha20_poly1305,
- 1, /* block_size */
- CHACHA_KEY_SIZE,/* key_len */
+ 1, /* block_size */
+ CHACHA_KEY_SIZE, /* key_len */
diff --git a/crypto/evp/e
core.git: Branch 'libreoffice-26-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f53c72bcc8993faa7e00a8ec81921a90cc2faf1e Author: Xisco Fauli AuthorDate: Mon Jan 26 10:43:18 2026 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Jan 27 03:19:04 2026 +0100 harfbuzz: upgrade to 12.3.2 Downloaded from https://github.com/harfbuzz/harfbuzz/releases/download/12.3.2/harfbuzz-12.3.2.tar.xz Change-Id: I19ce75272862266f8d410cf204c7fc314e9609bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198133 Reviewed-by: Xisco Fauli Tested-by: Jenkins (cherry picked from commit 715ce5478d537d22b3af107ffbd24fff5e3684a9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198144 Reviewed-by: Adolfo Jayme Barrientos diff --git a/download.lst b/download.lst index 45edd530ad3f..b783a79c6c20 100644 --- a/download.lst +++ b/download.lst @@ -327,8 +327,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz # three static lines # so that git cherry-pick # will not run into conflicts -HARFBUZZ_SHA256SUM := 3ee7133f7f160b27bc34c058e147a559bb781c2b8208bc760db9fa9fa69cea07 -HARFBUZZ_TARBALL := harfbuzz-12.3.1.tar.xz +HARFBUZZ_SHA256SUM := 6f6db164359a2da5a84ef826615b448b33e6306067ad829d85d5b0bf936f1bb8 +HARFBUZZ_TARBALL := harfbuzz-12.3.2.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
core.git: Branch 'libreoffice-26-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 445c25d06c0ca636852e1dbff3b00da8d7f2ecce Author: Xisco Fauli AuthorDate: Fri Jan 16 14:39:05 2026 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Fri Jan 23 10:01:40 2026 +0100 NotoNaskhArabic: upgrade to 2.021 Downloaded from https://github.com/notofonts/arabic/releases/download/NotoNaskhArabic-v2.021/NotoNaskhArabic-v2.021.zip Change-Id: I92276268401e3c18c49708329985bfa792dbcb69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197453 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit f4bc7693009eb181844aed884281655637f118ad) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197476 Reviewed-by: Adolfo Jayme Barrientos diff --git a/download.lst b/download.lst index d4cb1cb75924..45edd530ad3f 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 := 80cbc4929693044efce4dc814cf45ff3365c140e81a076671ccbff8e3c603a83 -FONT_NOTO_NASKH_ARABIC_TARBALL := NotoNaskhArabic-v2.020.zip +FONT_NOTO_NASKH_ARABIC_SHA256SUM := 6c050ab9bd087d69b733c505a7576e60c528c2f33cd7b91005a5bd7da4514032 +FONT_NOTO_NASKH_ARABIC_TARBALL := NotoNaskhArabic-v2.021.zip # three static lines # so that git cherry-pick # will not run into conflicts
core.git: Branch 'libreoffice-26-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e38c6a85cad53e7cc51e0d96085cf3def605f111 Author: Xisco Fauli AuthorDate: Wed Jan 21 10:23:22 2026 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Fri Jan 23 08:50:40 2026 +0100 harfbuzz: upgrade to 12.3.1 Downloaded from https://github.com/harfbuzz/harfbuzz/releases/download/12.3.1/harfbuzz-12.3.1.tar.xz Change-Id: I97a3c0b6c4f75ea12e92ac12f0266ad8534bdad3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197719 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 9d6fa61791fc16eba73adcfae1ae725a297cc786) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197731 Reviewed-by: Adolfo Jayme Barrientos diff --git a/download.lst b/download.lst index a97e795c4506..d4cb1cb75924 100644 --- a/download.lst +++ b/download.lst @@ -327,8 +327,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz # three static lines # so that git cherry-pick # will not run into conflicts -HARFBUZZ_SHA256SUM := 8660ebd3c27d9407fc8433b5d172bafba5f0317cb0bb4339f28e5370c93d42b7 -HARFBUZZ_TARBALL := harfbuzz-12.3.0.tar.xz +HARFBUZZ_SHA256SUM := 3ee7133f7f160b27bc34c058e147a559bb781c2b8208bc760db9fa9fa69cea07 +HARFBUZZ_TARBALL := harfbuzz-12.3.1.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
core.git: Branch 'libreoffice-26-2' - download.lst external/poppler sdext/source
download.lst |4 external/poppler/poppler-config.patch.1 | 221 +++--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 15 - sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 25 +- 4 files changed, 81 insertions(+), 184 deletions(-) New commits: commit d32948512dd8d403b2a4af4537b10e37dfffaec5 Author: Xisco Fauli AuthorDate: Wed Jan 7 14:06:55 2026 +0100 Commit: Christian Lohmaier CommitDate: Wed Jan 14 23:46:08 2026 +0100 poppler: upgrade to 26.01.0 Adapt external/poppler/poppler-config.patch.1 after commit 808094b11c07b1895bc9a1d03e338584045e6087 Author: Albert Astals Cid Date: Fri Dec 5 01:59:41 2025 +0100 cmakedefine -> cmakedefine01 Downloaded from https://poppler.freedesktop.org/poppler-26.01.0.tar.xz Change-Id: I8cf88d535e6fbd85fa0761fa23ac790c01711e01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196684 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit b307d254a88a87fe59f9c041346657790c75ac16) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196883 Reviewed-by: Christian Lohmaier diff --git a/download.lst b/download.lst index b110bbc8fcc4..a97e795c4506 100644 --- a/download.lst +++ b/download.lst @@ -599,8 +599,8 @@ LIBTIFF_TARBALL := tiff-4.7.1.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -POPPLER_SHA256SUM := c18b40eb36b1a0c5b86e29ca054bf0770304583da4f2cdd42fe86eca6a20de48 -POPPLER_TARBALL := poppler-25.12.0.tar.xz +POPPLER_SHA256SUM := 1cb944a4b88847f5fb6551683bc799db59f04990f5d8be07aba2acbf38601089 +POPPLER_TARBALL := poppler-26.01.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/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index 78f1c4fe2f72..edf04d4af2ef 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 -(cd workdir/UnpackedTarball/poppler && cmake -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_LCMS=off -DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_NSS3=off -DENABLE_GPGME=off -DENABLE_PGP_SIGNATURES=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_BOOST=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off -DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off -DENABLE_QT6=off +(cd workdir/UnpackedTarball/poppler && cmake -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_LCMS=off -DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_NSS3=off -DENABLE_GPGME=off -DENABLE_PGP_SIGNATURES=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_BOOST=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 @@ -13,41 +13,41 @@ new file mode 100644 index 0fbd336a..451213f8 100644 --- /dev/null +++ b/config.h -@@ -0,0 +1,232 @@ +@@ -0,0 +1,170 @@ +/* config.h. Generated from config.h.cmake by cmake. */ + +/* Build against libcurl. */ -+/* #undef ENABLE_LIBCURL */ ++#define ENABLE_LIBCURL 0 + +/* Use libjpeg instead of builtin jpeg decoder. */ +#define ENABLE_LIBJPEG 1 + +/* Use libopenjpeg instead of builtin jpeg2000 decoder. */ -+/* #undef ENABLE_LIBOPENJPEG */ ++#define ENABLE_LIBOPENJPEG 0 + +/* Build against libtiff. */ -+/* #undef ENABLE_LIBTIFF */ ++#define ENABLE_LIBTIFF 0 + +/* Build against libpng. */ -+/* #define ENABLE_LIBPNG 1 */ ++#define ENABLE_LIBPNG 0 + +/* Do not hardcode the library location */ -+/* #undef ENABLE_RELOCATABLE */ ++#define ENABLE_RELOCATABLE 0 + +/* Use zlib instead of builtin zlib decoder to uncompress flate streams. */ -+/* #undef ENABLE_ZLIB_UNCOMPRESS */ ++#define ENABLE_ZLIB_UNCOMPRESS 0 + +/* Build against libnss3 for digital signature validation */ -+/* #undef ENABLE_NSS3 */ ++#define ENABLE_NSS3 0 + +/* Build against libgpgme for digital signature validation */ -+/* #undef ENABLE_GPGME */ ++#define ENABLE_GPGME 0 + +/* Enable pgp signatures in GPG backend by default */ -+/* #undef ENABLE_PGP_SIGNATURES */ ++#define ENABLE_PGP_SIGNATURES 0 + +/* Signatures enabled */ -+/* #undef ENABLE_SIGNATURES */ ++#define ENABLE_SIGNATURES 0 + +/* Default signature backend */ +#define DEFAULT_SIGNATURE_BACKEND "None" @@ -59,33 +59,16 @@ index 0fbd336a..451213f8 100644 +#define HAVE_DCT_DECODER 1 + +/* Do we have any JPX decoder?. */ -+/* #undef HAVE_JPX_DECODER */ -+ -+#if !defined(_WIN32) -+/* Define to 1 if you have the header file, and it defines `DIR'. -+ */ -+#define HAVE_DIRENT_H 1 -+#endif -+ -+#if !defined
core.git: Branch 'libreoffice-26-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b9a74b055e91d2255b91b534a0d85f62519d79c2 Author: Michael Stahl AuthorDate: Tue Jan 13 11:07:32 2026 +0100 Commit: Xisco Fauli CommitDate: Wed Jan 14 15:34:58 2026 +0100 libpng: upgrade to release 1.6.54 Fixes CVE-2026-22695 CVE-2026-22801 Change-Id: Id7c4c4d2ffa583ca1eeec23720a4ce74b819305f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197183 Reviewed-by: Stephan Bergmann Tested-by: Jenkins CollaboraOffice (cherry picked from commit 4e63ac95e1cce0c56e0277c6ecdade3ff43d1f96) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197190 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 85624a4ccc76cb300d1e05ebb6b5c69549c989ed) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197262 Reviewed-by: Xisco Fauli diff --git a/download.lst b/download.lst index 7d01e6534fa8..a4acdda2c72f 100644 --- a/download.lst +++ b/download.lst @@ -589,8 +589,8 @@ PIXMAN_TARBALL := pixman-0.46.4.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4 -LIBPNG_TARBALL := libpng-1.6.53.tar.xz +LIBPNG_SHA256SUM := 01c9d8a303c941ec2c511c14312a3b1d36cedb41e2f5168ccdaa85d53b887805 +LIBPNG_TARBALL := libpng-1.6.54.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
core.git: Branch 'libreoffice-26-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a46275da62be06d87197c6ecc61559620070b145 Author: Xisco Fauli AuthorDate: Fri Jan 9 22:13:17 2026 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Sat Jan 10 21:08:58 2026 +0100 sqlite: upgrade to 3.51.2 Downloaded from https://sqlite.org/2026/sqlite-amalgamation-3510200.zip Change-Id: I505c2ea4e8e141c8a421d6689ac47e147576ba1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196946 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 8eee532e3e1b6c6c022168e671e3bba78754af17) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196957 Reviewed-by: Adolfo Jayme Barrientos diff --git a/download.lst b/download.lst index ae4c86843187..1ef5f064c697 100644 --- a/download.lst +++ b/download.lst @@ -662,8 +662,8 @@ SKIA_TARBALL := skia-m142-f4ed99d2443962782cf5f8b4dd27179f131e7cbe.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -SQLITE3_SHA256SUM := 84a85d6a1b920234349f01720912c12391a4f0cb5cb998087e641dee3ef8ef2e -SQLITE3_TARBALL := sqlite-amalgamation-3510100.zip +SQLITE3_SHA256SUM := 6e2a845a493026bdbad0618b2b5a0cf48584faab47384480ed9f592d912f23ec +SQLITE3_TARBALL := sqlite-amalgamation-3510200.zip # three static lines # so that git cherry-pick # will not run into conflicts
core.git: Branch 'libreoffice-26-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a1ebdb0080fbc07abfda44cf41c492ec8cbd69f2 Author: Xisco Fauli AuthorDate: Mon Dec 29 12:00:21 2025 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Dec 30 19:53:15 2025 +0100 NotoKufiArabic: upgrade to 2.110 Downloaded from https://github.com/notofonts/arabic/releases/download/NotoKufiArabic-v2.110/NotoKufiArabic-v2.110.zip Change-Id: Ifd42416d741f2de9847da9c278218404876dbd3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196297 Reviewed-by: Xisco Fauli Tested-by: Jenkins (cherry picked from commit 9e7f751ef67cadbff7d270c77f5c8297e98462b9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196310 Reviewed-by: Adolfo Jayme Barrientos diff --git a/download.lst b/download.lst index 97cf1123d29b..7c92b336a3d6 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 := 1b6880e4b8df09c3b9e246d6084bfd94bf32a060cf2dcffd3622d0e2d79f -FONT_NOTO_KUFI_ARABIC_TARBALL := NotoKufiArabic-v2.109.zip +FONT_NOTO_KUFI_ARABIC_SHA256SUM := 34390882c196f032811f2a3db8982c1e839f69aae3e4c2c1fdd63203150690df +FONT_NOTO_KUFI_ARABIC_TARBALL := NotoKufiArabic-v2.110.zip # three static lines # so that git cherry-pick # will not run into conflicts
core.git: Branch 'libreoffice-26-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2429f04ac7d120d85e3d5eb2e679c75ccf8f0125 Author: Xisco Fauli AuthorDate: Mon Dec 29 11:41:22 2025 +0100 Commit: Taichi Haradaguchi <[email protected]> CommitDate: Tue Dec 30 12:10:16 2025 +0100 harfbuzz: upgrade to 12.3.0 Downloaded from https://github.com/harfbuzz/harfbuzz/releases/download/12.3.0/harfbuzz-12.3.0.tar.xz Change-Id: I5e5ac046e586e8e0e0a1c797f56ec0e64c6a5e0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196295 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 354f06cf8f512dbc4e7f4e0d70703b887269e1bf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196313 Reviewed-by: Taichi Haradaguchi <[email protected]> diff --git a/download.lst b/download.lst index 9ea548c53b14..97cf1123d29b 100644 --- a/download.lst +++ b/download.lst @@ -327,8 +327,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz # three static lines # so that git cherry-pick # will not run into conflicts -HARFBUZZ_SHA256SUM := ecb603aa426a8b24665718667bda64a84c1504db7454ee4cadbd362eea64e545 -HARFBUZZ_TARBALL := harfbuzz-12.2.0.tar.xz +HARFBUZZ_SHA256SUM := 8660ebd3c27d9407fc8433b5d172bafba5f0317cb0bb4339f28e5370c93d42b7 +HARFBUZZ_TARBALL := harfbuzz-12.3.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
core.git: Branch 'libreoffice-26-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a6f8fa9f14568ea1a1bf409a6eb6610fd6811e0a Author: Xisco Fauli AuthorDate: Mon Dec 29 12:25:39 2025 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Dec 30 10:33:31 2025 +0100 NotoNaskhArabic: upgrade to 2.020 Downloaded from https://github.com/notofonts/arabic/releases/download/NotoNaskhArabic-v2.020/NotoNaskhArabic-v2.020.zip Change-Id: Iea3547580ed2972da1b81b4d80f3e5b575bc5405 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196300 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 90bf630fa2c612000cdc7128612c13088a22ce34) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196318 Reviewed-by: Adolfo Jayme Barrientos diff --git a/download.lst b/download.lst index 8394c54e7b6d..9ea548c53b14 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 := 7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81 -FONT_NOTO_NASKH_ARABIC_TARBALL := NotoNaskhArabic-v2.019.zip +FONT_NOTO_NASKH_ARABIC_SHA256SUM := 80cbc4929693044efce4dc814cf45ff3365c140e81a076671ccbff8e3c603a83 +FONT_NOTO_NASKH_ARABIC_TARBALL := NotoNaskhArabic-v2.020.zip # three static lines # so that git cherry-pick # will not run into conflicts
core.git: Branch 'libreoffice-26-2' - download.lst external/libgpg-error
download.lst |
4 -
external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 |
25 --
external/libgpg-error/ExternalPackage_libgpg-error.mk|
2
external/libgpg-error/UnpackedTarball_libgpg-error.mk|
1
4 files changed, 3 insertions(+), 29 deletions(-)
New commits:
commit 404b1c61257d305f60a11ceac03d2fa7ace173c5
Author: Xisco Fauli
AuthorDate: Mon Dec 15 10:03:16 2025 +0100
Commit: Xisco Fauli
CommitDate: Mon Dec 15 13:55:35 2025 +0100
libgpg-error: upgrade to 1.58
Downloaded from
https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.58.tar.bz2
Change-Id: Ia42fed5c4f9a7f4d88b2d74d8c3b6bc4397fdf20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195631
Reviewed-by: Xisco Fauli
Tested-by: Jenkins
(cherry picked from commit 6895234b23fa3a1d3c393d2fbc424e230ec147b1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195656
diff --git a/download.lst b/download.lst
index d67457201fbd..8394c54e7b6d 100644
--- a/download.lst
+++ b/download.lst
@@ -430,8 +430,8 @@ LIBFFI_TARBALL := libffi-3.5.2.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBGPGERROR_SHA256SUM :=
ab807c81fbd2b8e1d6e3377383be802147c08818f87a82e87f85e5939c939def
-LIBGPGERROR_TARBALL := libgpg-error-1.57.tar.bz2
+LIBGPGERROR_SHA256SUM :=
f943aea9a830a8bd938e5124b579efaece24a3225ff4c3d27611a80ce1260c27
+LIBGPGERROR_TARBALL := libgpg-error-1.58.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git
a/external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1
b/external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1
deleted file mode 100644
index f1e73f3eff4d..
---
a/external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From 421e101cf9760a4bc4f296d12ce25a7c3fe5b7b2 Mon Sep 17 00:00:00 2001
-From: Werner Koch
-Date: Fri, 12 Dec 2025 11:34:00 +0100
-Subject: [PATCH] w32: Fix a syntax error in a non-DLL build
-
-* src/w32-utils.c (_gpgrt_w32__init_utils): Fix syntax error.
- src/w32-utils.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/w32-utils.c b/src/w32-utils.c
-index d8f4896..5cf4fbd 100644
a/src/w32-utils.c
-+++ b/src/w32-utils.c
-@@ -159,6 +159,6 @@ w32_utils_init (void)
- void
- _gpgrt_w32__init_utils (void)
- {
-- w32_utils_init ().
-+ w32_utils_init ();
- }
- #endif
---
-2.39.5
-
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index d978c0665a63..dd571ff61b76 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.41.0))
+$(eval $(call
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.41.1))
else ifeq ($(OS),MACOSX)
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index 67d290672487..3345819e24c4 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
external/libgpg-error/clang-cl.patch \
external/libgpg-error/undeclared-environ-macOS.patch \
external/libgpg-error/0001-const-up-handle_metacmd.cmds-array.patch.1 \
-
external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 \
))
# vim: set noet sw=4 ts=4:
core.git: Branch 'libreoffice-26-2' - download.lst external/libgpg-error
download.lst | 4 - external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 | 25 ++ external/libgpg-error/ExternalPackage_libgpg-error.mk| 2 external/libgpg-error/UnpackedTarball_libgpg-error.mk| 1 external/libgpg-error/w32-build-fixes-5.patch| 17 -- 5 files changed, 40 insertions(+), 9 deletions(-) New commits: commit fd325b76cb095b7bcd4c1fc21a80c00a9e015a74 Author: Xisco Fauli AuthorDate: Thu Dec 11 09:54:55 2025 +0100 Commit: Taichi Haradaguchi <[email protected]> CommitDate: Sun Dec 14 08:35:59 2025 +0100 libgpg-error: upgrade to 1.57 Downloaded from https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.57.tar.bz2 Change-Id: I8da25b24f4cb444f0a28b50add598f95c2a3df4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195432 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 55df70eca02366e10e36611a09857ea484a870a8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195590 Reviewed-by: Taichi Haradaguchi <[email protected]> diff --git a/download.lst b/download.lst index 3c93aed46061..d67457201fbd 100644 --- a/download.lst +++ b/download.lst @@ -430,8 +430,8 @@ LIBFFI_TARBALL := libffi-3.5.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBGPGERROR_SHA256SUM := 82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0 -LIBGPGERROR_TARBALL := libgpg-error-1.56.tar.bz2 +LIBGPGERROR_SHA256SUM := ab807c81fbd2b8e1d6e3377383be802147c08818f87a82e87f85e5939c939def +LIBGPGERROR_TARBALL := libgpg-error-1.57.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 b/external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 new file mode 100644 index ..f1e73f3eff4d --- /dev/null +++ b/external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 @@ -0,0 +1,25 @@ +From 421e101cf9760a4bc4f296d12ce25a7c3fe5b7b2 Mon Sep 17 00:00:00 2001 +From: Werner Koch +Date: Fri, 12 Dec 2025 11:34:00 +0100 +Subject: [PATCH] w32: Fix a syntax error in a non-DLL build + +* src/w32-utils.c (_gpgrt_w32__init_utils): Fix syntax error. +--- + src/w32-utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/w32-utils.c b/src/w32-utils.c +index d8f4896..5cf4fbd 100644 +--- a/src/w32-utils.c b/src/w32-utils.c +@@ -159,6 +159,6 @@ w32_utils_init (void) + void + _gpgrt_w32__init_utils (void) + { +- w32_utils_init (). ++ w32_utils_init (); + } + #endif +-- +2.39.5 + diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk index 64ab28477b63..d978c0665a63 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.40.0)) +$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.41.0)) else ifeq ($(OS),MACOSX) diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk index 3345819e24c4..67d290672487 100644 --- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk +++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk @@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \ external/libgpg-error/clang-cl.patch \ external/libgpg-error/undeclared-environ-macOS.patch \ external/libgpg-error/0001-const-up-handle_metacmd.cmds-array.patch.1 \ + external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/w32-build-fixes-5.patch b/external/libgpg-error/w32-build-fixes-5.patch index 154cae3f8cd0..ba917c3bf899 100644 --- a/external/libgpg-error/w32-build-fixes-5.patch +++ b/external/libgpg-error/w32-build-fixes-5.patch @@ -74,26 +74,31 @@ # define S_IWGRP S_IWUSR --- src/Makefile.am2022-08-19 17:39:54.0 +0900 +++ src/Makefile.am~ 2023-08-30 15:41:10.371855465 +0900 -@@ -208,8 +208,8 @@ +@@ -214,9 +214,9 @@ # libgpg_error_la_DEPENDENCIES = \ #$(srcdir)/gpg-error.vers --libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" +-libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" \ +- -DSYSCONFDIR=\"$(sysconfdir)\" -libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD) -+libgpg_error_la_CPPFLAGS = -DLOCALEDIR=$(locale
core.git: Branch 'libreoffice-26-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e46ead06ea786091974aad43dee1546363cb059a Author: Xisco Fauli AuthorDate: Thu Dec 11 09:46:19 2025 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Fri Dec 12 05:20:35 2025 +0100 libjpeg-turbo: upgrade to 3.1.3 Downloaded from https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.2.tar.gz Change-Id: Idf03d1ac8910f39843e4c6c75d264f445f5ff003 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195430 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 870f682c386f858c44ce74ef3816f6df5c6c8c1d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195497 Reviewed-by: Adolfo Jayme Barrientos diff --git a/download.lst b/download.lst index e39247f6e3f2..3c93aed46061 100644 --- a/download.lst +++ b/download.lst @@ -390,8 +390,8 @@ JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip # three static lines # so that git cherry-pick # will not run into conflicts -LIBJPEG_TURBO_SHA256SUM := 560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6 -LIBJPEG_TURBO_TARBALL := libjpeg-turbo-3.1.2.tar.gz +LIBJPEG_TURBO_SHA256SUM := 3a13a5ba767dc8264bc40b185e41368a80d5d5f945944d1dbaa4b2fb0099f4e5 +LIBJPEG_TURBO_TARBALL := libjpeg-turbo-3.1.3.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts
core.git: Branch 'libreoffice-26-2' - download.lst external/nss
download.lst|4 ++--
external/nss/UnpackedTarball_nss.mk |1 -
external/nss/connectx.patch.0 | 11 ---
external/nss/nss_macosx.patch | 23 ---
4 files changed, 14 insertions(+), 25 deletions(-)
New commits:
commit fb22ad4fa2b3adc6b8502e6e22e6032a2075df21
Author: Xisco Fauli
AuthorDate: Fri Dec 5 14:20:42 2025 +0100
Commit: Xisco Fauli
CommitDate: Wed Dec 10 11:07:20 2025 +0100
nss: upgrade to 3.119
* external/nss/connectx.patch.0 has been fixed upstream
Downloaded from
https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_119_RTM/src/nss-3.119-with-nspr-4.38.2.tar.gz
Change-Id: I0477965c9ab62f21684278e5ed7860360521b270
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195081
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit aba5f8016965e42075e68faa17ddfd3b3213247d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195312
diff --git a/download.lst b/download.lst
index d97efcc12b90..e39247f6e3f2 100644
--- a/download.lst
+++ b/download.lst
@@ -523,8 +523,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-NSS_SHA256SUM :=
9e1f7da9f4e5e3bdfd73f7dc2c618d6125a12354aadaeedbb35af3699bc03e15
-NSS_TARBALL := nss-3.118.1-with-nspr-4.37.tar.gz
+NSS_SHA256SUM :=
8f12f61ef814662bf991a289bc6724d078cd79f135e09e260adbc35dfa9acaf3
+NSS_TARBALL := nss-3.119-with-nspr-4.38.2.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 4774e36d0853..a33a293f972d 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss-restore-manual-pre-dependencies.patch.1 \
external/nss/Wincompatible-function-pointer-types.patch.0 \
external/nss/nspr-win95-target.patch \
-external/nss/connectx.patch.0 \
$(if $(filter LINUX,$(OS)), \
external/nss/nss.disablefsync.patch \
external/nss/nss.getrandom.patch) \
diff --git a/external/nss/connectx.patch.0 b/external/nss/connectx.patch.0
deleted file mode 100644
index 29c6fd1a8469..
--- a/external/nss/connectx.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
nspr/pr/src/pthreads/ptio.c
-+++ nspr/pr/src/pthreads/ptio.c
-@@ -1989,7 +1989,7 @@
- PRIntn flags, const PRNetAddr* addr,
- PRIntervalTime timeout) {
- #if defined(LINUX) || HAS_CONNECTX
-- PRInt32 syserrno, bytes = -1;
-+ PRInt32 syserrno; ssize_t bytes = -1;
- PRBool fNeedContinue = PR_FALSE;
- pt_SockLen addr_len;
- const PRNetAddr* addrp = addr;
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index 13cf0cda706b..eaa025f1c205 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -23,32 +23,33 @@ diff -ru a/nspr/configure b/nspr/configure
diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
--- a/a/nss/coreconf/Darwin.mk 2014-09-29 16:50:22.992304799 +0100
+++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100
-@@ -20,13 +20,17 @@
+@@ -19,34 +19,39 @@
+ endif
- ifeq (,$(filter-out i%86,$(CPU_ARCH)))
- ifdef USE_64
+ ifeq (x86_64,$(CPU_ARCH))
+ifeq (,$(findstring -arch ,$(CC)))
CC += -arch x86_64
CCC += -arch x86_64
+endif
override CPU_ARCH = x86_64
- else
+ else ifeq (i386,$(CPU_ARCH))
OS_REL_CFLAGS = -Di386
+ifeq (,$(findstring -arch ,$(CC)))
CC += -arch i386
CCC += -arch i386
+endif
override CPU_ARCH = x86
- endif
- else
-@@ -33,19 +37,20 @@
- ifeq (arm,$(CPU_ARCH))
- # Nothing set for arm currently.
- else
+ else ifeq (,$(filter-out aarch64 arm,$(CPU_ARCH)))
+ CC += -arch arm64
+ CCC += -arch arm64
+ override CPU_ARCH = aarch64
+ else ifeq (powerpc,$(CPU_ARCH))
-OS_REL_CFLAGS = -Dppc
-CC += -arch ppc
-CCC += -arch ppc
- endif
+ override CPU_ARCH = ppc
+ else
+$(error Unknown CPU architecture)
endif
ifneq (,$(MACOS_SDK_DIR))
core.git: Branch 'libreoffice-26-2' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit be7015e60d32b1ddb385b6be587e7980848ccf2f Author: Xisco Fauli AuthorDate: Tue Dec 9 00:20:52 2025 +0100 Commit: Xisco Fauli CommitDate: Tue Dec 9 10:34:56 2025 +0100 libpng: upgrade to 1.6.53 Downloaded from http://prdownloads.sourceforge.net/libpng/libpng-1.6.53.tar.xz?download Change-Id: I09a817614658880cf1d4e0a162597b2d675bc4e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195245 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 50b39ceb42dda3234e63eebf8d3baedac58ca0f6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195277 diff --git a/download.lst b/download.lst index b33e6e5c9863..d97efcc12b90 100644 --- a/download.lst +++ b/download.lst @@ -589,8 +589,8 @@ PIXMAN_TARBALL := pixman-0.46.4.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 36bd726228ec93a3b6c22fdb49e94a67b16f2fe9b39b78b7cb6577291ccc -LIBPNG_TARBALL := libpng-1.6.52.tar.xz +LIBPNG_SHA256SUM := 1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4 +LIBPNG_TARBALL := libpng-1.6.53.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
