subject:"\[Libreoffice\-commits\] core.git\: download.lst"

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

2023-12-03 Thread 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

2023-11-10 Thread 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

2023-11-07 Thread 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

2023-11-01 Thread 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

2023-10-28 Thread 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

2023-10-25 Thread 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

2023-10-24 Thread 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

2023-10-21 Thread 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

2023-10-19 Thread 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

2023-10-14 Thread 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

2023-10-13 Thread 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

2023-10-12 Thread 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

2023-10-11 Thread 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

2023-10-03 Thread 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

2023-09-28 Thread 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

2023-09-28 Thread 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

2023-09-26 Thread 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

2023-09-25 Thread 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

2023-09-25 Thread 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

2023-09-14 Thread 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

2023-09-09 Thread 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

2023-08-15 Thread 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

2023-08-09 Thread 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

2023-08-05 Thread 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

2023-08-01 Thread 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

2023-07-11 Thread 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

2023-07-11 Thread 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

2023-07-03 Thread 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

2023-07-03 Thread 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

2023-07-03 Thread 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

2023-06-30 Thread 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

2023-06-30 Thread 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

2023-06-30 Thread 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

2023-06-27 Thread 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

2023-06-26 Thread 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

2023-06-23 Thread 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

2023-06-20 Thread 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

2023-06-15 Thread 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

2023-06-13 Thread 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

2023-06-12 Thread 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/].

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

2023-06-09 Thread Stephan Bergmann (via logerrit)

 download.lst   |4 
 external/coinmp/ExternalPackage_coinmp.mk  |   34 +-
 external/coinmp/ExternalProject_coinmp.mk  |   17 -
 external/coinmp/UnpackedTarball_coinmp.mk  |4 
 external/coinmp/bind2nd.patch.1|   74 --
 external/coinmp/clang-with-path.patch  |  120 ++
 external/coinmp/no-binaries.patch.1|4 
 external/coinmp/osi_cuts_iterator.patch.0  |   12 -
 external/coinmp/register.patch |  294 -
 external/coinmp/werror-format-pedantic.patch.0 |   10 
 external/coinmp/werror-format-security.patch.0 |   12 -
 external/coinmp/windows.build.patch.1  |   28 +-
 12 files changed, 175 insertions(+), 438 deletions(-)

New commits:
commit 2193650b3373ee1889961cfb72d1fe97f73e2c23
Author: Stephan Bergmann 
AuthorDate: Thu Sep 15 21:06:04 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 9 12:24:56 2023 +0200

external/coinmp: Update to CoinMP 1.8.4

...originally started mostly to simplify a then-upcoming change to address
std::bind2nd gone from libc++ for C++17 (which turned out to already be
partially addressed in this new CoinMP revision).  But that has since been
addressed with b97e8b9d13ef0f57f7cf0badbefcb038a8bbd137 "external/coinmp: 
Adapt
to std::bind2nd gone from C++17" on top of the old CoinMP 1.7.6, because
updating to 1.8.4 turned out to run into issues on Windows, see the email 
thread
starting at


"Maintaining building external/coinmp on Windows".

*  is a copy of
  .

* Various of our patches are meanwhile addressed upstream, partially or in
  whole.

* The upstream configure scripts deteriorated and caused one of my Linux 
build's
  CC=/absolute/path/to/some/clang to be mistaken for MSVC which caused them 
to
  force LD=link, which in turn caused them to only build archives and not 
the
  shared libraries that we expect.  external/coinmp/clang-with-path.patch
  addresses that.

* There's apparently a new ClpSolver library now that also needs to be
  installed.  Otherwise at least CppunitTest_sccomp_swarmsolvertest failed 
due
  to

> warn:sal.osl:1950612:1950612:sal/osl/unx/module.cxx:152: 
dlopen(instdir/program/libsolverlo.so, 257): libClpSolver.so.1: cannot open 
shared object file: No such file or directory

* Plus modifications to external/coinmp/windows.build.patch.1 thankfully 
done by
  Taichi Haradaguchi <20001...@ymail.ne.jp> to make this actually compile on
  Windows (cf. the mailing list thread starting at
  

  "Maintaining building external/coinmp on Windows")

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

diff --git a/download.lst b/download.lst
index 1b40709f0858..fb5226385dee 100644
--- a/download.lst
+++ b/download.lst
@@ -65,8 +65,8 @@ LIBCMIS_TARBALL := libcmis-0.5.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-COINMP_SHA256SUM := 
86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f
-COINMP_TARBALL := CoinMP-1.7.6.tgz
+COINMP_SHA256SUM := 
3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d
+COINMP_TARBALL := CoinMP-1.8.4.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/coinmp/ExternalPackage_coinmp.mk 
b/external/coinmp/ExternalPackage_coinmp.mk
index 23fbb10b820f..91c3d4531748 100644
--- a/external/coinmp/ExternalPackage_coinmp.mk
+++ b/external/coinmp/ExternalPackage_coinmp.mk
@@ -19,23 +19,25 @@ $(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,C
 else ifneq ($(DISABLE_DYNLOADING),)
 # Just use the static archives from workdir. See bin/lo-all-static-libs
 else ifeq ($(OS),MACOSX)
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.8.8.dylib))
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.8.8.dylib))
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCgl.1.dylib,Cgl/src/.libs/libCgl.1.8.5.dylib))
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libClp.1.dylib,Clp/src/.libs/libClp.1.12.6.dylib))
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsiClp.1.dylib,Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib))
-$(eval $(call

[Libreoffice-commits] core.git: download.lst external/xmlsec xmlsecurity/inc

2023-06-09 Thread Miklos Vajna (via logerrit)

 download.lst  |4 -
 external/xmlsec/UnpackedTarball_xmlsec.mk |2 
 external/xmlsec/old-nss.patch.1   |   66 ++
 xmlsecurity/inc/xmlsec-wrapper.h  |5 --
 4 files changed, 70 insertions(+), 7 deletions(-)

New commits:
commit bfd479abf0d1d8ce36c3b0dcc6c824216f88a95b
Author: Miklos Vajna 
AuthorDate: Thu Jun 8 16:45:53 2023 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jun 9 08:11:34 2023 +0200

Update libxmlsec to 1.3.1

This time try to do it in a way that doesn't re-introduce tdf#155034,
i.e. patch out code that would use NSS symbols which are in the RHEL7
baseline, but are not in Ubuntu 18.04. This is all code like RSA OAEP or
AES GCM which is relatively new, so not really required for our
signature needs.

It also helps that this release has a lowered baseline for NSS.

Change-Id: I5a8df6d98462e8173a5508e014bd2d515da2dc9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152747
Tested-by: Justin Luth 
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 5366f5e1bbbd..1b40709f0858 100644
--- a/download.lst
+++ b/download.lst
@@ -334,8 +334,8 @@ LIBWEBP_TARBALL := libwebp-1.3.0.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-XMLSEC_SHA256SUM := 
5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c
-XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz
+XMLSEC_SHA256SUM := 
10f48384d4fd1afc05fea545b74fbf7c152582f0a895c189f164d55270400c63
+XMLSEC_TARBALL := xmlsec1-1.3.1.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 3ad978cdb829..77d3386b27dc 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -8,6 +8,8 @@
 #
 
 xmlsec_patches :=
+# Remove this when Ubuntu 20.04 is EOL in 2025.
+xmlsec_patches += old-nss.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 
diff --git a/external/xmlsec/old-nss.patch.1 b/external/xmlsec/old-nss.patch.1
new file mode 100644
index ..b46453586351
--- /dev/null
+++ b/external/xmlsec/old-nss.patch.1
@@ -0,0 +1,66 @@
+diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
+index bb64c5f2..fe9904be 100644
+--- a/include/xmlsec/nss/crypto.h
 b/include/xmlsec/nss/crypto.h
+@@ -105,6 +105,7 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId  
xmlSecNssTransformAes192CbcGetKlass(void
+ XMLSEC_CRYPTO_EXPORT xmlSecTransformId  
xmlSecNssTransformAes256CbcGetKlass(void);
+ 
+ 
++#if 0
+ /**
+  * xmlSecNssTransformAes128GcmId:
+  *
+@@ -131,6 +132,7 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId  
xmlSecNssTransformAes192GcmGetKlass(void
+ #define xmlSecNssTransformAes256GcmId \
+ xmlSecNssTransformAes256GcmGetKlass()
+ XMLSEC_CRYPTO_EXPORT xmlSecTransformId  
xmlSecNssTransformAes256GcmGetKlass(void);
++#endif
+ 
+ 
+ /**
+diff --git a/src/nss/ciphers_gcm.c b/src/nss/ciphers_gcm.c
+index 5763a756..7b50e5fd 100644
+--- a/src/nss/ciphers_gcm.c
 b/src/nss/ciphers_gcm.c
+@@ -31,6 +31,7 @@
+ #include "../cast_helpers.h"
+ #include "../kw_aes_des.h"
+ 
++#if 0
+ /* https://www.w3.org/TR/xmlenc-core1/#sec-AES-GCM
+  *
+  * For the purposes of this specification, AES-GCM shall be used with
+@@ -591,3 +592,4 @@ xmlSecNssTransformAes256GcmGetKlass(void) {
+ }
+ 
+ #endif /* XMLSEC_NO_AES */
++#endif
+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) {
+ gXmlSecNssFunctions->transformAes192CbcGetKlass = 
xmlSecNssTransformAes192CbcGetKlass;
+ gXmlSecNssFunctions->transformAes256CbcGetKlass = 
xmlSecNssTransformAes256CbcGetKlass;
+ 
++#if 0
+ gXmlSecNssFunctions->transformAes128GcmGetKlass = 
xmlSecNssTransformAes128GcmGetKlass;
+ gXmlSecNssFunctions->transformAes192GcmGetKlass = 
xmlSecNssTransformAes192GcmGetKlass;
+ gXmlSecNssFunctions->transformAes256GcmGetKlass = 
xmlSecNssTransformAes256GcmGetKlass;
++#endif
+ 
+ gXmlSecNssFunctions->transformKWAes128GetKlass  = 
xmlSecNssTransformKWAes128GetKlass;
+ gXmlSecNssFunctions->transformKWAes192GetKlass  = 
xmlSecNssTransformKWAes192GetKlass;
+diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
+index bb64c5f2..4c3dc4d3 100644
+--- a/include/xmlsec/nss/crypto.h
 b/include/xmlsec/nss/crypto.h
+@@ -26,7 +26,7 @@
+  * RSA OAEP requires https://bugzilla.mozilla.org/show_bug.cgi?id=1666891
+  * which was fixed in NSS 3.59 
(https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_releases/nss_3.59_release_notes/index.html)
+  */
+-#if (NSS_VMAJOR < 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR < 59))
++#if 1
+ #define XMLSEC_NO_RSA_OAEP 1
+ #else  /* (NSS_VMAJOR < 3) ||

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

2023-05-25 Thread Miklos Vajna (via logerrit)

 download.lst  |4 
 external/pdfium/Library_pdfium.mk |1 
 external/pdfium/UnpackedTarball_pdfium.mk |8 -
 external/pdfium/abseil-trivial.patch  |   31 -
 external/pdfium/build.patch.1 |  170 +++---
 external/pdfium/include.patch |   11 -
 6 files changed, 89 insertions(+), 136 deletions(-)

New commits:
commit dc69e7c52f12f57197f26b56c968139186d4ed5b
Author: Miklos Vajna 
AuthorDate: Wed May 24 20:13:48 2023 +0200
Commit: Miklos Vajna 
CommitDate: Thu May 25 08:12:41 2023 +0200

Update pdfium to 5778

- external/pdfium/abseil-trivial.patch is no longer needed, upstream
  does what we did previously

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

- external/pdfium/include.patch is no longer needed, upstream does what
  we did previously

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

diff --git a/download.lst b/download.lst
index f05ff4539cb5..9a0ac67b1bff 100644
--- a/download.lst
+++ b/download.lst
@@ -433,8 +433,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PDFIUM_SHA256SUM := 
1a625b25562fb4c25c8bf4660c704111cdd306b8934b94dcd9b89329909ede55
-PDFIUM_TARBALL := pdfium-5636.tar.bz2
+PDFIUM_SHA256SUM := 
b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06
+PDFIUM_TARBALL := pdfium-5778.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 f137f851a0b2..bdab04c6861d 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -293,6 +293,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_transferfunc \
 UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_basedcs \
 UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_indexedcs \
+UnpackedTarball/pdfium/core/fpdfapi/parser/object_tree_traversal_util \
 ))
 
 # fpdfdoc
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk 
b/external/pdfium/UnpackedTarball_pdfium.mk
index 46c7a45ee798..79e93d24d439 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -14,14 +14,6 @@ pdfium_patches += build.patch.1
 # Avoids Windows 8 build dependency.
 pdfium_patches += windows7.patch.1
 pdfium_patches += c++20-comparison.patch
-# Use CoreGraphics.h instead of Carbon.h -- 
https://pdfium-review.googlesource.com/c/pdfium/+/99753
-# pdfium_patches += cg-instead-of-carbon.patch.1
-# Android NDK 19 - that is known to work well - does not have 2 defines -- 
https://pdfium-review.googlesource.com/c/pdfium/+/96530
-# pdfium_patches += AndroidNDK19.patch.1
-
-pdfium_patches += include.patch
-
-pdfium_patches += abseil-trivial.patch
 
 pdfium_patches += constexpr-template.patch
 
diff --git a/external/pdfium/abseil-trivial.patch 
b/external/pdfium/abseil-trivial.patch
deleted file mode 100644
index fa91fa6bbba9..
--- a/external/pdfium/abseil-trivial.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 third_party/abseil-cpp/absl/meta/type_traits.h
-+++ third_party/abseil-cpp/absl/meta/type_traits.h
-@@ -501,27 +501,7 @@ struct is_trivially_move_assignable
- // operation that is not trivial. `is_trivially_copy_assignable` is simply
- // `is_trivially_assignable`.
- template 
--struct is_trivially_copy_assignable
--#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
--: std::is_trivially_copy_assignable {
--#else
--: std::integral_constant<
--  bool, __has_trivial_assign(typename std::remove_reference::type) 
&&
--absl::is_copy_assignable::value> {
--#endif
--#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-- private:
--  static constexpr bool compliant =
--  std::is_trivially_copy_assignable::value ==
--  is_trivially_copy_assignable::value;
--  static_assert(compliant || std::is_trivially_copy_assignable::value,
--"Not compliant with std::is_trivially_copy_assignable; "
--"Standard: false, Implementation: true");
--  static_assert(compliant || !std::is_trivially_copy_assignable::value,
--"Not compliant with std::is_trivially_copy_assignable; "
--"Standard: true, Implementation: false");
--#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
--};
-+using is_trivially_copy_assignable = std::is_trivially_copy_assignable;
- 
- #if defined(__cpp_lib_remove_cvref) && __cpp_lib_remove_cvref >= 201711L
- template 
diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1
index 6f6a53a44ef3..2c177b3b61a4 100644
--- a/external/pdfium/build.patch.1
+++ b/external/pdfium/build.patch.1
@@ -1,9 +1,66 @@

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

2023-05-24 Thread Caolán McNamara (via logerrit)

 download.lst  |4 ++--
 external/libxml2/ExternalPackage_libxml2.mk   |2 +-
 external/libxml2/ExternalProject_libxml2.mk   |4 ++--
 external/libxml2/UnpackedTarball_libxml2.mk   |1 +
 external/libxml2/libxml2-XMLCALL-redefine.patch.0 |   11 +++
 external/libxml2/libxml2-icu-sym.patch.0  |2 +-
 external/libxml2/libxml2-icu.patch.0  |2 +-
 external/redland/UnpackedTarball_raptor.mk|1 +
 external/redland/raptor/raptor-libxml2-11.patch.1 |   15 +++
 9 files changed, 35 insertions(+), 7 deletions(-)

New commits:
commit fd6cbd983a3021d22321854d0414bdc42c6cb1b7
Author: Caolán McNamara 
AuthorDate: Tue May 23 21:15:52 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 24 15:52:03 2023 +0200

upgrade to libxml2-2.11.4

'checked' field removed with:

https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce76ebfd1312459951d555ad9d87fb9a89eede55

win32 'run_debug' removed with:

https://gitlab.gnome.org/GNOME/libxml2/-/commit/59f2f60e3eff07324f1c7cd861a444d714be750b

add libxml2-XMLCALL-redefine.patch.0 to avoid:
UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): error C2220: the 
following warning is treated as an error
UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): warning C4005: 
'XMLCALL': macro redefinition
UnpackedTarball\expat\lib\expat_external.h(69): note: see previous 
definition of 'XMLCALL'

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

diff --git a/download.lst b/download.lst
index 9615e2dac051..f05ff4539cb5 100644
--- a/download.lst
+++ b/download.lst
@@ -339,9 +339,9 @@ XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45
+LIBXML_SHA256SUM := 
737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7
 LIBXML_VERSION_MICRO := 4
-LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz
+LIBXML_TARBALL := libxml2-2.11.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libxml2/ExternalPackage_libxml2.mk 
b/external/libxml2/ExternalPackage_libxml2.mk
index 6338fb20b9df..3c399970cd5b 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.10.$(LIBXML_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.11.$(LIBXML_VERSION_MICRO)))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxml2/ExternalProject_libxml2.mk 
b/external/libxml2/ExternalProject_libxml2.mk
index 979a07728966..7b334fa8ab2a 100644
--- a/external/libxml2/ExternalProject_libxml2.mk
+++ b/external/libxml2/ExternalProject_libxml2.mk
@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build):
$(call gb_Trace_StartRange,libxml2,EXTERNAL)
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
-   iconv=no icu=yes sax1=yes $(if 
$(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
+   iconv=no icu=yes sax1=yes $(if 
$(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
&& nmake \
,win32)
@@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build):
$(if $(SYSBASE),-I$(SYSBASE)/usr/include) \
$(call 
gb_ExternalProject_get_build_flags,libxml2)" \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
-   && $(MAKE) \
+   && $(MAKE) libxml2.la \
)
$(call gb_Trace_EndRange,libxml2,EXTERNAL)
 endif
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk 
b/external/libxml2/UnpackedTarball_libxml2.mk
index 8c81c3d26e4c..d50d52cbeef8 100644
--- a/external/libxml2/UnpackedTarball_libxml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -16,6 +16,7 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,libxml2))
 $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
external/libxml2/libxml2-global-symbols.patch \
external/libxml2/libxml2-vc10.patch \
+   external/libxml2/libxml2-XMLCALL-redefine.patch.0 \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \

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

2023-05-02 Thread Julien Nabet (via logerrit)

 download.lst  |4 ++--
 external/libwpg/ExternalProject_libwpg.mk |1 +
 external/libwpg/Library_wpg.mk|1 +
 external/libwpg/UnpackedTarball_libwpg.mk |4 
 external/libwpg/rpath.patch   |   10 --
 5 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit 0c0c9a0dd8a7b102315ab1075f78a0f1f3397b67
Author: Julien Nabet 
AuthorDate: Sun Apr 30 07:47:40 2023 +0200
Commit: Julien Nabet 
CommitDate: Tue May 2 23:35:48 2023 +0200

tdf#155057: Wrong colors in some WPG2 (well rendered in WPG1)

Thank you Fridrich Strba for the quick fix in libwpg!

Change-Id: Icb2a48cdd7846ac9f2b32ca65a479381d8c8bfed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151217
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/download.lst b/download.lst
index 5dee8cfce9ab..9615e2dac051 100644
--- a/download.lst
+++ b/download.lst
@@ -533,8 +533,8 @@ WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-WPG_SHA256SUM := 
99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c
-WPG_VERSION_MICRO := 3
+WPG_SHA256SUM := 
b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3
+WPG_VERSION_MICRO := 4
 WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/external/libwpg/ExternalProject_libwpg.mk 
b/external/libwpg/ExternalProject_libwpg.mk
index 6a0d2c8984c6..dc6bdf7d6899 100644
--- a/external/libwpg/ExternalProject_libwpg.mk
+++ b/external/libwpg/ExternalProject_libwpg.mk
@@ -37,6 +37,7 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) :
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(gb_CONFIGURE_PLATFORMS) \
CXXFLAGS="$(gb_CXXFLAGS) $(call 
gb_ExternalProject_get_build_flags,libwpg)" \
+   CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
$(if $(filter LINUX,$(OS)), \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\ORIGIN') \
diff --git a/external/libwpg/Library_wpg.mk b/external/libwpg/Library_wpg.mk
index 09dc34915238..e59133ea588d 100644
--- a/external/libwpg/Library_wpg.mk
+++ b/external/libwpg/Library_wpg.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Library_Library,wpg))
 $(eval $(call gb_Library_use_unpacked,wpg,libwpg))
 
 $(eval $(call gb_Library_use_externals,wpg,\
+   boost_headers \
revenge \
wpd \
 ))
diff --git a/external/libwpg/UnpackedTarball_libwpg.mk 
b/external/libwpg/UnpackedTarball_libwpg.mk
index 9ca55c669d72..e3790c831296 100644
--- a/external/libwpg/UnpackedTarball_libwpg.mk
+++ b/external/libwpg/UnpackedTarball_libwpg.mk
@@ -15,10 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwpg,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwpg))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libwpg, \
-external/libwpg/rpath.patch \
-))
-
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
 ifneq ($(OS),iOS)
diff --git a/external/libwpg/rpath.patch b/external/libwpg/rpath.patch
deleted file mode 100644
index 5a8f56105509..
--- a/external/libwpg/rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 configure
-+++ configure
-@@ -13858,6 +13858,7 @@
-   esac
-   ;;
-   esac
-+hardcode_libdir_flag_spec_CXX=
-   ;;
- 
-   lynxos*)

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

2023-05-01 Thread Kohei Yoshida (via logerrit)

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

New commits:
commit fb3a6b82b55a298eabf8f431f1451dc826642acd
Author: Kohei Yoshida 
AuthorDate: Mon May 1 18:19:39 2023 -0400
Commit: Kohei Yoshida 
CommitDate: Tue May 2 02:03:07 2023 +0200

Update mdds to 2.1.1

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

diff --git a/download.lst b/download.lst
index f2ea92d5..5dee8cfce9ab 100644
--- a/download.lst
+++ b/download.lst
@@ -366,8 +366,8 @@ MARIADB_CONNECTOR_C_TARBALL := 
mariadb-connector-c-3.1.8-src.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-MDDS_SHA256SUM := 
9bd8ba6c81a560723e869486850c374bae4e897d6024698452de0738c3adb354
-MDDS_TARBALL := mdds-2.1.0.tar.xz
+MDDS_SHA256SUM := 
1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56
+MDDS_TARBALL := mdds-2.1.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: download.lst xmlsecurity/inc

2023-04-28 Thread Justin Luth (via logerrit)

 download.lst |4 ++--
 xmlsecurity/inc/xmlsec-wrapper.h |5 +
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1770d3ba3313f2166153d39be6ae1212c00da6d8
Author: Justin Luth 
AuthorDate: Thu Apr 27 17:49:48 2023 +0200
Commit: Miklos Vajna 
CommitDate: Fri Apr 28 08:05:21 2023 +0200

tdf#155034 Revert "Update libxmlsec to 1.3.0"

This reverts commit 26bf26272bf525b59b4a4ce18b3ce14c1febfd7b.

Reason for revert: compiled version fails open/create some documents
on Ubuntu 20.04, which is still an Ubuntu-supported release.
Also fails to compile on 20.04 with built-in system NSS

The clinching reason is for running bibisects.
There was no compelling reason to make the change,
just routine maintenance. So if something breaks
or is annoying when doing routine maintenance, then revert it.

The previous version is still 1.2.37, released in Nov 2022.
So this will likely come up again relatively soon
if there is a security fix required.
But at least at the end of the 7.6 development cycle,
we can avoid the pain.

Change-Id: Ife387d6e4058b017ba18cba1fbcb2b2d50f52c12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151118
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 8a75c598af84..f2ea92d5 100644
--- a/download.lst
+++ b/download.lst
@@ -334,8 +334,8 @@ LIBWEBP_TARBALL := libwebp-1.3.0.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-XMLSEC_SHA256SUM := 
df3ad2548288411fc3d44c20879e4c4e90684a1a4fb76a06ae444f957171c9a6
-XMLSEC_TARBALL := xmlsec1-1.3.0.tar.gz
+XMLSEC_SHA256SUM := 
5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c
+XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h
index 7c6d267e8b73..e4048de94bf2 100644
--- a/xmlsecurity/inc/xmlsec-wrapper.h
+++ b/xmlsecurity/inc/xmlsec-wrapper.h
@@ -23,6 +23,11 @@
 
 #include 
 
+// Cf. xmlsec's configure.in:
+#if SAL_TYPES_SIZEOFPOINTER != 4 && !defined SYSTEM_XMLSEC
+#define XMLSEC_NO_SIZE_T
+#endif
+
 #include 
 #include 
 #include

[Libreoffice-commits] core.git: download.lst xmlsecurity/inc

2023-04-25 Thread Miklos Vajna (via logerrit)

 download.lst |4 ++--
 xmlsecurity/inc/xmlsec-wrapper.h |5 -
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 26bf26272bf525b59b4a4ce18b3ce14c1febfd7b
Author: Miklos Vajna 
AuthorDate: Mon Apr 24 14:27:47 2023 +0200
Commit: Miklos Vajna 
CommitDate: Tue Apr 25 08:05:16 2023 +0200

Update libxmlsec to 1.3.0

See  for the
upstream release notes, notably:

> (ABI breaking change) Switched xmlSecSize to use size_t by default.

Adapt xmlsec-wrapper.h accordingly.

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

