diff --git a/download.lst b/download.lst index 2b6b475489af..77374c4ab2a1 100644 --- a/download.lst +++ b/download.lst @@ -642,8 +642,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/external/md4c/0001-const-up-scheme_map.patch.1 b/external/md4c/0001-const-up-scheme_map.patch.1 deleted file mode 100644 index ca2f1d4aaf51..000000000000 --- a/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?= -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/external/md4c/UnpackedTarball_md4c.mk b/external/md4c/UnpackedTarball_md4c.mk index d4ea369638f3..ed368456c249 100644 --- a/external/md4c/UnpackedTarball_md4c.mk +++ b/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/sw/qa/filter/md/md.cxx b/sw/qa/filter/md/md.cxx index bc0457b2b0cf..dc710324fe05 100644 --- a/sw/qa/filter/md/md.cxx +++ b/sw/qa/filter/md/md.cxx @@ -134,7 +134,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf169884_import_crash) CPPUNIT_ASSERT_EQUAL(OUString("Selected range of Release " "note\nhttps://wiki.documentfoundation.org/ReleaseNotes/" - "26.2#Markdown::text=Added%20support%20for%20importing%20from%" + "26.2#Markdown:~:text=Added%20support%20for%20importing%20from%" "20Markdown%20format"), getParagraph(1)->getString()); }