online.git: engine/download.lst engine/external qt/flatpak

0 views
Skip to first unread message

"Ujjawal Kumar (via cogerrit)"

unread,
Apr 21, 2026, 4:56:48 AM (8 days ago) Apr 21
to collaboraon...@googlegroups.com
engine/download.lst | 4 +-
engine/external/md4c/0001-const-up-scheme_map.patch.1 | 25 ------------------
engine/external/md4c/UnpackedTarball_md4c.mk | 7 -----
qt/flatpak/com.collaboraoffice.Office.json | 6 ++--
4 files changed, 5 insertions(+), 37 deletions(-)

New commits:
commit 28ffd146317aac1edb21deabbd2cd09f8311bda1
Author: Ujjawal Kumar <ujjawal.ku...@collabora.com>
AuthorDate: Mon Apr 20 22:48:40 2026 +0530
Commit: Andras Timar <andras...@collabora.com>
CommitDate: Tue Apr 21 10:55:57 2026 +0200

md4c: Upgrade to 0.5.3

Signed-off-by: Ujjawal Kumar <ujjawal.ku...@collabora.com>
Change-Id: I6cc36b76270a5e9a4f51f8ecc5cee15406ab7871
Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/1219
Tested-by: Jenkins CPCI <rel...@collaboraoffice.com>
Reviewed-by: Caolán McNamara <caolan....@collabora.com>