diff --git a/download.lst b/download.lst
index f2ea92d5..8a75c598af84 100644
--- a/download.lst
+++ b/download.lst
@@ -334,8 +334,8 @@ LIBWEBP_TARBALL := libwebp-1.3.0.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-XMLSEC_SHA256SUM := 
5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c
-XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz
+XMLSEC_SHA256SUM := 
df3ad2548288411fc3d44c20879e4c4e90684a1a4fb76a06ae444f957171c9a6
+XMLSEC_TARBALL := xmlsec1-1.3.0.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h
index e4048de94bf2..7c6d267e8b73 100644
--- a/xmlsecurity/inc/xmlsec-wrapper.h
+++ b/xmlsecurity/inc/xmlsec-wrapper.h
@@ -23,11 +23,6 @@
 
 #include 
 
-// Cf. xmlsec's configure.in:
-#if SAL_TYPES_SIZEOFPOINTER != 4 && !defined SYSTEM_XMLSEC
-#define XMLSEC_NO_SIZE_T
-#endif
-
 #include 
 #include 
 #include

[Libreoffice-commits] core.git: download.lst sw/qa

2023-04-19 Thread Michael Stahl (via logerrit)

 download.lst   |4 ++--
 sw/qa/extras/htmlexport/htmlexport.cxx |   16 
 2 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit b28fd940ca46828be624679863364b4db89dd38c
Author: Michael Stahl 
AuthorDate: Tue Apr 18 11:23:39 2023 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 19 13:08:29 2023 +0200

libxml2: upgrade to release 2.10.4

Fixes CVE-2023-29469 and CVE-2023-28484.

Also: SAX2: Ignore namespaces in HTML documents

which is probably the reason why one test fails, so switch it to parsing
XML:

HTML parser error : Tag reqif-xhtml:div invalid

HTML parser error : Tag reqif-xhtml:table invalid

...
reqif-table.xhtml:

C:/cygwin/home/tdf/jenkins/workspace/gerrit_windows/test/source/xmltesttools.cxx:195:testReqIfTable::Import_Export
equality assertion failed
- Expected: 1
- Actual  : 0
- In 
,
 XPath '/html/body/div/table/tr/th' number of nodes is incorrect

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

diff --git a/download.lst b/download.lst
index 284d73d2ff70..f2ea92d5 100644
--- a/download.lst
+++ b/download.lst
@@ -339,8 +339,8 @@ XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c
-LIBXML_VERSION_MICRO := 3
+LIBXML_SHA256SUM := 
ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45
+LIBXML_VERSION_MICRO := 4
 LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 8ec0c1bd6fc1..92cc07213d56 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -817,16 +817,24 @@ DECLARE_HTMLEXPORT_TEST(testReqIfJpgImg, 
"reqif-jpg-img.xhtml")
 
 DECLARE_HTMLEXPORT_TEST(testReqIfTable, "reqif-table.xhtml")
 {
-htmlDocUniquePtr pDoc = parseHtml(maTempFile);
+SvMemoryStream aStream;
+WrapReqifFromTempFile(aStream);
+xmlDocUniquePtr pDoc = parseXmlStream();
 CPPUNIT_ASSERT(pDoc);
 
 //  was missing, so the XHTML fragment wasn't a valid
 // xhtml.BlkStruct.class type anymore.
-assertXPath(pDoc, "/html/body/div/table/tr/th", 1);
+assertXPath(pDoc,
+
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr/reqif-xhtml:th",
+1);
 // Make sure that the cell background is not written using CSS.
-assertXPathNoAttribute(pDoc, "/html/body/div/table/tr/th", "style");
+assertXPathNoAttribute(
+pDoc, 
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr/reqif-xhtml:th",
+"style");
 // The attribute was present, which is not valid in reqif-xhtml.
-assertXPathNoAttribute(pDoc, "/html/body/div/table/tr/th", "bgcolor");
+assertXPathNoAttribute(
+pDoc, 
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr/reqif-xhtml:th",
+"bgcolor");
 }
 
 DECLARE_HTMLEXPORT_TEST(testReqIfTable2, "reqif-table2.odt")

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

2023-04-17 Thread Stephan Bergmann (via logerrit)

 download.lst |4 ++--
 external/boost/StaticLibrary_boost_locale.mk |1 +
 external/boost/boost.between.warning.patch   |8 
 external/boost/boost.fallback.encoding.patch |   16 +++-
 4 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit 8daa8eef06fa485f5271503921585a3fbef26567
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 13:27:27 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 18:59:32 2023 +0200

Upgrade external/boost to latest Boost 1.82.0

 has been 
generated (on
Fedora 38) with

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

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

* Updating StaticLibrary_boost_locale.mk is needed to avoid
> 
workdir/UnpackedTarball/boost/libs/locale/src/boost/locale/util/locale_data.cpp:137:
 error: undefined reference to 
'boost::locale::util::normalize_encoding(std::__cxx11::basic_string, std::allocator > const&)'

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

diff --git a/download.lst b/download.lst
index 3257a3d06caa..284d73d2ff70 100644
--- a/download.lst
+++ b/download.lst
@@ -9,8 +9,8 @@ ABW_TARBALL := libabw-0.1.3.tar.xz
 # so that git cherry-pick
 # will not run into conflicts
 # please repack the tarball using external/boost/repack_tarball.sh
-BOOST_SHA256SUM := 
1deb0a5a9e33a6626fcaa1d2efd4c0e74ca2b0eea87c1559e3917f3066b633d6
-BOOST_TARBALL := boost_1_81_0.tar.xz
+BOOST_SHA256SUM := 
e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de
+BOOST_TARBALL := boost_1_82_0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/boost/StaticLibrary_boost_locale.mk 
b/external/boost/StaticLibrary_boost_locale.mk
index 03e3bbc76b66..1193867a6d0e 100644
--- a/external/boost/StaticLibrary_boost_locale.mk
+++ b/external/boost/StaticLibrary_boost_locale.mk
@@ -44,6 +44,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,boost_locale,\
UnpackedTarball/boost/libs/locale/src/boost/locale/std/std_backend \

UnpackedTarball/boost/libs/locale/src/boost/locale/util/codecvt_converter \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/default_locale \
+   UnpackedTarball/boost/libs/locale/src/boost/locale/util/encoding \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/gregorian \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/info \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/locale_data \
diff --git a/external/boost/boost.between.warning.patch 
b/external/boost/boost.between.warning.patch
index 8c9ba65a1d39..349a9065ce62 100644
--- a/external/boost/boost.between.warning.patch
+++ b/external/boost/boost.between.warning.patch
@@ -1,6 +1,14 @@
 diff -ru boost.orig/boost/libs/locale/src/encoding/codepage.cpp 
boost/boost/libs/locale/src/encoding/codepage.cpp
 --- foo/misc/boost.orig/libs/locale/src/encoding/codepage.cpp
 +++ foo/misc/boost/libs/locale/src/boost/locale/encoding/codepage.cpp
+@@ -8,6 +8,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "boost/locale/encoding/conv.hpp"
+ #if BOOST_LOCALE_USE_WIN32_API
 @@ -58,6 +58,9 @@
  return cvt->convert(begin, end);
  #endif
diff --git a/external/boost/boost.fallback.encoding.patch 
b/external/boost/boost.fallback.encoding.patch
index 3ad39c47b638..8aa5ed6d1276 100644
--- a/external/boost/boost.fallback.encoding.patch
+++ b/external/boost/boost.fallback.encoding.patch
@@ -1,13 +1,11 @@
 --- foo/misc/boost.orig/libs/locale/src/util/locale_data.cpp.new   
2022-02-17 22:41:27.730549039 +
 +++ foo/misc/boost/libs/locale/src/boost/locale/util/locale_data.cpp
-@@ -18,8 +18,8 @@
- language = "C";
- country.clear();
- variant.clear();
--encoding = "us-ascii";
--utf8 = false;
-+encoding = "UTF-8";
-+utf8 = true;
- parse_from_lang(locale_name);
+@@ -50,6 +50,8 @@
+ bool locale_data::parse(const std::string& locale_name)
+ {
+ reset();
++encoding_ = "UTF-8";
++utf8_ = true;
+ return parse_from_lang(locale_name);
  }

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

2023-04-06 Thread Taichi Haradaguchi (via logerrit)

 download.lst |8 -
 external/poppler/ExternalPackage_poppler_data.mk |   24 ++---
 external/poppler/StaticLibrary_poppler.mk|   46 +--
 external/poppler/UnpackedTarball_poppler.mk  |7 -
 external/poppler/gcc7-GfxFont.patch.1|   94 +++
 external/poppler/poppler-config.patch.1  |   14 +--
 6 files changed, 145 insertions(+), 48 deletions(-)

New commits:
commit 79e60bb93f69370f23010adb078b5a5de5a1e7b2
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Mar 14 19:01:26 2023 +0900
Commit: Michael Stahl 
CommitDate: Thu Apr 6 12:33:15 2023 +0200

poppler: upgrade to release 23.03.0

* Upgrade poppler-data to 0.4.12
* Update poppler-config.patch.1

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

diff --git a/download.lst b/download.lst
index 81dda8af1413..3257a3d06caa 100644
--- a/download.lst
+++ b/download.lst
@@ -453,10 +453,10 @@ LIBTIFF_TARBALL := tiff-4.5.0rc3.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0
-POPPLER_TARBALL := poppler-22.12.0.tar.xz
-POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
-POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
+POPPLER_SHA256SUM := 
b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4
+POPPLER_TARBALL := poppler-23.03.0.tar.xz
+POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
+POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/poppler/ExternalPackage_poppler_data.mk 
b/external/poppler/ExternalPackage_poppler_data.mk
index 78024d3fec8b..b85a73f0e663 100644
--- a/external/poppler/ExternalPackage_poppler_data.mk
+++ b/external/poppler/ExternalPackage_poppler_data.mk
@@ -100,6 +100,7 @@ poppler_cmap-files =\
cMap/Adobe-GB1/GB-EUC-H \
cMap/Adobe-GB1/GB-EUC-V \
cMap/Adobe-GB1/GB-H \
+   cMap/Adobe-GB1/GB-V \
cMap/Adobe-GB1/GBK2K-H  \
cMap/Adobe-GB1/GBK2K-V  \
cMap/Adobe-GB1/GBK-EUC-H\
@@ -114,10 +115,9 @@ poppler_cmap-files =\
cMap/Adobe-GB1/GBT-EUC-H\
cMap/Adobe-GB1/GBT-EUC-V\
cMap/Adobe-GB1/GBT-H\
+   cMap/Adobe-GB1/GBT-V\
cMap/Adobe-GB1/GBTpc-EUC-H  \
cMap/Adobe-GB1/GBTpc-EUC-V  \
-   cMap/Adobe-GB1/GBT-V\
-   cMap/Adobe-GB1/GB-V \
cMap/Adobe-GB1/UCS2-GBK-EUC \
cMap/Adobe-GB1/UCS2-GBpc-EUC\
cMap/Adobe-GB1/UniGB-UCS2-H \
@@ -131,17 +131,17 @@ poppler_cmap-files =\
cMap/Adobe-Japan1/78-EUC-H  \
cMap/Adobe-Japan1/78-EUC-V  \
cMap/Adobe-Japan1/78-H  \
-   cMap/Adobe-Japan1/78ms-RKSJ-H   \
-   cMap/Adobe-Japan1/78ms-RKSJ-V   \
cMap/Adobe-Japan1/78-RKSJ-H \
cMap/Adobe-Japan1/78-RKSJ-V \
cMap/Adobe-Japan1/78-V  \
+   cMap/Adobe-Japan1/78ms-RKSJ-H   \
+   cMap/Adobe-Japan1/78ms-RKSJ-V   \
cMap/Adobe-Japan1/83pv-RKSJ-H   \
-   cMap/Adobe-Japan1/90msp-RKSJ-H  \
-   cMap/Adobe-Japan1/90msp-RKSJ-V  \
cMap/Adobe-Japan1/90ms-RKSJ-H   \
cMap/Adobe-Japan1/90ms-RKSJ-UCS2\
cMap/Adobe-Japan1/90ms-RKSJ-V   \
+   cMap/Adobe-Japan1/90msp-RKSJ-H  \
+   cMap/Adobe-Japan1/90msp-RKSJ-V  \
cMap/Adobe-Japan1/90pv-RKSJ-H   \
cMap/Adobe-Japan1/90pv-RKSJ-UCS2\
cMap/Adobe-Japan1/90pv-RKSJ-UCS2C   \
@@ -201,9 +201,6 @@ poppler_cmap-files =\
cMap/Adobe-Japan1/UniJIS2004-UTF32-V\
cMap/Adobe-Japan1/UniJIS2004-UTF8-H \
cMap/Adobe-Japan1/UniJIS2004-UTF8-V \
-   cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V   \
-   cMap/Adobe-Japan1/UniJISPro-UCS2-V  \
-   cMap/Adobe-Japan1/UniJISPro-UTF8-V  \
cMap/Adobe-Japan1/UniJIS-UCS2-H \
cMap/Adobe-Japan1/UniJIS-UCS2-HW-H  \
cMap/Adobe-Japan1/UniJIS-UCS2-HW-V

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

2023-03-29 Thread Taichi Haradaguchi (via logerrit)

 download.lst  |4 ++--
 external/libjpeg-turbo/README |2 +-
 external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk |   10 +-
 external/libjpeg-turbo/jconfig.h  |4 ++--
 external/libjpeg-turbo/jconfigint.h   |4 ++--
 external/libjpeg-turbo/jversion.h |6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 4bf27aa3a12cf4013ec1884ada902e905f751af7
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Mar 15 23:22:33 2023 +0900
Commit: Caolán McNamara 
CommitDate: Wed Mar 29 15:29:42 2023 +

libjpeg-turbo: upgrade to release 2.1.5.1

Fixes a serious regression that 2.1.5 had.[1]

[1] "Release 2.1.5.1 · libjpeg-turbo/libjpeg-turbo"


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

diff --git a/download.lst b/download.lst
index 86759b35fa9b..d201642cb232 100644
--- a/download.lst
+++ b/download.lst
@@ -269,8 +269,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 := 
bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf
-LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.tar.gz
+LIBJPEG_TURBO_SHA256SUM := 
2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf
+LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libjpeg-turbo/README b/external/libjpeg-turbo/README
index 46eff7cb7487..66ab7ad9660d 100644
--- a/external/libjpeg-turbo/README
+++ b/external/libjpeg-turbo/README
@@ -3,4 +3,4 @@ External library for reading/writing jpegs
 This is only used by the jpeg import filter that is provided
 for use by VCL see [[vcl/source/filter/jpeg]]
 
-From [http://www.libjpeg-turbo.org/].
+From [https://www.libjpeg-turbo.org/].
diff --git a/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk 
b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
index 0b6b3044d1b2..ace14fd8fc5d 100644
--- a/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
@@ -37,8 +37,10 @@ endif
 endif
 
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\
+UnpackedTarball/libjpeg-turbo/jaricom \
 UnpackedTarball/libjpeg-turbo/jcapimin \
 UnpackedTarball/libjpeg-turbo/jcapistd \
+UnpackedTarball/libjpeg-turbo/jcarith \
 UnpackedTarball/libjpeg-turbo/jccoefct \
 UnpackedTarball/libjpeg-turbo/jccolor \
 UnpackedTarball/libjpeg-turbo/jcdctmgr \
@@ -56,6 +58,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\
 UnpackedTarball/libjpeg-turbo/jctrans \
 UnpackedTarball/libjpeg-turbo/jdapimin \
 UnpackedTarball/libjpeg-turbo/jdapistd \
+UnpackedTarball/libjpeg-turbo/jdarith \
 UnpackedTarball/libjpeg-turbo/jdatadst \
 UnpackedTarball/libjpeg-turbo/jdatasrc \
 UnpackedTarball/libjpeg-turbo/jdcoefct \
@@ -80,14 +83,11 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\
 UnpackedTarball/libjpeg-turbo/jidctfst \
 UnpackedTarball/libjpeg-turbo/jidctint \
 UnpackedTarball/libjpeg-turbo/jidctred \
+UnpackedTarball/libjpeg-turbo/jmemmgr \
+UnpackedTarball/libjpeg-turbo/jmemnobs \
 UnpackedTarball/libjpeg-turbo/jquant1 \
 UnpackedTarball/libjpeg-turbo/jquant2 \
 UnpackedTarball/libjpeg-turbo/jutils \
-UnpackedTarball/libjpeg-turbo/jmemmgr \
-UnpackedTarball/libjpeg-turbo/jmemnobs \
-UnpackedTarball/libjpeg-turbo/jaricom \
-UnpackedTarball/libjpeg-turbo/jcarith \
-UnpackedTarball/libjpeg-turbo/jdarith \
 ))
 
 ifneq ($(NASM),)
diff --git a/external/libjpeg-turbo/jconfig.h b/external/libjpeg-turbo/jconfig.h
index 65151c1422ad..3855ccec9cfd 100644
--- a/external/libjpeg-turbo/jconfig.h
+++ b/external/libjpeg-turbo/jconfig.h
@@ -4,10 +4,10 @@
 #define JPEG_LIB_VERSION  62
 
 /* libjpeg-turbo version */
-#define LIBJPEG_TURBO_VERSION  2.1.4
+#define LIBJPEG_TURBO_VERSION  2.1.5.1
 
 /* libjpeg-turbo version in integer form */
-#define LIBJPEG_TURBO_VERSION_NUMBER  2001004
+#define LIBJPEG_TURBO_VERSION_NUMBER  2001005
 
 /* Support arithmetic encoding */
 #define C_ARITH_CODING_SUPPORTED 1
diff --git a/external/libjpeg-turbo/jconfigint.h 
b/external/libjpeg-turbo/jconfigint.h
index 6cd960a03368..b7644cbac90e 100644
--- a/external/libjpeg-turbo/jconfigint.h
+++ b/external/libjpeg-turbo/jconfigint.h
@@ -1,7 +1,7 @@
 #include 
 
 /* libjpeg-turbo build number */
-#define BUILD  "20230228"
+#define BUILD  "20230315"
 
 /* Compiler's inline keyword */
 #undef inline
@@ -19,7

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

2023-03-23 Thread Taichi Haradaguchi (via logerrit)

 download.lst|4 ++--
 external/harfbuzz/README|2 +-
 vcl/source/font/LogicalFontInstance.cxx |4 
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit b80e0165affb81bcc6bf343b54c17b9a9b4c0d0e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Mar 11 12:42:40 2023 +0900
Commit: خالد حسني 
CommitDate: Thu Mar 23 11:55:58 2023 +

Upgrade Harfbuzz to 7.1.0

* Fixes CVE-2023-25193.
* if Harfbuzz >= 7.0.0, uses hb_font_draw_glyph()
  instead of hb_font_get_glyph_shape().
* Update URL in README.

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

diff --git a/download.lst b/download.lst
index 4f2a9169d40f..86759b35fa9b 100644
--- a/download.lst
+++ b/download.lst
@@ -217,8 +217,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4
-HARFBUZZ_TARBALL := harfbuzz-6.0.0.tar.xz
+HARFBUZZ_SHA256SUM := 
f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b
+HARFBUZZ_TARBALL := harfbuzz-7.1.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 d2af8b559ad1..149da5566ab9 100644
--- a/external/harfbuzz/README
+++ b/external/harfbuzz/README
@@ -1 +1 @@
-HarfBuzz is an OpenType text shaping engine. From [http://harfbuzz.org/].
+HarfBuzz is an OpenType text shaping engine. From 
[https://harfbuzz.github.io/].
diff --git a/vcl/source/font/LogicalFontInstance.cxx 
b/vcl/source/font/LogicalFontInstance.cxx
index 385fe5ccd624..ee9c01b3881f 100644
--- a/vcl/source/font/LogicalFontInstance.cxx
+++ b/vcl/source/font/LogicalFontInstance.cxx
@@ -306,7 +306,11 @@ basegfx::B2DPolyPolygon 
LogicalFontInstance::GetGlyphOutlineUntransformed(sal_Gl
 }
 
 basegfx::B2DPolyPolygon aPolyPoly;
+#if HB_VERSION_ATLEAST(7, 0, 0)
+hb_font_draw_glyph(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, 
);
+#else
 hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, 
);
+#endif
 return aPolyPoly;
 }

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

2023-03-21 Thread Michael Stahl (via logerrit)

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

New commits:
commit e5005c76bd60a004f6025728e794ba3e4d0dfff1
Author: Michael Stahl 
AuthorDate: Tue Mar 21 10:46:46 2023 +0100
Commit: Michael Stahl 
CommitDate: Tue Mar 21 13:19:29 2023 +

curl: upgrade to release 8.0.1

Apparently 8.0.0 had a serious regression.

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

diff --git a/download.lst b/download.lst
index 08dfd4c0078c..4f2a9169d40f 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 := 
759690f9a375a720f8bcce9f953897b0d93f31eed9649b74f846d54bbf63bbcc
-CURL_TARBALL := curl-8.0.0.tar.xz
+CURL_SHA256SUM := 
0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0
+CURL_TARBALL := curl-8.0.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

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

2023-03-20 Thread Michael Stahl (via logerrit)

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

New commits:
commit bbe0d0534abe6480c4502ce8fb543a736d3399d8
Author: Michael Stahl 
AuthorDate: Mon Mar 20 11:52:22 2023 +0100
Commit: Michael Stahl 
CommitDate: Mon Mar 20 15:28:19 2023 +

curl: upgrade to release 8.0.0

Fixes CVE-2023-27535.

Also hopefully fixes excessive storage consumption during build:
o build: drop the use of XC_AMEND_DISTCLEAN [62]

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

diff --git a/download.lst b/download.lst
index a73e7be7dc30..08dfd4c0078c 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 := 
1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f
-CURL_TARBALL := curl-7.88.1.tar.xz
+CURL_SHA256SUM := 
759690f9a375a720f8bcce9f953897b0d93f31eed9649b74f846d54bbf63bbcc
+CURL_TARBALL := curl-8.0.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

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

2023-03-13 Thread Miklos Vajna (via logerrit)

 download.lst   |4 ++--
 external/pdfium/inc/pch/precompiled_pdfium.hxx |2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 47afcad0d599009c38b4597c27558ec2af58b7f8
Author: Miklos Vajna 
AuthorDate: Fri Mar 10 17:21:42 2023 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 13 07:13:41 2023 +

Update pdfium to 5636

Some changes in the bundled libtiff, but it seems that would be for XFA
which we disable, so it doesn't affect us.

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

diff --git a/download.lst b/download.lst
index 09d11ff543c8..a73e7be7dc30 100644
--- a/download.lst
+++ b/download.lst
@@ -433,8 +433,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PDFIUM_SHA256SUM := 
9fae5f8b3b90a4f7ca663f741e232e1e4c3f098fb7a18b0ad52e74ae172cf16c
-PDFIUM_TARBALL := pdfium-5522.tar.bz2
+PDFIUM_SHA256SUM := 
1a625b25562fb4c25c8bf4660c704111cdd306b8934b94dcd9b89329909ede55
+PDFIUM_TARBALL := pdfium-5636.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx 
b/external/pdfium/inc/pch/precompiled_pdfium.hxx
index 315b5d81ec12..6258e8036360 100644
--- a/external/pdfium/inc/pch/precompiled_pdfium.hxx
+++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx
@@ -310,6 +310,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include

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

2023-03-01 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 -
 external/fontconfig/ExternalPackage_fontconfig_data.mk   |5 +-
 external/fontconfig/README   |4 -
 external/fontconfig/UnpackedTarball_fontconfig.mk|1 
 external/fontconfig/android_x86.patch|   13 +
 external/fontconfig/fontconfig-2.12.1.patch.1|   36 +++
 external/fontconfig/libfontconfig-bundled-soname.patch.0 |2 
 7 files changed, 41 insertions(+), 24 deletions(-)

New commits:
commit 7aea297d371de4f8384f819e570bd3280a50b7bf
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Jan 5 19:47:19 2023 +0900
Commit: Caolán McNamara 
CommitDate: Wed Mar 1 11:10:42 2023 +

fontconfig: upgrade to release 2.14.2

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

diff --git a/download.lst b/download.lst
index 95505112300a..09d11ff543c8 100644
--- a/download.lst
+++ b/download.lst
@@ -116,8 +116,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 := 
a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c
-FONTCONFIG_TARBALL := fontconfig-2.13.94.tar.xz
+FONTCONFIG_SHA256SUM := 
dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b
+FONTCONFIG_TARBALL := fontconfig-2.14.2.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 cc33c26705d7..cc72312da430 100644
--- a/external/fontconfig/ExternalPackage_fontconfig_data.mk
+++ b/external/fontconfig/ExternalPackage_fontconfig_data.mk
@@ -23,13 +23,15 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fontconfig_data,$(LIBO_SHARE
 conf.d/10-hinting-medium.conf \
 conf.d/10-hinting-none.conf \
 conf.d/10-hinting-slight.conf \
-conf.d/10-no-sub-pixel.conf \
+conf.d/10-no-antialias.conf \
 conf.d/10-scale-bitmap-fonts.conf \
 conf.d/10-sub-pixel-bgr.conf \
+conf.d/10-sub-pixel-none.conf \
 conf.d/10-sub-pixel-rgb.conf \
 conf.d/10-sub-pixel-vbgr.conf \
 conf.d/10-sub-pixel-vrgb.conf \
 conf.d/10-unhinted.conf \
+conf.d/10-yes-antialias.conf \
 conf.d/11-lcdfilter-default.conf \
 conf.d/11-lcdfilter-legacy.conf \
 conf.d/11-lcdfilter-light.conf \
@@ -40,6 +42,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fontconfig_data,$(LIBO_SHARE
 conf.d/40-nonlatin.conf \
 conf.d/45-generic.conf \
 conf.d/45-latin.conf \
+conf.d/48-spacing.conf \
 conf.d/49-sansserif.conf \
 conf.d/50-user.conf \
 conf.d/51-local.conf \
diff --git a/external/fontconfig/README b/external/fontconfig/README
index 220ee6078a65..318d99594d89 100644
--- a/external/fontconfig/README
+++ b/external/fontconfig/README
@@ -1,6 +1,6 @@
-This "bundled" fontconfig is built only in an Android build
+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. 
 
-From [ http://packages.debian.org/squeeze/fontconfig ]
\ No newline at end of file
+From [ https://www.freedesktop.org/wiki/Software/fontconfig/ ]
diff --git a/external/fontconfig/UnpackedTarball_fontconfig.mk 
b/external/fontconfig/UnpackedTarball_fontconfig.mk
index ceb87ea062ad..25e5a33f1d75 100644
--- a/external/fontconfig/UnpackedTarball_fontconfig.mk
+++ b/external/fontconfig/UnpackedTarball_fontconfig.mk
@@ -14,6 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,fontconfig,$(FONTCONFIG_TARBALL),,f
 $(eval $(call gb_UnpackedTarball_set_patchlevel,fontconfig,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\
+   $(if $(filter ANDROID,$(OS)), external/fontconfig/android_x86.patch) \
external/fontconfig/fontconfig-2.12.1.patch.1 \
external/fontconfig/ubsan.patch \
external/fontconfig/libfontconfig-bundled-soname.patch.0 \
diff --git a/external/fontconfig/android_x86.patch 
b/external/fontconfig/android_x86.patch
new file mode 100644
index ..c8c0fc14ee64
--- /dev/null
+++ b/external/fontconfig/android_x86.patch
@@ -0,0 +1,13 @@
+Avoids "error: undefined symbol: posix_fadvise" if ANDROID_API_LEVEL is less 
than 21.
+
+--- src/fccache.c
 src/fccache.c
+@@ -962,7 +962,7 @@
+ {
+ #if defined(HAVE_MMAP) || defined(__CYGWIN__)
+   cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0);
+-#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
++#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED) && 
(!defined(__ANDROID_API__) ||

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

2023-03-01 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 ++--
 external/curl/asan-poison-nsspem.patch.0 |2 +-
 external/curl/curl-nss.patch.1   |6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ed6eeb2496a1989856de312152b64401bb600300
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Feb 23 15:31:02 2023 +0900
Commit: Michael Stahl 
CommitDate: Wed Mar 1 11:10:15 2023 +

curl: upgrade to release 7.88.1

Fixes CVE-2023-23916, 2 CVEs that probably don't affect LO.

Reference: https://curl.se/docs/security.html

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

diff --git a/download.lst b/download.lst
index 3df1404cf2af..95505112300a 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 := 
ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff
-CURL_TARBALL := curl-7.87.0.tar.xz
+CURL_SHA256SUM := 
1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f
+CURL_TARBALL := curl-7.88.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/curl/asan-poison-nsspem.patch.0 
b/external/curl/asan-poison-nsspem.patch.0
index 1f490bd6bf86..b348d44ee573 100644
--- a/external/curl/asan-poison-nsspem.patch.0
+++ b/external/curl/asan-poison-nsspem.patch.0
@@ -1,6 +1,6 @@
 --- lib/vtls/nss.c
 +++ lib/vtls/nss.c
-@@ -1945,7 +1945,7 @@
+@@ -1926,7 +1926,7 @@
  
PK11_SetPasswordFunc(nss_get_password);
  
diff --git a/external/curl/curl-nss.patch.1 b/external/curl/curl-nss.patch.1
index 2128849369e7..2e8766b3d45f 100644
--- a/external/curl/curl-nss.patch.1
+++ b/external/curl/curl-nss.patch.1
@@ -1,7 +1,7 @@
 diff -ur curl.org/configure curl/configure
 curl.org/configure 2016-03-13 15:14:07.17776 +0100
-+++ curl/configure 2016-03-13 15:16:44.13276 +0100
-@@ -28230,7 +28230,12 @@
+--- curl.orig/configure2023-02-20 16:11:55.0 +0900
 curl/configure 2023-02-23 15:40:58.617432471 +0900
+@@ -28675,7 +28675,12 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using hard-wired 
libraries and compilation flags for NSS." >&5
  printf "%s\n" "$as_me: WARNING: Using hard-wired libraries and compilation 
flags for NSS." >&2;}
addld="-L$OPT_NSS/lib"

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

2023-03-01 Thread Taichi Haradaguchi (via logerrit)

 download.lst|4 ++--
 external/postgresql/arm64.patch.1   |2 +-
 external/postgresql/postgresql.exit.patch.0 |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 1a980e7ac8c70b7c057c930c46689460202bc45f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 24 17:49:23 2023 +0900
Commit: Michael Stahl 
CommitDate: Wed Mar 1 11:06:44 2023 +

postgresql: upgrade to release 13.10

Fixes CVE-2022-41862

Reference: https://www.postgresql.org/support/security/CVE-2022-41862/

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

diff --git a/download.lst b/download.lst
index 3085109d0f4a..3df1404cf2af 100644
--- a/download.lst
+++ b/download.lst
@@ -460,8 +460,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POSTGRESQL_SHA256SUM := 
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
-POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
+POSTGRESQL_SHA256SUM := 
5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2
+POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/postgresql/arm64.patch.1 
b/external/postgresql/arm64.patch.1
index 7f8f2d6e4137..db8a3ad0a069 100644
--- a/external/postgresql/arm64.patch.1
+++ b/external/postgresql/arm64.patch.1
@@ -28,7 +28,7 @@ diff -ur postgresql.org/src/tools/msvc/MSBuildProject.pm 
postgresql/src/tools/ms
  
my $includes = $self->{includes};
unless ($includes eq '' or $includes =~ /;$/)
-@@ -347,7 +347,6 @@
+@@ -347,7 +346,6 @@

.\\$cfgname\\$self->{name}\\$self->{name}.pdb
false
.\\$cfgname\\$self->{name}\\$self->{name}.map
diff --git a/external/postgresql/postgresql.exit.patch.0 
b/external/postgresql/postgresql.exit.patch.0
index bd14d16e0ed6..8eaa1ea52ebb 100644
--- a/external/postgresql/postgresql.exit.patch.0
+++ b/external/postgresql/postgresql.exit.patch.0
@@ -1,7 +1,7 @@
 # error: implicitly declaring library function 'exit' with type 'void (int) 
__attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]
 --- configure
 +++ configure
-@@ -16821,6 +16821,7 @@
+@@ -16997,6 +16997,7 @@
  else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -9,7 +9,7 @@
  typedef long int ac_int64;
  
  /*
-@@ -16905,6 +16905,7 @@
+@@ -17081,6 +17082,7 @@
  else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */

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

2023-02-28 Thread Caolán McNamara (via logerrit)

 download.lst|4 ++--
 external/libjpeg-turbo/jconfigint.h |7 +--
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 8a180b663323be2cd36a17562d7052d9549ae89e
Author: Caolán McNamara 
AuthorDate: Tue Feb 28 09:04:28 2023 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 28 15:56:04 2023 +

upgrade to libjpeg-turbo 2.1.5

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

diff --git a/download.lst b/download.lst
index 7a5030a05adf..3085109d0f4a 100644
--- a/download.lst
+++ b/download.lst
@@ -269,8 +269,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 := 
d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b
-LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.4.tar.gz
+LIBJPEG_TURBO_SHA256SUM := 
bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf
+LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libjpeg-turbo/jconfigint.h 
b/external/libjpeg-turbo/jconfigint.h
index f0987ba31609..6cd960a03368 100644
--- a/external/libjpeg-turbo/jconfigint.h
+++ b/external/libjpeg-turbo/jconfigint.h
@@ -1,7 +1,7 @@
 #include 
 
 /* libjpeg-turbo build number */
-#define BUILD  "20221122"
+#define BUILD  "20230228"
 
 /* Compiler's inline keyword */
 #undef inline
@@ -19,11 +19,14 @@
 #define PACKAGE_NAME  "libjpeg-turbo"
 
 /* Version number of package */
-#define VERSION  "2.1.4"
+#define VERSION  "2.1.5"
 
 /* The size of `size_t', as computed by sizeof. */
 /* #undef SIZEOF_SIZE_T */
 
+/* How to obtain thread-local storage */
+#define THREAD_LOCAL
+
 #if defined(__GNUC__) && SAL_TYPES_SIZEOFLONG == SIZEOF_SIZE_T
 /* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == 
sizeof(size_t). */
 #define HAVE_BUILTIN_CTZL

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

2023-02-24 Thread Caolán McNamara (via logerrit)

 download.lst|4 +--
 external/zxing/StaticLibrary_zxing.mk   |   19 ---
 external/zxing/UnpackedTarball_zxing.mk |   13 +-
 external/zxing/android_include.patch.0  |   10 
 external/zxing/assume.__cpp_lib_string_view.patch.0 |   25 
 external/zxing/coroutine.patch.0|   11 
 external/zxing/inc/pch/precompiled_zxing.hxx|   14 +--
 external/zxing/missing-include.patch.0  |   12 -
 external/zxing/msvc-lambdacapture.patch.0   |   11 
 external/zxing/no_sanitize_ignored.patch.0  |   24 +++
 external/zxing/undeprecate-warning.patch.0  |   14 +++
 11 files changed, 50 insertions(+), 107 deletions(-)

New commits:
commit b16f5e374eb7e7199d4506eb04a3c3223dd52257
Author: Caolán McNamara 
AuthorDate: Fri Feb 24 10:59:17 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 24 20:09:12 2023 +

upgrade zxing-cpp to 2.0.0

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

diff --git a/download.lst b/download.lst
index 49f98fae9188..7a5030a05adf 100644
--- a/download.lst
+++ b/download.lst
@@ -560,8 +560,8 @@ ZMF_TARBALL := libzmf-0.0.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ZXING_SHA256SUM := 
126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862
-ZXING_TARBALL := zxing-cpp-1.4.0.tar.gz
+ZXING_SHA256SUM := 
12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76
+ZXING_TARBALL := zxing-cpp-2.0.0.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/zxing/StaticLibrary_zxing.mk 
b/external/zxing/StaticLibrary_zxing.mk
index debc137abb98..431d523a49b3 100644
--- a/external/zxing/StaticLibrary_zxing.mk
+++ b/external/zxing/StaticLibrary_zxing.mk
@@ -33,9 +33,6 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/aztec/AZToken \
UnpackedTarball/zxing/core/src/aztec/AZWriter \
UnpackedTarball/zxing/core/src/BarcodeFormat \
-   UnpackedTarball/zxing/core/src/textcodec/Big5MapTable \
-   UnpackedTarball/zxing/core/src/textcodec/Big5TextDecoder \
-   UnpackedTarball/zxing/core/src/textcodec/Big5TextEncoder \
UnpackedTarball/zxing/core/src/BinaryBitmap \
UnpackedTarball/zxing/core/src/BitArray \
UnpackedTarball/zxing/core/src/BitMatrix \
@@ -45,7 +42,6 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/ConcentricFinder \
UnpackedTarball/zxing/core/src/Content \
UnpackedTarball/zxing/core/src/DecodeHints \
-   UnpackedTarball/zxing/core/src/DecodeStatus \
UnpackedTarball/zxing/core/src/datamatrix/DMBitLayout \
UnpackedTarball/zxing/core/src/datamatrix/DMDataBlock \
UnpackedTarball/zxing/core/src/datamatrix/DMDecoder \
@@ -57,20 +53,12 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/datamatrix/DMVersion \
UnpackedTarball/zxing/core/src/datamatrix/DMWriter \
UnpackedTarball/zxing/core/src/ECI \
-   UnpackedTarball/zxing/core/src/textcodec/GBTextEncoder \
-   UnpackedTarball/zxing/core/src/textcodec/GBTextDecoder \
UnpackedTarball/zxing/core/src/GenericGF \
UnpackedTarball/zxing/core/src/GenericGFPoly \
UnpackedTarball/zxing/core/src/GlobalHistogramBinarizer \
UnpackedTarball/zxing/core/src/GridSampler \
-   UnpackedTarball/zxing/core/src/GS1 \
UnpackedTarball/zxing/core/src/GTIN \
UnpackedTarball/zxing/core/src/HybridBinarizer \
-   UnpackedTarball/zxing/core/src/textcodec/JPTextDecoder \
-   UnpackedTarball/zxing/core/src/textcodec/JPTextEncoder \
-   UnpackedTarball/zxing/core/src/textcodec/KRHangulMapping \
-   UnpackedTarball/zxing/core/src/textcodec/KRTextDecoder \
-   UnpackedTarball/zxing/core/src/textcodec/KRTextEncoder \
UnpackedTarball/zxing/core/src/maxicode/MCBitMatrixParser \
UnpackedTarball/zxing/core/src/maxicode/MCDecoder \
UnpackedTarball/zxing/core/src/maxicode/MCReader \
@@ -136,8 +124,13 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/TextDecoder \
UnpackedTarball/zxing/core/src/TextEncoder \
UnpackedTarball/zxing/core/src/TextUtfEncoding \
+   UnpackedTarball/zxing/core/src/Utf \
UnpackedTarball/zxing/core/src/WhiteRectDetector \
UnpackedTarball/zxing/core/src/ZXBigInteger \
 ))
 
-# vim: set noet sw=4 ts=4:
\ No newline at end of file
+$(eval $(call gb_StaticLibrary_add_generated_cobjects,zxing,\
+

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

2023-02-24 Thread Taichi Haradaguchi (via logerrit)

 download.lst   |4 +--
 external/freetype/freetype-2.6.5.patch.1   |   36 ++---
 external/freetype/freetype-fd-hack.patch.0 |7 ++---
 external/freetype/ubsan.patch  |   17 ++---
 4 files changed, 26 insertions(+), 38 deletions(-)

New commits:
commit 803e3a63d879d8095b53b020cb648522fcb2af99
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Feb 21 20:14:33 2023 +0900
Commit: Caolán McNamara 
CommitDate: Fri Feb 24 10:44:05 2023 +

freetype: upgrade to release 2.13.0

As the issue has been fixed upstream[1], removed some codes from 
"external/freetype/ubsan.patch".

[1]"[truetype] Fix undefined pointer arithmetic."



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

diff --git a/download.lst b/download.lst
index 0ba8412a5ca6..49f98fae9188 100644
--- a/download.lst
+++ b/download.lst
@@ -197,8 +197,8 @@ FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FREETYPE_SHA256SUM := 
ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033
-FREETYPE_TARBALL := freetype-2.12.0.tar.xz
+FREETYPE_SHA256SUM := 
5ee23abd047636c24b2d43c6625dcafc1d1aca64dec9e0d05df29592624c
+FREETYPE_TARBALL := freetype-2.13.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/freetype/freetype-2.6.5.patch.1 
b/external/freetype/freetype-2.6.5.patch.1
index c10c0bb38ea8..544e4fa496a6 100644
--- a/external/freetype/freetype-2.6.5.patch.1
+++ b/external/freetype/freetype-2.6.5.patch.1
@@ -1,7 +1,7 @@
 diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure
 freetype/builds/unix/configure.dt  2017-02-01 22:14:45.206257952 +0100
-+++ freetype/builds/unix/configure 2017-02-01 22:16:31.076183707 +0100
-@@ -9386,7 +9386,7 @@
+--- freetype/builds/unix/configure.dt  2023-02-09 15:33:17.0 +0900
 freetype/builds/unix/configure 2023-02-22 16:53:49.547740397 +0900
+@@ -9523,7 +9523,7 @@ _LT_EOF
case $host_cpu in
powerpc)
  # see comment about AmigaOS4 .so support
@@ -10,7 +10,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
  archive_expsym_cmds=''
  ;;
m68k)
-@@ -9402,7 +9402,7 @@
+@@ -9539,7 +9539,7 @@ _LT_EOF
allow_undefined_flag=unsupported
# Joseph Beckenbach  says some releases of gcc
# support --undefined.  This deserves some investigation.  FIXME
@@ -19,7 +19,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
else
ld_shlibs=no
fi
-@@ -9436,7 +9436,7 @@
+@@ -9573,7 +9573,7 @@ _LT_EOF
;;
  
  haiku*)
@@ -28,7 +28,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
link_all_deplibs=yes
;;
  
-@@ -9531,13 +9531,13 @@
+@@ -9669,13 +9669,13 @@ _LT_EOF
*Sun\ F*)   # Sun Fortran 8.3
  tmp_sharedflag='-G' ;;
esac
@@ -37,14 +37,14 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
  
  if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> 
$output_objdir/$libname.ver~
+ cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> 
$output_objdir/$libname.ver~
  echo "local: *; };" >> $output_objdir/$libname.ver~
 -$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs 
$compiler_flags $wl-soname $wl$soname $wl-version-script 
$wl$output_objdir/$libname.ver -o $lib'
 +$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs 
$compiler_flags $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
  fi
  
case $cc_basename in
-@@ -9567,8 +9567,8 @@
+@@ -9705,8 +9705,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -55,7 +55,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
fi
;;
  
-@@ -9586,8 +9586,8 @@
+@@ -9724,8 +9724,8 @@ _LT_EOF
  
  _LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; 
then
@@ -66,7 +66,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
else
ld_shlibs=no
fi
-@@ -9615,8 +9615,8 @@
+@@ -9753,8 +9753,8 @@ _LT_EOF
  # requires that you compile everything twice, which is a pain.
  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; 
then

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

2023-02-21 Thread Michael Stahl (via logerrit)

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

New commits:
commit 538975a0e511ad79a7dd3c71300b993d1554cd03
Author: Michael Stahl 
AuthorDate: Tue Feb 21 11:11:42 2023 +0100
Commit: Michael Stahl 
CommitDate: Tue Feb 21 13:40:38 2023 +

nss: upgrade to release 3.88.1

Fixes CVE-2023-0767 CVE-2022-3479

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

diff --git a/download.lst b/download.lst
index 4b8e212456e2..0ba8412a5ca6 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 := 
8b5a2e9e3d632a78ad4d9c8d2ea502d2790d7a8e7b1986d173107232eca27432
-NSS_TARBALL := nss-3.86-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a
+NSS_TARBALL := nss-3.88.1-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/liborcus

2023-02-11 Thread Kohei Yoshida (via logerrit)

 download.lst|4 
 external/liborcus/ExternalProject_liborcus.mk   |2 
 external/liborcus/UnpackedTarball_liborcus.mk   |2 
 external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1 |  236 
 external/liborcus/liborcus-no-benchmark.patch.1 |   19 
 5 files changed, 4 insertions(+), 259 deletions(-)

New commits:
commit 3c988ef450b809767ca7f897c59041758af53f4b
Author: Kohei Yoshida 
AuthorDate: Sat Feb 11 17:05:45 2023 -0500
Commit: Kohei Yoshida 
CommitDate: Sat Feb 11 23:04:29 2023 +

Update liborcus to 0.18.1

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

diff --git a/download.lst b/download.lst
index 0f42585bb7c8..4b8e212456e2 100644
--- a/download.lst
+++ b/download.lst
@@ -423,8 +423,8 @@ OPENSSL_TARBALL := openssl-3.0.8.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ORCUS_SHA256SUM := 
0a8c55a227f13dbda08da8a1f6e18f27ba873da55a2cdd23bd0825989d1abff8
-ORCUS_TARBALL := liborcus-0.18.0.tar.xz
+ORCUS_SHA256SUM := 
6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb
+ORCUS_TARBALL := liborcus-0.18.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index b07df31a34d0..7f2e5f24083f 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -99,6 +99,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-spreadsheet-model \
--without-tools \
+   --without-benchmark \
+   --without-doc-example \
--disable-python \
--disable-werror \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 48b7fb4743e9..ca4a40acf4e5 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/libtool.patch.0 \
external/liborcus/fix-pch.patch.0 \
external/liborcus/liborcus_newline.patch.1 \
-   external/liborcus/liborcus-no-benchmark.patch.1 \
-   external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1 
b/external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1
deleted file mode 100644
index 5b8a04069e99..
--- a/external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1
+++ /dev/null
@@ -1,236 +0,0 @@
-diff --git a/src/liborcus/xls_xml_context.cpp 
b/src/liborcus/xls_xml_context.cpp
-index 85916fc7..739678ee 100644
 a/src/liborcus/xls_xml_context.cpp
-+++ b/src/liborcus/xls_xml_context.cpp
-@@ -1292,7 +1292,7 @@ void xls_xml_context::start_element_border(const 
xml_token_attrs_t& attrs)
- {
- ss::border_direction_t dir = ss::border_direction_t::unknown;
- ss::border_style_t style = ss::border_style_t::unknown;
--ss::color_rgb_t color;
-+std::optional color;
- long weight = 0;
- 
- for (const xml_token_attr_t& attr : attrs)
-@@ -1950,8 +1950,14 @@ void xls_xml_context::commit_default_style()
- {
- for (const border_style_type& b : m_default_style->borders)
- {
--border_style->set_style(b.dir, b.style);
--border_style->set_color(b.dir, 255, b.color.red, b.color.green, 
b.color.blue);
-+if (b.dir == ss::border_direction_t::unknown)
-+continue;
-+
-+if (b.style != ss::border_style_t::unknown)
-+border_style->set_style(b.dir, b.style);
-+
-+if (b.color)
-+border_style->set_color(b.dir, 255, b.color->red, 
b.color->green, b.color->blue);
- }
- }
- 
-@@ -2109,8 +2115,14 @@ void xls_xml_context::commit_styles()
- 
- for (const border_style_type& b : style->borders)
- {
--border_style->set_style(b.dir, b.style);
--border_style->set_color(b.dir, 255, b.color.red, 
b.color.green, b.color.blue);
-+if (b.dir == ss::border_direction_t::unknown)
-+continue;
-+
-+if (b.style != ss::border_style_t::unknown)
-+border_style->set_style(b.dir, b.style);
-+
-+if (b.color)
-+border_style->set_color(b.dir, 255, b.color->red,

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

2023-02-08 Thread Michael Stahl (via logerrit)

 download.lst  |4 -
 external/openssl/0001-x509-fix-double-locking-problem.patch.1 |   39 --
 external/openssl/UnpackedTarball_openssl.mk   |1 
 external/openssl/system-cannot-find-path-for-move.patch.0 |   11 --
 4 files changed, 2 insertions(+), 53 deletions(-)

New commits:
commit 80dd2ce29413809ca337618e313795bd9610cf80
Author: Michael Stahl 
AuthorDate: Wed Feb 8 12:36:16 2023 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 8 14:22:00 2023 +

openssl: upgrade to release 3.0.8

Fixes CVE-2023-0401 CVE-2023-0286 CVE-2023-0217 CVE-2023-0216
CVE-2023-0215 CVE-2022-4450 CVE-2022-4304 CVE-2022-4203 CVE-2022-3996

Remove the patch that fixed CVE-2022-3996.

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

diff --git a/download.lst b/download.lst
index 7ca17b72d88e..0f42585bb7c8 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 := 
83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e
-OPENSSL_TARBALL := openssl-3.0.7.tar.gz
+OPENSSL_SHA256SUM := 
6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e
+OPENSSL_TARBALL := openssl-3.0.8.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/openssl/0001-x509-fix-double-locking-problem.patch.1 
b/external/openssl/0001-x509-fix-double-locking-problem.patch.1
deleted file mode 100644
index ec289215e1a5..
--- a/external/openssl/0001-x509-fix-double-locking-problem.patch.1
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001
-From: Pauli 
-Date: Fri, 11 Nov 2022 09:40:19 +1100
-Subject: [PATCH] x509: fix double locking problem
-
-This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the
-redundant flag setting.
-
-Fixes #19643
-
-Fixes LOW CVE-2022-3996
-
-Reviewed-by: Dmitry Belyavskiy 
-Reviewed-by: Tomas Mraz 
-(Merged from https://github.com/openssl/openssl/pull/19652)
-
-(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5)

- crypto/x509/pcy_map.c | 4 
- 1 file changed, 4 deletions(-)
-
-diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c
-index 05406c6493..60dfd1e320 100644
 a/crypto/x509/pcy_map.c
-+++ b/crypto/x509/pcy_map.c
-@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS 
*maps)
- 
- ret = 1;
-  bad_mapping:
--if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) {
--x->ex_flags |= EXFLAG_INVALID_POLICY;
--CRYPTO_THREAD_unlock(x->lock);
--}
- sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free);
- return ret;
- 
--- 
-2.39.0
-
diff --git a/external/openssl/UnpackedTarball_openssl.mk 
b/external/openssl/UnpackedTarball_openssl.mk
index 7ee91bb43425..2a8f3bb3f905 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openssl))
 $(eval $(call 
gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl))
 
 $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
-   external/openssl/0001-x509-fix-double-locking-problem.patch.1 \
external/openssl/openssl-no-multilib.patch.0 \
external/openssl/configurable-z-option.patch.0 \
external/openssl/openssl-no-ipc-cmd.patch.0 \
diff --git a/external/openssl/system-cannot-find-path-for-move.patch.0 
b/external/openssl/system-cannot-find-path-for-move.patch.0
index 7d08dd636730..421d6b8df2be 100644
--- a/external/openssl/system-cannot-find-path-for-move.patch.0
+++ b/external/openssl/system-cannot-find-path-for-move.patch.0
@@ -1,16 +1,5 @@
 --- Configurations/windows-makefile.tmpl   2022-09-09 15:18:35.849924899 
+0100
 +++ Configurations/windows-makefile.tmpl   2022-09-09 15:20:28.895825331 
+0100
-@@ -777,8 +777,8 @@
- $target: "$gen0" $deps
-   cmd /C "set "ASM=\$(AS)" & $generator \$@.S"
-   \$(CPP) $incs $cppflags $defs \$@.S > \$@.i
--  move /Y \$@.i \$@
--del /Q \$@.S
-+  mv -f \$@.i \$@
-+rm -f \$@.S
- EOF
-   }
-   # Otherwise
 @@ -790,7 +790,7 @@
return <<"EOF";
  $target: "$gen0" $deps

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