diff --git a/engine/download.lst b/engine/download.lst
index 0c8c6e8a25cb..84d0f867f1d7 100644
--- a/engine/download.lst
+++ b/engine/download.lst
@@ -725,8 +725,8 @@ REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
-MD4C_SHA256SUM := 55d0111d48fb11883aaee91465e642b8b640775a4d6993c2d0e7a8092758ef21
-MD4C_TARBALL := md4c-release-0.5.2.tar.gz
+MD4C_SHA256SUM := 353c346f376b87c954a13f3415ede2d51264cc61dc5abcd38ff1d2aa0d059b9e
+MD4C_TARBALL := md4c-release-0.5.3.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/engine/external/md4c/0001-const-up-scheme_map.patch.1 b/engine/external/md4c/0001-const-up-scheme_map.patch.1
deleted file mode 100644
index ca2f1d4aaf51..000000000000
--- a/engine/external/md4c/0001-const-up-scheme_map.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From 66526366b67e3b42eb4c30cefa6f5efdff690c8e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan....@collabora.com>
-Date: Sat, 26 Jul 2025 21:38:34 +0100
-Subject: [PATCH] const up scheme_map
-
----
- src/md4c.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/md4c.c b/src/md4c.c
-index e3f5cf9..947f5c9 100644
---- a/src/md4c.c
-+++ b/src/md4c.c
-@@ -3238,7 +3238,7 @@ md_collect_marks(MD_CTX* ctx, const MD_LINE* lines, MD_SIZE n_lines, int table_m
-
- /* A potential permissive URL autolink. */
- if(ch == _T(':')) {
-- static struct {
-+ static const struct {
- const CHAR* scheme;
- SZ scheme_size;
- const CHAR* suffix;
---
-2.49.0
-
diff --git a/engine/external/md4c/UnpackedTarball_md4c.mk b/engine/external/md4c/UnpackedTarball_md4c.mk
index b47e346280ad..a0e79d31c8a2 100644
--- a/engine/external/md4c/UnpackedTarball_md4c.mk
+++ b/engine/external/md4c/UnpackedTarball_md4c.mk
@@ -10,12 +10,5 @@
$(eval $(call gb_UnpackedTarball_UnpackedTarball,md4c))
$(eval $(call gb_UnpackedTarball_set_tarball,md4c,$(MD4C_TARBALL)))

-# 0001-const-up-scheme_map.patch.1 effort to upstream at:
-# https://github.com/mity/md4c/pull/291
-
-$(eval $(call gb_UnpackedTarball_add_patches,md4c,\
- external/md4c/0001-const-up-scheme_map.patch.1 \
-))
-

# vim: set noet sw=4 ts=4:
diff --git a/qt/flatpak/com.collaboraoffice.Office.json b/qt/flatpak/com.collaboraoffice.Office.json
index 99daa65635b4..e72326865246 100644
--- a/qt/flatpak/com.collaboraoffice.Office.json
+++ b/qt/flatpak/com.collaboraoffice.Office.json
@@ -67,11 +67,11 @@
"dest-filename": "libjpeg-turbo-3.1.3.tar.gz"
},
{
- "url": "https://dev-www.libreoffice.org/src/md4c-release-0.5.2.tar.gz",
- "sha256": "55d0111d48fb11883aaee91465e642b8b640775a4d6993c2d0e7a8092758ef21",
+ "url": "https://dev-www.libreoffice.org/src/md4c-release-0.5.3.tar.gz",
+ "sha256": "353c346f376b87c954a13f3415ede2d51264cc61dc5abcd38ff1d2aa0d059b9e",
"type": "file",
"dest": "external/tarballs",
- "dest-filename": "md4c-release-0.5.2.tar.gz"
+ "dest-filename": "md4c-release-0.5.3.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/2024-09-19-karla-main.zip",

"Miklos Vajna (via cogerrit)"

unread,
Apr 28, 2026, 4:21:44 PM (14 hours ago) Apr 28
to collaboraon...@googlegroups.com
engine/download.lst | 4 ++--
engine/external/xmlsec/ExternalProject_xmlsec.mk | 2 +-
qt/flatpak/com.collaboraoffice.Office.json | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit cbeaa070b8bc8ba624f1ae85c0381fb1635ed531
Author: Miklos Vajna <vmi...@collabora.com>
AuthorDate: Tue Apr 28 17:20:39 2026 +0200
Commit: Miklos Vajna <vmi...@collabora.com>
CommitDate: Tue Apr 28 20:20:42 2026 +0000

external: update libxmlsec to 1.3.11

The Windows configure script is now ported from javascript to
powershell, adapt to that.

Signed-off-by: Miklos Vajna <vmi...@collabora.com>
Change-Id: I94e03f685d562f1abae65d22e65579bacfebecf3
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/1755
Reviewed-by: Andras Timar <andras...@collabora.com>
Tested-by: Jenkins CPCI <rel...@collaboraoffice.com>

diff --git a/engine/download.lst b/engine/download.lst
index 27c3f39ce4d6..445c23f74e3b 100644
--- a/engine/download.lst
+++ b/engine/download.lst
@@ -523,8 +523,8 @@ LIBWEBP_TARBALL := libwebp-1.6.0.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-XMLSEC_SHA256SUM := 5915590780566dae4b5d13d51a42fc0e34b30b26fda6f2c5f744ec31b363ee1a
-XMLSEC_TARBALL := xmlsec1-1.3.10.tar.gz
+XMLSEC_SHA256SUM := 53675e98fa83b48201d24f7bfbcaeaa1b51496b8b19ff969785856bdeb196af3
+XMLSEC_TARBALL := xmlsec1-1.3.11.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/engine/external/xmlsec/ExternalProject_xmlsec.mk b/engine/external/xmlsec/ExternalProject_xmlsec.mk
index 7e394707f709..396719989b43 100644
--- a/engine/external/xmlsec/ExternalProject_xmlsec.mk
+++ b/engine/external/xmlsec/ExternalProject_xmlsec.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_ExternalProject_use_nmake,xmlsec,build))
$(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(call gb_Trace_StartRange,xmlsec,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- cscript /e:javascript configure.js crypto=mscng xslt=no iconv=no static=no \
+ powershell -ExecutionPolicy Bypass -File configure.ps1 crypto=mscng xslt=no iconv=no static=no \
lib=$(gb_UnpackedTarball_workdir)/libxml2/win32/bin.msvc \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes cruntime=/MDd) \
cflags="$(SOLARINC) -I$(WORKDIR)/UnpackedTarball/libxml2/include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common" \
diff --git a/qt/flatpak/com.collaboraoffice.Office.json b/qt/flatpak/com.collaboraoffice.Office.json
index 24c6e48efce2..5f4ccf1fdc2f 100644
--- a/qt/flatpak/com.collaboraoffice.Office.json
+++ b/qt/flatpak/com.collaboraoffice.Office.json
@@ -119,11 +119,11 @@
"dest-filename": "antlr4-cpp-runtime-4.13.2-source.zip"
},
{
- "url": "https://dev-www.libreoffice.org/src/xmlsec1-1.3.10.tar.gz",
- "sha256": "5915590780566dae4b5d13d51a42fc0e34b30b26fda6f2c5f744ec31b363ee1a",
+ "url": "https://dev-www.libreoffice.org/src/xmlsec1-1.3.11.tar.gz",
+ "sha256": "53675e98fa83b48201d24f7bfbcaeaa1b51496b8b19ff969785856bdeb196af3",
"type": "file",
"dest": "external/tarballs",
- "dest-filename": "xmlsec1-1.3.10.tar.gz"
+ "dest-filename": "xmlsec1-1.3.11.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz",

Reply all
Reply to author
Forward
0 new messages