2023-01-30 Thread Noel Grandin (via logerrit)

 download.lst |4 
 external/skia/Library_skia.mk|  137 +++
 external/skia/UnpackedTarball_skia.mk|7 
 external/skia/clang-attributes-warning.patch.1   |   12 -
 external/skia/clang11-flax-vector-conversion.patch.0 |4 
 external/skia/constexpr-template.patch.0 |   34 ---
 external/skia/fix-graphite-ifdef.patch.1 |   48 -
 external/skia/fix-pch.patch.1|   30 ---
 external/skia/fix-warnings.patch.1   |4 
 external/skia/inc/pch/precompiled_skia.hxx   |  112 +++-
 external/skia/make-api-visible.patch.1   |   21 ++
 external/skia/missing-include.patch.0|   20 --
 external/skia/redefinition-of-op.patch.0 |   11 +
 external/skia/share-grcontext.patch.1|   20 +-
 external/skia/skia_sk_cpu_sse_level_0_by_default.patch.1 |   15 -
 external/skia/source/skia_opts.cxx   |2 
 external/skia/tdf148624.patch.1  |   60 --
 vcl/skia/SkiaHelper.cxx  |6 
 vcl/skia/gdiimpl.cxx |1 
 19 files changed, 169 insertions(+), 379 deletions(-)

New commits:
commit 9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150
Author: Noel Grandin 
AuthorDate: Fri Jan 27 10:48:45 2023 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 30 10:52:07 2023 +

Update skia to m111

(*) Remove patches already upstream

(*) Remove the skia_sk_cpu_sse_level_0_by_default.patch.1 patch and rather 
set
that define via -D parameter, because that is how the skia BUILD.gn
seems to do it.

(*) I hand edited the PCH file, because running the update_pch script 
failed for me.

Change-Id: I1fd175b9f63f8d2792a1876e4ece03fe92fb5374
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146251
Tested-by: Jenkins
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/download.lst b/download.lst
index 9ac09cc6f3bd..7ca17b72d88e 100644
--- a/download.lst
+++ b/download.lst
@@ -501,8 +501,8 @@ RHINO_TARBALL := 
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-SKIA_SHA256SUM := 
c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9
-SKIA_TARBALL := skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
+SKIA_SHA256SUM := 
0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9
+SKIA_TARBALL := skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 3bb9cc3eed40..4b7d9ee56407 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Library_add_defs,skia,\
 -DSKIA_IMPLEMENTATION=1 \
 -DSKIA_DLL \
 -DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \
+$(if $(filter INTEL 
X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \
 ))
 
 # SK_DEBUG controls runtime checks and is controlled by config_skia.h and 
depends on DBG_UTIL.
@@ -112,7 +113,7 @@ $(eval $(call gb_Library_use_libraries,skia,\
 $(eval $(call gb_Library_set_include,skia,\
 $$(INCLUDE) \
 -I$(call gb_UnpackedTarball_get_dir,skia) \
--I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/skcms/ \
+-I$(call gb_UnpackedTarball_get_dir,skia)/modules/skcms/ \
 -I$(call 
gb_UnpackedTarball_get_dir,skia)/third_party/vulkanmemoryallocator/ \
 -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan/ \
 -I$(SRCDIR)/external/skia/inc/ \
@@ -127,6 +128,20 @@ $(eval $(call gb_Library_add_exception_objects,skia,\
 $(eval $(call gb_Library_set_generated_cxx_suffix,skia,cpp))
 
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
+UnpackedTarball/skia/src/base/SkArenaAlloc \
+UnpackedTarball/skia/src/base/SkBlockAllocator \
+UnpackedTarball/skia/src/base/SkBuffer \
+UnpackedTarball/skia/src/base/SkContainers \
+UnpackedTarball/skia/src/base/SkDeque \
+UnpackedTarball/skia/src/base/SkMalloc \
+UnpackedTarball/skia/src/base/SkMathPriv \
+UnpackedTarball/skia/src/base/SkSafeMath \
+UnpackedTarball/skia/src/base/SkSemaphore \
+UnpackedTarball/skia/src/base/SkTDArray \
+UnpackedTarball/skia/src/base/SkThreadID \
+UnpackedTarball/skia/src/base/SkTSearch \
+UnpackedTarball/skia/src/base/SkUtils \
+UnpackedTarball/skia/src/base/SkUTF \
 UnpackedTarball/skia/src/codec/SkAndroidCodecAdapter \
 UnpackedTarball/skia/src/codec/SkAndroidCodec \
 UnpackedTarball/skia/src/codec/SkBmpBaseCodec \
@@ -145,14 +160,12 @@ $(eval $(call

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

2023-01-25 Thread Stephan Bergmann (via logerrit)

 download.lst |4 
 external/skia/Library_skia.mk|  109 ++-
 external/skia/UnpackedTarball_skia.mk|5 
 external/skia/clang11-flax-vector-conversion.patch.0 |4 
 external/skia/constexpr-template.patch.0 |   34 -
 external/skia/fix-graphite-ifdef.patch.1 |   48 
 external/skia/fix-pch.patch.1|   30 -
 external/skia/fix-warnings.patch.1   |4 
 external/skia/inc/pch/precompiled_skia.hxx   |   44 +++
 external/skia/make-api-visible.patch.1   |   21 ---
 external/skia/missing-include.patch.0|   20 +++
 external/skia/share-grcontext.patch.1|   20 +--
 external/skia/tdf148624.patch.1  |   60 ++
 vcl/skia/SkiaHelper.cxx  |2 
 vcl/skia/gdiimpl.cxx |1 
 15 files changed, 305 insertions(+), 101 deletions(-)

New commits:
commit 9fd65d8f9485f44e8f18b4e68d0e70ba154ae636
Author: Stephan Bergmann 
AuthorDate: Wed Jan 25 13:14:58 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 25 17:25:32 2023 +

Revert "Update skia to m110"

This reverts commit aef70869b0fae3001648ec2a2651ffc9c507678f plus follow-up
4172fcb7514ff8a9e9740ff0939e9a2f611edbce "Fix no-pch Windows build: missing
include".  It caused my Windows build `instdir/program/soffice` to 
immediatley
fail with

> skia\include/core/SkRefCnt.h(62): fatal error: "assert(this->getRefCnt() 
> 0)"
> warn:skia:10572:7804:external/skia/source/SkMemory_malloc.cxx:32: 
sk_abort_no_print

on start.

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

diff --git a/download.lst b/download.lst
index 6c1af18404b5..6d77206cfec3 100644
--- a/download.lst
+++ b/download.lst
@@ -501,8 +501,8 @@ RHINO_TARBALL := 
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-SKIA_SHA256SUM := 
878112f9693be12292d5fad5e73367fa11c96909ae27d1d7d2e2cb5d01011ea7
-SKIA_TARBALL := skia-m110-aab9fb4100da797d25fe340e9a2fcb2ae30fc2e1.tar.xz
+SKIA_SHA256SUM := 
c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9
+SKIA_TARBALL := skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 447a223592f1..c0f91e1a463a 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -112,7 +112,7 @@ $(eval $(call gb_Library_use_libraries,skia,\
 $(eval $(call gb_Library_set_include,skia,\
 $$(INCLUDE) \
 -I$(call gb_UnpackedTarball_get_dir,skia) \
--I$(call gb_UnpackedTarball_get_dir,skia)/modules/skcms/ \
+-I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/skcms/ \
 -I$(call 
gb_UnpackedTarball_get_dir,skia)/third_party/vulkanmemoryallocator/ \
 -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan/ \
 -I$(SRCDIR)/external/skia/inc/ \
@@ -145,6 +145,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/codec/SkPngCodec \
 UnpackedTarball/skia/src/codec/SkSampledCodec \
 UnpackedTarball/skia/src/codec/SkSampler \
+UnpackedTarball/skia/src/codec/SkStreamBuffer \
 UnpackedTarball/skia/src/codec/SkSwizzler \
 UnpackedTarball/skia/src/codec/SkWbmpCodec \
 UnpackedTarball/skia/src/core/SkAAClip \
@@ -167,6 +168,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkBlitter_ARGB32 \
 UnpackedTarball/skia/src/core/SkBlitter_A8 \
 UnpackedTarball/skia/src/core/SkBlitter \
+UnpackedTarball/skia/src/core/SkBlitter_RGB565 \
 UnpackedTarball/skia/src/core/SkBlitter_Sprite \
 UnpackedTarball/skia/src/core/SkBlockAllocator \
 UnpackedTarball/skia/src/core/SkBlurMask \
@@ -175,7 +177,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkCachedData \
 UnpackedTarball/skia/src/core/SkCanvas \
 UnpackedTarball/skia/src/core/SkCanvasPriv \
-UnpackedTarball/skia/src/core/SkCapabilities \
 UnpackedTarball/skia/src/core/SkChromeRemoteGlyphCache \
 UnpackedTarball/skia/src/core/SkClipStack \
 UnpackedTarball/skia/src/core/SkClipStackDevice \
@@ -185,7 +186,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkColorSpace \
 UnpackedTarball/skia/src/core/SkColorSpaceXformSteps \
 UnpackedTarball/skia/src/core/SkCompressedDataUtils \
-UnpackedTarball/skia/src/core/SkContainers \

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

2023-01-24 Thread Noel Grandin (via logerrit)

 download.lst |4 
 external/skia/Library_skia.mk|  109 ---
 external/skia/UnpackedTarball_skia.mk|5 
 external/skia/clang11-flax-vector-conversion.patch.0 |4 
 external/skia/constexpr-template.patch.0 |   34 +
 external/skia/fix-graphite-ifdef.patch.1 |   48 
 external/skia/fix-pch.patch.1|   30 -
 external/skia/fix-warnings.patch.1   |4 
 external/skia/inc/pch/precompiled_skia.hxx   |   44 ---
 external/skia/make-api-visible.patch.1   |   12 +-
 external/skia/missing-include.patch.0|   20 ---
 external/skia/share-grcontext.patch.1|   20 +--
 external/skia/tdf148624.patch.1  |   60 --
 vcl/skia/SkiaHelper.cxx  |2 
 vcl/skia/gdiimpl.cxx |1 
 15 files changed, 92 insertions(+), 305 deletions(-)

New commits:
commit aef70869b0fae3001648ec2a2651ffc9c507678f
Author: Noel Grandin 
AuthorDate: Tue Jan 24 13:24:05 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Jan 25 06:39:05 2023 +

Update skia to m110

Removing those bits of the patches that appear to have been
upstreamed.

Change-Id: Ia7683c26af4c622ca4fccb828df023ae30e724a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146069
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/download.lst b/download.lst
index 6d77206cfec3..6c1af18404b5 100644
--- a/download.lst
+++ b/download.lst
@@ -501,8 +501,8 @@ RHINO_TARBALL := 
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-SKIA_SHA256SUM := 
c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9
-SKIA_TARBALL := skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
+SKIA_SHA256SUM := 
878112f9693be12292d5fad5e73367fa11c96909ae27d1d7d2e2cb5d01011ea7
+SKIA_TARBALL := skia-m110-aab9fb4100da797d25fe340e9a2fcb2ae30fc2e1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index c0f91e1a463a..447a223592f1 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -112,7 +112,7 @@ $(eval $(call gb_Library_use_libraries,skia,\
 $(eval $(call gb_Library_set_include,skia,\
 $$(INCLUDE) \
 -I$(call gb_UnpackedTarball_get_dir,skia) \
--I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/skcms/ \
+-I$(call gb_UnpackedTarball_get_dir,skia)/modules/skcms/ \
 -I$(call 
gb_UnpackedTarball_get_dir,skia)/third_party/vulkanmemoryallocator/ \
 -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan/ \
 -I$(SRCDIR)/external/skia/inc/ \
@@ -145,7 +145,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/codec/SkPngCodec \
 UnpackedTarball/skia/src/codec/SkSampledCodec \
 UnpackedTarball/skia/src/codec/SkSampler \
-UnpackedTarball/skia/src/codec/SkStreamBuffer \
 UnpackedTarball/skia/src/codec/SkSwizzler \
 UnpackedTarball/skia/src/codec/SkWbmpCodec \
 UnpackedTarball/skia/src/core/SkAAClip \
@@ -168,7 +167,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkBlitter_ARGB32 \
 UnpackedTarball/skia/src/core/SkBlitter_A8 \
 UnpackedTarball/skia/src/core/SkBlitter \
-UnpackedTarball/skia/src/core/SkBlitter_RGB565 \
 UnpackedTarball/skia/src/core/SkBlitter_Sprite \
 UnpackedTarball/skia/src/core/SkBlockAllocator \
 UnpackedTarball/skia/src/core/SkBlurMask \
@@ -177,6 +175,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkCachedData \
 UnpackedTarball/skia/src/core/SkCanvas \
 UnpackedTarball/skia/src/core/SkCanvasPriv \
+UnpackedTarball/skia/src/core/SkCapabilities \
 UnpackedTarball/skia/src/core/SkChromeRemoteGlyphCache \
 UnpackedTarball/skia/src/core/SkClipStack \
 UnpackedTarball/skia/src/core/SkClipStackDevice \
@@ -186,6 +185,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkColorSpace \
 UnpackedTarball/skia/src/core/SkColorSpaceXformSteps \
 UnpackedTarball/skia/src/core/SkCompressedDataUtils \
+UnpackedTarball/skia/src/core/SkContainers \
 UnpackedTarball/skia/src/core/SkContourMeasure \
 UnpackedTarball/skia/src/core/SkConvertPixels \
 UnpackedTarball/skia/src/core/SkCpu \
@@ -224,7 +224,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkGlobalInitialization_core \
 UnpackedTarball/skia/src/core/SkGlyph \
 UnpackedTarball/skia/src/core/SkGlyphBuffer \
-

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

2023-01-20 Thread Caolán McNamara (via logerrit)

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

New commits:
commit bf052b03d2258ea101a0a3ae4b5e72cc85a9f856
Author: Caolán McNamara 
AuthorDate: Thu Jan 19 20:19:15 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Jan 20 08:53:34 2023 +

add a warning about Caladea versions/variants with different metrics

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

diff --git a/download.lst b/download.lst
index fce2df44bf18..6d77206cfec3 100644
--- a/download.lst
+++ b/download.lst
@@ -121,6 +121,10 @@ FONTCONFIG_TARBALL := fontconfig-2.13.94.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
+# There are sadly now two Caladea fonts with different metrics, see:
+#  https://bugzilla.redhat.com/show_bug.cgi?id=2162532
+#  https://github.com/huertatipografica/Caladea/issues/4
+# be careful on potential upgrades
 FONT_CALADEA_SHA256SUM := 
c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
 FONT_CALADEA_TARBALL := 
368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
 # three static lines

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

2023-01-12 Thread Miklos Vajna (via logerrit)

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

New commits:
commit 04fd7d0f53faa08c608034707ca4a459a162712d
Author: Miklos Vajna 
AuthorDate: Thu Jan 12 20:12:37 2023 +0100
Commit: Miklos Vajna 
CommitDate: Fri Jan 13 07:14:15 2023 +

Update pdfium to 5522

The internal libpng 1.6 is now dropped, but that doesn't really affect
us.

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

diff --git a/download.lst b/download.lst
index cd75552a37f0..fce2df44bf18 100644
--- a/download.lst
+++ b/download.lst
@@ -429,8 +429,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PDFIUM_SHA256SUM := 
7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35
-PDFIUM_TARBALL := pdfium-5408.tar.bz2
+PDFIUM_SHA256SUM := 
9fae5f8b3b90a4f7ca663f741e232e1e4c3f098fb7a18b0ad52e74ae172cf16c
+PDFIUM_TARBALL := pdfium-5522.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

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

2023-01-06 Thread Taichi Haradaguchi (via logerrit)

 download.lst  |4 ++--
 external/curl/asan-poison-nsspem.patch.0  |2 +-
 external/curl/curl-msvc-disable-protocols.patch.1 |2 +-
 external/curl/curl-nss.patch.1|2 +-
 external/curl/zlib.patch.0|   12 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 5a1ddc1a92a7883597ab7d825408a1f0adc2ec6e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Dec 30 21:29:58 2022 +0900
Commit: Caolán McNamara 
CommitDate: Fri Jan 6 20:48:41 2023 +

curl: upgrade to release 7.87.0

Fixes CVE-2022-43551 and CVE-2022-43552.

https://curl.se/docs/CVE-2022-43551.html
https://curl.se/docs/CVE-2022-43552.html

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

diff --git a/download.lst b/download.lst
index c41e59d336fb..cd75552a37f0 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 := 
2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b
-CURL_TARBALL := curl-7.86.0.tar.xz
+CURL_SHA256SUM := 
ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff
+CURL_TARBALL := curl-7.87.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/curl/asan-poison-nsspem.patch.0 
b/external/curl/asan-poison-nsspem.patch.0
index 8675f06e6b8b..1f490bd6bf86 100644
--- a/external/curl/asan-poison-nsspem.patch.0
+++ b/external/curl/asan-poison-nsspem.patch.0
@@ -1,6 +1,6 @@
 --- lib/vtls/nss.c
 +++ lib/vtls/nss.c
-@@ -1942,7 +1942,7 @@
+@@ -1945,7 +1945,7 @@
  
PK11_SetPasswordFunc(nss_get_password);
  
diff --git a/external/curl/curl-msvc-disable-protocols.patch.1 
b/external/curl/curl-msvc-disable-protocols.patch.1
index 89c4ff576f85..71ff0c01a028 100644
--- a/external/curl/curl-msvc-disable-protocols.patch.1
+++ b/external/curl/curl-msvc-disable-protocols.patch.1
@@ -2,7 +2,7 @@ disable protocols nobody needs in MSVC build
 
 --- curl/lib/config-win32.h.orig   2017-08-09 16:43:29.46400 +0200
 +++ curl/lib/config-win32.h2017-08-09 16:47:38.54920 +0200
-@@ -616,4 +616,20 @@
+@@ -654,4 +654,20 @@
  #  define ENABLE_IPV6 1
  #endif
  
diff --git a/external/curl/curl-nss.patch.1 b/external/curl/curl-nss.patch.1
index 5ef25748d7eb..2128849369e7 100644
--- a/external/curl/curl-nss.patch.1
+++ b/external/curl/curl-nss.patch.1
@@ -1,7 +1,7 @@
 diff -ur curl.org/configure curl/configure
 --- curl.org/configure 2016-03-13 15:14:07.17776 +0100
 +++ curl/configure 2016-03-13 15:16:44.13276 +0100
-@@ -27985,7 +27985,12 @@
+@@ -28230,7 +28230,12 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using hard-wired 
libraries and compilation flags for NSS." >&5
  printf "%s\n" "$as_me: WARNING: Using hard-wired libraries and compilation 
flags for NSS." >&2;}
addld="-L$OPT_NSS/lib"
diff --git a/external/curl/zlib.patch.0 b/external/curl/zlib.patch.0
index b8e242a3aaea..b4442ba262d1 100644
--- a/external/curl/zlib.patch.0
+++ b/external/curl/zlib.patch.0
@@ -1,6 +1,6 @@
 --- configure
 +++ configure
-@@ -22808,7 +22808,6 @@
+@@ -23035,7 +23035,6 @@
  clean_CPPFLAGS=$CPPFLAGS
  clean_LDFLAGS=$LDFLAGS
  clean_LIBS=$LIBS
@@ -8,7 +8,7 @@
  
  # Check whether --with-zlib was given.
  if test ${with_zlib+y}
-@@ -22818,6 +22818,7 @@
+@@ -23045,6 +23044,7 @@
  
  
  if test "$OPT_ZLIB" = "no" ; then
@@ -16,7 +16,7 @@
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5
  printf "%s\n" "$as_me: WARNING: zlib disabled" >&2;}
  else
-@@ -22825,6 +825,21 @@
+@@ -23052,6 +23052,21 @@
  OPT_ZLIB=""
fi
  
@@ -38,7 +38,7 @@
if test -z "$OPT_ZLIB" ; then
  
  if test -n "$PKG_CONFIG"; then
-@@ -23120,6 +23120,7 @@
+@@ -23344,6 +23359,7 @@
  printf "%s\n" "$as_me: found both libz and libz.h header" >&6;}
  curl_zlib_msg="enabled"
fi
@@ -48,7 +48,7 @@
   if test x"$AMFIXLIB" = x1; then
 --- configure.ac
 +++ configure.ac
-@@ -1222,19 +1222,30 @@
+@@ -1243,19 +1243,30 @@
  clean_CPPFLAGS=$CPPFLAGS
  clean_LDFLAGS=$LDFLAGS
  clean_LIBS=$LIBS
@@ -80,7 +80,7 @@
if test -z "$OPT_ZLIB" ; then
  CURL_CHECK_PKGCONFIG(zlib)
  
-@@ -1316,6 +1316,7 @@
+@@ -1336,6 +1347,7 @@
  AC_MSG_NOTICE([found both libz and libz.h header])
  curl_zlib_msg="enabled"
fi

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

2023-01-04 Thread Stephan Bergmann (via logerrit)

 download.lst   
  |4 
 
external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
 |   27 ++
 
external/boost/0001-Change-mpl-integral_c-to-boost-integral_constant-to-.patch.2
 |   91 --
 external/boost/UnpackedTarball_boost.mk
  |   10 -
 external/boost/boost.between.warning.patch 
  |   16 -
 external/boost/boost.fallback.encoding.patch   
  |4 
 external/boost/boost.noiconv.patch 
  |   78 
 external/boost/libc++.patch.0  
  |   12 -
 external/boost/windows-no-utf8-locales.patch.0 
  |   20 --
 9 files changed, 81 insertions(+), 181 deletions(-)

New commits:
commit ed259e5efe432386b54c553cbc644b3b64976852
Author: Stephan Bergmann 
AuthorDate: Wed Jan 4 17:57:45 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 5 07:14:18 2023 +

Upgrade external/boost to latest Boost 1.81.0

 has been 
generated (on
Fedora 37) with

> $ wget 
https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2
> $ printf 
'71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa 
boost_1_81_0.tar.bz2' | sha256sum -c # cf. 

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

* external/boost/windows-no-utf8-locales.patch.0, introduced with
  f046fed2782f0d4244aff719ba70a56399a2583a "Don't ever attempt to 
initialise a
  std::locale with a UTF-8 locale on Windows", was presumably obsoleted by
  

  "Use UTF-16 <-> UTF-8 codecvt on Windows".

* external/boost/libc++.patch.0 was obsoleted by
  

  "The std lib unary/binary_function base classes are deprecated/removed 
from
  libcpp15."

* 
external/boost/0001-Change-mpl-integral_c-to-boost-integral_constant-to-.patch.2
  was obsoleted by
  

  "Change mpl::integral_c to boost::integral_constant to avoid Clang 16 
errors
  when constructing out of range enums (refs #24, boostorg/mpl#69)".

* 
external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
  is needed to e.g. avoid
> 
./.libs/libetonyek_internal.a(libetonyek_internal_la-KEY1DivElement.o):(.bss+0x3e):
 multiple definition of `boost::phoenix::placeholders::uarg1'; 
./.libs/libetonyek_internal.a(libetonyek_internal_la-IWORKFormula.o):(.bss+0x3e):
 first defined here
  etc. while building ExternalProject_libetonyek, caused by
  

  "std::tuple support (Resolving #103) (#104)".

Change-Id: I48773166d0c50f2850d8bb37fa6215d9e5c0d51d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145044
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/download.lst b/download.lst
index 6cfc19a0573b..c41e59d336fb 100644
--- a/download.lst
+++ b/download.lst
@@ -9,8 +9,8 @@ ABW_TARBALL := libabw-0.1.3.tar.xz
 # so that git cherry-pick
 # will not run into conflicts
 # please repack the tarball using external/boost/repack_tarball.sh
-BOOST_SHA256SUM := 
322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666
-BOOST_TARBALL := boost_1_80_0.tar.xz
+BOOST_SHA256SUM := 
1deb0a5a9e33a6626fcaa1d2efd4c0e74ca2b0eea87c1559e3917f3066b633d6
+BOOST_TARBALL := boost_1_81_0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
 
b/external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
new file mode 100644
index ..e0989727fb5a
--- /dev/null
+++ 
b/external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
@@ -0,0 +1,27 @@
+From 50973dc10ea16931245ea61a00b2ce9041acc5ba Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Wed, 4 Jan 2023 17:33:31 +0100
+Subject: [PATCH] Avoid boost::phoenix::placeholders::uarg1..10 ODR violations
+
+Those variables, defined in an include file, had external linkage, causing ODR
+violations.  Make them const to implicitly give them

[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch readlicense_oo/license Repository.mk solenv/flatpak-manifest.in sw/qa sw/source vcl/qa

2022-12-31 Thread Khaled Hosny (via logerrit)

 Makefile.fetch|1 
 Repository.mk |1 
 download.lst  |5 
 external/more_fonts/ExternalPackage_sourcesans.mk |   27 --
 external/more_fonts/Module_more_fonts.mk  |2 -
 external/more_fonts/UnpackedTarball_sourcesans.mk |   14 ---
 readlicense_oo/license/license.xml|9 ---
 solenv/flatpak-manifest.in|7 -
 sw/qa/uitest/data/metadata.odt|binary
 sw/source/uibase/sidebar/ThemePanel.cxx   |4 +--
 vcl/qa/cppunit/pdfexport/data/tdf148442.odt   |binary
 11 files changed, 2 insertions(+), 68 deletions(-)

New commits:
commit 5d42f4403d4e51f33ad8f2ce9efbed542978b521
Author: Khaled Hosny 
AuthorDate: Mon Dec 5 12:09:38 2022 +0200
Commit: خالد حسني 
CommitDate: Sat Dec 31 19:34:37 2022 +

tdf#136604: Remove Source Sans Pro fonts

Templates using the fonts are left unchanged.

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

diff --git a/Makefile.fetch b/Makefile.fetch
index 053cb3190a49..c8c5c91941f2 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -177,7 +177,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call 
fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
-   $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index d6db83c47873..ff20165796a5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1052,7 +1052,6 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo_fonts,\
fonts_libre_hebrew \
fonts_noto \
fonts_reem \
-   fonts_sourcesans \
fonts_scheherazade \
) \
 ))
diff --git a/download.lst b/download.lst
index 5eed30c442ec..6cfc19a0573b 100644
--- a/download.lst
+++ b/download.lst
@@ -153,11 +153,6 @@ FONT_LINLIBERTINEG_TARBALL := 
e7a384790b13c29113e22e596ade9687-LinLibertineG-201
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_SOURCESANS_SHA256SUM := 
e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61
-FONT_SOURCESANS_TARBALL := 
edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
-# three static lines
-# so that git cherry-pick
-# will not run into conflicts
 FONT_NOTO_SHA256SUM := 
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
 FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
 # three static lines
diff --git a/external/more_fonts/ExternalPackage_sourcesans.mk 
b/external/more_fonts/ExternalPackage_sourcesans.mk
deleted file mode 100644
index cd7ac29e92af..
--- a/external/more_fonts/ExternalPackage_sourcesans.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- 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 http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call 
gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans))
-
-$(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
-   SourceSansPro-BlackIt.ttf \
-   SourceSansPro-Black.ttf \
-   SourceSansPro-BoldIt.ttf \
-   SourceSansPro-Bold.ttf \
-   SourceSansPro-ExtraLightIt.ttf \
-   SourceSansPro-ExtraLight.ttf \
-   SourceSansPro-It.ttf \
-   SourceSansPro-LightIt.ttf \
-   SourceSansPro-Light.ttf \
-   SourceSansPro-Regular.ttf \
-   SourceSansPro-SemiboldIt.ttf \
-   SourceSansPro-Semibold.ttf \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/Module_more_fonts.mk 
b/external/more_fonts/Module_more_fonts.mk
index b97f71ac5c64..001e9bcc2d03 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_liberation_narrow \
ExternalPackage_libertineg \
ExternalPackage_libre_hebrew \
-   ExternalPackage_sourcesans \
ExternalPackage_noto \
ExternalPackage_reem \
ExternalPackage_scheherazade \
@@ -36,7 +35,6 @@ $(eval $(call

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

2022-12-30 Thread László Németh (via logerrit)

 download.lst   
   |4 
 
external/hunspell/0001-check-len-in-cpdpat_check-like-r1-blen-is-checked-63.patch
 |   27 ---
 
external/hunspell/0001-fix-LibreOffice-build-problem-with-basic_string-appe.patch
 |   84 ++
 external/hunspell/0001-improve-630-test-case-from-0m1.836s-0m1.223s-785.patch  
   |   52 --
 external/hunspell/0001-improve-630-test-case-from-0m2.427s-0m1.836s-781.patch  
   |   40 
 external/hunspell/UnpackedTarball_hunspell.mk  
   |4 
 6 files changed, 87 insertions(+), 124 deletions(-)

New commits:
commit 247e161cf1dca6811998b67d1138062fa4e14381
Author: László Németh 
AuthorDate: Thu Dec 29 22:09:55 2022 +0100
Commit: László Németh 
CommitDate: Fri Dec 30 13:40:57 2022 +

upgrade to hunspell 1.7.2

Change-Id: If969eccc73926911a4a09440623adf83b8e2c520
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144869
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/download.lst b/download.lst
index 4bf163be50c7..de7a832422a0 100644
--- a/download.lst
+++ b/download.lst
@@ -228,8 +228,8 @@ HSQLDB_TARBALL := 
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HUNSPELL_SHA256SUM := 
b2d9c5369c2cc7f321cb5983fda2dbf007dce3d9e17519746840a6f0c4bf7444
-HUNSPELL_TARBALL := hunspell-1.7.1.tar.gz
+HUNSPELL_SHA256SUM := 
11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8
+HUNSPELL_TARBALL := hunspell-1.7.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/hunspell/0001-check-len-in-cpdpat_check-like-r1-blen-is-checked-63.patch
 
b/external/hunspell/0001-check-len-in-cpdpat_check-like-r1-blen-is-checked-63.patch
deleted file mode 100644
index 58b68d0dda43..
--- 
a/external/hunspell/0001-check-len-in-cpdpat_check-like-r1-blen-is-checked-63.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 56ad6310c95695d25f936d3f89f6ee3d787df274 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
-Date: Mon, 22 Aug 2022 21:21:36 +0100
-Subject: [PATCH] check 'len' in cpdpat_check like 'r1->blen' is checked (#633)
- (#780)
-
-we should check len against pos like we do r1->blen in the line above

- src/hunspell/affixmgr.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hunspell/affixmgr.cxx b/src/hunspell/affixmgr.cxx
-index 7ea1ea5..c2432c0 100644
 a/src/hunspell/affixmgr.cxx
-+++ b/src/hunspell/affixmgr.cxx
-@@ -1330,7 +1330,7 @@ int AffixMgr::cpdpat_check(const char* word,
-  ((checkcpdtable[i].pattern[0] == '0' && r1->blen <= pos &&
-strncmp(word + pos - r1->blen, r1->word, r1->blen) == 0) ||
-   (checkcpdtable[i].pattern[0] != '0' &&
--   ((len = checkcpdtable[i].pattern.size()) != 0) &&
-+   ((len = checkcpdtable[i].pattern.size()) != 0) && len <= pos &&
-strncmp(word + pos - len, checkcpdtable[i].pattern.c_str(), len) 
== 0 {
-   return 1;
- }
--- 
-2.37.2
-
diff --git 
a/external/hunspell/0001-fix-LibreOffice-build-problem-with-basic_string-appe.patch
 
b/external/hunspell/0001-fix-LibreOffice-build-problem-with-basic_string-appe.patch
new file mode 100644
index ..3c6f9831b2b4
--- /dev/null
+++ 
b/external/hunspell/0001-fix-LibreOffice-build-problem-with-basic_string-appe.patch
@@ -0,0 +1,84 @@
+From 1587ea4ab5e8d94c9c0d552f7ab61c217ebdcbeb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= 
+Date: Fri, 30 Dec 2022 12:20:02 +0100
+Subject: [PATCH] fix LibreOffice build problem with basic_string::append()
+
+---
+ src/hunspell/affentry.cxx | 6 +++---
+ src/hunspell/affixmgr.cxx | 8 
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/hunspell/affentry.cxx b/src/hunspell/affentry.cxx
+index 46e8b58..6ee23be 100644
+--- a/src/hunspell/affentry.cxx
 b/src/hunspell/affentry.cxx
+@@ -290,7 +290,7 @@ struct hentry* PfxEntry::check_twosfx(const std::string& 
word,
+ // back any characters that would have been stripped
+ 
+ std::string tmpword(strip);
+-tmpword.append(word, start + appnd.size());
++tmpword.append(word, start + appnd.size(), tmpl);
+ 
+ // now make sure all of the conditions on characters
+ // are met.  Please see the appendix at the end of
+@@ -338,7 +338,7 @@ std::string PfxEntry::check_twosfx_morph(const 
std::string& word,
+ // back any characters that would have been stripped
+ 
+ std::string tmpword(strip);
+-tmpword.append(word, start + appnd.size());
++tmpword.append(word, start + appnd.size(), tmpl);
+ 
+ // now make sure all of the conditions on characters
+ // are met.  Please see the appendix at the end of
+@@ -386,7 +386,7 @@ std::string PfxEntry::check_morph(const std::string& word,
+ // back any characters that would have been stripped
+ 
+

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

2022-12-17 Thread Khaled Hosny (via logerrit)

 download.lst   
 |4 
 
external/harfbuzz/0001-PairPos-Another-attempt-at-fixing-unsafe-to-break-wi.patch.1
 |   62 -
 external/harfbuzz/0001-buffer-diff-Fix-check-for-glyph-flag-equality.patch.1   
 |   65 --
 external/harfbuzz/0001-font-Respect-subfont-slant-setting-in-hb-draw.patch.1   
 |  104 --
 external/harfbuzz/0001-hb-view-Fix-cairo-slanting-condition.patch.1
 |   29 --
 external/harfbuzz/3874.patch.1 
 |   47 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk  
 |6 
 7 files changed, 2 insertions(+), 315 deletions(-)

New commits:
commit e272fd31b115e6ea128b593087aeaf4f55119a36
Author: Khaled Hosny 
AuthorDate: Sat Dec 17 23:47:06 2022 +0200
Commit: خالد حسني 
CommitDate: Sat Dec 17 22:44:37 2022 +

Update HarfBuzz to 6.0.0

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

diff --git a/download.lst b/download.lst
index f193a571d4ee..4bf163be50c7 100644
--- a/download.lst
+++ b/download.lst
@@ -218,8 +218,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
735a94917b47936575acb4d4fa7e7986522f8a89527e4635721474dee2bc942c
-HARFBUZZ_TARBALL := harfbuzz-5.2.0.tar.xz
+HARFBUZZ_SHA256SUM := 
1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4
+HARFBUZZ_TARBALL := harfbuzz-6.0.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/harfbuzz/0001-PairPos-Another-attempt-at-fixing-unsafe-to-break-wi.patch.1
 
b/external/harfbuzz/0001-PairPos-Another-attempt-at-fixing-unsafe-to-break-wi.patch.1
deleted file mode 100644
index 0fd429257b8d..
--- 
a/external/harfbuzz/0001-PairPos-Another-attempt-at-fixing-unsafe-to-break-wi.patch.1
+++ /dev/null
@@ -1,62 +0,0 @@
-From 05aa084e67705285941c9acd13151e2a38da8b0f Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod 
-Date: Thu, 24 Nov 2022 12:13:31 -0700
-Subject: [PATCH] [PairPos] Another attempt at fixing unsafe-to-break with
- ValueFormat2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes https://github.com/harfbuzz/harfbuzz/issues/3888#issuecomment-1326781116
-
-Test:
-$ hb-shape XBRoya34.ttf  ' الأ' --show-flags --script=arab

- src/OT/Layout/GPOS/PairPosFormat2.hh | 9 +
- src/OT/Layout/GPOS/PairSet.hh| 5 +++--
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/src/OT/Layout/GPOS/PairPosFormat2.hh 
b/src/OT/Layout/GPOS/PairPosFormat2.hh
-index 1bb0d60ae..523e0e936 100644
 a/src/OT/Layout/GPOS/PairPosFormat2.hh
-+++ b/src/OT/Layout/GPOS/PairPosFormat2.hh
-@@ -241,15 +241,16 @@ struct PairPosFormat2_4
- boring:
-   buffer->unsafe_to_concat (buffer->idx, skippy_iter.idx + 1);
- 
--
--buffer->idx = skippy_iter.idx;
- if (len2)
- {
--  buffer->idx++;
-+  skippy_iter.idx++;
-   // https://github.com/harfbuzz/harfbuzz/issues/3824
--  buffer->unsafe_to_break (buffer->idx - 1, buffer->idx + 1);
-+  // 
https://github.com/harfbuzz/harfbuzz/issues/3888#issuecomment-1326781116
-+  buffer->unsafe_to_break (buffer->idx, skippy_iter.idx + 1);
- }
- 
-+buffer->idx = skippy_iter.idx;
-+
- return_trace (true);
-   }
- 
-diff --git a/src/OT/Layout/GPOS/PairSet.hh b/src/OT/Layout/GPOS/PairSet.hh
-index b1d9f83bc..2ad1f004c 100644
 a/src/OT/Layout/GPOS/PairSet.hh
-+++ b/src/OT/Layout/GPOS/PairSet.hh
-@@ -132,8 +132,9 @@ struct PairSet
-   if (len2)
-   {
-   pos++;
--  // https://github.com/harfbuzz/harfbuzz/issues/3824
--  buffer->unsafe_to_break (pos - 1, pos + 1);
-+  // https://github.com/harfbuzz/harfbuzz/issues/3824
-+  // 
https://github.com/harfbuzz/harfbuzz/issues/3888#issuecomment-1326781116
-+  buffer->unsafe_to_break (buffer->idx, pos + 1);
-   }
- 
-   buffer->idx = pos;
--- 
-2.38.1
-
diff --git 
a/external/harfbuzz/0001-buffer-diff-Fix-check-for-glyph-flag-equality.patch.1 
b/external/harfbuzz/0001-buffer-diff-Fix-check-for-glyph-flag-equality.patch.1
deleted file mode 100644
index 45da1bddf161..
--- 
a/external/harfbuzz/0001-buffer-diff-Fix-check-for-glyph-flag-equality.patch.1
+++ /dev/null
@@ -1,65 +0,0 @@
-From 404cb99d86c2d639b4ce2fc59f00f5e66468af34 Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod 
-Date: Wed, 23 Nov 2022 15:35:14 -0700
-Subject: [PATCH] [buffer-diff] Fix check for glyph flag equality
-
-I'm not sure if the old behavior was intentional, but it was checking
-that the glyph flags were a subset of the reference buffer's glyph
-flags.  I don't see why that is useful.  Fix that.
-
-Then make the buffer-verify code ignore flag

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

2022-12-15 Thread Christian Lohmaier (via logerrit)

 download.lst |  318 +++
 1 file changed, 318 insertions(+)

New commits:
commit 37530317f35ad59091cf1fb0850055612fe0d529
Author: Christian Lohmaier 
AuthorDate: Thu Dec 15 18:08:59 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 15 23:33:47 2022 +

add three static lines beween tarballs to ease cherry-picking

since otherwise merge-conflicts are likely to occur

Change-Id: I46d507763a4d4287a7450bb81d28aed4279aae1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144247
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index 902634db2a26..f193a571d4ee 100644
--- a/download.lst
+++ b/download.lst
@@ -5,105 +5,246 @@
 
 ABW_SHA256SUM := 
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
 ABW_TARBALL := libabw-0.1.3.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 # please repack the tarball using external/boost/repack_tarball.sh
 BOOST_SHA256SUM := 
322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666
 BOOST_TARBALL := boost_1_80_0.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 BOX2D_SHA256SUM := 
d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2
 BOX2D_TARBALL := box2d-2.4.1.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 BREAKPAD_SHA256SUM := 
c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91
 BREAKPAD_TARBALL := breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 BSH_SHA256SUM := 
9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96
 BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 BZIP2_SHA256SUM := 
ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
 BZIP2_TARBALL := bzip2-1.0.8.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 CAIRO_SHA256SUM := 
4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf
 CAIRO_VERSION_MICRO := 6
 CAIRO_TARBALL := cairo-1.17.$(CAIRO_VERSION_MICRO).tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 CDR_SHA256SUM := 
5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4
 CDR_TARBALL := libcdr-0.1.7.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 CLUCENE_SHA256SUM := 
ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
 CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 DRAGONBOX_SHA256SUM := 
09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384
 DRAGONBOX_TARBALL := dragonbox-1.1.3.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 DTOA_SHA256SUM := 
0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
 DTOA_TARBALL := dtoa-20180411.tgz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 LIBCMIS_SHA256SUM := 
d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
 LIBCMIS_TARBALL := libcmis-0.5.2.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 COINMP_SHA256SUM := 
86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f
 COINMP_TARBALL := CoinMP-1.7.6.tgz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 CPPUNIT_SHA256SUM := 
89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7
 CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 CURL_SHA256SUM := 
2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b
 CURL_TARBALL := curl-7.86.0.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 EBOOK_TARBALL := libe-book-0.1.3.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 EPOXY_SHA256SUM := 
a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
 EPOXY_TARBALL := libepoxy-1.5.10.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 EPM_SHA256SUM := 
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
 EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 EPUBGEN_SHA256SUM := 
03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad
 EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 ETONYEK_SHA256SUM :=

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

2022-12-15 Thread 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/Library_gpgmepp.mk |  
  3 
 external/gpgmepp/UnpackedTarball_gpgmepp.mk |  
  3 
 external/gpgmepp/Wincompatible-function-pointer-types.patch |  
  6 
 external/gpgmepp/asan.patch |  
  2 
 external/gpgmepp/configure.patch|  
  4 
 external/gpgmepp/find-libgpg-error-libassuan.patch  |  
  6 
 external/gpgmepp/fix-autoconf-macros.patch  |  
  8 -
 external/gpgmepp/gcc9.patch |  
  2 
 external/gpgmepp/gpgme.git-4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e.patch.1 |  
 32 
 external/gpgmepp/macos-include.patch|  
 10 +
 external/gpgmepp/rpath.patch|  
  2 
 external/gpgmepp/ubsan.patch|  
  8 -
 external/gpgmepp/w32-build-fixes.patch.1|  
 16 +-
 external/gpgmepp/w32-disable-docs.patch.1   |  
  2 
 external/gpgmepp/w32-fix-libtool.patch.1|  
  2 
 external/gpgmepp/w32-fix-win32-macro.patch.1|  
 20 +-
 external/gpgmepp/w32-include.patch  |  
 20 ++
 20 files changed, 151 insertions(+), 75 deletions(-)

New commits:
commit 1c5c31b006f8515bfea440bbcf286f8b4b840aac
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Nov 21 23:39:38 2022 +0900
Commit: Caolán McNamara 
CommitDate: Thu Dec 15 15:19:54 2022 +

gpgme: upgrade to release 1.18.0

Remove gpgme.git-4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e.patch.1 as it has 
applied in 1.18.0.

* 0001-cpp-Fix-building-with-C-11.patch.1: fixed error "no matching 
function for call to object of type "(lambda at importresult.cpp:154:71)"".
* w32-include.patch: add missing #include  (for std::string).
* macos-include.patch: add missing #include  (for std::any_of).

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

diff --git a/download.lst b/download.lst
index b3c852ea291b..b255cc10b6c8 100644
--- a/download.lst
+++ b/download.lst
@@ -88,8 +88,8 @@ export FREETYPE_SHA256SUM := 
ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4ad
 export FREETYPE_TARBALL := freetype-2.12.0.tar.xz
 export GLM_SHA256SUM := 
6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
 export GLM_TARBALL := glm-0.9.9.8.zip
-export GPGME_SHA256SUM := 
6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0
-export GPGME_TARBALL := gpgme-1.16.0.tar.bz2
+export GPGME_SHA256SUM := 
361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
+export GPGME_TARBALL := gpgme-1.18.0.tar.bz2
 export GRAPHITE_SHA256SUM := 
b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
 export GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 export HARFBUZZ_SHA256SUM := 
735a94917b47936575acb4d4fa7e7986522f8a89527e4635721474dee2bc942c
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
new file mode 100755
index ..c7b288d7240a
--- /dev/null
+++ b/external/gpgmepp/0001-cpp-Fix-building-with-C-11.patch.1
@@ -0,0 +1,72 @@
+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 &&

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

2022-12-14 Thread Caolán McNamara (via logerrit)

 download.lst |4 
 external/libtiff/0001-add-16bit-cielab-support.patch |  164 ---
 external/libtiff/UnpackedTarball_libtiff.mk  |2 
 external/libtiff/include.patch   |   10 -
 4 files changed, 2 insertions(+), 178 deletions(-)

New commits:
commit 8bdb85f8c7f31e51328afa51a584c3cfdea1c06f
Author: Caolán McNamara 
AuthorDate: Wed Dec 14 09:46:01 2022 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 14 12:37:55 2022 +

upgrade to libtiff 4.5.0

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

diff --git a/download.lst b/download.lst
index d1d9537f5831..b3c852ea291b 100644
--- a/download.lst
+++ b/download.lst
@@ -200,8 +200,8 @@ export PIXMAN_SHA256SUM := 
ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e
 export PIXMAN_TARBALL := pixman-0.42.2.tar.gz
 export LIBPNG_SHA256SUM := 
1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937
 export LIBPNG_TARBALL := libpng-1.6.39.tar.xz
-export LIBTIFF_SHA256SUM := 
49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1
-export LIBTIFF_TARBALL := tiff-4.4.0.tar.xz
+export LIBTIFF_SHA256SUM := 
dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c
+export LIBTIFF_TARBALL := tiff-4.5.0rc3.tar.xz
 export POPPLER_SHA256SUM := 
d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0
 export POPPLER_TARBALL := poppler-22.12.0.tar.xz
 export POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
diff --git a/external/libtiff/0001-add-16bit-cielab-support.patch 
b/external/libtiff/0001-add-16bit-cielab-support.patch
deleted file mode 100644
index 3ee6c3f648ca..
--- a/external/libtiff/0001-add-16bit-cielab-support.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 87cf58d0604e4bfd70da1044894c3e8f073133a1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
-Date: Sun, 22 May 2022 14:20:21 +0100
-Subject: [PATCH] add 16bit-cielab support
-
-add an internal TIFFCIELab16ToXYZ that assumes 16bit encoding
-
-multiply the 8bit variant input to use that, keep TIFFCIELabToXYZ
-unchanged so no different to existing potential consumers
-
-motivation: https://bugs.documentfoundation.org/show_bug.cgi?id=131199
-the "clavijo16bitlab.tiff" example where tiffinfo says:
-
-  Image Width: 2601 Image Length: 3503
-  Resolution: 96, 96 pixels/inch
-  Bits/Sample: 16
-  Compression Scheme: AdobeDeflate
-  Photometric Interpretation: CIE L*a*b*
-  Orientation: row 0 top, col 0 lhs
-  Samples/Pixel: 3
-  Rows/Strip: 1
-  Planar Configuration: single image plane
-  DateTime: 2020:03:07 10:20:42

- libtiff/tif_color.c| 19 ---
- libtiff/tif_getimage.c | 38 ++
- libtiff/tiffiop.h  |  2 ++
- 3 files changed, 52 insertions(+), 7 deletions(-)
-
-diff --git a/libtiff/tif_color.c b/libtiff/tif_color.c
-index 20e41684..e0fc4bf0 100644
 libtiff/tif_color.c
-+++ libtiff/tif_color.c
-@@ -44,7 +44,20 @@ void
- TIFFCIELabToXYZ(TIFFCIELabToRGB *cielab, uint32_t l, int32_t a, int32_t b,
- float *X, float *Y, float *Z)
- {
--  float L = (float)l * 100.0F / 255.0F;
-+  TIFFCIELab16ToXYZ(cielab, l * 257, a * 256, b * 256, X, Y, Z);
-+}
-+
-+/*
-+ * For CIELab encoded in 16 bits, L is an unsigned integer range [0,65535].
-+ * The a* and b* components are signed integers range [-32768,32767]. The 16
-+ * bit chrominance values are encoded as 256 times the 1976 CIE a* and b*
-+ * values
-+ */
-+void
-+TIFFCIELab16ToXYZ(TIFFCIELabToRGB *cielab, uint32_t l, int32_t a, int32_t b,
-+  float *X, float *Y, float *Z)
-+{
-+  float L = (float)l * 100.0F / 65535.0F;
-   float cby, tmp;
- 
-   if( L < 8.856F ) {
-@@ -55,13 +68,13 @@ TIFFCIELabToXYZ(TIFFCIELabToRGB *cielab, uint32_t l, 
int32_t a, int32_t b,
-   *Y = cielab->Y0 * cby * cby * cby;
-   }
- 
--  tmp = (float)a / 500.0F + cby;
-+  tmp = (float)a / 256.0F / 500.0F + cby;
-   if( tmp < 0.2069F )
-   *X = cielab->X0 * (tmp - 0.13793F) / 7.787F;
-   else
-   *X = cielab->X0 * tmp * tmp * tmp;
- 
--  tmp = cby - (float)b / 200.0F;
-+  tmp = cby - (float)b / 256.0F / 200.0F;
-   if( tmp < 0.2069F )
-   *Z = cielab->Z0 * (tmp - 0.13793F) / 7.787F;
-   else
-diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
-index a1b6570b..9e2ac2c9 100644
 libtiff/tif_getimage.c
-+++ libtiff/tif_getimage.c
-@@ -194,7 +194,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
- }
-   break;
-   case PHOTOMETRIC_CIELAB:
--if ( td->td_samplesperpixel != 3 || colorchannels != 
3 || td->td_bitspersample != 8 ) {
-+if ( td->td_samplesperpixel

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

2022-12-13 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 -
 external/nss/UnpackedTarball_nss.mk  |2 
 external/nss/asan.patch.1|2 
 external/nss/clang-cl.patch.0|   12 ++---
 external/nss/macos-dlopen.patch.0|2 
 external/nss/nss-android.patch.1 |6 +-
 external/nss/nss-ios.patch   |   36 +++
 external/nss/nss-restore-manual-pre-dependencies.patch.1 |2 
 external/nss/nss-win32-make.patch.1  |4 -
 external/nss/nss.aix.patch   |   10 ++--
 external/nss/nss.bzmozilla1238154.patch  |2 
 external/nss/nss.cygwin64.in32bit.patch  |2 
 external/nss/nss.nowerror.patch  |2 
 external/nss/nss.utf8bom.patch.1 |4 -
 external/nss/nss.vs2015.patch|2 
 external/nss/nss.vs2015.pdb.patch|2 
 external/nss/nss.windows.patch   |6 +-
 external/nss/nss_macosx.patch|   12 ++---
 external/nss/ubsan.patch.0   |2 
 19 files changed, 57 insertions(+), 57 deletions(-)

New commits:
commit a2969884af71e88d2541bd2bfdebea222876fef4
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Nov 21 23:33:32 2022 +0900
Commit: Caolán McNamara 
CommitDate: Tue Dec 13 12:35:08 2022 +

nss: upgrade to release 3.86.0

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

diff --git a/download.lst b/download.lst
index 0e8fda2d1113..d1d9537f5831 100644
--- a/download.lst
+++ b/download.lst
@@ -177,8 +177,8 @@ export MWAW_VERSION_MICRO := 21
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 
19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d
 export MYTHES_TARBALL := mythes-1.2.5.tar.xz
-export NSS_SHA256SUM := 
b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30
-export NSS_TARBALL := nss-3.83-with-nspr-4.34.1.tar.gz
+export NSS_SHA256SUM := 
8b5a2e9e3d632a78ad4d9c8d2ea502d2790d7a8e7b1986d173107232eca27432
+export NSS_TARBALL := nss-3.86-with-nspr-4.35.tar.gz
 export ODFGEN_SHA256SUM := 
55200027fd46623b9b38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625
 export ODFGEN_VERSION_MICRO := 8
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.xz
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index b7373772152a..e589ea9698e3 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss.vs2015.patch \
 external/nss/nss.vs2015.pdb.patch \
 external/nss/nss.bzmozilla1238154.patch \
-   external/nss/nss-bz1646594.patch.1 \
+external/nss/nss-bz1646594.patch.1 \
 external/nss/macos-dlopen.patch.0 \
 external/nss/nss-restore-manual-pre-dependencies.patch.1 \
 external/nss/Wincompatible-function-pointer-types.patch.0 \
diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
index ce584a34a3b5..ccabd446ebac 100644
--- a/external/nss/asan.patch.1
+++ b/external/nss/asan.patch.1
@@ -1,7 +1,7 @@
 diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
 --- nss.org/nss/coreconf/Linux.mk  2014-05-06 04:36:01.817838877 +0200
 +++ nss/nss/coreconf/Linux.mk  2014-05-06 04:37:25.387835456 +0200
-@@ -146,7 +146,7 @@
+@@ -157,7 +157,7 @@
  # we don't use -z defs there.
  # Also, -z defs conflicts with Address Sanitizer, which emits relocations
  # against the libsanitizer runtime built into the main executable.
diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0
index b02fff60e36b..e20aab3b9ff1 100644
--- a/external/nss/clang-cl.patch.0
+++ b/external/nss/clang-cl.patch.0
@@ -14,7 +14,7 @@
  #pragma intrinsic(_InterlockedExchange)
 --- nspr/pr/include/prbit.h
 +++ nspr/pr/include/prbit.h
-@@ -14,7 +14,7 @@
+@@ -15,7 +15,7 @@
  */
  #if defined(_WIN32) && (_MSC_VER >= 1300) && \
  (defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM) || \
@@ -23,7 +23,7 @@
  # include 
  # pragma  intrinsic(_BitScanForward,_BitScanReverse)
  __forceinline static int __prBitScanForward32(unsigned int val)
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
  # define pr_bitscan_ctz32(val)  __prBitScanForward32(val)
  # define pr_bitscan_clz32(val)  __prBitScanReverse32(val)
  # define  PR_HAVE_BUILTIN_BITSCAN32
@@ -32,7 +32,7 @@
 (defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
  defined(__aarch64__))
  # define pr_bitscan_ctz32(val)  __builtin_ctz(val)
-@@ -136,7 +136,7 @@
+@@ -138,7 +138,7 @@
  */
  
  #if

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

2022-12-13 Thread Taichi Haradaguchi (via logerrit)

 download.lst  |4 ++--
 external/poppler/disable-freetype.patch.1 |4 ++--
 external/poppler/sanitizer.patch  |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 1ec7f8b5b21bf74f684095b97a2b9900a71a0979
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Dec 11 18:00:28 2022 +0900
Commit: Michael Stahl 
CommitDate: Tue Dec 13 10:23:05 2022 +

poppler: upgrade to release 22.12.0

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

diff --git a/download.lst b/download.lst
index 8c04fb5893ed..0e8fda2d1113 100644
--- a/download.lst
+++ b/download.lst
@@ -202,8 +202,8 @@ export LIBPNG_SHA256SUM := 
1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e
 export LIBPNG_TARBALL := libpng-1.6.39.tar.xz
 export LIBTIFF_SHA256SUM := 
49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1
 export LIBTIFF_TARBALL := tiff-4.4.0.tar.xz
-export POPPLER_SHA256SUM := 
d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e
-export POPPLER_TARBALL := poppler-22.09.0.tar.xz
+export POPPLER_SHA256SUM := 
d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0
+export POPPLER_TARBALL := poppler-22.12.0.tar.xz
 export POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
 export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
 export POSTGRESQL_SHA256SUM := 
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index d59006eba979..710742206925 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -22,7 +22,7 @@ disable freetype dependent code
  
  // return a newly allocated char* containing an UTF16BE string of size length
  char *pdfDocEncodingToUTF16(const std::string , int *length)
-@@ -2730,6 +2730,8 @@
+@@ -2743,6 +2743,8 @@
  
  Form::AddFontResult Form::addFontToDefaultResources(const std::string 
, int faceIndex, const std::string , const std::string 
)
  {
@@ -31,7 +31,7 @@ disable freetype dependent code
  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 {};
-@@ -2939,6 +2941,7 @@
+@@ -2951,6 +2953,7 @@
  }
  
  return { dictFontName, fontDictRef };
diff --git a/external/poppler/sanitizer.patch b/external/poppler/sanitizer.patch
index 149361661b95..c08e1b4e8a4f 100644
--- a/external/poppler/sanitizer.patch
+++ b/external/poppler/sanitizer.patch
@@ -1,6 +1,6 @@
 --- poppler/PSOutputDev.cc
 +++ poppler/PSOutputDev.cc
-@@ -3111,6 +3111,8 @@
+@@ -3138,6 +3138,8 @@
  bool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double 
/*vDPI*/, int rotateA, bool useMediaBox, bool crop, int sliceX, int sliceY, int 
sliceW, int sliceH, bool printing, bool (*abortCheckCbk)(void *data),
   void *abortCheckCbkData, bool 
(*annotDisplayDecideCbk)(Annot *annot, void *user_data), void 
*annotDisplayDecideCbkData)
  {
@@ -9,7 +9,7 @@
  PreScanOutputDev *scan;
  bool rasterize;
  bool useFlate, useLZW;
-@@ -3593,5 +3595,6 @@
+@@ -3623,5 +3625,6 @@
  
  return false;
 +#endif

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

2022-12-13 Thread Taichi Haradaguchi (via logerrit)

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

New commits:
commit 9fb776f508a676d4c7255b5cfc6dfdc00d620a8c
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Dec 11 15:13:32 2022 +0900
Commit: Michael Stahl 
CommitDate: Tue Dec 13 10:21:29 2022 +

libpng: upgrade to release 1.6.39

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

diff --git a/download.lst b/download.lst
index 60af75d77aca..8c04fb5893ed 100644
--- a/download.lst
+++ b/download.lst
@@ -198,8 +198,8 @@ export PDFIUM_SHA256SUM := 
7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358
 export PDFIUM_TARBALL := pdfium-5408.tar.bz2
 export PIXMAN_SHA256SUM := 
ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e
 export PIXMAN_TARBALL := pixman-0.42.2.tar.gz
-export LIBPNG_SHA256SUM := 
b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be
-export LIBPNG_TARBALL := libpng-1.6.38.tar.xz
+export LIBPNG_SHA256SUM := 
1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937
+export LIBPNG_TARBALL := libpng-1.6.39.tar.xz
 export LIBTIFF_SHA256SUM := 
49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1
 export LIBTIFF_TARBALL := tiff-4.4.0.tar.xz
 export POPPLER_SHA256SUM := 
d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e

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

2022-12-07 Thread Taichi Haradaguchi (via logerrit)

 download.lst   
|4 
 external/zxing/0001-Use-a-patch-file-to-document-changes-from-upstream-s.patch 
|   35 
 external/zxing/0002-Update-stb_image_write-from-1.14-to-1.16.patch 
|  361 ---
 external/zxing/0003-Update-stb_image-from-2.25-to-2.27.patch   
| 1162 --
 external/zxing/0004-Apply-stb-PR-1223-to-stb_image.patch   
|   98 
 external/zxing/StaticLibrary_zxing.mk  
|  107 
 external/zxing/UnpackedTarball_zxing.mk
|8 
 external/zxing/android_include.patch.0 
|   10 
 external/zxing/assume.__cpp_lib_string_view.patch.0
|   25 
 external/zxing/include.patch.0 
|   10 
 external/zxing/zxing_newline.patch.1   
|   21 
 11 files changed, 93 insertions(+), 1748 deletions(-)

New commits:
commit 368116fb55eb83c9f8c7eb180044f848294638bb
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Nov 11 00:37:22 2022 +0900
Commit: Caolán McNamara 
CommitDate: Wed Dec 7 14:49:45 2022 +

zxing-cpp: upgrade to release 1.4.0

== list of removed patches ==
* 0001-Use-a-patch-file-to-document-changes-from-upstream-s.patch: fixed 
upstream[1].
* 0002-Update-stb_image_write-from-1.14-to-1.16.patch: fixed upstream.
* 0003-Update-stb_image-from-2.25-to-2.27.patch: fixed upstream
* 0004-Apply-stb-PR-1223-to-stb_image.patch: "stb_image.h" and 
"stb_image.patch" were removed upstream[1][2].
* include.patch.0: fixed upstream (added #include )[3].
* zxing_newline.patch: this issue has been fixed since gcc 11.2/12 or 
later[4].

== list of added patches ==
* android_include.patch.0: added missing #include (for std::abs)
* assume.__cpp_lib_string_view.patch.0 (by Caolán McNamara): fixed "error: 
no member named 'asString' in 'ZXing::ByteArray'"

[1] 
https://github.com/zxing-cpp/zxing-cpp/commit/b208f4bd9052527b7a499d178d81d55b30a27c2d
[2] 
https://github.com/zxing-cpp/zxing-cpp/commit/d2603139c57e2bbca770656a683abb124adc1591
[3] 
https://github.com/zxing-cpp/zxing-cpp/commit/53da58625dcd519b7c10e2349a83c9bd10105cf7
[4] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100392

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

diff --git a/download.lst b/download.lst
index 01bd8d655d08..814bbf7e744e 100644
--- a/download.lst
+++ b/download.lst
@@ -249,8 +249,8 @@ export ZLIB_SHA256SUM := 
d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da05
 export ZLIB_TARBALL := zlib-1.2.13.tar.xz
 export ZMF_SHA256SUM := 
27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
 export ZMF_TARBALL := libzmf-0.0.2.tar.xz
-export ZXING_SHA256SUM := 
653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a
-export ZXING_TARBALL := zxing-cpp-1.2.0.tar.gz
+export ZXING_SHA256SUM := 
126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862
+export ZXING_TARBALL := zxing-cpp-1.4.0.tar.gz
 NUMBERTEXT_EXTENSION_SHA256SUM := 
1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
 export OPENSYMBOL_SHA256SUM := 
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
 export OPENSYMBOL_TTF := 
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
diff --git 
a/external/zxing/0001-Use-a-patch-file-to-document-changes-from-upstream-s.patch
 
b/external/zxing/0001-Use-a-patch-file-to-document-changes-from-upstream-s.patch
deleted file mode 100644
index 2ef284f53c28..
--- 
a/external/zxing/0001-Use-a-patch-file-to-document-changes-from-upstream-s.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1d031966e08aef92ef742ae3cf91e1addaf95a47 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" 
-Date: Wed, 8 Dec 2021 18:14:54 -0500
-Subject: [PATCH 1/4] Use a patch file to document changes from upstream
- stb_image.h
-

- thirdparty/stb/stb_image.patch | 15 +++
- 1 file changed, 15 insertions(+)
- create mode 100644 thirdparty/stb/stb_image.patch
-
-diff --git a/thirdparty/stb/stb_image.patch b/thirdparty/stb/stb_image.patch
-new file mode 100644
-index 000..5153728
 /dev/null
-+++ b/thirdparty/stb/stb_image.patch
-@@ -0,0 +1,15 @@
-+diff -Naur upstream/stb_image.h zxing/stb_image.h
-+--- upstream/stb_image.h  2021-12-08 18:11:28.170529096 -0500
- zxing/stb_image.h 2021-12-08 18:06:42.706717697 -0500
-+@@ -1644,7 +1644,11 @@
-+ 
-+ static stbi_uc stbi__compute_y(int r, int g, int b)
-+ {
-++#if 0 // ori
-+return (stbi_uc) (((r*77) + (g*150) +  (29*b)) >> 8);
-++#else // zxing (see ReadBarcode.cpp:RGBToGray)
-++   return (stbi_uc) ((306 * r + 601 *

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

2022-12-05 Thread Miklos Vajna (via logerrit)

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

New commits:
commit 136cff8909576bc7f50c4e91fb3916218fbb4f83
Author: Miklos Vajna 
AuthorDate: Mon Dec 5 20:12:57 2022 +0100
Commit: Miklos Vajna 
CommitDate: Tue Dec 6 07:08:08 2022 +

Update libxmlsec to 1.2.37

Fixes two regressions, see 
.

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

diff --git a/download.lst b/download.lst
index 6cea1bbeaed2..01bd8d655d08 100644
--- a/download.lst
+++ b/download.lst
@@ -152,8 +152,8 @@ export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export LIBWEBP_SHA256SUM := 
7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df
 export LIBWEBP_TARBALL := libwebp-1.2.4.tar.gz
-export XMLSEC_SHA256SUM := 
f0d97e008b211d85808f038326d42e7f5cf46648e176f07406a323e7e8d41c80
-export XMLSEC_TARBALL := xmlsec1-1.2.36.tar.gz
+export XMLSEC_SHA256SUM := 
5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c
+export XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz
 export LIBXML_SHA256SUM := 
5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c
 export LIBXML_VERSION_MICRO := 3
 export LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz

[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch readlicense_oo/license Repository.mk solenv/flatpak-manifest.in vcl/qa

2022-12-05 Thread Khaled Hosny (via logerrit)

 Makefile.fetch   |1 -
 Repository.mk|1 -
 download.lst |2 --
 external/more_fonts/ExternalPackage_kacst.mk |   17 -
 external/more_fonts/Module_more_fonts.mk |2 --
 external/more_fonts/UnpackedTarball_kacst.mk |   14 --
 readlicense_oo/license/license.xml   |6 --
 solenv/flatpak-manifest.in   |7 ---
 vcl/qa/cppunit/complextext.cxx   |2 +-
 vcl/qa/cppunit/text.cxx  |2 +-
 10 files changed, 2 insertions(+), 52 deletions(-)

New commits:
commit 6d6a2343b1d45695f3ea02818d317a022a7b259f
Author: Khaled Hosny 
AuthorDate: Mon Dec 5 01:01:10 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Dec 5 08:26:29 2022 +

tdf#152376: Remove Kacst Book and Kacst Office fonts

Change-Id: I979e01ee6cab26431a6e54094c59ea28e886019a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143647
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/Makefile.fetch b/Makefile.fetch
index 07454893d700..053cb3190a49 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -183,7 +183,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \
-   $(call fetch_Optional,MORE_FONTS,FONT_KACST_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index bc51c5c1be5d..56d8b2d28b84 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1040,7 +1040,6 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo_fonts,\
$(if $(MPL_SUBSET),,fonts_culmus) \
fonts_dejavu \
fonts_gentium \
-   $(if $(MPL_SUBSET),,fonts_kacst) \
fonts_liberation \
fonts_liberation_narrow \
fonts_libertineg \
diff --git a/download.lst b/download.lst
index c0f41e15ee4d..6cea1bbeaed2 100644
--- a/download.lst
+++ b/download.lst
@@ -78,8 +78,6 @@ export FONT_ALEF_SHA256SUM := 
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f
 export FONT_ALEF_TARBALL := alef-1.001.tar.gz
 export FONT_AMIRI_SHA256SUM := 
926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30
 export FONT_AMIRI_TARBALL := Amiri-1.000.zip
-export FONT_KACST_SHA256SUM := 
dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
-export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz
 export FONT_REEM_SHA256SUM := 
c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413
 export FONT_REEM_TARBALL := ReemKufi-1.2.zip
 export FONT_SCHEHERAZADE_SHA256SUM := 
251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5
diff --git a/external/more_fonts/ExternalPackage_kacst.mk 
b/external/more_fonts/ExternalPackage_kacst.mk
deleted file mode 100644
index 909ed0b3..
--- a/external/more_fonts/ExternalPackage_kacst.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- 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 http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_kacst,font_kacst))
-
-$(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_kacst,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
-   KacstBook.ttf \
-   KacstOffice.ttf \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/Module_more_fonts.mk 
b/external/more_fonts/Module_more_fonts.mk
index 233d890c6097..b97f71ac5c64 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
$(if $(MPL_SUBSET),,ExternalPackage_culmus) \
ExternalPackage_dejavu \
ExternalPackage_gentium \
-   $(if $(MPL_SUBSET),,ExternalPackage_kacst) \
ExternalPackage_liberation \
ExternalPackage_liberation_narrow \
ExternalPackage_libertineg \
@@ -33,7 +32,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
$(if $(MPL_SUBSET),,UnpackedTarball_culmus) \
UnpackedTarball_dejavu \
UnpackedTarball_gentium \
-   $(if $(MPL_SUBSET),,UnpackedTarball_kacst) \
UnpackedTarball_liberation \
UnpackedTarball_liberation_narrow \
UnpackedTarball_libertineg \
diff --git a/external/more_fonts/UnpackedTarball_kacst.mk

[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch readlicense_oo/license Repository.mk solenv/flatpak-manifest.in sw/source

2022-12-04 Thread Khaled Hosny (via logerrit)

 Makefile.fetch |2 -
 Repository.mk  |2 -
 download.lst   |4 --
 external/more_fonts/ExternalPackage_sourcecode.mk  |   29 -
 external/more_fonts/ExternalPackage_sourceserif.mk |   27 ---
 external/more_fonts/Module_more_fonts.mk   |4 --
 external/more_fonts/UnpackedTarball_sourcecode.mk  |   14 --
 external/more_fonts/UnpackedTarball_sourceserif.mk |   14 --
 readlicense_oo/license/license.xml |   18 -
 solenv/flatpak-manifest.in |   14 --
 sw/source/uibase/sidebar/ThemePanel.cxx|4 +-
 11 files changed, 2 insertions(+), 130 deletions(-)

New commits:
commit 05eb5e487455dfaa0947c704c2ae06544d1f9253
Author: Khaled Hosny 
AuthorDate: Mon Dec 5 00:30:03 2022 +0200
Commit: خالد حسني 
CommitDate: Mon Dec 5 06:46:44 2022 +

tdf#136604: Remove Source Serif Pro and Source Code Pro fonts

Kept Source Sans Pro for now because it is used in some styles and using
also weights that not supported by other fonts we bundle (e.g. light).

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

diff --git a/Makefile.fetch b/Makefile.fetch
index be1f988adf2a..07454893d700 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -177,9 +177,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call 
fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
-   $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
-   $(call fetch_Optional,MORE_FONTS,FONT_SOURCESERIF_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 15a75405ee23..bc51c5c1be5d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1047,9 +1047,7 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo_fonts,\
fonts_libre_hebrew \
fonts_noto \
fonts_reem \
-   fonts_sourcecode \
fonts_sourcesans \
-   fonts_sourceserif \
fonts_scheherazade \
) \
 ))
diff --git a/download.lst b/download.lst
index 754c42a57f7c..c0f41e15ee4d 100644
--- a/download.lst
+++ b/download.lst
@@ -66,12 +66,8 @@ export FONT_LIBERATION_SHA256SUM := 
26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d4
 export FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.1.4.tar.gz
 export FONT_LINLIBERTINEG_SHA256SUM := 
54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5
 export FONT_LINLIBERTINEG_TARBALL := 
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
-export FONT_SOURCECODE_SHA256SUM := 
09466dce8765f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f
-export FONT_SOURCECODE_TARBALL := 
907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
 export FONT_SOURCESANS_SHA256SUM := 
e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61
 export FONT_SOURCESANS_TARBALL := 
edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
-export FONT_SOURCESERIF_SHA256SUM := 
826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3
-export FONT_SOURCESERIF_TARBALL := source-serif-pro-3.000R.tar.gz
 export FONT_NOTO_SHA256SUM := 
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
 export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
 export FONT_CULMUS_SHA256SUM := 
c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
diff --git a/external/more_fonts/ExternalPackage_sourcecode.mk 
b/external/more_fonts/ExternalPackage_sourcecode.mk
deleted file mode 100644
index 5f1d7f7c5b31..
--- a/external/more_fonts/ExternalPackage_sourcecode.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- 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 http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call 
gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode))
-
-$(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
-   SourceCodePro-BlackIt.ttf \
-   SourceCodePro-Black.ttf \
-

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

2022-12-03 Thread Khaled Hosny (via logerrit)

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

New commits:
commit 402d331a0e75a340a3b01cf12b5a61a3266c50fe
Author: Khaled Hosny 
AuthorDate: Sat Dec 3 22:14:58 2022 +0200
Commit: خالد حسني 
CommitDate: Sun Dec 4 07:03:23 2022 +

more_fonts: Update Amiri to version 1.000

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

diff --git a/download.lst b/download.lst
index 7a2905e2f8ff..754c42a57f7c 100644
--- a/download.lst
+++ b/download.lst
@@ -80,8 +80,8 @@ export FONT_LIBRE_HEBREW_SHA256SUM := 
f596257c1db706ce35795b18d7f66a4db99d427725
 export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz
 export FONT_ALEF_SHA256SUM := 
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
 export FONT_ALEF_TARBALL := alef-1.001.tar.gz
-export FONT_AMIRI_SHA256SUM := 
9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7
-export FONT_AMIRI_TARBALL := Amiri-0.117.zip
+export FONT_AMIRI_SHA256SUM := 
926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30
+export FONT_AMIRI_TARBALL := Amiri-1.000.zip
 export FONT_KACST_SHA256SUM := 
dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
 export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz
 export FONT_REEM_SHA256SUM := 
c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413
diff --git a/external/more_fonts/ExternalPackage_amiri.mk 
b/external/more_fonts/ExternalPackage_amiri.mk
index d938b8cf7542..96aa3a1b1a33 100644
--- a/external/more_fonts/ExternalPackage_amiri.mk
+++ b/external/more_fonts/ExternalPackage_amiri.mk
@@ -10,11 +10,11 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_amiri,font_amiri))
 
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_amiri,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+   Amiri-Regular.ttf \
Amiri-Bold.ttf \
-   Amiri-BoldSlanted.ttf \
+   Amiri-Italic.ttf \
+   Amiri-BoldItalic.ttf \
AmiriQuran.ttf \
-   Amiri-Regular.ttf \
-   Amiri-Slanted.ttf \
 ))
 
 # vim: set noet sw=4 ts=4:

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

2022-11-29 Thread Taichi Haradaguchi (via logerrit)

 download.lst   |4 
 external/cairo/ExternalPackage_pixman.mk   |2 
 external/cairo/UnpackedTarball_pixman.mk   |1 
 external/cairo/pixman/Wincompatible-function-pointer-types.patch.0 |   19 
 external/cairo/pixman/pixman-0.24.4.patch  |2 
 external/cairo/pixman/pixman-ubsan.patch   |   41 
+-
 6 files changed, 26 insertions(+), 43 deletions(-)

New commits:
commit 93a69d37c1dbcc7365dc0cf2493d1ca27babef2b
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Nov 28 21:04:45 2022 +0900
Commit: Michael Stahl 
CommitDate: Tue Nov 29 14:18:28 2022 +0100

pixman: upgrade to release 0.42.2

Fixes CVE-2022-44638

Remove Wincompatible-function-pointer-types.patch.0, fixed upstream.

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

diff --git a/download.lst b/download.lst
index 5a656203287f..7a2905e2f8ff 100644
--- a/download.lst
+++ b/download.lst
@@ -202,8 +202,8 @@ export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef
 export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 export PDFIUM_SHA256SUM := 
7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35
 export PDFIUM_TARBALL := pdfium-5408.tar.bz2
-export PIXMAN_SHA256SUM := 
6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
-export PIXMAN_TARBALL := pixman-0.40.0.tar.gz
+export PIXMAN_SHA256SUM := 
ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e
+export PIXMAN_TARBALL := pixman-0.42.2.tar.gz
 export LIBPNG_SHA256SUM := 
b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be
 export LIBPNG_TARBALL := libpng-1.6.38.tar.xz
 export LIBTIFF_SHA256SUM := 
49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1
diff --git a/external/cairo/ExternalPackage_pixman.mk 
b/external/cairo/ExternalPackage_pixman.mk
index 458c2733503e..85ff062f22e2 100644
--- a/external/cairo/ExternalPackage_pixman.mk
+++ b/external/cairo/ExternalPackage_pixman.mk
@@ -12,7 +12,7 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,pixman,pixman))
 $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call 
gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.40.0))
+$(eval $(call 
gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.42.2))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/cairo/UnpackedTarball_pixman.mk 
b/external/cairo/UnpackedTarball_pixman.mk
index 327041a1b141..3f1f75616611 100644
--- a/external/cairo/UnpackedTarball_pixman.mk
+++ b/external/cairo/UnpackedTarball_pixman.mk
@@ -14,7 +14,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo))
 $(eval $(call gb_UnpackedTarball_add_patches,pixman,\
external/cairo/pixman/pixman-0.24.4.patch \
external/cairo/pixman/pixman-ubsan.patch \
-   external/cairo/pixman/Wincompatible-function-pointer-types.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/cairo/pixman/Wincompatible-function-pointer-types.patch.0 
b/external/cairo/pixman/Wincompatible-function-pointer-types.patch.0
deleted file mode 100644
index 7f43a350af35..
--- a/external/cairo/pixman/Wincompatible-function-pointer-types.patch.0
+++ /dev/null
@@ -1,19 +0,0 @@
 pixman/pixman-bits-image.c
-+++ pixman/pixman-bits-image.c
-@@ -1851,14 +1851,14 @@
- iter->y++;
- }
- 
--static const float
-+static float
- dither_factor_blue_noise_64 (int x, int y)
- {
- float m = dither_blue_noise_64x64[((y & 0x3f) << 6) | (x & 0x3f)];
- return m * (1. / 4096.f) + (1. / 8192.f);
- }
- 
--static const float
-+static float
- dither_factor_bayer_8 (int x, int y)
- {
- uint32_t m;
diff --git a/external/cairo/pixman/pixman-0.24.4.patch 
b/external/cairo/pixman/pixman-0.24.4.patch
index 6d871e37bfd1..a5d32f88f82f 100644
--- a/external/cairo/pixman/pixman-0.24.4.patch
+++ b/external/cairo/pixman/pixman-0.24.4.patch
@@ -1,6 +1,6 @@
 --- misc/pixman-0.24.4/Makefile.in 2011-11-06 22:11:25.0 +0100
 +++ misc/build/pixman-0.24.4/Makefile.in   2011-12-16 09:06:45.317211035 
+0100
-@@ -272,7 +272,7 @@
+@@ -385,7 +385,7 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/external/cairo/pixman/pixman-ubsan.patch 
b/external/cairo/pixman/pixman-ubsan.patch
index 3a556d19a9dd..64e5778ee4d4 100644
--- a/external/cairo/pixman/pixman-ubsan.patch
+++ b/external/cairo/pixman/pixman-ubsan.patch
@@ -1,6 +1,6 @@
-diff -ru pixman-0.40.0.orig/pixman/pixman-bits-image.c 
pixman-0.40.0/pixman/pixman-bits-image.c

[Libreoffice-commits] core.git: download.lst external/libjpeg-turbo solenv/clang-format

2022-11-22 Thread Caolán McNamara (via logerrit)

 download.lst|4 -
 external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk |1 
 external/libjpeg-turbo/jconfig.h|   39 +--
 external/libjpeg-turbo/jconfigint.h |8 +-
 external/libjpeg-turbo/jversion.h   |   54 
 solenv/clang-format/excludelist |3 
 6 files changed, 68 insertions(+), 41 deletions(-)

New commits:
commit 7d49a2afc504b8988d0405dfa582758de92c35a3
Author: Caolán McNamara 
AuthorDate: Tue Nov 22 20:16:47 2022 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 22 22:17:13 2022 +0100

upgrade to libjpeg-turbo-2.1.4

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

diff --git a/download.lst b/download.lst
index 452f4ad97f54..5a656203287f 100644
--- a/download.lst
+++ b/download.lst
@@ -132,8 +132,8 @@ export JFREEREPORT_LIBXML_SHA256SUM := 
7d2797fe9f79a77009721e3f14fa4a1dec17a6d70
 export JFREEREPORT_LIBXML_TARBALL := 
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-export LIBJPEG_TURBO_SHA256SUM := 
09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5
-export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.2.tar.gz
+export LIBJPEG_TURBO_SHA256SUM := 
d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b
+export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.4.tar.gz
 export LANGTAGREG_SHA256SUM := 
e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00
 export LANGTAGREG_TARBALL := language-subtag-registry-2022-08-08.tar.bz2
 export LCMS2_SHA256SUM := 
18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5
diff --git a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk 
b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
index 22777b863e4c..b3505444c8d6 100644
--- a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
@@ -19,5 +19,6 @@ $(eval $(call 
gb_UnpackedTarball_set_patchlevel,libjpeg-turbo,0))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,libjpeg-turbo,jconfigint.h,external/libjpeg-turbo/jconfigint.h))
 $(eval $(call 
gb_UnpackedTarball_add_file,libjpeg-turbo,jconfig.h,external/libjpeg-turbo/jconfig.h))
+$(eval $(call 
gb_UnpackedTarball_add_file,libjpeg-turbo,jversion.h,external/libjpeg-turbo/jversion.h))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libjpeg-turbo/jconfig.h b/external/libjpeg-turbo/jconfig.h
index 7cff688125a9..65151c1422ad 100644
--- a/external/libjpeg-turbo/jconfig.h
+++ b/external/libjpeg-turbo/jconfig.h
@@ -1,13 +1,13 @@
 /* Version ID for the JPEG library.
  * Might be useful for tests like "#if JPEG_LIB_VERSION >= 60".
  */
-#define JPEG_LIB_VERSION 62
+#define JPEG_LIB_VERSION  62
 
 /* libjpeg-turbo version */
-#define LIBJPEG_TURBO_VERSION 2.1.1
+#define LIBJPEG_TURBO_VERSION  2.1.4
 
 /* libjpeg-turbo version in integer form */
-#define LIBJPEG_TURBO_VERSION_NUMBER 2001001
+#define LIBJPEG_TURBO_VERSION_NUMBER  2001004
 
 /* Support arithmetic encoding */
 #define C_ARITH_CODING_SUPPORTED 1
@@ -30,43 +30,12 @@
  * We do not support run-time selection of data precision, sorry.
  */
 
-#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */
-
-/* Define to 1 if you have the  header file. */
-/* undef HAVE_LOCALE_H */
-
-/* Define to 1 if you have the  header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the  header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define if you need to include  to get size_t. */
-#define NEED_SYS_TYPES_H 1
-
-/* Define if you have BSD-like bzero and bcopy in  rather than
-   memset/memcpy in . */
-/* #undef NEED_BSD_STRINGS */
-
-/* Define to 1 if the system has the type `unsigned char'. */
-#define HAVE_UNSIGNED_CHAR 1
-
-/* Define to 1 if the system has the type `unsigned short'. */
-#define HAVE_UNSIGNED_SHORT 1
-
-/* Compiler does not support pointers to undefined structures. */
-/* #undef INCOMPLETE_TYPES_BROKEN */
+#define BITS_IN_JSAMPLE  8  /* use 8 or 12 */
 
 /* Define if your (broken) compiler shifts signed values as if they were
unsigned. */
 /* #undef RIGHT_SHIFT_IS_UNSIGNED */
 
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `unsigned int' if  does not define. */
-/* #undef size_t */
-
 /* Extra Libreoffice config for windows */
 #ifdef _MSC_VER
 
diff --git a/external/libjpeg-turbo/jconfigint.h 
b/external/libjpeg-turbo/jconfigint.h
index 478a4d338b30..f0987ba31609 100644
--- a/external/libjpeg-turbo/jconfigint.h
+++ b/external/libjpeg-turbo/jconfigint.h
@@ -1,7 +1,7 @@
 #include 
 
 /* libjpeg-turbo build number */
-#define BUILD "20211020"

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

2022-11-16 Thread Miklos Vajna (via logerrit)

 download.lst  |4 -
 external/freetype/ubsan.patch |  114 --
 2 files changed, 2 insertions(+), 116 deletions(-)

New commits:
commit 7229a380d3d607dc896e1d48b1a13f7b301aef80
Author: Miklos Vajna 
AuthorDate: Wed Nov 16 13:37:33 2022 +0100
Commit: Miklos Vajna 
CommitDate: Wed Nov 16 14:47:29 2022 +0100

Update freetype to 2.12.0

- fixes CVE-2022-27404
- dropped the no longer applying parts of ubsan.patch

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

diff --git a/download.lst b/download.lst
index bc899a047dfd..452f4ad97f54 100644
--- a/download.lst
+++ b/download.lst
@@ -90,8 +90,8 @@ export FONT_SCHEHERAZADE_SHA256SUM := 
251c8817ceb87d9b661ce1d5b49e732a0116add10a
 export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
 export FREEHAND_SHA256SUM := 
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
 export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
-export FREETYPE_SHA256SUM := 
ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8
-export FREETYPE_TARBALL := freetype-2.11.1.tar.xz
+export FREETYPE_SHA256SUM := 
ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033
+export FREETYPE_TARBALL := freetype-2.12.0.tar.xz
 export GLM_SHA256SUM := 
6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
 export GLM_TARBALL := glm-0.9.9.8.zip
 export GPGME_SHA256SUM := 
6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0
diff --git a/external/freetype/ubsan.patch b/external/freetype/ubsan.patch
index 236ef023bf1b..c8173eeff531 100644
--- a/external/freetype/ubsan.patch
+++ b/external/freetype/ubsan.patch
@@ -1,117 +1,3 @@
 src/autofit/afcjk.c
-+++ src/autofit/afcjk.c
-@@ -843,7 +843,7 @@
-   {
- AF_AxisHints  axis  = >axis[dim];
- AF_Segmentsegments  = axis->segments;
--AF_Segmentsegment_limit = segments + axis->num_segments;
-+AF_Segmentsegment_limit = axis->num_segments == 0 ? segments : 
segments + axis->num_segments;
- AF_Direction  major_dir = axis->major_dir;
- AF_Segmentseg1, seg2;
- FT_Poslen_threshold;
-@@ -1005,7 +1005,7 @@
- AF_CJKAxislaxis  = &((AF_CJKMetrics)hints->metrics)->axis[dim];
- 
- AF_Segmentsegments  = axis->segments;
--AF_Segmentsegment_limit = segments + axis->num_segments;
-+AF_Segmentsegment_limit = axis->num_segments == 0 ? segments : 
segments + axis->num_segments;
- AF_Segmentseg;
- 
- FT_Fixed  scale;
-@@ -1153,7 +1153,7 @@
-  */
- {
-   AF_Edge  edges  = axis->edges;
--  AF_Edge  edge_limit = edges + axis->num_edges;
-+  AF_Edge  edge_limit = axis->num_edges == 0 ? edges : edges + 
axis->num_edges;
-   AF_Edge  edge;
- 
- 
-@@ -1291,7 +1291,7 @@
-   {
- AF_AxisHints  axis   = >axis[dim];
- AF_Edge   edge   = axis->edges;
--AF_Edge   edge_limit = edge + axis->num_edges;
-+AF_Edge   edge_limit = axis->num_edges == 0 ? edge : edge + 
axis->num_edges;
- AF_CJKAxiscjk= >axis[dim];
- FT_Fixed  scale  = cjk->scale;
- FT_Posbest_dist0;  /* initial threshold */
-@@ -1798,7 +1798,7 @@
-   {
- AF_AxisHints  axis   = >axis[dim];
- AF_Edge   edges  = axis->edges;
--AF_Edge   edge_limit = edges + axis->num_edges;
-+AF_Edge   edge_limit = axis->num_edges == 0 ? edges : edges + 
axis->num_edges;
- FT_PtrDistn_edges;
- AF_Edge   edge;
- AF_Edge   anchor   = NULL;
-@@ -2177,7 +2177,7 @@
-   {
- AF_AxisHints  axis   = & hints->axis[dim];
- AF_Edge   edges  = axis->edges;
--AF_Edge   edge_limit = edges + axis->num_edges;
-+AF_Edge   edge_limit = axis->num_edges == 0 ? edges : edges + 
axis->num_edges;
- AF_Edge   edge;
- FT_Bool   snapping;
- 
 src/autofit/afhints.c
-+++ src/autofit/afhints.c
-@@ -1316,7 +1316,7 @@
-   {
- AF_AxisHints  axis  = & hints->axis[dim];
- AF_Segmentsegments  = axis->segments;
--AF_Segmentsegment_limit = segments + axis->num_segments;
-+AF_Segmentsegment_limit = axis->num_segments == 0 ? segments : 
segments + axis->num_segments;
- AF_Segmentseg;
- 
- 
-@@ -1393,7 +1393,7 @@
- AF_Point  point_limit = points + hints->num_points;
- AF_AxisHints  axis= >axis[dim];
- AF_Edge   edges   = axis->edges;
--AF_Edge   edge_limit  = edges + axis->num_edges;
-+AF_Edge   edge_limit  = axis->num_edges == 0 ? edges : edges + 
axis->num_edges;
- FT_UInt   touch_flag;
- 
- 
 src/autofit/aflatin.c
-+++ src/autofit/aflatin.c
-@@ -1989,7 +1989,7 @@
-   {
- AF_AxisHints  axis  = >axis[dim];
- AF_Segmentsegments  = axis->segments;
--AF_Segment

[Libreoffice-commits] core.git: download.lst external/libnumbertext offapi/com sw/qa

2022-11-14 Thread László Németh (via logerrit)

 download.lst|4 -
 external/libnumbertext/EmptyString.patch1   |   13 --
 external/libnumbertext/ExternalPackage_numbertext.mk|1 
 external/libnumbertext/UnpackedTarball_libnumbertext.mk |1 
 offapi/com/sun/star/linguistic2/XNumberText.idl |2 
 sw/qa/extras/uiwriter/uiwriter6.cxx |   33 
 6 files changed, 38 insertions(+), 16 deletions(-)

New commits:
commit 6064b3382102bcbc153156f5874fbc8dfde97b98
Author: László Németh 
AuthorDate: Sun Nov 13 13:00:42 2022 +0100
Commit: László Németh 
CommitDate: Mon Nov 14 09:26:20 2022 +0100

tdf#115007 tdf#148672 bump libnumbertext 1.0.11

tdf#115007 fix missing currency of en-BZ, en-DK, en-IL, en-LK,
en-ZM, en-ZW; es-PA, es-SV, es-VE; and ga (Irish).

tdf#148672 fix of transliteration of parenthesized words of hu-Hung.

– remove EmptyString.patch1 wich was merged up-stream;

– add test for hu_Hung transliteration of parenthesized words;

– add new Persian (Farsi) module;

– fixes for Czech, English, Irish, Romanian, Russian, Slovenian,
  Spanish and Ukrainian.

Follow-up to commit 2a1d2d42af7f365330479f4032ddfdd9eeba7c1d
"tdf#115007 add NatNum12 number format list items, fix title case".

Change-Id: I24aa32ad28c853e4c97a10dc8039ca6232eaed4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142657
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git a/download.lst b/download.lst
index 45ed4d38c38a..bc899a047dfd 100644
--- a/download.lst
+++ b/download.lst
@@ -152,8 +152,8 @@ export LIBGPGERROR_SHA256SUM := 
a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa3
 export LIBGPGERROR_TARBALL := libgpg-error-1.43.tar.bz2
 export LIBLANGTAG_SHA256SUM := 
1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd
 export LIBLANGTAG_TARBALL := liblangtag-0.6.3.tar.bz2
-export LIBNUMBERTEXT_SHA256SUM := 
a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb
-export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.10.tar.xz
+export LIBNUMBERTEXT_SHA256SUM := 
5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0
+export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export LIBWEBP_SHA256SUM := 
7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df
diff --git a/external/libnumbertext/EmptyString.patch1 
b/external/libnumbertext/EmptyString.patch1
deleted file mode 100644
index d6570117da09..
--- a/external/libnumbertext/EmptyString.patch1
+++ /dev/null
@@ -1,13 +0,0 @@
 a/src/Soros.cxx2022-06-27 09:36:46.486075920 +0100
-+++ b/src/Soros.cxx2022-06-27 09:37:52.594072196 +0100
-@@ -98,8 +98,8 @@
- s = regex_replace(s, quoteEnd, L"");
- s = translate(s, c.substr(1), m.substr(1), L"");
- replace(s, slash, L""); // -> \\, ", ;, #
--begins.push_back(s[0] == L'^');
--ends.push_back(s[s.length()-1] == L'$');
-+begins.push_back(!s.empty() && s[0] == L'^');
-+ends.push_back(!s.empty() && s[s.length()-1] == L'$');
- s = L"^" + regex_replace(s, wregex(L"^\\^"), L"");
- s = regex_replace(s, wregex(L"\\$$"), L"") + L"$";
- try
diff --git a/external/libnumbertext/ExternalPackage_numbertext.mk 
b/external/libnumbertext/ExternalPackage_numbertext.mk
index aa31ecc75106..0116627b87f3 100644
--- a/external/libnumbertext/ExternalPackage_numbertext.mk
+++ b/external/libnumbertext/ExternalPackage_numbertext.mk
@@ -21,6 +21,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libnumbertext_numbertext,$(L
data/eo.sor \
data/es.sor \
data/et.sor \
+   data/fa.sor \
data/fi.sor \
data/fr.sor \
data/fr.sor \
diff --git a/external/libnumbertext/UnpackedTarball_libnumbertext.mk 
b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
index 583b26308675..162fafdb6a20 100644
--- a/external/libnumbertext/UnpackedTarball_libnumbertext.mk
+++ b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
@@ -21,7 +21,6 @@ $(eval $(call 
gb_UnpackedTarball_set_patchlevel,libnumbertext,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libnumbertext, \
 external/libnumbertext/MSVCNonBMPBug.patch1 \
 external/libnumbertext/WinUnicodePath.patch1 \
-external/libnumbertext/EmptyString.patch1 \
 external/libnumbertext/deprecated.patch.0 \
 ))
 
diff --git a/offapi/com/sun/star/linguistic2/XNumberText.idl 
b/offapi/com/sun/star/linguistic2/XNumberText.idl
index a1676c73002b..214997513257 100644
--- a/offapi/com/sun/star/linguistic2/XNumberText.idl
+++ b/offapi/com/sun/star/linguistic2/XNumberText.idl
@@ -40,6 +40,7 @@ module com { module sun { module star { module linguistic2 {
 eo :

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

2022-11-11 Thread Taichi Haradaguchi (via logerrit)

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

New commits:
commit dd1610146528cba8642caad3bf72e27b9ca6c153
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Nov 7 21:19:46 2022 +0900
Commit: Caolán McNamara 
CommitDate: Fri Nov 11 21:11:38 2022 +0100

dragonbox: upgrade to release 1.1.3

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

diff --git a/download.lst b/download.lst
index 6889f8bcab45..45ed4d38c38a 100644
--- a/download.lst
+++ b/download.lst
@@ -23,8 +23,8 @@ export CDR_SHA256SUM := 
5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e8
 export CDR_TARBALL := libcdr-0.1.7.tar.xz
 export CLUCENE_SHA256SUM := 
ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
 export CLUCENE_TARBALL := 
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
-export DRAGONBOX_SHA256SUM := 
293247ccba995ec47ae3abb52c3e83904a7d71efb7093d4c0d2c6367c1cc1e20
-export DRAGONBOX_TARBALL := dragonbox-1.1.0.tar.gz
+export DRAGONBOX_SHA256SUM := 
09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384
+export DRAGONBOX_TARBALL := dragonbox-1.1.3.tar.gz
 export DTOA_SHA256SUM := 
0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
 export DTOA_TARBALL := dtoa-20180411.tgz
 export LIBCMIS_SHA256SUM := 
d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2

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

2022-11-09 Thread Miklos Vajna (via logerrit)

 download.lst|  
  4 
 external/pdfium/Add-FPDFAnnot_GetFormAdditionalActionJavaScript-API.patch.1 |  
103 --
 external/pdfium/Add-FPDFAnnot_GetFormFieldAlternateName-API.patch.1 |  
 70 --
 external/pdfium/AndroidNDK19.patch.1|  
 16 -
 external/pdfium/Library_pdfium.mk   |  
 14 -
 external/pdfium/UnpackedTarball_pdfium.mk   |  
 28 --
 external/pdfium/build.patch.1   |  
 13 -
 external/pdfium/cg-instead-of-carbon.patch.1|  
 23 --
 external/pdfium/gcc-c++20-comparison.patch  |  
 18 -
 external/pdfium/inc/pch/precompiled_pdfium.hxx  |  
 25 --
 10 files changed, 13 insertions(+), 301 deletions(-)

New commits:
commit 5a69fd3052bb638857f30a4cfd5913634275d23d
Author: Miklos Vajna 
AuthorDate: Wed Nov 9 13:19:49 2022 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 10 08:08:56 2022 +0100

Update pdfium to 5408

- drop cg-instead-of-carbon.patch.1, no longer needed after
  https://pdfium-review.googlesource.com/c/pdfium/+/99753

- drop AndroidNDK19.patch.1, no longer needed after
  https://pdfium-review.googlesource.com/c/pdfium/+/96530

- drop gcc-c++20-comparison.patch, no longer needed after
  

  "Fix interaction between RetainPtr and transparent comparisons" since
  chromium/5321

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

diff --git a/download.lst b/download.lst
index 98b46b17eb59..6889f8bcab45 100644
--- a/download.lst
+++ b/download.lst
@@ -200,8 +200,8 @@ export ORCUS_SHA256SUM := 
2a86c405a5929f749b27637509596421d46805753364ab258b035f
 export ORCUS_TARBALL := liborcus-0.17.2.tar.bz2
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
 export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
-export PDFIUM_SHA256SUM := 
ecb9c2a0d777196949994946e3f24ed251ae5d3db8a9fa1e2827ef857151db13
-export PDFIUM_TARBALL := pdfium-5298.tar.bz2
+export PDFIUM_SHA256SUM := 
7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35
+export PDFIUM_TARBALL := pdfium-5408.tar.bz2
 export PIXMAN_SHA256SUM := 
6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
 export PIXMAN_TARBALL := pixman-0.40.0.tar.gz
 export LIBPNG_SHA256SUM := 
b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be
diff --git 
a/external/pdfium/Add-FPDFAnnot_GetFormAdditionalActionJavaScript-API.patch.1 
b/external/pdfium/Add-FPDFAnnot_GetFormAdditionalActionJavaScript-API.patch.1
deleted file mode 100644
index a0629bfc8fef..
--- 
a/external/pdfium/Add-FPDFAnnot_GetFormAdditionalActionJavaScript-API.patch.1
+++ /dev/null
@@ -1,103 +0,0 @@
-From f929f2ffbfdd92aea755ca1d3fd1a0bfe9e2827a Mon Sep 17 00:00:00 2001
-From: Miklos Vajna 
-Date: Fri, 16 Sep 2022 20:42:32 +
-Subject: [PATCH] Add FPDFAnnot_GetFormAdditionalActionJavaScript() API
-
-This is similar to FPDFAnnot_GetFormFieldType() and allows getting the
-JavaScript of a given event. Such JavaScripts are used e.g. on a text
-form which wants to accept dates.
-
-Bug: pdfium:1885
-Change-Id: Ieceb3042a309b9578e8a6751a60918c7e8d8f91d
-Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/97950
-Reviewed-by: Tom Sepez 
-Commit-Queue: Lei Zhang 
-Reviewed-by: Lei Zhang 

-
-diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp
-index 349348583..75bdf6cd4 100644
 a/fpdfsdk/fpdf_annot.cpp
-+++ b/fpdfsdk/fpdf_annot.cpp
-@@ -1223,6 +1238,28 @@ FPDFAnnot_GetFormFieldType(FPDF_FORMHANDLE hHandle, 
FPDF_ANNOTATION annot) {
-   return pFormField ? static_cast(pFormField->GetFieldType()) : -1;
- }
- 
-+FPDF_EXPORT unsigned long FPDF_CALLCONV
-+FPDFAnnot_GetFormAdditionalActionJavaScript(FPDF_FORMHANDLE hHandle,
-+FPDF_ANNOTATION annot,
-+int event,
-+FPDF_WCHAR* buffer,
-+unsigned long buflen) {
-+  const CPDF_FormField* pFormField = GetFormField(hHandle, annot);
-+  if (!pFormField)
-+return 0;
-+
-+  if (event < FPDF_ANNOT_AACTION_KEY_STROKE ||
-+  event > FPDF_ANNOT_AACTION_CALCULATE) {
-+return 0;
-+  }
-+
-+  auto type = static_cast(event);
-+  CPDF_AAction additional_action = pFormField->GetAdditionalAction();
-+  CPDF_Action action = additional_action.GetAction(type);
-+  return Utf16EncodeMaybeCopyAndReturnLength(action.GetJavaScript(), buffer,
-+ buflen);
-+}
-+
-

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

2022-11-07 Thread Miklos Vajna (via logerrit)

 download.lst |4 +-
 external/xmlsec/UnpackedTarball_xmlsec.mk|3 -
 external/xmlsec/fix-size_max-412.patch.1 |   31 ---
 external/xmlsec/old-nss.patch.1  |   13 ---
 external/xmlsec/remove-unnecessary-macro-417.patch.1 |   24 --
 5 files changed, 2 insertions(+), 73 deletions(-)

New commits:
commit 34c7d169a248578d953661217144f2dda9831cb4
Author: Miklos Vajna 
AuthorDate: Mon Nov 7 20:14:26 2022 +0100
Commit: Miklos Vajna 
CommitDate: Tue Nov 8 08:06:44 2022 +0100

Update libxmlsec to 1.2.36

- remove the fix-size_max-412.patch.1 and
  remove-unnecessary-macro-417.patch.1 backports
- drop old-nss.patch.1, which is now upstream

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

diff --git a/download.lst b/download.lst
index 71ee55b138c4..98b46b17eb59 100644
--- a/download.lst
+++ b/download.lst
@@ -158,8 +158,8 @@ export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export LIBWEBP_SHA256SUM := 
7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df
 export LIBWEBP_TARBALL := libwebp-1.2.4.tar.gz
-export XMLSEC_SHA256SUM := 
a39f86f6fe8e8cdc998b9a911ef1fae03f57a9ef99c2b704cd492007a52ac223
-export XMLSEC_TARBALL := xmlsec1-1.2.35.tar.gz
+export XMLSEC_SHA256SUM := 
f0d97e008b211d85808f038326d42e7f5cf46648e176f07406a323e7e8d41c80
+export XMLSEC_TARBALL := xmlsec1-1.2.36.tar.gz
 export LIBXML_SHA256SUM := 
5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c
 export LIBXML_VERSION_MICRO := 3
 export LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz
diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk 
b/external/xmlsec/UnpackedTarball_xmlsec.mk
index b64fe48e6161..3ad978cdb829 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -8,9 +8,6 @@
 #
 
 xmlsec_patches :=
-xmlsec_patches += remove-unnecessary-macro-417.patch.1
-xmlsec_patches += fix-size_max-412.patch.1
-xmlsec_patches += old-nss.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 
diff --git a/external/xmlsec/fix-size_max-412.patch.1 
b/external/xmlsec/fix-size_max-412.patch.1
deleted file mode 100644
index 5b4e2b69d960..
--- a/external/xmlsec/fix-size_max-412.patch.1
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3445fbfe1aceb88a255b90ee1c06df2d05c188b0 Mon Sep 17 00:00:00 2001
-From: lsh123 
-Date: Mon, 24 Oct 2022 17:38:59 -0700
-Subject: [PATCH] fix size_max (#412)
-

- src/cast_helpers.h | 6 +-
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/cast_helpers.h b/src/cast_helpers.h
-index 67330822..2b670ad1 100644
 a/src/cast_helpers.h
-+++ b/src/cast_helpers.h
-@@ -17,13 +17,9 @@
- #endif /* XMLSEC_PRIVATE */
- 
- #include 
-+#include 
- #include "errors_helpers.h"
- 
--/* if it is missing */
--#ifndef SIZE_MAX
--#define SIZE_MAX (~(size_t)0)
--#endif /* SIZE_MAX */
--
- /**
-  * Helpers for printing out enum values (mostly debugging).
-  */
--- 
-2.38.0.rc2
-
diff --git a/external/xmlsec/old-nss.patch.1 b/external/xmlsec/old-nss.patch.1
deleted file mode 100644
index 2fc16f30f2ae..
--- a/external/xmlsec/old-nss.patch.1
+++ /dev/null
@@ -1,13 +0,0 @@
 xmlsec/configure.ac.orig   2022-10-28 11:49:10.461643631 +0200
-+++ xmlsec/configure.ac2022-10-28 11:49:23.637626991 +0200
-@@ -948,8 +948,8 @@
- dnl   2 overrides 1
- dnl
- dnl ==
--NSS_MIN_VERSION="3.50.1"
--NSPR_MIN_VERSION="4.25.1"
-+NSS_MIN_VERSION="3.49"
-+NSPR_MIN_VERSION="4.25.0"
- SEAMONKEY_MIN_VERSION="1.0"
- MOZILLA_MIN_VERSION="1.4"
- NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
diff --git a/external/xmlsec/remove-unnecessary-macro-417.patch.1 
b/external/xmlsec/remove-unnecessary-macro-417.patch.1
deleted file mode 100644
index 18cd5252b68e..
--- a/external/xmlsec/remove-unnecessary-macro-417.patch.1
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3da1d53fce229d8a72d41b68aacbc115574012e0 Mon Sep 17 00:00:00 2001
-From: lsh123 
-Date: Tue, 25 Oct 2022 05:47:51 -0700
-Subject: [PATCH] remove unnecessary macro (#417)
-

- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 67c8e50b..bb5d3e4b 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -65,7 +65,6 @@ AM_CONDITIONAL(HAS_XSLTPROC, [test x"$XSLTPROC" != x])
- 
- dnl Checks for header files.
- AC_HEADER_DIRENT
--AC_CHECK_INCLUDES_DEFAULT
- 
- 
- dnl ==
--- 
-2.38.0.rc2
-

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

2022-11-04 Thread Taichi Haradaguchi (via logerrit)

 download.lst  |4 ++--
 external/expat/expat-winapi.patch |   13 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 30fba094c428199e1dd81fc5dd768c544897a190
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Oct 31 00:20:55 2022 +0900
Commit: Caolán McNamara 
CommitDate: Fri Nov 4 14:14:00 2022 +0100

upgrade Expat to 2.5.0

Fixes CVE-2022-43680

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

diff --git a/download.lst b/download.lst
index be17cba2e9a5..71ee55b138c4 100644
--- a/download.lst
+++ b/download.lst
@@ -46,8 +46,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
 export ETONYEK_SHA256SUM := 
b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a
 export ETONYEK_VERSION_MICRO := 10
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
-export EXPAT_SHA256SUM := 
6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354
-export EXPAT_TARBALL := expat-2.4.9.tar.xz
+export EXPAT_SHA256SUM := 
ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe
+export EXPAT_TARBALL := expat-2.5.0.tar.xz
 export FIREBIRD_SHA256SUM := 
acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76
 export FIREBIRD_TARBALL := Firebird-3.0.7.33374-0.tar.bz2
 export FONTCONFIG_SHA256SUM := 
a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c
diff --git a/external/expat/expat-winapi.patch 
b/external/expat/expat-winapi.patch
index 7eae7d5d6139..fed65644a732 100644
--- a/external/expat/expat-winapi.patch
+++ b/external/expat/expat-winapi.patch
@@ -1,6 +1,6 @@
 misc/expat-2.1.0/lib/expat_external.h  2009-11-16 08:53:17.37500 
+
-+++ misc/build/expat-2.1.0/lib/expat_external.h2009-11-16 
08:53:34.703125000 +
-@@ -81,10 +81,6 @@
+--- 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,10 +88,6 @@
  #  ifndef XML_BUILDING_EXPAT
  /* using Expat from an application */
  
@@ -11,12 +11,13 @@
  #  endif
  #endif /* not defined XML_STATIC */
  
 misc/expat-2.1.0/lib/xmlparse.c2021-05-23 16:56:25.0 +0100
-+++ misc/build/expat-2.1.0/lib/xmlparse.c  2021-05-25 12:42:11.997173600 
+0100
-@@ -64,6 +64,8 @@
+--- misc/expat-2.5.0/lib/xmlparse.c2022-10-26 00:09:08.0 +0900
 misc/build/expat-2.5.0/lib/xmlparse.c  2022-10-30 23:09:01.843006341 
+0900
+@@ -67,6 +67,9 @@
  #endif
  
  #ifdef _WIN32
++#  undef HAVE_ARC4RANDOM_BUF
 +#  undef HAVE_GETRANDOM
 +#  undef HAVE_SYSCALL_GETRANDOM
  /* force stdlib to define rand_s() */

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

2022-11-02 Thread Caolán McNamara (via logerrit)

 download.lst|4 
 external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1 |   54 
--
 external/openssl/UnpackedTarball_openssl.mk |1 
 external/openssl/openssl-no-ipc-cmd.patch.0 |   12 +-
 4 files changed, 8 insertions(+), 63 deletions(-)

New commits:
commit fc29f11d6e1737b26eb89efababc89cf700e0f05
Author: Caolán McNamara 
AuthorDate: Wed Nov 2 16:08:31 2022 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 2 18:13:46 2022 +0100

upgrade to openssl 3.0.7

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

diff --git a/download.lst b/download.lst
index b3d439d3cbd1..be17cba2e9a5 100644
--- a/download.lst
+++ b/download.lst
@@ -194,8 +194,8 @@ export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENLDAP_SHA256SUM := 
99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34
 export OPENLDAP_TARBALL := openldap-2.4.59.tgz
-export OPENSSL_SHA256SUM := 
aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9349dcea6d3e4f0b024a7a
-export OPENSSL_TARBALL := openssl-3.0.5.tar.gz
+export OPENSSL_SHA256SUM := 
83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e
+export OPENSSL_TARBALL := openssl-3.0.7.tar.gz
 export ORCUS_SHA256SUM := 
2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143
 export ORCUS_TARBALL := liborcus-0.17.2.tar.bz2
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
diff --git a/external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1 
b/external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1
deleted file mode 100644
index 45ce5a9038e5..
--- a/external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1
+++ /dev/null
@@ -1,54 +0,0 @@
-From c04b8819161de007cee831dd9e58dde52268da18 Mon Sep 17 00:00:00 2001
-From: Richard Levitte 
-Date: Mon, 25 Jul 2022 08:07:33 +0200
-Subject: [PATCH] Configurations/10-main.conf: In the VC-common target, unquote
- $(CC)
-
-Some of the VC-common attributes have values that use `$(CC)`, wrapped with
-quotes.  However, `Configurations/windows-makefile.tmpl` already quotes the
-`CC` value, like this:
-
-CC="{- $config{CC} -}"
-
-The interaction between that makefile variable and the attributes using
-`$(CC)` wrapped with quotes is a command line with the quotes doubled.  For
-example, the value of `$(CPP)` becomes `""cl""`.
-
-Strangely enough, this appears to be tolerated, at least on some versions of
-Windows.  However, this has been reported not to be the case.
-
-This is fixed by removing the quotes in `Configurations/10-main.conf`,
-making `Configurations/windows-makefile.tmpl` responsible for proper
-quoting.
-
-Fixes #18823
-
-Reviewed-by: Hugo Landau 
-Reviewed-by: Matt Caswell 
-(Merged from https://github.com/openssl/openssl/pull/18861)

- Configurations/10-main.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index c824f4ed4a0..73ace78bc41 100644
 a/Configurations/10-main.conf
-+++ b/Configurations/10-main.conf
-@@ -1309,7 +1309,7 @@ my %targets = (
- inherit_from => [ "BASE_Windows" ],
- template => 1,
- CC   => "cl",
--CPP  => '"$(CC)" /EP /C',
-+CPP  => '$(CC) /EP /C',
- CFLAGS   => "/W3 /wd4090 /nologo",
- coutflag => "/Fo",
- LD   => "link",
-@@ -1318,7 +1318,7 @@ my %targets = (
- ldpostoutflag=> "",
- ld_resp_delim=> "\n",
- bin_lflags   => "setargv.obj",
--makedepcmd   => '"$(CC)" /Zs /showIncludes',
-+makedepcmd   => '$(CC) /Zs /showIncludes',
- makedep_scheme   => 'VC',
- AR   => "lib",
- ARFLAGS  => "/nologo",
diff --git a/external/openssl/UnpackedTarball_openssl.mk 
b/external/openssl/UnpackedTarball_openssl.mk
index 18ed71850627..2a8f3bb3f905 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
external/openssl/openssl-no-multilib.patch.0 \
external/openssl/configurable-z-option.patch.0 \
external/openssl/openssl-no-ipc-cmd.patch.0 \
-   external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1 \
external/openssl/system-cannot-find-path-for-move.patch.0 \
 ))
 
diff --git a/external/openssl/openssl-no-ipc-cmd.patch.0 
b/external/openssl/openssl-no-ipc-cmd.patch.0
index f844831a34ae..75ed669eabc9 100644
--- a/external/openssl/openssl-no-ipc-cmd.patch.0
+++

[Libreoffice-commits] core.git: download.lst external/xmlsec xmlsecurity/source

2022-10-27 Thread Miklos Vajna (via logerrit)

 download.lst  |4 -
 external/xmlsec/UnpackedTarball_xmlsec.mk |2 
 external/xmlsec/fix-size_max-412.patch.1  |   31 
++
 external/xmlsec/remove-unnecessary-macro-417.patch.1  |   24 
+++
 xmlsecurity/source/gpg/SecurityEnvironment.cxx|4 -
 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx   |   14 
++--
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |3 
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |3 
 8 files changed, 75 insertions(+), 10 deletions(-)

New commits:
commit 19e998aa98d966cffca98bed9408d5758d91d9be
Author: Miklos Vajna 
AuthorDate: Wed Oct 26 19:36:33 2022 +0200
Commit: Miklos Vajna 
CommitDate: Thu Oct 27 09:38:37 2022 +0200

Update libxmlsec to 1.2.35

- backport 2 patches to fix the build

- replace calls to the now deprecated xmlSecBase64Decode()

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

diff --git a/download.lst b/download.lst
index 146b58391232..b3d439d3cbd1 100644
--- a/download.lst
+++ b/download.lst
@@ -158,8 +158,8 @@ export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export LIBWEBP_SHA256SUM := 
7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df
 export LIBWEBP_TARBALL := libwebp-1.2.4.tar.gz
-export XMLSEC_SHA256SUM := 
52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262
-export XMLSEC_TARBALL := xmlsec1-1.2.34.tar.gz
+export XMLSEC_SHA256SUM := 
a39f86f6fe8e8cdc998b9a911ef1fae03f57a9ef99c2b704cd492007a52ac223
+export XMLSEC_TARBALL := xmlsec1-1.2.35.tar.gz
 export LIBXML_SHA256SUM := 
5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c
 export LIBXML_VERSION_MICRO := 3
 export LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz
diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk 
b/external/xmlsec/UnpackedTarball_xmlsec.mk
index 3ad978cdb829..7b4f082bf931 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -8,6 +8,8 @@
 #
 
 xmlsec_patches :=
+xmlsec_patches += remove-unnecessary-macro-417.patch.1
+xmlsec_patches += fix-size_max-412.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 
diff --git a/external/xmlsec/fix-size_max-412.patch.1 
b/external/xmlsec/fix-size_max-412.patch.1
new file mode 100644
index ..5b4e2b69d960
--- /dev/null
+++ b/external/xmlsec/fix-size_max-412.patch.1
@@ -0,0 +1,31 @@
+From 3445fbfe1aceb88a255b90ee1c06df2d05c188b0 Mon Sep 17 00:00:00 2001
+From: lsh123 
+Date: Mon, 24 Oct 2022 17:38:59 -0700
+Subject: [PATCH] fix size_max (#412)
+
+---
+ src/cast_helpers.h | 6 +-
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/cast_helpers.h b/src/cast_helpers.h
+index 67330822..2b670ad1 100644
+--- a/src/cast_helpers.h
 b/src/cast_helpers.h
+@@ -17,13 +17,9 @@
+ #endif /* XMLSEC_PRIVATE */
+ 
+ #include 
++#include 
+ #include "errors_helpers.h"
+ 
+-/* if it is missing */
+-#ifndef SIZE_MAX
+-#define SIZE_MAX (~(size_t)0)
+-#endif /* SIZE_MAX */
+-
+ /**
+  * Helpers for printing out enum values (mostly debugging).
+  */
+-- 
+2.38.0.rc2
+
diff --git a/external/xmlsec/remove-unnecessary-macro-417.patch.1 
b/external/xmlsec/remove-unnecessary-macro-417.patch.1
new file mode 100644
index ..18cd5252b68e
--- /dev/null
+++ b/external/xmlsec/remove-unnecessary-macro-417.patch.1
@@ -0,0 +1,24 @@
+From 3da1d53fce229d8a72d41b68aacbc115574012e0 Mon Sep 17 00:00:00 2001
+From: lsh123 
+Date: Tue, 25 Oct 2022 05:47:51 -0700
+Subject: [PATCH] remove unnecessary macro (#417)
+
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67c8e50b..bb5d3e4b 100644
+--- a/configure.ac
 b/configure.ac
+@@ -65,7 +65,6 @@ AM_CONDITIONAL(HAS_XSLTPROC, [test x"$XSLTPROC" != x])
+ 
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+-AC_CHECK_INCLUDES_DEFAULT
+ 
+ 
+ dnl ==
+-- 
+2.38.0.rc2
+
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx 
b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index da2310765315..dcddca194762 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -162,7 +162,9 @@ Reference< XCertificate > 
SecurityEnvironmentGpg::getCertificate( const OUString
 //xmlChar* pSignatureValue=xmlNodeGetContent(cur);
 OString ostr = OUStringToOString( keyId , RTL_TEXTENCODING_UTF8 );
 const xmlChar* strKeyId = reinterpret_cast(ostr.getStr());
-if(xmlSecBase64Decode(strKeyId, const_cast(strKeyId),

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

2022-10-26 Thread Michael Stahl (via logerrit)

 download.lst  |4 ++--
 external/curl/ExternalProject_curl.mk |2 +-
 external/curl/curl-nss.patch.1|7 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit a76a88203d8508f38b10d9bbb94c3bba2485fcaf
Author: Michael Stahl 
AuthorDate: Wed Oct 26 11:07:49 2022 +0200
Commit: Michael Stahl 
CommitDate: Wed Oct 26 16:32:27 2022 +0200

curl: upgrade to release 7.86.0

Fixes CVE-2022-32221 which could affect libcmis, CVE-2022-42915,
and 2 more CVEs that probably don't affect LO.

* remove --without-ssl:
  On the one hand, on GNU/Linux this now results in:

configure: error: --without-ssl has been set together with an explicit 
option to use an ssl library

  On the other hand, using the more obvious --without-openssl yields a link
  failure on Android on the nss check in configure:

  configure:28220: checking for SSL_VersionRangeSet in -lnss
  
/home/cl/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/bin/../lib/gcc/aarch64-linux-android/4.9.x/../../../../aarch64-linux-android/bin/ld:
 warning: liblog.so, needed by 
/home/cl/rpmbuild/BUILD/lo-android2/workdir/UnpackedTarball/nss/dist/out/lib/libnss3.so,
 not found (try using -rpath or -rpath-link)
  
/home/cl/rpmbuild/BUILD/lo-android2/workdir/UnpackedTarball/nss/dist/out/lib/libnspr4.so:
 undefined reference to `__android_log_write'
  
/home/cl/rpmbuild/BUILD/lo-android2/workdir/UnpackedTarball/nss/dist/out/lib/libnspr4.so:
 undefined reference to `__android_log_assert'

  ... so add the -llog for android in curl-nss.patch.1

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

diff --git a/download.lst b/download.lst
index 0db9970fcd5d..146b58391232 100644
--- a/download.lst
+++ b/download.lst
@@ -33,8 +33,8 @@ export COINMP_SHA256SUM := 
86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8
 export COINMP_TARBALL := CoinMP-1.7.6.tgz
 export CPPUNIT_SHA256SUM := 
89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7
 export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
-export CURL_SHA256SUM := 
88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6
-export CURL_TARBALL := curl-7.85.0.tar.xz
+export CURL_SHA256SUM := 
2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b
+export CURL_TARBALL := curl-7.86.0.tar.xz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
 export EPOXY_SHA256SUM := 
a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index cad4199b5927..8d8bd13aefab 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(filter iOS MACOSX,$(OS)),\
--with-secure-transport,\
$(if $(ENABLE_NSS),--with-nss$(if 
$(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out") 
--with-nss-deprecated,--without-nss)) \
-   --without-ssl --without-gnutls --without-polarssl 
--without-cyassl --without-axtls --without-mbedtls \
+   --without-openssl --without-gnutls --without-polarssl 
--without-cyassl --without-axtls --without-mbedtls \
--enable-ftp --enable-http --enable-ipv6 \
--without-libidn2 --without-libpsl --without-librtmp \
--without-libssh2 --without-metalink --without-nghttp2 \
diff --git a/external/curl/curl-nss.patch.1 b/external/curl/curl-nss.patch.1
index 016cd109c7a2..5ef25748d7eb 100644
--- a/external/curl/curl-nss.patch.1
+++ b/external/curl/curl-nss.patch.1
@@ -1,12 +1,17 @@
 diff -ur curl.org/configure curl/configure
 --- curl.org/configure 2016-03-13 15:14:07.17776 +0100
 +++ curl/configure 2016-03-13 15:16:44.13276 +0100
-@@ -27985,7 +27985,7 @@
+@@ -27985,7 +27985,12 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using hard-wired 
libraries and compilation flags for NSS." >&5
  printf "%s\n" "$as_me: WARNING: Using hard-wired libraries and compilation 
flags for NSS." >&2;}
addld="-L$OPT_NSS/lib"
 -  addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4"
 +  addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lnssutil3"
++  case $host_os in
++*android*)
++  addlib="${addlib} -llog"
++  ;;
++  esac
addcflags="-I$OPT_NSS/include"
version="unknown"
nssprefix=$OPT_NSS

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

2022-10-24 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 -
 external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch |   29 -
 external/zlib/UnpackedTarball_zlib.mk|7 --
 external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch |   32 ---
 4 files changed, 3 insertions(+), 69 deletions(-)

New commits:
commit b2d6ad64473527f88dfb7088376ccf1242d97666
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Oct 24 18:00:18 2022 +0900
Commit: Caolán McNamara 
CommitDate: Mon Oct 24 21:02:24 2022 +0200

zlib: upgrade to release 1.2.13

Fixes CVE-2022-37434

Removed two patches as fixed upstream.

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

diff --git a/download.lst b/download.lst
index 07dbd60d2143..1b855434d7f9 100644
--- a/download.lst
+++ b/download.lst
@@ -251,8 +251,8 @@ export WPS_VERSION_MICRO := 12
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 export XSLTML_SHA256SUM := 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-export ZLIB_SHA256SUM := 
7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18
-export ZLIB_TARBALL := zlib-1.2.12.tar.xz
+export ZLIB_SHA256SUM := 
d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98
+export ZLIB_TARBALL := zlib-1.2.13.tar.xz
 export ZMF_SHA256SUM := 
27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
 export ZMF_TARBALL := libzmf-0.0.2.tar.xz
 export ZXING_SHA256SUM := 
653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a
diff --git a/external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch 
b/external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch
deleted file mode 100644
index c5c95a92b28a..
--- a/external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
-From: Mark Adler 
-Date: Mon, 8 Aug 2022 10:50:09 -0700
-Subject: [PATCH] Fix extra field processing bug that dereferences NULL
- state->head.
-
-The recent commit to fix a gzip header extra field processing bug
-introduced the new bug fixed here.

- inflate.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/inflate.c b/inflate.c
-index 7a7289749..2a3c4fe98 100644
 a/inflate.c
-+++ b/inflate.c
-@@ -763,10 +763,10 @@ int flush;
- copy = state->length;
- if (copy > have) copy = have;
- if (copy) {
--len = state->head->extra_len - state->length;
- if (state->head != Z_NULL &&
- state->head->extra != Z_NULL &&
--len < state->head->extra_max) {
-+(len = state->head->extra_len - state->length) <
-+state->head->extra_max) {
- zmemcpy(state->head->extra + len, next,
- len + copy > state->head->extra_max ?
- state->head->extra_max - len : copy);
diff --git a/external/zlib/UnpackedTarball_zlib.mk 
b/external/zlib/UnpackedTarball_zlib.mk
index 10ee74b9568a..dd9fc1c31445 100644
--- a/external/zlib/UnpackedTarball_zlib.mk
+++ b/external/zlib/UnpackedTarball_zlib.mk
@@ -16,11 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_post_action,zlib,\
cp $(addsuffix .c,adler32 compress crc32 deflate inffast inflate 
inftrees trees zutil) x64 \
 ))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,zlib,\
-   external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch \
-   external/zlib/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch \
-))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,0))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch 
b/external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch
deleted file mode 100644
index dc84d3a1d385..
--- a/external/zlib/eff308af425b67093bab25f80f1ae950166bece1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001
-From: Mark Adler 
-Date: Sat, 30 Jul 2022 15:51:11 -0700
-Subject: [PATCH] Fix a bug when getting a gzip header extra field with
- inflate().
-
-If the extra field was larger than the space the user provided with
-inflateGetHeader(), and if multiple calls of inflate() delivered
-the extra header data, then there could be a buffer overflow of the
-provided space. This commit assures that provided space is not
-exceeded.

- inflate.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/inflate.c b/inflate.c
-index 7be8c6366..7a7289749 100644

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

2022-10-17 Thread Michael Stahl (via logerrit)

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

New commits:
commit 39b5701976ff3d489c3212d6e2a116d6244c8ad1
Author: Michael Stahl 
AuthorDate: Mon Oct 17 11:33:50 2022 +0200
Commit: Michael Stahl 
CommitDate: Mon Oct 17 17:16:16 2022 +0200

libxml2: upgrade to release 2.10.3

Fixes CVE-2022-40304 and CVE-2022-40303.

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

diff --git a/download.lst b/download.lst
index 728dbeeb96f9..8cda34cd6d51 100644
--- a/download.lst
+++ b/download.lst
@@ -160,8 +160,8 @@ export LIBWEBP_SHA256SUM := 
7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c2
 export LIBWEBP_TARBALL := libwebp-1.2.4.tar.gz
 export XMLSEC_SHA256SUM := 
52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262
 export XMLSEC_TARBALL := xmlsec1-1.2.34.tar.gz
-export LIBXML_SHA256SUM := 
d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265
-export LIBXML_VERSION_MICRO := 2
+export LIBXML_SHA256SUM := 
5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c
+export LIBXML_VERSION_MICRO := 3
 export LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz
 export LIBXSLT_SHA256SUM := 
8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79
 export LIBXSLT_VERSION_MICRO := 35

[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch officecfg/registry readlicense_oo/license Repository.mk solenv/flatpak-manifest.in vcl/unx

2022-09-27 Thread Khaled Hosny (via logerrit)

 Makefile.fetch |1 
 Repository.mk  |1 
 download.lst   |2 
 external/more_fonts/ExternalPackage_EmojiOne_Color.mk  |   16 -
 external/more_fonts/Module_more_fonts.mk   |2 
 external/more_fonts/UnpackedTarball_EmojiOne_Color.mk  |   14 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 
 readlicense_oo/license/license.xml |   39 -
 solenv/flatpak-manifest.in |7 --
 vcl/unx/generic/fontmanager/fontconfig.cxx |2 
 10 files changed, 2 insertions(+), 84 deletions(-)

New commits:
commit 694f8eb1f79ff28a45682c77d7bb88ad9197025b
Author: Khaled Hosny 
AuthorDate: Mon Sep 26 15:55:51 2022 +0200
Commit: خالد حسني 
CommitDate: Tue Sep 27 11:30:44 2022 +0200

tdf#144348: Remove EmojiOne Color font

The EmojiFont setting is now a comma-separated list of the three common
color emoji fonts, it should fallback to the next font if the first is
missing.

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

diff --git a/Makefile.fetch b/Makefile.fetch
index cb76c9f08883..be1f988adf2a 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -180,7 +180,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_SOURCESERIF_TARBALL) \
-   $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index ef2de04e7874..7e8d3c2ede18 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1044,7 +1044,6 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo_fonts,\
fonts_carlito \
$(if $(MPL_SUBSET),,fonts_culmus) \
fonts_dejavu \
-   fonts_emojione_color \
fonts_gentium \
$(if $(MPL_SUBSET),,fonts_kacst) \
fonts_liberation \
diff --git a/download.lst b/download.lst
index 9650caa66ed7..728dbeeb96f9 100644
--- a/download.lst
+++ b/download.lst
@@ -72,8 +72,6 @@ export FONT_SOURCESANS_SHA256SUM := 
e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc
 export FONT_SOURCESANS_TARBALL := 
edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
 export FONT_SOURCESERIF_SHA256SUM := 
826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3
 export FONT_SOURCESERIF_TARBALL := source-serif-pro-3.000R.tar.gz
-export FONT_EMOJIONE_COLOR_SHA256SUM := 
d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7
-export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
 export FONT_NOTO_SHA256SUM := 
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
 export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
 export FONT_CULMUS_SHA256SUM := 
c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
diff --git a/external/more_fonts/ExternalPackage_EmojiOne_Color.mk 
b/external/more_fonts/ExternalPackage_EmojiOne_Color.mk
deleted file mode 100644
index 76cdb668487f..
--- a/external/more_fonts/ExternalPackage_EmojiOne_Color.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- 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 http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call 
gb_ExternalPackage_ExternalPackage,fonts_emojione_color,font_emojione_color))
-
-$(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_emojione_color,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
-   EmojiOneColor-SVGinOT.ttf \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/Module_more_fonts.mk 
b/external/more_fonts/Module_more_fonts.mk
index c6e56c5b90b7..0d4ae72cf14d 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_noto \
ExternalPackage_reem \
ExternalPackage_scheherazade \
-   ExternalPackage_EmojiOne_Color \
UnpackedTarball_alef \
UnpackedTarball_amiri \
UnpackedTarball_caladea \
@@ -47,7 +46,6 @@ $(eval $(call

1 2 3 4 5 6 7 >

1 - 100 of 606 matches

Mail list logo