core.git: configure.ac download.lst external/icu include/svx svx/source

[Taichi Haradaguchi (via logerrit)]

 configure.ac|4 ++--
 download.lst|8 
 external/icu/icu4c-khmerbreakengine.patch.1 |1 -
 include/svx/strings.hrc |1 +
 svx/source/dialog/charmap.cxx   |5 +
 5 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit ae182240328f20508c7a8936daf74a088627540b
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Oct 31 19:46:23 2023 +0900
Commit: Eike Rathke 
CommitDate: Mon May 13 16:51:58 2024 +0200

Update to ICU 74.1

https://icu.unicode.org/download/74

Unicode 15.1

https://blog.unicode.org/2023/09/announcing-unicode-standard-version-151.html

CLDR 44
https://cldr.unicode.org/index/downloads/cldr-44

New Unicode blocks:
UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I

Change-Id: Ic9196e10138663d07235f5ebd9cc4bf3a9750824
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158749
Tested-by: Eike Rathke 
Reviewed-by: Eike Rathke 

diff --git a/configure.ac b/configure.ac
index 5954533a7f1b..b27504e56dac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11036,8 +11036,8 @@ fi
 dnl ===
 dnl Check for system icu
 dnl ===
-ICU_MAJOR=73
-ICU_MINOR=2
+ICU_MAJOR=74
+ICU_MINOR=1
 ICU_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/icu/source/i18n 
-I${WORKDIR}/UnpackedTarball/icu/source/common"
 ICU_LIBS_internal="-L${WORKDIR}/UnpackedTarball/icu/source/lib"
 libo_CHECK_SYSTEM_MODULE([icu],[ICU],[icu-i18n >= 66])
diff --git a/download.lst b/download.lst
index 59d7ae0ee360..0c4553a37dd7 100644
--- a/download.lst
+++ b/download.lst
@@ -317,10 +317,10 @@ 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
-ICU_DATA_TARBALL := icu4c-73_2-data.zip
+ICU_SHA256SUM := 
86ce8e60681972e60e4dcb2490c697463fcec60dd400a5f9bffba26d0b52b8d0
+ICU_TARBALL := icu4c-74_1-src.tgz
+ICU_DATA_SHA256SUM := 
67d5ab39c5187e1dd0fed60a3fe52794dce9784b4c045cb85e19f5d317fd783f
+ICU_DATA_TARBALL := icu4c-74_1-data.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/icu/icu4c-khmerbreakengine.patch.1 
b/external/icu/icu4c-khmerbreakengine.patch.1
index 605914014e96..db8ac50e6f75 100644
--- a/external/icu/icu4c-khmerbreakengine.patch.1
+++ b/external/icu/icu4c-khmerbreakengine.patch.1
@@ -796,7 +796,6 @@ diff -ur icu.org/source/common/dictionarydata.cpp 
icu/source/common/dictionaryda
  if (wordCount < limit) {
  if (values != nullptr) {
  values[wordCount] = bt.getValue();
-
 diff -ur icu.org/source/common/dictionarydata.h 
icu/source/common/dictionarydata.h
 --- icu.org/source/common/dictionarydata.h 2023-06-14 06:23:55.0 
+0900
 +++ icu/source/common/dictionarydata.h 2023-06-26 17:43:53.097724900 +0900
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 13f896f04eeb..b8e69dc3dbe1 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1790,6 +1790,7 @@
 #define RID_SUBSETSTR_KAKTOVIK_NUMERALS 
NC_("RID_SUBSETMAP", "Kaktovik Numerals")
 #define RID_SUBSETSTR_KAWI  
NC_("RID_SUBSETMAP", "Kawi")
 #define RID_SUBSETSTR_NAG_MUNDARI   
NC_("RID_SUBSETMAP", "Nag Mundari")
+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I
NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension I")
 
 #define RID_SVXSTR_FRAMEDIR_LTR 
NC_("RID_SVXSTR_FRAMEDIR_LTR", "Left-to-right (LTR)")
 #define RID_SVXSTR_FRAMEDIR_RTL 
NC_("RID_SVXSTR_FRAMEDIR_RTL", "Right-to-left (RTL)")
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index ed0c626b59c6..a73b0e263d60 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1923,6 +1923,11 @@ void SubsetMap::InitList()
 case UBLOCK_NAG_MUNDARI:
 aAllSubsets.emplace_back( 0x1E4D0, 0x1E4FF, 
SvxResId(RID_SUBSETSTR_NAG_MUNDARI) );
 break;
+#endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 74)
+case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I:
+aAllSubsets.emplace_back( 0x2EBF0, 0x2EE5F, 
SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I) );
+break;
 #endif
 }
 

core.git: include/svx svx/source

[Taichi Haradaguchi (via logerrit)]

 include/svx/strings.hrc   |2 +-
 svx/source/dialog/charmap.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3bfd7ae3d414cae3bb4e582c2a2562d7b08887cb
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Apr 18 19:59:41 2024 +0900
Commit: Eike Rathke 
CommitDate: Sat Apr 20 21:23:44 2024 +0200

Fix Unicode block name

See https://unicode.org/charts/PDF/U0080.pdf

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

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index f26dbe3bd558..13f896f04eeb 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1464,7 +1464,7 @@
 #define RID_SVXSTR_SAVE_MODIFIED_IMAGE  
NC_("RID_SVXSTR_SAVE_MODIFIED_IMAGE", "The image has been modified. By default 
the original image will be saved.
Do you want to save the modified version instead?")
 
 #define RID_SUBSETSTR_BASIC_LATIN   
NC_("RID_SUBSETMAP", "Basic Latin")
-#define RID_SUBSETSTR_LATIN_1   
NC_("RID_SUBSETMAP", "Latin-1")
+#define RID_SUBSETSTR_LATIN_1_SUPPLEMENT
NC_("RID_SUBSETMAP", "C1 Controls and Latin-1 Supplement")
 #define RID_SUBSETSTR_LATIN_EXTENDED_A  
NC_("RID_SUBSETMAP", "Latin Extended-A")
 #define RID_SUBSETSTR_LATIN_EXTENDED_B  
NC_("RID_SUBSETMAP", "Latin Extended-B")
 #define RID_SUBSETSTR_IPA_EXTENSIONS
NC_("RID_SUBSETMAP", "IPA Extensions")
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index dcb1205584d7..9b87fe3666a7 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -952,7 +952,7 @@ void SubsetMap::InitList()
 aAllSubsets.emplace_back( 0x, 0x007F, 
SvxResId(RID_SUBSETSTR_BASIC_LATIN) );
 break;
 case UBLOCK_LATIN_1_SUPPLEMENT:
-aAllSubsets.emplace_back( 0x0080, 0x00FF, 
SvxResId(RID_SUBSETSTR_LATIN_1) );
+aAllSubsets.emplace_back( 0x0080, 0x00FF, 
SvxResId(RID_SUBSETSTR_LATIN_1_SUPPLEMENT) );
 break;
 case UBLOCK_LATIN_EXTENDED_A:
 aAllSubsets.emplace_back( 0x0100, 0x017F, 
SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_A) );

core.git: xmlsecurity/uiconfig

[Taichi Haradaguchi (via logerrit)]

 xmlsecurity/uiconfig/ui/certpage.ui   |4 ++--
 xmlsecurity/uiconfig/ui/viewcertdialog.ui |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 18a7f0aaadb440bdbf0e1507642d16de783dcc14
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Apr 17 16:53:21 2024 +0900
Commit: Michael Stahl 
CommitDate: Thu Apr 18 11:16:22 2024 +0200

xmlsecurity: Change spelling from "Certification" to "Certificate"

Unify the terms used in the View Certificate dialog.

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

diff --git a/xmlsecurity/uiconfig/ui/certpage.ui 
b/xmlsecurity/uiconfig/ui/certpage.ui
index 4e0579ac53e0..03a92c8cbbae 100644
--- a/xmlsecurity/uiconfig/ui/certpage.ui
+++ b/xmlsecurity/uiconfig/ui/certpage.ui
@@ -30,7 +30,7 @@
   
 True
 False
-Certification path
+Certificate Path
 True
 signatures
 0
@@ -119,7 +119,7 @@
   
 True
 False
-Certification status
+Certificate status
 True
 status
 0
diff --git a/xmlsecurity/uiconfig/ui/viewcertdialog.ui 
b/xmlsecurity/uiconfig/ui/viewcertdialog.ui
index 12cf4b40e6da..44ff70ec74f6 100644
--- a/xmlsecurity/uiconfig/ui/viewcertdialog.ui
+++ b/xmlsecurity/uiconfig/ui/viewcertdialog.ui
@@ -203,7 +203,7 @@
   
 True
 False
-Certification Path
+Certificate Path
   
   
 2

core.git: svx/uiconfig

[Taichi Haradaguchi (via logerrit)]

 svx/uiconfig/ui/dockingfontwork.ui |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7897f1d9835f686dd042348c51f7d2326de71971
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Apr 16 18:03:06 2024 +0900
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Apr 16 18:43:16 2024 +0200

Fix typo in dockingfontwork.ui

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

diff --git a/svx/uiconfig/ui/dockingfontwork.ui 
b/svx/uiconfig/ui/dockingfontwork.ui
index b088a8df17dc..1f2f2fd55638 100644
--- a/svx/uiconfig/ui/dockingfontwork.ui
+++ b/svx/uiconfig/ui/dockingfontwork.ui
@@ -159,7 +159,7 @@
   
 True
 False
-Style
+Style
 
   
 
@@ -293,7 +293,7 @@
   
 True
 False
-Adjust
+Adjust
 
   
 
@@ -426,7 +426,7 @@
   
 True
 False
-Shadow
+Shadow
 
   
 
@@ -468,7 +468,7 @@
   
 True
 False
-Shadow Color
+Shadow Color
 
   
 
@@ -574,7 +574,7 @@
   
 True
 False
-Shadow Offset
+Shadow Offset
 
   
 
@@ -679,7 +679,7 @@
   
 True
 False
-Position and Indent
+Position and Indent
 
   
 

core.git: helpcontent2

[Taichi Haradaguchi (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b599d60fef80039cdfe636a771c3fc8eb1028c3
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Apr 14 02:45:49 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Apr 14 03:45:49 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1f63165a8f02d96fbdb0b9b8bea287389edb1121
  - Change the strings in the help pages

...to follow changes in the UI strings.[1][2][3]

[1] "Fix extended tip in mmselectpage.ui"


[2] "Fix extended tips"


[3] "Add the strings "dialog" after "Macro Selector" in extended tips"



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

diff --git a/helpcontent2 b/helpcontent2
index 58350a811a80..1f63165a8f02 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 58350a811a8001f72b13f6ca3def5f32ea904e72
+Subproject commit 1f63165a8f02d96fbdb0b9b8bea287389edb1121

help.git: source/text

[Taichi Haradaguchi (via logerrit)]

 source/text/schart/01/three_d_view.xhp|4 ++--
 source/text/shared/01/06140402.xhp|2 +-
 source/text/shared/01/06140500.xhp|2 +-
 source/text/shared/01/certificatepath.xhp |2 +-
 source/text/swriter/01/04090003.xhp   |2 +-
 source/text/swriter/01/04090006.xhp   |2 +-
 source/text/swriter/01/04180400.xhp   |2 +-
 source/text/swriter/01/mailmerge01.xhp|2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 1f63165a8f02d96fbdb0b9b8bea287389edb1121
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 00:59:31 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Apr 14 03:45:49 2024 +0200

Change the strings in the help pages

...to follow changes in the UI strings.[1][2][3]

[1] "Fix extended tip in mmselectpage.ui"


[2] "Fix extended tips"


[3] "Add the strings "dialog" after "Macro Selector" in extended tips"



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

diff --git a/source/text/schart/01/three_d_view.xhp 
b/source/text/schart/01/three_d_view.xhp
index cffb8aa0f6..a696a9e335 100644
--- a/source/text/schart/01/three_d_view.xhp
+++ b/source/text/schart/01/three_d_view.xhp
@@ -154,11 +154,11 @@
 
 Select a color for the selected light 
source.
 
-Select a color using the color 
dialog.Ambient light
+Select a color using the Pick a Color 
dialog.Ambient light
 
 Select a color for the ambient light.
 
-Select a color using the color dialog.
+Select a color using the Pick a Color 
dialog.
   
  
  
diff --git a/source/text/shared/01/06140402.xhp 
b/source/text/shared/01/06140402.xhp
index fa8f9c64a5..e853ae908d 100644
--- a/source/text/shared/01/06140402.xhp
+++ b/source/text/shared/01/06140402.xhp
@@ -36,7 +36,7 @@
 Displays the 
available icons in %PRODUCTNAME. To replace the icon that you selected in the 
Customize dialog, click an 
icon, then click the OK button.
 
 Import
-Adds new icons to the list of icons. You see a file open dialog that 
imports the selected icon or icons into the internal icon directory of 
%PRODUCTNAME.
+Adds new icons to the list of icons. You see the Open dialog that 
imports the selected icon or icons into the internal icon directory of 
%PRODUCTNAME.
 You can only import 
icons that are in the PNG file format and that are 16 × 16 or 24 × 24 pixels in 
size.
 
 Click to remove the selected icon from the list. Only user-defined 
icons can be removed.
diff --git a/source/text/shared/01/06140500.xhp 
b/source/text/shared/01/06140500.xhp
index 63b05a3f51..d5821cc3c2 100644
--- a/source/text/shared/01/06140500.xhp
+++ b/source/text/shared/01/06140500.xhp
@@ -55,7 +55,7 @@
 
 
 Assign Macro
-Opens the Macro Selector to assign a macro to 
the selected event.
+Opens the Macro Selector dialog to assign a 
macro to the selected event.
 
 Assign Component...
 Opens the 
Assign Component dialog to set a custom UNO command for the 
selected event.
diff --git a/source/text/shared/01/certificatepath.xhp 
b/source/text/shared/01/certificatepath.xhp
index 56f0391694..2321cffa0e 100644
--- a/source/text/shared/01/certificatepath.xhp
+++ b/source/text/shared/01/certificatepath.xhp
@@ -37,7 +37,7 @@
 
 
 Select NSS path
-Opens a file picker dialog to add a new 
Network Security Services Certificate directory to the list.
+Opens the Select Path dialog to add a 
new Network Security Services Certificate directory to the 
list.
 
 
 
diff --git a/source/text/swriter/01/04090003.xhp 
b/source/text/swriter/01/04090003.xhp
index 38159f8751..0413bab7b6 100644
--- a/source/text/swriter/01/04090003.xhp
+++ b/source/text/swriter/01/04090003.xhp
@@ -151,7 +151,7 @@
 
 
 Macro
-Opens the Macro 
Selector, where you can choose the macro that will run when you click 
the selected field in the document. This button is only available for 
the "Execute macro" function field.
+Opens the Macro 
Selector dialog, where you can choose the macro that will run when you 
click the selected field in the document. This button is only available 
for the "Execute macro" function field.
 
 The following 
controls are displayed for Input list fields:
 
diff --git a/source/text/swriter/01/04090006.xhp 
b/source/text/swriter/01/04090006.xhp
index 6cc3eb7ceb..10c09e1039 100644
--- a/source/text/swriter/01/04090006.xhp
+++ b/source/text/swriter/01/04090006.xhp
@@ -110,7 +110,7 @@
 Uses the format defined in 
the selected database.
 
 Browse
-Opens a file open dialog where you 
can select a database file (*.odb). The selected file 

core.git: cui/uiconfig sw/uiconfig

[Taichi Haradaguchi (via logerrit)]

 cui/uiconfig/ui/eventsconfigpage.ui   |2 +-
 cui/uiconfig/ui/macroassignpage.ui|2 +-
 sw/uiconfig/swriter/ui/fldfuncpage.ui |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a8fda337a88ca4d47218efa9ee44e7bfd590d30c
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Mar 31 10:43:00 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Apr 12 15:34:49 2024 +0200

Add the strings "dialog" after "Macro Selector" in extended tips

because the Macro Selector is the dialog name.

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

diff --git a/cui/uiconfig/ui/eventsconfigpage.ui 
b/cui/uiconfig/ui/eventsconfigpage.ui
index acdf91c4df48..8a679d77c6ec 100644
--- a/cui/uiconfig/ui/eventsconfigpage.ui
+++ b/cui/uiconfig/ui/eventsconfigpage.ui
@@ -66,7 +66,7 @@
 True
 
   
-Opens the 
Macro Selector to assign a macro to the selected event.
+Opens the 
Macro Selector dialog to assign a macro to the selected event.
   
 
   
diff --git a/cui/uiconfig/ui/macroassignpage.ui 
b/cui/uiconfig/ui/macroassignpage.ui
index 24395c840c6c..a444c231f760 100644
--- a/cui/uiconfig/ui/macroassignpage.ui
+++ b/cui/uiconfig/ui/macroassignpage.ui
@@ -138,7 +138,7 @@
 True
 
   
-Opens the 
Macro Selector to assign a macro to the selected event.
+Opens the 
Macro Selector dialog to assign a macro to the selected event.
   
 
   
diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui 
b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index 042727bc4542..8773a89d57bd 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -259,7 +259,7 @@
 True
 
   
-Opens the Macro 
Selector, where you can choose the macro that will run when you click the 
selected field in the document.
+Opens the Macro 
Selector dialog, where you can choose the macro that will run when you click 
the selected field in the document.
   
 
   

core.git: xmloff/source

[Taichi Haradaguchi (via logerrit)]

 xmloff/source/core/xmlexp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 432c866072aa62cf90168d569dc56cbc7269bcda
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Apr 8 15:38:44 2024 +0200
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Apr 9 01:46:04 2024 +0200

Revert "Fix typo"

This reverts commit 659051b7aa7eb9a142d044693409631cfa319b40.

Reason for revert: "fo" is the "formatting objects" namespace in ODF, not a 
typo for "for".

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

diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index b04c42cb0432..140b264f6d41 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -982,7 +982,7 @@ void SvXMLExport::AddLanguageTagAttributes( sal_uInt16 
nPrefix, sal_uInt16 nPref
 {
 if (getSaneDefaultVersion() >= SvtSaveOptions::ODFSVER_012)
 AddAttribute( nPrefixRfc, XML_RFC_LANGUAGE_TAG, 
rLanguageTag.getBcp47());
-// Also in case of non-pure-ISO tag store best matching for: attributes
+// Also in case of non-pure-ISO tag store best matching fo: attributes
 // for consumers not handling *:rfc-language-tag, ensuring that only
 // valid ISO codes are stored. Here the bWriteEmpty parameter has no
 // meaning.

core.git: sc/uiconfig

[Taichi Haradaguchi (via logerrit)]

 sc/uiconfig/scalc/ui/dataproviderdlg.ui |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2564374efebb5218fbc3c81540fe95557f6119ac
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Apr 4 18:06:52 2024 +0900
Commit: Caolán McNamara 
CommitDate: Sat Apr 6 16:37:58 2024 +0200

Add dialog name to dataproviderdlg.ui

...and change "Okay" to "OK" in the dialog.

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

diff --git a/sc/uiconfig/scalc/ui/dataproviderdlg.ui 
b/sc/uiconfig/scalc/ui/dataproviderdlg.ui
index 2ab251046ded..a2fa7978cb20 100644
--- a/sc/uiconfig/scalc/ui/dataproviderdlg.ui
+++ b/sc/uiconfig/scalc/ui/dataproviderdlg.ui
@@ -1,9 +1,10 @@
 
-
+
 
   
   
 False
+Data Provider
 True
 dialog
 
@@ -19,7 +20,7 @@
 end
 
   
-Okay
+OK
 True
 True
 True

core.git: download.lst external/lcms2

[Taichi Haradaguchi (via logerrit)]

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

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

lcms2: upgrade to 2.16

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

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

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

core.git: chart2/uiconfig cui/uiconfig sw/uiconfig

[Taichi Haradaguchi (via logerrit)]

 chart2/uiconfig/ui/tp_3D_SceneIllumination.ui |8 
 cui/uiconfig/ui/certdialog.ui |2 +-
 cui/uiconfig/ui/iconselectordialog.ui |2 +-
 sw/uiconfig/swriter/ui/exchangedatabases.ui   |2 +-
 sw/uiconfig/swriter/ui/flddbpage.ui   |2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b5c40d4864b07861e889244834635c8cfc957d6e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 00:57:49 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Mar 30 06:18:15 2024 +0100

Fix extended tips

Fix wrong dialog names in extended tips.

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

diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui 
b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
index 2187db5ab092..f67f287f68fc 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
@@ -276,11 +276,11 @@
 True
 True
 True
-Select a 
color using the color dialog
+Select a 
color using the Pick a Color dialog
 IMG_LIGHTSOURCE_COLOR
 
   
-Select a 
color using the color dialog.
+Select a 
color using the Pick a Color dialog.
   
 
   
@@ -360,11 +360,11 @@
 True
 True
 True
-Select a color 
using the color dialog
+Select a color 
using the Pick a Color dialog
 IMG_AMBIENT_COLOR
 
   
-Select a color 
using the color dialog.
+Select a color 
using the Pick a color dialog.
   
 
   
diff --git a/cui/uiconfig/ui/certdialog.ui b/cui/uiconfig/ui/certdialog.ui
index 8f3545e3176a..29b19e3d3742 100644
--- a/cui/uiconfig/ui/certdialog.ui
+++ b/cui/uiconfig/ui/certdialog.ui
@@ -44,7 +44,7 @@
 True
 
   
-Opens a file picker 
dialog to add a new Network Security Services Certificate directory to the 
list.
+Opens the Select Path 
dialog to add a new Network Security Services Certificate directory to the 
list.
   
 
   
diff --git a/cui/uiconfig/ui/iconselectordialog.ui 
b/cui/uiconfig/ui/iconselectordialog.ui
index f9672c7406fe..9ee6ee8847cb 100644
--- a/cui/uiconfig/ui/iconselectordialog.ui
+++ b/cui/uiconfig/ui/iconselectordialog.ui
@@ -165,7 +165,7 @@
 True
 
   
-Adds 
new icons to the list of icons. You see a file open dialog that imports the 
selected icon or icons into the internal icon directory of the office 
suite.
+Adds 
new icons to the list of icons. You see the Open dialog that imports the 
selected icon or icons into the internal icon directory of the office 
suite.
   
 
   
diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui 
b/sw/uiconfig/swriter/ui/exchangedatabases.ui
index 9d5589d6ce6b..341a2669cf47 100644
--- a/sw/uiconfig/swriter/ui/exchangedatabases.ui
+++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui
@@ -153,7 +153,7 @@
 True
 
   
-Opens a file 
open dialog to select a database file (*.odb). The selected file is added to 
the Available Databases list.
+Opens the 
Open dialog to select a database file (*.odb). The selected file is added to 
the Available Databases list.
   
 
   
diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui 
b/sw/uiconfig/swriter/ui/flddbpage.ui
index d2e6ec9b7322..f3f94d1e011f 100644
--- a/sw/uiconfig/swriter/ui/flddbpage.ui
+++ b/sw/uiconfig/swriter/ui/flddbpage.ui
@@ -329,7 +329,7 @@
 True
 
   
-Opens a file open 
dialog where you can select a database file (*.odb). The selected file is added 
to the Databases Selection list.
+Opens the Open 
dialog where you can select a database file (*.odb). The selected file is added 
to the Databases Selection list.
   
 
   

core.git: sw/uiconfig

[Taichi Haradaguchi (via logerrit)]

 sw/uiconfig/swriter/ui/findentrydialog.ui |  104 ++
 1 file changed, 50 insertions(+), 54 deletions(-)

New commits:
commit 0c5f0e5dbb482bfc62059a0f586efce6e7b292fe
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Mar 23 14:39:52 2024 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Mar 30 03:55:18 2024 +0100

resave latest glade

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

diff --git a/sw/uiconfig/swriter/ui/findentrydialog.ui 
b/sw/uiconfig/swriter/ui/findentrydialog.ui
index d34690b8b762..68ef33185385 100644
--- a/sw/uiconfig/swriter/ui/findentrydialog.ui
+++ b/sw/uiconfig/swriter/ui/findentrydialog.ui
@@ -1,35 +1,34 @@
 
-
+
 
   
   
-True
-6
+True
+6
 Find Entry
-True
-0
-0
-dialog
+0
+0
+dialog
 
   
 True
-False
+False
 vertical
 12
 
   
 True
-False
-end
+False
+end
 
   
 _Find
 True
-True
-True
-True
-True
-True
+True
+True
+True
+True
+True
 
   
 Displays the 
next record that contains the search text.
@@ -46,8 +45,8 @@
   
 _Close
 True
-True
-True
+True
+True
 True
   
   
@@ -60,8 +59,8 @@
   
 _Help
 True
-True
-True
+True
+True
 True
   
   
@@ -74,44 +73,44 @@
   
 False
 True
-end
+end
 0
   
 
 
-  
+  
   
 True
-False
+False
 True
-12
+12
 
-  
+  
   
 True
-False
+False
 True
-12
+12
 
   
 True
-False
+False
 F_ind
-True
-entry
+True
+entry
 0
   
   
-0
-0
+0
+0
   
 
 
   
 True
-True
+True
 True
-True
+True
 True
 
   
@@ -120,30 +119,30 @@
 
   
   
-1
-0
+1
+0
   
 
   
   
-0
-0
+0
+0
   
 
 
-  
+  
   
 True
-False
-6
+False
+6
 
   
 Find _only in
 True
-True
-False
-True
-True
+True
+False
+True
+True
 
   
 
@@ -154,14 +153,14 @@
 
   
   
-0
-0
+0
+0
   
 
 
   
 True
-False
+False
 12
 
   
@@ -173,14 +172,14 @@
 
   
   
-0
-1
+0
+1
   
 
   
   
-0
-1
+0
+1
   
 
   
@@ -197,9 +196,6 @@
   cancel
   help
 
-
-  
-
 
  

core.git: sw/uiconfig

[Taichi Haradaguchi (via logerrit)]

 sw/uiconfig/swriter/ui/mmselectpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1aeec70c2a635a69e90d2643f2e524bb342378ae
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Mar 21 19:59:37 2024 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Mar 24 04:08:23 2024 +0100

Fix extended tip in mmselectpage.ui

Fix wrong dialog name in extended tip.

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

diff --git a/sw/uiconfig/swriter/ui/mmselectpage.ui 
b/sw/uiconfig/swriter/ui/mmselectpage.ui
index 82a655e31fae..ee474cc1663a 100644
--- a/sw/uiconfig/swriter/ui/mmselectpage.ui
+++ b/sw/uiconfig/swriter/ui/mmselectpage.ui
@@ -173,7 +173,7 @@
 True
 
   
-Opens a 
template selector dialog.
+Opens the 
New dialog to select a template.
   
 
   

core.git: sw/uiconfig

[Taichi Haradaguchi (via logerrit)]

 sw/uiconfig/swriter/ui/findentrydialog.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4bdf2829a31e29949bf4d9a008e1f9d2b50bf4c1
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 18:34:39 2024 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Mar 23 01:04:12 2024 +0100

Add missing dialog name in findentrydialog.ui

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

diff --git a/sw/uiconfig/swriter/ui/findentrydialog.ui 
b/sw/uiconfig/swriter/ui/findentrydialog.ui
index 589a12b5d5b1..d34690b8b762 100644
--- a/sw/uiconfig/swriter/ui/findentrydialog.ui
+++ b/sw/uiconfig/swriter/ui/findentrydialog.ui
@@ -5,6 +5,8 @@
   
 True
 6
+Find Entry
+True
 0
 0
 dialog

core.git: Branch 'libreoffice-7-6' - download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit af7dbe1de9145b91d212f6567c6a47bd92a7a60e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 13:43:14 2024 +0100
Commit: Xisco Fauli 
CommitDate: Fri Mar 22 20:57:14 2024 +0100

Expat: upgrade to release 2.6.2

Fixes CVE-2024-28757

Change-Id: Id85044fa9d8eda922425e580e9d6979f6563e98a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165129
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 370ca73a45b291e172918b4c8fcbc37ccaa434cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165177
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

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

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

core.git: Branch 'libreoffice-24-2-2' - download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 314286d59b3d24e700def6f817224770573579ad
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 13:43:14 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Fri Mar 22 19:44:22 2024 +0100

Expat: upgrade to release 2.6.2

Fixes CVE-2024-28757

Change-Id: Id85044fa9d8eda922425e580e9d6979f6563e98a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165129
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 370ca73a45b291e172918b4c8fcbc37ccaa434cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165176
Reviewed-by: Xisco Fauli 
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

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

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

core.git: Branch 'libreoffice-24-2' - download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit b4622a2a5bc4472658b203025524ac5e11fc3c2e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 13:43:14 2024 +0100
Commit: Xisco Fauli 
CommitDate: Fri Mar 22 18:04:53 2024 +0100

Expat: upgrade to release 2.6.2

Fixes CVE-2024-28757

Change-Id: Id85044fa9d8eda922425e580e9d6979f6563e98a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165129
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 370ca73a45b291e172918b4c8fcbc37ccaa434cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165175
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

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

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

core.git: download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

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

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

Expat: upgrade to release 2.6.2

Fixes CVE-2024-28757

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

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

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

core.git: Branch 'libreoffice-24-2' - 2 commits - download.lst external/gpgmepp sw/source

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 +-
 external/gpgmepp/ExternalPackage_gpgmepp.mk |4 +-
 external/gpgmepp/Library_gpgmepp.mk |1 
 external/gpgmepp/Wincompatible-function-pointer-types.patch |4 +-
 external/gpgmepp/w32-build-fixes.patch.1|   19 ++--
 sw/source/uibase/docvw/AnnotationWin2.cxx   |2 -
 6 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 539909be1436f7402c9d4718b58d99fcd2f28a75
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Feb 25 13:42:01 2024 +0100
Commit: Caolán McNamara 
CommitDate: Fri Mar 1 11:59:36 2024 +0100

GPGME: upgrade to release 1.23.2

Change-Id: I56c419fbbe615ef57b7d8117ccdc32f0daddf95f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163840
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit c9d3e68481e4db0e732b9186b75b582a5b41271b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163980
Reviewed-by: Caolán McNamara 

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

core.git: download.lst external/gpgmepp

[Taichi Haradaguchi (via logerrit)]

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

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

GPGME: upgrade to release 1.23.2

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

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

core.git: Branch 'distro/collabora/libreoffice-7-5+backports' - download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit c6e787cb8fb2263939369aefe7381a3d95b6f130
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Andras Timar 
CommitDate: Fri Feb 23 11:44:59 2024 +0100

Expat: upgrade to release 2.6.0

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

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163395
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

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

core.git: Branch 'libreoffice-24-2-1' - 2 commits - download.lst external/expat sc/source

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 +-
 external/expat/0001-Fix-compiler-warnings.patch |   47 
 external/expat/UnpackedTarball_expat.mk |3 +
 sc/source/filter/rtf/rtfparse.cxx   |4 +-
 4 files changed, 54 insertions(+), 4 deletions(-)

New commits:
commit d8b1133a8fb9ddee010a9a38a25453f3b245ea9f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 22 21:21:47 2024 +0100

Expat: upgrade to release 2.6.0

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

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163392
Reviewed-by: Xisco Fauli 
(cherry picked from commit 66022adfa09662a082272f42bf0c34582abf38b1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163397
Reviewed-by: Michael Stahl 
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Xisco Fauli 

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

tdf#101313 Copy-paste table from writer to calc

With Merged Cells from Writer to Calc,
Cells Placed in Wrong Position (Wrong cell offsets).

regression from
commit ed24564ce11683731b820c29d5a46e073ab7a2a7
Author: Noel Grandin 
Date:   Thu 

core.git: download.lst external/fontconfig

[Taichi Haradaguchi (via logerrit)]

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

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

Fontconfig: upgrade to release 2.15.0

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

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

core.git: Branch 'distro/collabora/co-23.05' - download.lst external/openssl

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 3d9dcc749788d5609a853396c643b61f58f763b9
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Sep 30 23:54:06 2023 +0900
Commit: Andras Timar 
CommitDate: Mon Feb 19 18:39:21 2024 +0100

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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163522
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index fb19aea24cc8..07fa9cbd0983 100644
--- a/download.lst
+++ b/download.lst
@@ -487,8 +487,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.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"),

core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 4 commits - download.lst external/expat external/nss

[Taichi Haradaguchi (via logerrit)]

 download.lst|8 ++--
 external/expat/0001-Fix-compiler-warnings.patch |   47 
 external/expat/UnpackedTarball_expat.mk |3 +
 external/nss/README |   26 +
 4 files changed, 65 insertions(+), 19 deletions(-)

New commits:
commit d7ee61c6b976992ceeaef7a57616ed7968fa13be
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Michael Stahl 
CommitDate: Fri Feb 16 17:16:14 2024 +0100

Expat: upgrade to release 2.6.0

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

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163393
Reviewed-by: Xisco Fauli 
(cherry picked from commit 0ba4dfa1000a9177f1ea855ec4ffaddf7fc44c19)

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

nss: upgrade to release 3.98

Fixes CVE-2023-5388

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

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

  * debian/control, debian/libnss3*, debian/rules,
mozilla/security/coreconf/*, mozilla/security/nss/lib/*/manifest.mn:
Move to unversioned library. ABI compatibility is 

core.git: Branch 'distro/collabora/co-23.05' - download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit ea7e720219cb0779c7cce41a93f2da84dfd8b2fa
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Andras Timar 
CommitDate: Fri Feb 16 22:36:22 2024 +0100

Expat: upgrade to release 2.6.0

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

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163395
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

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

core.git: Branch 'distro/cib/libreoffice-6-4' - 6 commits - download.lst external/expat external/nss sc/source

[Taichi Haradaguchi (via logerrit)]

 download.lst|8 ++--
 external/expat/0001-Fix-compiler-warnings.patch |   47 
 external/expat/UnpackedTarball_expat.mk |3 +
 external/nss/README |   26 +
 sc/source/core/data/document.cxx|4 ++
 sc/source/core/tool/compiler.cxx|   10 +++--
 6 files changed, 76 insertions(+), 22 deletions(-)

New commits:
commit eb89d3a01d5e7a8ff1f213a89a78f5ccd2064635
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Michael Stahl 
CommitDate: Fri Feb 16 17:16:09 2024 +0100

Expat: upgrade to release 2.6.0

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

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163393
Reviewed-by: Xisco Fauli 
(cherry picked from commit 0ba4dfa1000a9177f1ea855ec4ffaddf7fc44c19)

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

nss: upgrade to release 3.98

Fixes CVE-2023-5388

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

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

  * debian/control, debian/libnss3*, debian/rules,

core.git: Branch 'distro/allotropia/zeta-7-4' - 6 commits - download.lst external/expat external/nss sc/source

[Taichi Haradaguchi (via logerrit)]

 download.lst|8 ++--
 external/expat/0001-Fix-compiler-warnings.patch |   47 
 external/expat/UnpackedTarball_expat.mk |3 +
 external/nss/README |   26 +
 sc/source/core/data/document.cxx|4 ++
 sc/source/core/tool/compiler.cxx|   10 +++--
 6 files changed, 76 insertions(+), 22 deletions(-)

New commits:
commit 0f0351b3e0e3273ad113292c7e0f0c80f987d6f4
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Michael Stahl 
CommitDate: Fri Feb 16 17:15:53 2024 +0100

Expat: upgrade to release 2.6.0

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

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163393
Reviewed-by: Xisco Fauli 
(cherry picked from commit 0ba4dfa1000a9177f1ea855ec4ffaddf7fc44c19)

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

nss: upgrade to release 3.98

Fixes CVE-2023-5388

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

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

  * debian/control, debian/libnss3*, debian/rules,

core.git: Branch 'distro/collabora/co-22.05' - download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit f3e13570812f5ef5fa67e6460e315c124007ea47
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Andras Timar 
CommitDate: Fri Feb 16 16:40:07 2024 +0100

Expat: upgrade to release 2.6.0

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

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163463
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

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

core.git: Branch 'libreoffice-7-6-5' - download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 4229a5f1996c648cdb038295d2f9b777832c924f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 15 21:35:50 2024 +0100

Expat: upgrade to release 2.6.0

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

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163393
Reviewed-by: Xisco Fauli 
(cherry picked from commit a0090efcb3dd8a55421993f91f4ee5ba769a34ef)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163396
Reviewed-by: Thorsten Behrens 
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

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

core.git: Branch 'libreoffice-24-2' - download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 5c785764f1b7bbf43e894d23f33eb43dc5f187b9
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 15 15:08:03 2024 +0100

Expat: upgrade to release 2.6.0

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

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163392
Reviewed-by: Xisco Fauli 

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

core.git: Branch 'libreoffice-7-6' - download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 0ba4dfa1000a9177f1ea855ec4ffaddf7fc44c19
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 15 15:07:40 2024 +0100

Expat: upgrade to release 2.6.0

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

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163393
Reviewed-by: Xisco Fauli 

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

core.git: download.lst external/expat

[Taichi Haradaguchi (via logerrit)]

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

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

Expat: upgrade to release 2.6.0

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

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

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

core.git: Branch 'distro/collabora/co-24.04' - helpcontent2

[Taichi Haradaguchi (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e10115f17ea59740d6eefca1f750e17d5bcf360
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Feb 10 04:18:50 2024 +0900
Commit: Gerrit Code Review 
CommitDate: Fri Feb 9 20:18:50 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'distro/collabora/co-24.04'
  to d6423aa350685e984ac30209a0269b02c1cc145a
  - Fix link to graphic_size_check page

Fix a bug that the "Help Page Not Found" page is displayed
when the Help button in the "Graphic Size Check" dialog is clicked.

Change-Id: I6bf7c568b5f0dafc5d21de49d950b074cc09f442
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162645
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 10c11a706ac08e4324a9439e42c748417c0e7f47)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162898
Reviewed-by: Christian Lohmaier 

  - tdf#159568 Fix link to extensions page -> Dictionaries category

Change-Id: I729264913b54c797193bb6b9c238c8d72a94608c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163045
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 
(cherry picked from commit 3323d51dec401d59a5b0163294922d2487ba91a8)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163014

  - Update link to teasing video for master

Change-Id: Iaa1d4a1729945d9a6cbf658bfac8071db6f02bfb
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162723
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 549f8c25c3d2da1038ade4768a08ebb6ffb832f7)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162724
Reviewed-by: Adolfo Jayme Barrientos 

  - Revert "tdf#156156: add Slide Transition sidebar deck help button's HID"

This reverts commit d529ecdee07d04f261fd13d05ecf2e0ee9f18a4b.

Reason for revert: merged after string freeze

Change-Id: I955aed0f12d265fc05d2903d44743ecba8d8c0f4
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162274
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Christian Lohmaier 

diff --git a/helpcontent2 b/helpcontent2
index 8754781f8e55..d6423aa35068 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8754781f8e55e17c177e0b5f2d632f7c45842e5b
+Subproject commit d6423aa350685e984ac30209a0269b02c1cc145a

help.git: Branch 'distro/collabora/co-24.04' - 4 commits - source/text

[Taichi Haradaguchi (via logerrit)]

 source/text/shared/01/graphic_size_check.xhp|1 +
 source/text/shared/06/youtubevideos.xhp |4 ++--
 source/text/simpress/00/0407.xhp|   12 +---
 source/text/simpress/01/0604.xhp|3 +--
 source/text/swriter/guide/spellcheck_dialog.xhp |2 +-
 5 files changed, 6 insertions(+), 16 deletions(-)

New commits:
commit d6423aa350685e984ac30209a0269b02c1cc145a
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jan 28 02:13:50 2024 +0900
Commit: Andras Timar 
CommitDate: Fri Feb 9 20:18:04 2024 +0100

Fix link to graphic_size_check page

Fix a bug that the "Help Page Not Found" page is displayed
when the Help button in the "Graphic Size Check" dialog is clicked.

Change-Id: I6bf7c568b5f0dafc5d21de49d950b074cc09f442
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162645
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 10c11a706ac08e4324a9439e42c748417c0e7f47)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162898
Reviewed-by: Christian Lohmaier 

diff --git a/source/text/shared/01/graphic_size_check.xhp 
b/source/text/shared/01/graphic_size_check.xhp
index 92020fcbcb..c864034f4b 100644
--- a/source/text/shared/01/graphic_size_check.xhp
+++ b/source/text/shared/01/graphic_size_check.xhp
@@ -17,6 +17,7 @@
 
 
 
+
 
 graphic size;check
 check;graphic size
commit da61e06242a8e9a8121ae76ef9680c1c730c3f18
Author: Gabor Kelemen 
AuthorDate: Tue Feb 6 11:53:15 2024 +0100
Commit: Andras Timar 
CommitDate: Fri Feb 9 20:18:04 2024 +0100

tdf#159568 Fix link to extensions page -> Dictionaries category

Change-Id: I729264913b54c797193bb6b9c238c8d72a94608c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163045
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 
(cherry picked from commit 3323d51dec401d59a5b0163294922d2487ba91a8)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163014

diff --git a/source/text/swriter/guide/spellcheck_dialog.xhp 
b/source/text/swriter/guide/spellcheck_dialog.xhp
index 0e61d3e40b..cb70371fbe 100644
--- a/source/text/swriter/guide/spellcheck_dialog.xhp
+++ b/source/text/swriter/guide/spellcheck_dialog.xhp
@@ -35,7 +35,7 @@
 
 Checking Spelling and 
Grammar
 You can 
manually check the spelling and grammar of a text selection or the entire 
document.
-To check 
the spelling and the grammar of a text, the appropriate dictionaries must be 
installed. For many languages three different dictionaries exist: a 
spellchecker, a hyphenation dictionary, and a thesaurus. Each dictionary covers 
one language only. Grammar checkers can be downloaded and installed as 
extensions. See the https://extensions.libreoffice.org/extension-center?getCategories=Dictionary;>extensions
 web page.
+To check 
the spelling and the grammar of a text, the appropriate dictionaries must be 
installed. For many languages three different dictionaries exist: a 
spellchecker, a hyphenation dictionary, and a thesaurus. Each dictionary covers 
one language only. Grammar checkers can be downloaded and installed as 
extensions. See the https://extensions.libreoffice.org/?Tags[]=50;>extensions web 
page.
 The spellcheck 
starts at the current cursor position, or at the beginning of the text 
selection.
 
 
commit 87071edd02e12866f7e8316d38e79edd0c086e6c
Author: Olivier Hallot 
AuthorDate: Tue Jan 30 17:45:19 2024 +0100
Commit: Andras Timar 
CommitDate: Fri Feb 9 20:18:04 2024 +0100

Update link to teasing video for master

Change-Id: Iaa1d4a1729945d9a6cbf658bfac8071db6f02bfb
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162723
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 549f8c25c3d2da1038ade4768a08ebb6ffb832f7)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162724
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/06/youtubevideos.xhp 
b/source/text/shared/06/youtubevideos.xhp
index fbd5e80785..d511f66160 100644
--- a/source/text/shared/06/youtubevideos.xhp
+++ b/source/text/shared/06/youtubevideos.xhp
@@ -11,13 +11,13 @@
 
 
   
-YouTube Videos
+YouTube Videos
 /text/shared/06/youtubevideos.xhp
   
 
 
 
-
+
 
 
 
commit 4b6a22e29dbed75bbb995921eae96bc59d714541
Author: Christian Lohmaier 
AuthorDate: Fri Jan 19 14:51:19 2024 +0100
Commit: Andras Timar 
CommitDate: Fri Feb 9 20:18:04 2024 +0100

Revert "tdf#156156: add Slide Transition sidebar deck help button's HID"

This reverts commit d529ecdee07d04f261fd13d05ecf2e0ee9f18a4b.

Reason for revert: merged after string freeze

Change-Id: I955aed0f12d265fc05d2903d44743ecba8d8c0f4
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162274
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Christian Lohmaier 

diff --git a/source/text/simpress/00/0407.xhp 

core.git: Branch 'libreoffice-24-2' - helpcontent2

[Taichi Haradaguchi (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 24d0bcea8085a6e7675cda1ac736dd7f1081a30e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Feb 8 21:39:56 2024 +0900
Commit: Gerrit Code Review 
CommitDate: Thu Feb 8 13:39:56 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-24-2'
  to 1eed95f9a3d99dc12aa83fecbf7767630dfb79bd
  - Fix link to graphic_size_check page

Fix a bug that the "Help Page Not Found" page is displayed
when the Help button in the "Graphic Size Check" dialog is clicked.

Change-Id: I6bf7c568b5f0dafc5d21de49d950b074cc09f442
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162645
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 10c11a706ac08e4324a9439e42c748417c0e7f47)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162898
Reviewed-by: Christian Lohmaier 

diff --git a/helpcontent2 b/helpcontent2
index f2ee21b4f0df..1eed95f9a3d9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f2ee21b4f0df120c737d7357e7d6dd2df92b4e9c
+Subproject commit 1eed95f9a3d99dc12aa83fecbf7767630dfb79bd

help.git: Branch 'libreoffice-24-2' - source/text

[Taichi Haradaguchi (via logerrit)]

 source/text/shared/01/graphic_size_check.xhp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1eed95f9a3d99dc12aa83fecbf7767630dfb79bd
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jan 28 02:13:50 2024 +0900
Commit: Christian Lohmaier 
CommitDate: Thu Feb 8 13:39:56 2024 +0100

Fix link to graphic_size_check page

Fix a bug that the "Help Page Not Found" page is displayed
when the Help button in the "Graphic Size Check" dialog is clicked.

Change-Id: I6bf7c568b5f0dafc5d21de49d950b074cc09f442
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162645
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 10c11a706ac08e4324a9439e42c748417c0e7f47)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162898
Reviewed-by: Christian Lohmaier 

diff --git a/source/text/shared/01/graphic_size_check.xhp 
b/source/text/shared/01/graphic_size_check.xhp
index 92020fcbcb..c864034f4b 100644
--- a/source/text/shared/01/graphic_size_check.xhp
+++ b/source/text/shared/01/graphic_size_check.xhp
@@ -17,6 +17,7 @@
 
 
 
+
 
 graphic size;check
 check;graphic size

core.git: helpcontent2

[Taichi Haradaguchi (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3d00f4ca0ec5a53d694ab9924fd79d0e536aec4
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 2 02:40:20 2024 +0900
Commit: Gerrit Code Review 
CommitDate: Thu Feb 1 18:40:20 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 10c11a706ac08e4324a9439e42c748417c0e7f47
  - Fix link to graphic_size_check page

Fix a bug that the "Help Page Not Found" page is displayed
when the Help button in the "Graphic Size Check" dialog is clicked.

Change-Id: I6bf7c568b5f0dafc5d21de49d950b074cc09f442
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162645
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 3f4e836fd8b7..10c11a706ac0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3f4e836fd8b70243326cb8cb5f71213055f08195
+Subproject commit 10c11a706ac08e4324a9439e42c748417c0e7f47

help.git: source/text

[Taichi Haradaguchi (via logerrit)]

 source/text/shared/01/graphic_size_check.xhp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 10c11a706ac08e4324a9439e42c748417c0e7f47
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jan 28 02:13:50 2024 +0900
Commit: Olivier Hallot 
CommitDate: Thu Feb 1 18:40:19 2024 +0100

Fix link to graphic_size_check page

Fix a bug that the "Help Page Not Found" page is displayed
when the Help button in the "Graphic Size Check" dialog is clicked.

Change-Id: I6bf7c568b5f0dafc5d21de49d950b074cc09f442
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162645
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/graphic_size_check.xhp 
b/source/text/shared/01/graphic_size_check.xhp
index 53464554df..54fc7615d4 100644
--- a/source/text/shared/01/graphic_size_check.xhp
+++ b/source/text/shared/01/graphic_size_check.xhp
@@ -17,6 +17,7 @@
 
 
 
+
 
 graphic size;check
 check;graphic size

core.git: connectivity/inc download.lst external/firebird

[Taichi Haradaguchi (via logerrit)]

 connectivity/inc/pch/precompiled_firebird_sdbc.hxx 
 |   11 
 download.lst   
 |4 
 external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 
 |   41 --
 external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1  
 |   37 --
 
external/firebird/0001-Revert-Backported-fix-for-7122-Invalid-state-of-mapp.patch.1
 |  180 ++
 
external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1
 |   41 --
 external/firebird/ExternalPackage_firebird.mk  
 |4 
 external/firebird/ExternalProject_firebird.mk  
 |2 
 external/firebird/UnpackedTarball_firebird.mk  
 |   19 -
 external/firebird/asan.patch   
 |   12 
 external/firebird/configure-c99.patch  
 |   12 
 external/firebird/firebird-cygwin-msvc-warnings.patch  
 |   36 +-
 external/firebird/firebird-cygwin-msvc.patch   
 |  102 ++---
 external/firebird/firebird-macosx-sandbox.patch.1  
 |   13 
 external/firebird/firebird-macosx.patch.1  
 |   11 
 external/firebird/sanitizer.patch  
 |8 
 external/firebird/ubsan.patch  
 |   21 -
 17 files changed, 290 insertions(+), 264 deletions(-)

New commits:
commit 00eae23267bf64e07cf057f828cd85f3c38ac669
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Apr 27 00:57:05 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Jan 6 02:37:26 2024 +0100

tdf#134526 Firebird: upgrade to release 3.0.11

- Removed unneeded patches [1][2][3][4].
- No changes of ODS version.
- Added patch to revert upstream commits to avoid 
CppunitTest_dbaccess_firebird_test,
  CppunitTest_dbaccess_hsql_binary_import, CppunitTest_dbaccess_tdf119625
  and CppunitTest_dbaccess_tdf126268 failing when building on Windows.

[1] "extern/cloop: Missing dependencies of compilations on output 
directories"

[2] "Fix checks for null HANDLE in Windows-only code"

[3] "Fix warning on Win64 build"

[4] "Mac sandbox" 

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

diff --git a/connectivity/inc/pch/precompiled_firebird_sdbc.hxx 
b/connectivity/inc/pch/precompiled_firebird_sdbc.hxx
index bd628cf76a9a..7860e0b4af4e 100644
--- a/connectivity/inc/pch/precompiled_firebird_sdbc.hxx
+++ b/connectivity/inc/pch/precompiled_firebird_sdbc.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2021-03-08 13:12:28 using:
+ Generated on 2023-10-28 10:48:29 using:
  ./bin/update_pch connectivity firebird_sdbc --cutoff=2 --exclude:system 
--exclude:module --exclude:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -30,22 +30,24 @@
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #endif // PCH_LEVEL >= 2
 #if PCH_LEVEL >= 3
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -59,10 +61,11 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
-#include 
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
 #include 
diff --git a/download.lst b/download.lst
index 568b404f03f3..8921f425cc67 100644
--- a/download.lst
+++ b/download.lst
@@ -116,8 +116,8 @@ EXPAT_TARBALL := expat-2.5.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FIREBIRD_SHA256SUM := 
acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76
-FIREBIRD_TARBALL := Firebird-3.0.7.33374-0.tar.bz2
+FIREBIRD_SHA256SUM := 
c716fc1c788ed614050f5469e1ba0ff442c2f1f7b907a2c808a8bac1dc3d6f83
+FIREBIRD_TARBALL := Firebird-3.0.11.33703-0.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1
 

core.git: Branch 'libreoffice-24-2' - i18npool/source

[Taichi Haradaguchi (via logerrit)]

 i18npool/source/breakiterator/data/ja.dic |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bc9aef121e8e920d400f3247c304454eca8ba586
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Nov 25 14:20:47 2023 +0900
Commit: Xisco Fauli 
CommitDate: Wed Jan 3 11:38:14 2024 +0100

Japanese word for 'reiwa' added to ja.dic

Change-Id: I80743231e22f0507ba5569d325e1f86920658a2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159967
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 7cad8b664d957445b044b414de61af521a2e6553)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161423
Reviewed-by: Xisco Fauli 

diff --git a/i18npool/source/breakiterator/data/ja.dic 
b/i18npool/source/breakiterator/data/ja.dic
index d2923833e57d..955adc935a53 100644
--- a/i18npool/source/breakiterator/data/ja.dic
+++ b/i18npool/source/breakiterator/data/ja.dic
@@ -34359,6 +34359,7 @@
 令
 令兄
 令名
+令和
 令嗣
 令夫人
 令妹

core.git: Branch 'libreoffice-7-6' - i18npool/source

[Taichi Haradaguchi (via logerrit)]

 i18npool/source/breakiterator/data/ja.dic |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4172f59dc8e5e850e1dd945d16a16cb7331eedcf
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Nov 25 14:20:47 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Jan 2 12:07:01 2024 +0100

Japanese word for 'reiwa' added to ja.dic

Change-Id: I80743231e22f0507ba5569d325e1f86920658a2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159967
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 7cad8b664d957445b044b414de61af521a2e6553)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161424

diff --git a/i18npool/source/breakiterator/data/ja.dic 
b/i18npool/source/breakiterator/data/ja.dic
index d2923833e57d..955adc935a53 100644
--- a/i18npool/source/breakiterator/data/ja.dic
+++ b/i18npool/source/breakiterator/data/ja.dic
@@ -34359,6 +34359,7 @@
 令
 令兄
 令名
+令和
 令嗣
 令夫人
 令妹

core.git: i18npool/source

[Taichi Haradaguchi (via logerrit)]

 i18npool/source/breakiterator/data/ja.dic |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b72aa31d7db38c81f757206e4e51844b839797ea
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Nov 25 14:20:47 2023 +0900
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jan 2 10:38:03 2024 +0100

Japanese word for 'reiwa' added to ja.dic

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

diff --git a/i18npool/source/breakiterator/data/ja.dic 
b/i18npool/source/breakiterator/data/ja.dic
index d2923833e57d..955adc935a53 100644
--- a/i18npool/source/breakiterator/data/ja.dic
+++ b/i18npool/source/breakiterator/data/ja.dic
@@ -34359,6 +34359,7 @@
 令
 令兄
 令名
+令和
 令嗣
 令夫人
 令妹

core.git: Branch 'libreoffice-24-2' - helpcontent2

[Taichi Haradaguchi (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20f5fd144cb532ef93b462db1db6d8307c890378
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Jan 2 18:35:11 2024 +0900
Commit: Gerrit Code Review 
CommitDate: Tue Jan 2 10:35:11 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-24-2'
  to 9c01242d5ab31b6eac99d3f7ce153848c9f26c22
  - Fix broken link to "Text Box"

This issue affects versions 24.2 and later.

Change-Id: Icd61deadf03a83c34935e6c05a3554785f649abe
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161461
Tested-by: Jenkins
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 1ef1b1bde6db47e48a04ed77bb53abbd6ed939c6)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161416
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 3c6d3a4e3dbc..9c01242d5ab3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3c6d3a4e3dbc6ab35d76d43032114a637d9288d6
+Subproject commit 9c01242d5ab31b6eac99d3f7ce153848c9f26c22

help.git: Branch 'libreoffice-24-2' - source/text

[Taichi Haradaguchi (via logerrit)]

 source/text/simpress/main0104.xhp |4 +---
 source/text/swriter/main0104.xhp  |6 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 9c01242d5ab31b6eac99d3f7ce153848c9f26c22
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Dec 31 15:55:13 2023 +0900
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jan 2 10:35:11 2024 +0100

Fix broken link to "Text Box"

This issue affects versions 24.2 and later.

Change-Id: Icd61deadf03a83c34935e6c05a3554785f649abe
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161461
Tested-by: Jenkins
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 1ef1b1bde6db47e48a04ed77bb53abbd6ed939c6)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161416
Reviewed-by: Olivier Hallot 

diff --git a/source/text/simpress/main0104.xhp 
b/source/text/simpress/main0104.xhp
index 855cda2857..1f4a5eeb25 100644
--- a/source/text/simpress/main0104.xhp
+++ b/source/text/simpress/main0104.xhp
@@ -44,9 +44,7 @@
 
 
 
-
-
-
+
 
 Floating 
Frame
 
diff --git a/source/text/swriter/main0104.xhp b/source/text/swriter/main0104.xhp
index 4a0ebc8627..cc856e3c4b 100644
--- a/source/text/swriter/main0104.xhp
+++ b/source/text/swriter/main0104.xhp
@@ -34,20 +34,16 @@
 Page Break
 Inserts a manual page break at the current cursor 
position and places the cursor at the beginning of the next 
page.
 
-
 
 
-
 
-
 
 
 Section
 
 Text from 
File
 
-Textbox
-
+
 
 
 

core.git: helpcontent2

[Taichi Haradaguchi (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d978e2fe9e7e259bf724178d2d4fe4f9cda18e5f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jan 1 19:25:20 2024 +0900
Commit: Gerrit Code Review 
CommitDate: Mon Jan 1 11:25:20 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to a7fc08834190211307266e4af41d53cdb54e3cd4
  - Fix broken link to "Text Box"

This issue affects versions 24.2 and later.

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

diff --git a/helpcontent2 b/helpcontent2
index 58b85d5d8886..a7fc08834190 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 58b85d5d8886f116064102e38d98e494643fb55d
+Subproject commit a7fc08834190211307266e4af41d53cdb54e3cd4

help.git: source/text

[Taichi Haradaguchi (via logerrit)]

 source/text/simpress/main0104.xhp |4 +---
 source/text/swriter/main0104.xhp  |6 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit a7fc08834190211307266e4af41d53cdb54e3cd4
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Dec 31 15:55:13 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Jan 1 11:25:19 2024 +0100

Fix broken link to "Text Box"

This issue affects versions 24.2 and later.

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

diff --git a/source/text/simpress/main0104.xhp 
b/source/text/simpress/main0104.xhp
index 855cda2857..1f4a5eeb25 100644
--- a/source/text/simpress/main0104.xhp
+++ b/source/text/simpress/main0104.xhp
@@ -44,9 +44,7 @@
 
 
 
-
-
-
+
 
 Floating 
Frame
 
diff --git a/source/text/swriter/main0104.xhp b/source/text/swriter/main0104.xhp
index 4a0ebc8627..cc856e3c4b 100644
--- a/source/text/swriter/main0104.xhp
+++ b/source/text/swriter/main0104.xhp
@@ -34,20 +34,16 @@
 Page Break
 Inserts a manual page break at the current cursor 
position and places the cursor at the beginning of the next 
page.
 
-
 
 
-
 
-
 
 
 Section
 
 Text from 
File
 
-Textbox
-
+
 
 
 

core.git: cui/uiconfig sc/uiconfig

[Taichi Haradaguchi (via logerrit)]

 cui/uiconfig/ui/fileextcheckdialog.ui |2 +-
 cui/uiconfig/ui/tipofthedaydialog.ui  |2 +-
 sc/uiconfig/scalc/ui/searchresults.ui |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ba2bd49397725fd07ed36aefe2acc4d2be70c72e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Dec 24 20:01:32 2023 +0900
Commit: Caolán McNamara 
CommitDate: Thu Dec 28 21:30:44 2023 +0100

Fix tooltips

* Correct some path names.
* Change some context names.
* Replace "" with "-".
* Replace "▸" with "-".

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

diff --git a/cui/uiconfig/ui/fileextcheckdialog.ui 
b/cui/uiconfig/ui/fileextcheckdialog.ui
index da0c3b8da91d..e0dd68bb0b6d 100644
--- a/cui/uiconfig/ui/fileextcheckdialog.ui
+++ b/cui/uiconfig/ui/fileextcheckdialog.ui
@@ -33,7 +33,7 @@
 True
 True
 False
-Enable the dialog again at Tools  
Options  General
+Enable the dialog again at Tools - 
Options - %PRODUCTNAME - General
 True
 True
 True
diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui 
b/cui/uiconfig/ui/tipofthedaydialog.ui
index 2ea58ad3b03a..dbb3e84945e6 100644
--- a/cui/uiconfig/ui/tipofthedaydialog.ui
+++ b/cui/uiconfig/ui/tipofthedaydialog.ui
@@ -26,7 +26,7 @@
 True
 True
 False
-Enable the dialog again at Tools ▸ 
Options ▸ General, or Help ▸ Show Tip of the Day
+Enable the dialog again at Tools - 
Options - %PRODUCTNAME - General, or Help - Show Tip of the Day
 True
 True
 True
diff --git a/sc/uiconfig/scalc/ui/searchresults.ui 
b/sc/uiconfig/scalc/ui/searchresults.ui
index ea0f536d902b..304a167cd421 100644
--- a/sc/uiconfig/scalc/ui/searchresults.ui
+++ b/sc/uiconfig/scalc/ui/searchresults.ui
@@ -37,7 +37,7 @@
 True
 True
 False
-Enable the dialog again at Tools  Options 
 Calc  View
+Enable the dialog again at Tools - 
Options - %PRODUCTNAME Calc - View
 True
 True
 True

core.git: download.lst external/zxing

[Taichi Haradaguchi (via logerrit)]

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

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

zxing-cpp: upgrade to release 2.2.1

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

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

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

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

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

core.git: Branch 'libreoffice-24-2' - external/lcms2

[Taichi Haradaguchi (via logerrit)]

 external/lcms2/lcms2-2.4-windows.patch |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 09b493fba9766a9305f2e7da148ac7f0b6ca
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Dec 14 22:01:40 2023 +0900
Commit: Xisco Fauli 
CommitDate: Thu Dec 21 16:05:13 2023 +0100

external/lcms2: fix lcms2-2.4-windows.patch

fix typos and macros in code.

Change-Id: I0886f3d95d87be70be1e7e6a220617f728fe6653
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161056
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 324a12413f28ca506487f677d68b840529130aef)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161091
Reviewed-by: Xisco Fauli 

diff --git a/external/lcms2/lcms2-2.4-windows.patch 
b/external/lcms2/lcms2-2.4-windows.patch
index 0281a7769a91..1b5dfdffe8a2 100644
--- a/external/lcms2/lcms2-2.4-windows.patch
+++ b/external/lcms2/lcms2-2.4-windows.patch
@@ -1,4 +1,4 @@
-This patch is neccesary for Windows (32-bit) build.
+This patch is necessary for Windows (32-bit) build.
 
 (In Jenkins' build message)
 > icc_transform.o : error LNK2019: unresolved external symbol 
 > _cmsGetColorSpace referenced in function "public: static class 
 > std::unique_ptr fxcodec::IccTransform> > __cdecl 
 > fxcodec::IccTransform::CreateTransformSRGB(class pdfium::span const >)" 
 > (?CreateTransformSRGB@IccTransform@fxcodec@@SA?AV?$unique_ptr@VIccTransform@fxcodec@@U?$default_delete@VIccTransform@fxcodec@@@std@@@std@@V?$span@$$CBE@pdfium@@@Z)
@@ -21,7 +21,7 @@ This patch is neccesary for Windows (32-bit) build.
 +// LibreOffice always builds this as DLL and with the stdcall calling
 +// convention, so make this usable from outside without having to
 +// specify CMS_DLL manually whenever the library is used.
-+#if !defined(CMS_DLL_BUILD) && !defined(CMS_DLL) && !defined(_WIN64)
++#if !defined(CMS_DLL_BUILD) && !defined(CMS_DLL) && defined(_MSC_VER) && 
defined(_M_IX86)
 +#define CMS_DLL
 +#endif
 +

core.git: external/lcms2

[Taichi Haradaguchi (via logerrit)]

 external/lcms2/lcms2-2.4-windows.patch |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 324a12413f28ca506487f677d68b840529130aef
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Dec 14 22:01:40 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Thu Dec 21 04:49:20 2023 +0100

external/lcms2: fix lcms2-2.4-windows.patch

fix typos and macros in code.

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

diff --git a/external/lcms2/lcms2-2.4-windows.patch 
b/external/lcms2/lcms2-2.4-windows.patch
index 0281a7769a91..1b5dfdffe8a2 100644
--- a/external/lcms2/lcms2-2.4-windows.patch
+++ b/external/lcms2/lcms2-2.4-windows.patch
@@ -1,4 +1,4 @@
-This patch is neccesary for Windows (32-bit) build.
+This patch is necessary for Windows (32-bit) build.
 
 (In Jenkins' build message)
 > icc_transform.o : error LNK2019: unresolved external symbol 
 > _cmsGetColorSpace referenced in function "public: static class 
 > std::unique_ptr fxcodec::IccTransform> > __cdecl 
 > fxcodec::IccTransform::CreateTransformSRGB(class pdfium::span const >)" 
 > (?CreateTransformSRGB@IccTransform@fxcodec@@SA?AV?$unique_ptr@VIccTransform@fxcodec@@U?$default_delete@VIccTransform@fxcodec@@@std@@@std@@V?$span@$$CBE@pdfium@@@Z)
@@ -21,7 +21,7 @@ This patch is neccesary for Windows (32-bit) build.
 +// LibreOffice always builds this as DLL and with the stdcall calling
 +// convention, so make this usable from outside without having to
 +// specify CMS_DLL manually whenever the library is used.
-+#if !defined(CMS_DLL_BUILD) && !defined(CMS_DLL) && !defined(_WIN64)
++#if !defined(CMS_DLL_BUILD) && !defined(CMS_DLL) && defined(_MSC_VER) && 
defined(_M_IX86)
 +#define CMS_DLL
 +#endif
 +

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

[Taichi Haradaguchi (via logerrit)]

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

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

Upgrade lcms2 to 2.15

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

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

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

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

[Libreoffice-commits] core.git: vcl/inc

[Taichi Haradaguchi (via logerrit)]

 vcl/inc/unx/cairotextrender.hxx  |5 +
 vcl/inc/unx/cpdmgr.hxx   |6 +-
 vcl/inc/unx/cupsmgr.hxx  |5 +
 vcl/inc/unx/fc_fontoptions.hxx   |6 +-
 vcl/inc/unx/gendisp.hxx  |5 +
 vcl/inc/unx/genprn.h |5 +
 vcl/inc/unx/gensys.h |5 +
 vcl/inc/unx/gtk/gloactiongroup.h |5 +
 vcl/inc/unx/gtk/glomenu.h|5 +
 vcl/inc/unx/gtk/gtkinst.hxx  |5 +
 vcl/inc/unx/gtk/gtkobject.hxx|6 +-
 vcl/inc/unx/gtk/gtksalmenu.hxx   |5 +
 vcl/inc/unx/gtk/gtksys.hxx   |6 ++
 vcl/inc/unx/gtk/hudawareness.h   |5 +
 vcl/inc/unx/helper.hxx   |6 +-
 vcl/inc/unx/i18n_cb.hxx  |6 ++
 vcl/inc/unx/i18n_ic.hxx  |5 +
 vcl/inc/unx/i18n_im.hxx  |5 +
 vcl/inc/unx/i18n_keysym.hxx  |5 +
 vcl/inc/unx/i18n_xkb.hxx |5 +
 vcl/inc/unx/saldata.hxx  |5 +
 vcl/inc/unx/saldisp.hxx  |5 +
 vcl/inc/unx/salframe.h   |5 +
 vcl/inc/unx/salinst.h|5 +
 vcl/inc/unx/salobj.h |5 +
 vcl/inc/unx/saltimer.h   |5 +
 vcl/inc/unx/saltype.h|5 ++---
 vcl/inc/unx/salunx.h |5 +
 vcl/inc/unx/salunxtime.h |5 +
 vcl/inc/unx/salvd.h  |5 +
 vcl/inc/unx/sessioninhibitor.hxx |5 +
 vcl/inc/unx/sm.hxx   |6 ++
 vcl/inc/unx/svsys.h  |6 ++
 vcl/inc/unx/wmadaptor.hxx|5 +
 vcl/inc/unx/x11/x11gdiimpl.h |5 +
 35 files changed, 40 insertions(+), 143 deletions(-)

New commits:
commit 76898eaf8fc665802c4fcdd129ec221d9019d4b9
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Nov 19 11:10:53 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Nov 20 04:50:03 2023 +0100

tdf#143148: Use pragma once instead of include guards in vcl/inc/unx

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

diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index e262a9184b31..50848ed19fa6 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
-#define INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
+#pragma once
 
 #include 
 
@@ -43,6 +42,4 @@ public:
 virtual ~CairoTextRender();
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/cpdmgr.hxx b/vcl/inc/unx/cpdmgr.hxx
index 8e71d4c13015..2806f1d09b53 100644
--- a/vcl/inc/unx/cpdmgr.hxx
+++ b/vcl/inc/unx/cpdmgr.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_UNX_CPDMGR_HXX
-#define INCLUDED_VCL_INC_UNX_CPDMGR_HXX
+#pragma once
 
 #include 
 #include 
@@ -120,7 +119,4 @@ public:
 
 } // namespace psp
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index 096efdea6e77..fb172103bbd9 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
-#define INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
+#pragma once
 
 #include 
 #include 
@@ -87,6 +86,4 @@ public:
 
 } // namespace psp
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx
index 30411d5d0c60..73bcf3421bc5 100644
--- a/vcl/inc/unx/fc_fontoptions.hxx
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX
-#define INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX
+#pragma once
 
 #include 
 #include 
@@ -38,7 +37,4 @@ private:
 FcPattern* mpPattern;
 };
 
-
-#endif // INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gendisp.hxx b/vcl/inc/unx/gendisp.hxx
index a6188e27a16e..5ef7d445b25a 100644
--- a/vcl/inc/unx/gendisp.hxx
+++ b/vcl/inc/unx/gendisp.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
-#define INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
+#pragma once
 
 #include 
 #include 
@@ -50,6 +49,4 @@ public:
 { return m_pCapture; }
 };
 
-#endif // INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h
index 

[Libreoffice-commits] core.git: vcl/inc

[Taichi Haradaguchi (via logerrit)]

 vcl/inc/win/salbmp.h   |5 +
 vcl/inc/win/salframe.h |5 +
 vcl/inc/win/salinst.h  |5 +
 vcl/inc/win/salobj.h   |5 +
 vcl/inc/win/salprn.h   |5 +
 vcl/inc/win/salsys.h   |5 +
 vcl/inc/win/saltimer.h |5 +
 vcl/inc/win/salvd.h|6 +-
 vcl/inc/win/svsys.h|5 +
 9 files changed, 9 insertions(+), 37 deletions(-)

New commits:
commit 7618c791a39e74b0f8291ff28f65df78cfa20301
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Nov 19 12:28:28 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Nov 19 09:14:51 2023 +0100

tdf#143148: Use pragma once instead of include guards in vcl/inc/win

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

diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index c83b1675331f..2edf291342cc 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_WIN_SALBMP_H
-#define INCLUDED_VCL_INC_WIN_SALBMP_H
+#pragma once
 
 #include 
 #include 
@@ -93,6 +92,4 @@ public:
 virtual const basegfx::SystemDependentDataHolder* 
accessSystemDependentDataHolder() const override;
 };
 
-#endif // INCLUDED_VCL_INC_WIN_SALBMP_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 66da5e3a976f..de72c089b57b 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_WIN_SALFRAME_H
-#define INCLUDED_VCL_INC_WIN_SALFRAME_H
+#pragma once
 
 #include 
 
@@ -160,6 +159,4 @@ namespace vcl_sal {
 LONG nSymbol );
 }
 
-#endif // INCLUDED_VCL_INC_WIN_SALFRAME_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index 7af6e007b562..9c6ca82d38bd 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_WIN_SALINST_H
-#define INCLUDED_VCL_INC_WIN_SALINST_H
+#pragma once
 
 #include 
 
@@ -86,6 +85,4 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND 
hWndParent, SalFrameSt
 SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent );
 HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild );
 
-#endif // INCLUDED_VCL_INC_WIN_SALINST_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h
index e76c4787eb71..37bcf0317866 100644
--- a/vcl/inc/win/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_WIN_SALOBJ_H
-#define INCLUDED_VCL_INC_WIN_SALOBJ_H
+#pragma once
 
 #include 
 
@@ -50,6 +49,4 @@ public:
 virtual const SystemEnvData*GetSystemData() const override;
 };
 
-#endif // INCLUDED_VCL_INC_WIN_SALOBJ_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index 2d02aa5b0e54..e1bbb665e29d 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_WIN_SALPRN_H
-#define INCLUDED_VCL_INC_WIN_SALPRN_H
+#pragma once
 
 #include 
 
@@ -113,6 +112,4 @@ public:
 bool isValid() const { return mbValid && mhDC; }
 };
 
-#endif // INCLUDED_VCL_INC_WIN_SALPRN_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index cf1a6ecb4419..ae94bb9e1a5d 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_WIN_SALSYS_H
-#define INCLUDED_VCL_INC_WIN_SALSYS_H
+#pragma once
 
 #include 
 
@@ -65,6 +64,4 @@ public:
 sal_IntPtr /*LPRECT*/ );
 };
 
-#endif // INCLUDED_VCL_INC_WIN_SALSYS_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/saltimer.h b/vcl/inc/win/saltimer.h
index a467de815d85..827c08ab8305 100644
--- a/vcl/inc/win/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_WIN_SALTIMER_H
-#define INCLUDED_VCL_INC_WIN_SALTIMER_H
+#pragma once
 
 #include 
 
@@ -81,6 +80,4 @@ inline bool WinSalTimer::GetForceRealTimer() const
 return m_bForceRealTimer;
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h
index 7a776056c3a2..66833f99f18a 100644
--- 

[Libreoffice-commits] core.git: vcl/osx

[Taichi Haradaguchi (via logerrit)]

 vcl/osx/a11yactionwrapper.h |5 +
 vcl/osx/a11ycomponentwrapper.h  |5 +
 vcl/osx/a11yrolehelper.h|5 +
 vcl/osx/a11yselectionwrapper.h  |5 +
 vcl/osx/a11ytablewrapper.h  |4 +---
 vcl/osx/a11ytextattributeswrapper.h |4 +---
 vcl/osx/a11ytextwrapper.h   |5 +
 vcl/osx/a11yutil.h  |4 +---
 vcl/osx/a11yvaluewrapper.h  |5 +
 vcl/osx/a11ywrapperbutton.h |5 +
 vcl/osx/a11ywrappercheckbox.h   |5 +
 vcl/osx/a11ywrappercombobox.h   |5 +
 vcl/osx/a11ywrappergroup.h  |5 +
 vcl/osx/a11ywrapperlist.h   |5 +
 vcl/osx/a11ywrapperradiobutton.h|5 +
 vcl/osx/a11ywrapperradiogroup.h |5 +
 vcl/osx/a11ywrapperrow.h|5 +
 vcl/osx/a11ywrapperscrollarea.h |5 +
 vcl/osx/a11ywrapperscrollbar.h  |5 +
 vcl/osx/a11ywrappersplitter.h   |5 +
 vcl/osx/a11ywrapperstatictext.h |5 +
 vcl/osx/a11ywrappertabgroup.h   |5 +
 vcl/osx/a11ywrappertextarea.h   |5 +
 vcl/osx/a11ywrappertoolbar.h|5 +
 24 files changed, 24 insertions(+), 93 deletions(-)

New commits:
commit a688f401980646577d353e96d271499b9b720667
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Nov 19 10:58:51 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Nov 19 06:42:30 2023 +0100

tdf#143148: Use pragma once instead of include guards in vcl/osx

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

diff --git a/vcl/osx/a11yactionwrapper.h b/vcl/osx/a11yactionwrapper.h
index 9afc08b6b970..eb0141c805d1 100644
--- a/vcl/osx/a11yactionwrapper.h
+++ b/vcl/osx/a11yactionwrapper.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H
-#define INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H
+#pragma once
 
 #include 
 #include 
@@ -31,6 +30,4 @@
 + (NSAccessibilityActionName)actionNameForSelector:(SEL)aSelector;
 @end
 
-#endif // INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/a11ycomponentwrapper.h b/vcl/osx/a11ycomponentwrapper.h
index 3d8b16929279..a63f327e43bb 100644
--- a/vcl/osx/a11ycomponentwrapper.h
+++ b/vcl/osx/a11ycomponentwrapper.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H
-#define INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H
+#pragma once
 
 #include 
 #include 
@@ -34,6 +33,4 @@
 + (void)setFocusedAttributeForElement:(AquaA11yWrapper*)wrapper to:(id)value;
 @end
 
-#endif // INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/a11yrolehelper.h b/vcl/osx/a11yrolehelper.h
index 7a4df6dbe967..db349ad38ddd 100644
--- a/vcl/osx/a11yrolehelper.h
+++ b/vcl/osx/a11yrolehelper.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_OSX_A11YROLEHELPER_H
-#define INCLUDED_VCL_OSX_A11YROLEHELPER_H
+#pragma once
 
 #include 
 
@@ -30,6 +29,4 @@
 +(id)getRoleDescriptionFrom: (NSString *) role with: (NSString *) subRole;
 @end
 
-#endif // INCLUDED_VCL_OSX_A11YROLEHELPER_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/a11yselectionwrapper.h b/vcl/osx/a11yselectionwrapper.h
index 880281a114ed..3b62fbd903a8 100644
--- a/vcl/osx/a11yselectionwrapper.h
+++ b/vcl/osx/a11yselectionwrapper.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H
-#define INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H
+#pragma once
 
 #include 
 #include 
@@ -32,6 +31,4 @@
 + (void)setSelectedChildrenAttributeForElement:(AquaA11yWrapper*)wrapper 
to:(id)value;
 @end
 
-#endif // INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/a11ytablewrapper.h b/vcl/osx/a11ytablewrapper.h
index ae2c454a81f0..bc8ce4f39ff1 100644
--- a/vcl/osx/a11ytablewrapper.h
+++ b/vcl/osx/a11ytablewrapper.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H
-#define INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H
+#pragma once
 
 #include 
 
@@ -33,6 +32,5 @@
 - (id)rowsAttribute;
 - (id)columnsAttribute;
 @end
-#endif // INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/a11ytextattributeswrapper.h 
b/vcl/osx/a11ytextattributeswrapper.h
index 4170f5f8a8cc..7df60a93833a 100644
--- a/vcl/osx/a11ytextattributeswrapper.h
+++ b/vcl/osx/a11ytextattributeswrapper.h
@@ 

[Libreoffice-commits] core.git: vcl/source

[Taichi Haradaguchi (via logerrit)]

 vcl/source/filter/jpeg/jpeg.h |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 9beb65b258f5e3e95ad4b86f2682c15ea1dac1af
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Nov 19 10:49:53 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Nov 19 06:41:07 2023 +0100

tdf#143148: Use pragma once instead of include guards in vcl/source

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

diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h
index a7ddcffa6ece..2cf600bb6de4 100644
--- a/vcl/source/filter/jpeg/jpeg.h
+++ b/vcl/source/filter/jpeg/jpeg.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_H
-#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_H
+#pragma once
 
 #include 
 
@@ -62,6 +61,4 @@ struct SourceManagerStruct {
 int no_data_available_failures;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: configure.ac

[Taichi Haradaguchi (via logerrit)]

 configure.ac |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a1ed8fe97c8ebf8de97659dc89ff6ac245254889
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Nov 18 15:29:57 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Nov 18 09:58:50 2023 +0100

Latest VS 2022 Preview is 17.9.0 now

...while latest proper VS 2022 is 17.8.0

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

diff --git a/configure.ac b/configure.ac
index d6a6bf43fd95..eb4dd017a406 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4073,7 +4073,7 @@ map_vs_year_to_version()
 2022)
 vsversion=17;;
 2022preview)
-vsversion=17.8;;
+vsversion=17.9;;
 *)
 AC_MSG_ERROR([Assertion failure - invalid argument "$1" to 
map_vs_year_to_version()]);;
 esac
@@ -4193,7 +4193,7 @@ find_msvc()
 vcyear=2019
 vctoolset=v142
 ;;
-17.0 | 17.8)
+17.0 | 17.9)
 vcyear=2022
 vctoolset=v143
 ;;
@@ -4365,7 +4365,7 @@ if test "$_os" = "WINNT"; then
 # are always "better", we list them in reverse chronological order.
 
 case "$vcnumwithdot" in
-16.0 | 17.0 | 17.8)
+16.0 | 17.0 | 17.9)
 WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0"
 ;;
 esac
@@ -6719,7 +6719,7 @@ find_msms()
 
 msmdir=
 case "$VCVER" in
-16.0 | 17.0 | 17.8)
+16.0 | 17.0 | 17.9)
 for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
 my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$l/MergeModules/"
 echo "$as_me:$LINENO: looking for $my_msm_dir${my_msm_file}])" >&5
@@ -6755,7 +6755,7 @@ find_msvc_x64_dlls()
 
 msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
 case "$VCVER" in
-16.0 | 17.0 | 17.8)
+16.0 | 17.0 | 17.9)
 for crtver in 141 142 143; do
 for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
 echo "$as_me:$LINENO: testing 
$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT" >&5

[Libreoffice-commits] core.git: cui/uiconfig

[Taichi Haradaguchi (via logerrit)]

 cui/uiconfig/ui/optionsdialog.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2c71560cf64499365e803f710c788d033da0e5e9
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Nov 17 22:16:28 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Nov 18 07:38:14 2023 +0100

Related tdf#49895: Mark strings as translatable

...and add context strings

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

diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui
index 06fe41605dfa..d1c1984eda68 100644
--- a/cui/uiconfig/ui/optionsdialog.ui
+++ b/cui/uiconfig/ui/optionsdialog.ui
@@ -149,10 +149,10 @@
 True
 start
 True
-Type to search
+Type to search
 
   
-Type here to search in the list of 
options.
+Type here 
to search in the list of options.
   
 
   

[Libreoffice-commits] core.git: fpicker/uiconfig

[Taichi Haradaguchi (via logerrit)]

 fpicker/uiconfig/ui/explorerfiledialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92e5898fa9ffa4dd8742f5f26e790563feef286e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Nov 14 21:49:50 2023 +0900
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Nov 15 00:32:13 2023 +0100

Fix wrong context strings

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

diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui 
b/fpicker/uiconfig/ui/explorerfiledialog.ui
index 852ae4f2782f..238760f74d13 100644
--- a/fpicker/uiconfig/ui/explorerfiledialog.ui
+++ b/fpicker/uiconfig/ui/explorerfiledialog.ui
@@ -308,7 +308,7 @@
 True
 True
 True
-Remove selected folder from 
Places
+Remove selected folder from 
Places
 image2
 True
   

[Libreoffice-commits] core.git: vcl/uiconfig

[Taichi Haradaguchi (via logerrit)]

 vcl/uiconfig/ui/openlockedquerybox.ui |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 80e908b0ce68c13385c1eb5c0285665fa89d5e3d
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Nov 12 11:12:11 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Nov 14 12:35:32 2023 +0100

tdf#155138 Change context strings

"stock" -> "openlockedquerybox|[id]"

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

diff --git a/vcl/uiconfig/ui/openlockedquerybox.ui 
b/vcl/uiconfig/ui/openlockedquerybox.ui
index 74094e793024..680698d2ecef 100644
--- a/vcl/uiconfig/ui/openlockedquerybox.ui
+++ b/vcl/uiconfig/ui/openlockedquerybox.ui
@@ -21,7 +21,7 @@
 end
 
   
-_Open
+_Open
 True
 True
 False
@@ -35,7 +35,7 @@
 
 
   
-_Cancel
+_Cancel
 True
 True
 True
@@ -189,7 +189,7 @@ local system.
 
 
   
-Open Co_py
+Open Co_py
 True
 True
 True
@@ -208,7 +208,7 @@ local system.
 3
 
   
-Open _R/O
+Open _R/O
 True
 True
 True
@@ -222,7 +222,7 @@ local system.
 
 
   
-_Notify
+_Notify
 True
 True
 False

[Libreoffice-commits] core.git: xmlsecurity/uiconfig

[Taichi Haradaguchi (via logerrit)]

 xmlsecurity/uiconfig/ui/securitylevelpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4acd25cced4c22dd4dd4f718eb5a12f870fb93a9
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Oct 31 20:31:00 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Nov 4 04:59:13 2023 +0100

tdf#157588 fix extended_tip

"untrusted locations" -> "untrusted file locations"

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

diff --git a/xmlsecurity/uiconfig/ui/securitylevelpage.ui 
b/xmlsecurity/uiconfig/ui/securitylevelpage.ui
index 948c62a311c0..5292a72fcf17 100644
--- a/xmlsecurity/uiconfig/ui/securitylevelpage.ui
+++ b/xmlsecurity/uiconfig/ui/securitylevelpage.ui
@@ -72,7 +72,7 @@ Unsigned macros are disabled.
 True
 
   
-Only signed macros or macros 
from a trusted file location are allowed to run. Macros signed with untrusted 
certificates will require confirmation to run, when located in untrusted 
locations. Trusted certificates and trusted file locations can be set on the 
Trusted Sources tab page.
+Only signed macros or macros 
from a trusted file location are allowed to run. Macros signed with untrusted 
certificates will require confirmation to run, when located in untrusted file 
locations. Trusted certificates and trusted file locations can be set on the 
Trusted Sources tab page.
   
 
   

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 533e84c07b249334fb32495bb923264fb89dbdaf
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Oct 1 00:30:13 2023 +0900
Commit: Xisco Fauli 
CommitDate: Thu Nov 2 00:51:09 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 
(cherry picked from commit d8326f1f54b2f4644b52fbfa7106eeeae6e5bb7b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158704
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 04ed71b1ae90..b5516ffb6749 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 := 
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

[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: xmlsecurity/uiconfig

[Taichi Haradaguchi (via logerrit)]

 xmlsecurity/uiconfig/ui/securitylevelpage.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 095e9be9d1be7fbc7dc611aa875202a4e5837cad
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Oct 27 19:48:13 2023 +0900
Commit: Samuel Mehrbrodt 
CommitDate: Mon Oct 30 20:13:50 2023 +0100

tdf#157588 More clarify meaning of High macro security level

Change-Id: I7a56ed976ddac9917721da1247c55a735ae77d32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158557
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/xmlsecurity/uiconfig/ui/securitylevelpage.ui 
b/xmlsecurity/uiconfig/ui/securitylevelpage.ui
index 0c9d9ae1b7cd..948c62a311c0 100644
--- a/xmlsecurity/uiconfig/ui/securitylevelpage.ui
+++ b/xmlsecurity/uiconfig/ui/securitylevelpage.ui
@@ -61,7 +61,7 @@ Confirmation required before executing macros from untrusted 
sources.
 
   
 H_igh.
-Only signed macros and macros from trusted file sources are executed.
+Only signed macros and macros from trusted file locations are executed.
 Unsigned macros are disabled.
 True
 True
@@ -72,7 +72,7 @@ Unsigned macros are disabled.
 True
 
   
-Only signed macros or macros 
from a trusted file location are allowed to run. Trusted file locations can be 
set on the Trusted Sources tab page.
+Only signed macros or macros 
from a trusted file location are allowed to run. Macros signed with untrusted 
certificates will require confirmation to run, when located in untrusted 
locations. Trusted certificates and trusted file locations can be set on the 
Trusted Sources tab page.
   
 
   

[Libreoffice-commits] core.git: i18npool/Library_localedata_others.mk

[Taichi Haradaguchi (via logerrit)]

 i18npool/Library_localedata_others.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fd69b546ad36452560cb11ccb28e78632d65f045
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Oct 22 00:43:04 2023 +0900
Commit: Stephan Bergmann 
CommitDate: Sun Oct 22 22:37:25 2023 +0200

Link Library_localedata_others against sal

 etc. recently
started to fail with

> localedata_af_NA.o : error LNK2001: unresolved external symbol 
__imp_rtl_uString_release
> 
C:\cygwin\home\tdf\jenkins\daily_workspace\tb\build_master\instdir\program\localedata_others.dll
 : fatal error LNK1120: 1 unresolved externals
> touch: failed to get attributes of 
'C:/cygwin/home/tdf/jenkins/daily_workspace/tb/build_master/instdir/program/localedata_others.dll':
 No such file or directory
> make[1]: *** 
[C:/cygwin/home/tdf/jenkins/daily_workspace/tb/src_master/i18npool/Library_localedata_others.mk:10:
 
C:/cygwin/home/tdf/jenkins/daily_workspace/tb/build_master/instdir/program/localedata_others.dll]
 Error 96

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

diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index 1e9bce721a3e..f3578f2da097 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_Library_set_plugin_for_nodep,localedata_others,i18npool))
 
 $(eval $(call gb_Library_use_libraries,localedata_others,\
localedata_en \
+   sal \
 ))
 
 $(eval $(call gb_Library_use_common_precompiled_header,localedata_others))

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

[Taichi Haradaguchi (via logerrit)]

 external/python3/python-3.8-msvc-libffi.patch.1 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f1cb3bb7739b2917a2ba2bce45885bd20f6f7fba
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Oct 22 01:21:23 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Oct 22 14:45:16 2023 +0200

Replace a tab with spaces

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

diff --git a/external/python3/python-3.8-msvc-libffi.patch.1 
b/external/python3/python-3.8-msvc-libffi.patch.1
index 7a4490cd2f34..674043a7dca6 100644
--- a/external/python3/python-3.8-msvc-libffi.patch.1
+++ b/external/python3/python-3.8-msvc-libffi.patch.1
@@ -10,7 +10,7 @@


 -<_LIBFFIDLL Include="$(libffiOutDir)\libffi-7.dll" />
-+<_LIBFFIDLL Include="$(libffiOutDir)\libffi-8.dll" />
++<_LIBFFIDLL Include="$(libffiOutDir)\libffi-8.dll" />


  

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

[Taichi Haradaguchi (via logerrit)]

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

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

lxml: upgrade to release 4.9.2

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

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

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

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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/libffi external/python3

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit f298e4b24660e34e651a9b0ec349b542b661efa6
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Oct 14 11:30:48 2023 +0900
Commit: Michael Stahl 
CommitDate: Wed Oct 18 10:55:27 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>
(cherry picked from commit 7359700d5dc847accd360e70f7dcc45d119577be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158030
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 09c449b11a92..6c0684d07362 100644
--- a/download.lst
+++ b/download.lst
@@ -309,8 +309,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 ..674043a7dca6
--- /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 external/libffi external/python3

[Taichi Haradaguchi (via logerrit)]

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

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

Upgrade libffi to 3.4.4

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

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

[Libreoffice-commits] core.git: configure.ac external/bzip2 external/python3 RepositoryExternal.mk

[Taichi Haradaguchi (via logerrit)]

 RepositoryExternal.mk  |4 -
 configure.ac   |6 +-
 external/bzip2/ExternalProject_bzip2.mk|1 
 external/bzip2/UnpackedTarball_bzip2.mk|   14 +++---
 external/bzip2/disable-test.patch.0|   49 +
 external/python3/ExternalPackage_python3.mk|2 
 external/python3/ExternalProject_python3.mk|4 +
 external/python3/python-3.5.4-msvc-disable.patch.1 |   15 +++---
 8 files changed, 75 insertions(+), 20 deletions(-)

New commits:
commit c72d5d787f7a3024f2108d6d6e192b158fb144ed
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 20 20:12:54 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Oct 14 08:53:14 2023 +0200

tdf#116412 include bz2 module in internal python

This commit includes the changes in 5e3510dbb62229cfb01da371d39ecc27b0d44880
and 219bef04b7084eef49e1001312e186f390f4f735, as well as the following 
changes:

* add bzip2 as permissable build target when cross compiling for Windows 
ARM64.
* add external/bzip2/disable-test.patch.0 for cross-compiling.
* revert the changes to configure.ac in 
5e3510dbb62229cfb01da371d39ecc27b0d44880.
* change the argument of gb_UnpackedTarball_fix_end_of_line.

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a7f6dc3897ec..82a3478a1ac4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4147,7 +4147,6 @@ endef
 
 endif
 
-ifneq ($(ENABLE_ONLINE_UPDATE_MAR),)
 ifneq ($(SYSTEM_BZIP2),)
 
 define gb_LinkTarget__use_bzip2
@@ -4186,8 +4185,7 @@ define gb_ExternalProject__use_bzip2
 $(call gb_ExternalProject_use_external_project,$(1),bzip2)
 endef
 
-endif
-endif
+endif # SYSTEM_BZIP2
 
 define gb_LinkTarget__use_clew
 $(call gb_LinkTarget_set_include,$(1), \
diff --git a/configure.ac b/configure.ac
index f04904541cdc..32c2eecfbc7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2199,7 +2199,8 @@ AC_ARG_WITH(system-libs,
 
 AC_ARG_WITH(system-bzip2,
 AS_HELP_STRING([--with-system-bzip2],
-[Use bzip2 already on system. Used only when 
--enable-online-update=mar]),,
+[Use bzip2 already on system. Used when --enable-online-update=mar
+or --enable-python=internal]),,
 [with_system_bzip2="$with_system_libs"])
 
 AC_ARG_WITH(system-headers,
@@ -5827,6 +5828,7 @@ if test "$cross_compiling" = "yes"; then
 PERMITTED_BUILD_TARGETS="
 AVMEDIA
 BOOST
+BZIP2
 CAIRO
 CLUCENE
 CURL
@@ -13593,7 +13595,7 @@ dnl 
===
 dnl Test whether we need bzip2
 dnl ===
 SYSTEM_BZIP2=
-if test "$ENABLE_ONLINE_UPDATE_MAR" = "TRUE"; then
+if test "$ENABLE_ONLINE_UPDATE_MAR" = "TRUE" -o "$enable_python" = internal; 
then
 AC_MSG_CHECKING([whether to use system bzip2])
 if test "$with_system_bzip2" = yes; then
 SYSTEM_BZIP2=TRUE
diff --git a/external/bzip2/ExternalProject_bzip2.mk 
b/external/bzip2/ExternalProject_bzip2.mk
index 8b37bcd27151..b4c93a356ccc 100644
--- a/external/bzip2/ExternalProject_bzip2.mk
+++ b/external/bzip2/ExternalProject_bzip2.mk
@@ -27,6 +27,7 @@ $(call gb_ExternalProject_get_state_target,bzip2,build):
$(call gb_Trace_StartRange,bzip2,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(MAKE) \
+   CC="$(CC) -fPIC" \
)
$(call gb_Trace_EndRange,bzip2,EXTERNAL)
 endif
diff --git a/external/bzip2/UnpackedTarball_bzip2.mk 
b/external/bzip2/UnpackedTarball_bzip2.mk
index f22ca2b5ca8f..350b45c76e0a 100644
--- a/external/bzip2/UnpackedTarball_bzip2.mk
+++ b/external/bzip2/UnpackedTarball_bzip2.mk
@@ -12,13 +12,13 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,bzip2))
 $(eval $(call gb_UnpackedTarball_set_tarball,bzip2,$(BZIP2_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,bzip2,\
-   blocksort.c \
-   bzlib.c \
-   compress.c \
-   crctable.c \
-   decompress.c \
-   huffman.c \
-   randtable.c \
+   makefile.msc \
 ))
 
+ifneq ($(CROSS_COMPILING),)
+$(eval $(call gb_UnpackedTarball_add_patches,bzip2,\
+   external/bzip2/disable-test.patch.0 \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/bzip2/disable-test.patch.0 
b/external/bzip2/disable-test.patch.0
new file mode 100644
index ..10d95ed25a7a
--- /dev/null
+++ b/external/bzip2/disable-test.patch.0
@@ -0,0 +1,49 @@
+Disable bzip2 tests when cross compiling on Windows to avoid this error:
+
+> Doing 6 tests (3 compress, 3 uncompress) ...
+> If there's a problem, things 

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

[Taichi Haradaguchi (via logerrit)]

 external/skia/UnpackedTarball_skia.mk|1 -
 external/skia/clang11-flax-vector-conversion.patch.0 |   11 ---
 2 files changed, 12 deletions(-)

New commits:
commit 06b7a31cbe971470b5551044efc6c977b44bc312
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Oct 2 20:45:31 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Oct 6 02:44:39 2023 +0200

Drop some patches for old Clang

There are no longer needed after 6ef2d358ac053ce0f6de9cf0f8f25e8bae66d441
"Adapt Clang and GCC minimum version checks"

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

diff --git a/external/skia/UnpackedTarball_skia.mk 
b/external/skia/UnpackedTarball_skia.mk
index b931aefd8618..ae90f26fe15b 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -18,7 +18,6 @@ skia_patches := \
 no-trace-resources-on-exit.patch.1 \
 fix-alpha-difference-copy.patch.1 \
 share-grcontext.patch.1 \
-clang11-flax-vector-conversion.patch.0 \
 clang-attributes-warning.patch.1 \
 fontconfig-get-typeface.patch.0 \
 windows-do-not-modify-logfont.patch.0 \
diff --git a/external/skia/clang11-flax-vector-conversion.patch.0 
b/external/skia/clang11-flax-vector-conversion.patch.0
deleted file mode 100644
index aebe66c907d6..
--- a/external/skia/clang11-flax-vector-conversion.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
 src/opts/SkRasterPipeline_opts.h
-+++ src/opts/SkRasterPipeline_opts.h
-@@ -43,7 +43,7 @@
- 
- using NoCtx = const void*;
- 
--#if !defined(__clang__)
-+#if !defined(__clang__) || __clang_major__ >= 11
- #define JUMPER_IS_SCALAR
- #elif defined(SK_ARM_HAS_NEON)
- #define JUMPER_IS_NEON

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

[Taichi Haradaguchi (via logerrit)]

 external/poppler/UnpackedTarball_poppler.mk |2 
 external/poppler/gcc7-EntityInfo.patch.1|   55 
 external/poppler/gcc7-GfxFont.patch.1   |   94 
 3 files changed, 151 deletions(-)

New commits:
commit 12157c9e42ffd89b3e0de205a1ecf500cd78d992
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Oct 2 20:31:31 2023 +0900
Commit: Michael Stahl 
CommitDate: Wed Oct 4 10:35:16 2023 +0200

Drop some patches for old GCC

There are no longer needed after 6ef2d358ac053ce0f6de9cf0f8f25e8bae66d441
"Adapt Clang and GCC minimum version checks"

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

diff --git a/external/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
index 73265d8ec65b..c6ddbf9785d3 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -17,8 +17,6 @@ $(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 \
external/poppler/pch.patch.0 \
 ))
diff --git a/external/poppler/gcc7-EntityInfo.patch.1 
b/external/poppler/gcc7-EntityInfo.patch.1
deleted file mode 100644
index 1dd7c83ad475..
--- a/external/poppler/gcc7-EntityInfo.patch.1
+++ /dev/null
@@ -1,55 +0,0 @@
-gcc 7.3.1 says:
-
-workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc:42:34: error: 
function ‘X509CertificateInfo::EntityInfo& 
X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo&&)’ 
defaulted on its redeclaration with an exception-specification that differs 
from the implicit exception-specification ‘’
-
-workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc: In member function 
‘void 
X509CertificateInfo::setPublicKeyInfo(X509CertificateInfo::PublicKeyInfo&&)’:
-workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc:106:39: error: use 
of deleted function ‘X509CertificateInfo::PublicKeyInfo& 
X509CertificateInfo::PublicKeyInfo::operator=(X509CertificateInfo::PublicKeyInfo&&)’
- public_key_info = std::move(pkInfo);
-   ^
-In file included from 
workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc:15:0:
-workdir/UnpackedTarball/poppler/poppler/CertificateInfo.h:58:24: note: 
‘X509CertificateInfo::PublicKeyInfo& 
X509CertificateInfo::PublicKeyInfo::operator=(X509CertificateInfo::PublicKeyInfo&&)
 noexcept’ is implicitly deleted because its exception-specification does not 
match the implicit exception-specification ‘’
- PublicKeyInfo =(PublicKeyInfo &&) noexcept = default;
-^~~~
-
 poppler/poppler/CertificateInfo.h.orig 2023-06-05 19:29:14.0 
+0900
-+++ poppler/poppler/CertificateInfo.h  2023-06-19 18:10:55.760031700 +0900
-@@ -55,7 +55,7 @@
- PublicKeyInfo() = default;
- 
- PublicKeyInfo(PublicKeyInfo &&) noexcept = default;
--PublicKeyInfo =(PublicKeyInfo &&) noexcept = default;
-+PublicKeyInfo =(PublicKeyInfo &&) /*noexcept*/ = default;
- 
- PublicKeyInfo(const PublicKeyInfo &) = delete;
- PublicKeyInfo =(const PublicKeyInfo &) = delete;
-@@ -71,7 +71,7 @@
- ~EntityInfo() = default;
- 
- EntityInfo(EntityInfo &&) noexcept = default;
--EntityInfo =(EntityInfo &&) noexcept = default;
-+EntityInfo =(EntityInfo &&) /*noexcept*/ = default;
- 
- EntityInfo(const EntityInfo &) = delete;
- EntityInfo =(const EntityInfo &) = delete;
 poppler/poppler/GfxFont.cc.orig2022-09-14 20:24:32.569607333 +0200
-+++ poppler/poppler/GfxFont.cc 2022-09-14 20:24:52.323596186 +0200
-@@ -180,7 +180,7 @@
- 
- GfxFontLoc::GfxFontLoc(GfxFontLoc &) noexcept = default;
- 
--GfxFontLoc ::operator=(GfxFontLoc &) noexcept = default;
-+GfxFontLoc ::operator=(GfxFontLoc &) /*noexcept*/ = default;
- 
- void GfxFontLoc::setPath(GooString *pathA)
- {
 poppler/poppler/GfxFont.h.orig 2022-09-14 20:24:30.784608340 +0200
-+++ poppler/poppler/GfxFont.h  2022-09-14 20:25:08.850586861 +0200
-@@ -124,7 +124,7 @@
- GfxFontLoc(const GfxFontLoc &) = delete;
- GfxFontLoc(GfxFontLoc &&) noexcept;
- GfxFontLoc =(const GfxFontLoc &) = delete;
--GfxFontLoc =(GfxFontLoc &) noexcept;
-+GfxFontLoc =(GfxFontLoc &) /*noexcept*/;
- 
- // Set the 'path' string from a GooString on the heap.
- // Ownership of the object is taken.
diff --git a/external/poppler/gcc7-GfxFont.patch.1 
b/external/poppler/gcc7-GfxFont.patch.1
deleted file mode 100644
index a240b1b8bad2..
--- 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/openssl

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit ba808a28f5ea365eaf8fe5d9c7c91b417633d75f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Sep 30 23:54:06 2023 +0900
Commit: Caolán McNamara 
CommitDate: Tue Oct 3 21:39:02 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>
(cherry picked from commit d059aebd99f717d846e7746d5ff5b99d507a3160)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157466
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 3ff258e84901..823d5351c1c4 100644
--- a/download.lst
+++ b/download.lst
@@ -423,8 +423,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 external/openssl

[Taichi Haradaguchi (via logerrit)]

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

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

openssl: upgrade to release 3.0.11

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

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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - download.lst external/curl

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 5d9a942721ea683b3684e71c470d338599a80eb1
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 13 18:25:13 2023 +0900
Commit: Caolán McNamara 
CommitDate: Sun Oct 1 18:34:33 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>
(cherry picked from commit c2930ebff82c4f7ffe8377ab82627131f8544226)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157311
Reviewed-by: Michael Stahl 
(cherry picked from commit 609d4a6b8d66d02a36c57de99efd36a4b1c2b789)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157313
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 7ec467d43a66..683951549de2 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 087ea2c44b39..fdc93a46c3cb 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 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 6f6ac891e7fac111699b04f7e32e218b8897f24a
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 13 23:37:13 2023 +0900
Commit: Xisco Fauli 
CommitDate: Fri Sep 29 10:55:27 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>
(cherry picked from commit 271491c338bd1f0faad627c8d43076e6e6d2a754)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157324
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 393b47d9af49..3ff258e84901 100644
--- a/download.lst
+++ b/download.lst
@@ -555,8 +555,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

[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: Branch 'libreoffice-7-6' - download.lst external/curl

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 609d4a6b8d66d02a36c57de99efd36a4b1c2b789
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 13 18:25:13 2023 +0900
Commit: Michael Stahl 
CommitDate: Wed Sep 27 12:34:13 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>
(cherry picked from commit c2930ebff82c4f7ffe8377ab82627131f8544226)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157311
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 2b875b046e8e..393b47d9af49 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 087ea2c44b39..fdc93a46c3cb 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 

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 2 commits - download.lst external/poppler

[Taichi Haradaguchi (via logerrit)]

 download.lst|4 -
 external/poppler/StaticLibrary_poppler.mk   |   46 +++--
 external/poppler/UnpackedTarball_poppler.mk |3 
 external/poppler/disable-freetype.patch.1   |4 -
 external/poppler/gcc7-GfxFont.patch.1   |   94 
 external/poppler/poppler-config.patch.1 |   14 ++--
 6 files changed, 131 insertions(+), 34 deletions(-)

New commits:
commit 3c627c338fcfc5039d110c15e2e9089eb687c3f8
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Mar 14 19:01:26 2023 +0900
Commit: Michael Stahl 
CommitDate: Wed Sep 27 12:15:53 2023 +0200

poppler: upgrade to release 23.03.0

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

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148842
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 79e60bb93f69370f23010adb078b5a5de5a1e7b2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157251
(cherry picked from commit 8aa3645801c48f0db4a7fe4f126c4e4e7691cb08)

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

diff --git a/download.lst b/download.lst
index d490f3cd6bf3..00523c9e32d6 100644
--- a/download.lst
+++ b/download.lst
@@ -475,8 +475,8 @@ LIBPNG_TARBALL := libpng-1.6.37.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_SHA256SUM := 
b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4
+POPPLER_TARBALL := poppler-23.03.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/poppler/StaticLibrary_poppler.mk 
b/external/poppler/StaticLibrary_poppler.mk
index 1f1adba6ee34..4915c5e81fff 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -53,24 +53,26 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,poppler,\
 ))
 
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
+   UnpackedTarball/poppler/goo/gbase64 \
+   UnpackedTarball/poppler/goo/gbasename \
UnpackedTarball/poppler/goo/gfile \
-   UnpackedTarball/poppler/goo/GooTimer \
+   UnpackedTarball/poppler/goo/glibc \
+   UnpackedTarball/poppler/goo/glibc_strtok_r \
+   UnpackedTarball/poppler/goo/grandom \
+   UnpackedTarball/poppler/goo/gstrtod \
UnpackedTarball/poppler/goo/GooString \
+   UnpackedTarball/poppler/goo/GooTimer \
+   UnpackedTarball/poppler/goo/ImgWriter \
+   UnpackedTarball/poppler/goo/JpegWriter \
UnpackedTarball/poppler/goo/NetPBMWriter \
UnpackedTarball/poppler/goo/PNGWriter \
UnpackedTarball/poppler/goo/TiffWriter \
-   UnpackedTarball/poppler/goo/JpegWriter \
-   UnpackedTarball/poppler/goo/ImgWriter \
-   UnpackedTarball/poppler/goo/gstrtod \
-   UnpackedTarball/poppler/goo/grandom \
-   UnpackedTarball/poppler/goo/glibc \
-   UnpackedTarball/poppler/goo/glibc_strtok_r \
UnpackedTarball/poppler/fofi/FoFiBase \
UnpackedTarball/poppler/fofi/FoFiEncodings \
+   UnpackedTarball/poppler/fofi/FoFiIdentifier \
UnpackedTarball/poppler/fofi/FoFiTrueType \
UnpackedTarball/poppler/fofi/FoFiType1 \
UnpackedTarball/poppler/fofi/FoFiType1C \
-   UnpackedTarball/poppler/fofi/FoFiIdentifier \
UnpackedTarball/poppler/poppler/Annot \
UnpackedTarball/poppler/poppler/AnnotStampImageHelper \
UnpackedTarball/poppler/poppler/Array \
@@ -80,6 +82,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
UnpackedTarball/poppler/poppler/CertificateInfo \
UnpackedTarball/poppler/poppler/CharCodeToUnicode \
UnpackedTarball/poppler/poppler/CMap \
+   UnpackedTarball/poppler/poppler/DCTStream \
UnpackedTarball/poppler/poppler/DateInfo \
UnpackedTarball/poppler/poppler/Decrypt \
UnpackedTarball/poppler/poppler/Dict \
@@ -88,8 +91,8 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
UnpackedTarball/poppler/poppler/FILECacheLoader \
UnpackedTarball/poppler/poppler/FileSpec \
UnpackedTarball/poppler/poppler/FontEncodingTables \
-   UnpackedTarball/poppler/poppler/Form \
UnpackedTarball/poppler/poppler/FontInfo \
+   UnpackedTarball/poppler/poppler/Form \
UnpackedTarball/poppler/poppler/Function \
UnpackedTarball/poppler/poppler/Gfx \
UnpackedTarball/poppler/poppler/GfxFont \
@@ -101,43 +104,42 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
UnpackedTarball/poppler/poppler/JBIG2Stream \

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - download.lst external/libtommath

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 07e629e7822c979871fef5a10e19eaa083276e80
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 17:27:57 2023 +0900
Commit: Michael Stahl 
CommitDate: Wed Sep 27 12:14:54 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>
(cherry picked from commit 13bc0489d98b1f49a4f82fccb89d640439db4f4e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157248
Reviewed-by: Michael Stahl 
(cherry picked from commit c2f87ac01cad03e286ebb304a32b785f1dac7b60)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157288
Tested-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 2b7b69775ea5..c7827fa44076 100644
--- a/download.lst
+++ b/download.lst
@@ -346,8 +346,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.5.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 0da3128c5404..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).
 
-http://www.libtom.org/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/curl

[Taichi Haradaguchi (via logerrit)]

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

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

curl: upgrade to release 8.3.0

Fixes CVE-2023-38039

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

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

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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - configure.ac download.lst external/libwps

[Taichi Haradaguchi (via logerrit)]

 configure.ac|2 +-
 download.lst|4 ++--
 external/libwps/README  |2 +-
 external/libwps/inc/pch/precompiled_wps.hxx |3 ++-
 external/libwps/libtool.patch.0 |   13 ++---
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit d74f136da78b3690ecdf284940ac9d9a4231b56c
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Sep 21 20:23:26 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:39:15 2023 +0200

upload libwps 0.4.14

Change-Id: I0d10aafa17afaaef9b154255bf17638dd67070e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157149
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 6acdde8006e6b59758b00bc178f15f32796a1987)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157214
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index 69f5ef61bec8..bc6a09974a54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9573,7 +9573,7 @@ libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10])
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.12])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.14])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index 0044c6a8f3ab..629782352844 100644
--- a/download.lst
+++ b/download.lst
@@ -544,8 +544,8 @@ WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-WPS_SHA256SUM := 
e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb
-WPS_VERSION_MICRO := 12
+WPS_SHA256SUM := 
365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de
+WPS_VERSION_MICRO := 14
 WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/external/libwps/README b/external/libwps/README
index 3ce52187d520..1354aaa24db2 100644
--- a/external/libwps/README
+++ b/external/libwps/README
@@ -1 +1 @@
-Microsoft Works file word processor format import library from 
[http://libwps.sourceforge.net/].
+Microsoft Works file word processor format import library from 
[https://sourceforge.net/projects/libwps/].
diff --git a/external/libwps/inc/pch/precompiled_wps.hxx 
b/external/libwps/inc/pch/precompiled_wps.hxx
index 77d92f7615b6..e25d81e9c6ca 100644
--- a/external/libwps/inc/pch/precompiled_wps.hxx
+++ b/external/libwps/inc/pch/precompiled_wps.hxx
@@ -13,13 +13,14 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2019-10-13 10:00:18 using:
+ Generated on 2023-09-21 20:32:22 using:
  ./bin/update_pch external/libwps wps --cutoff=1 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
  ./bin/update_pch_bisect ./external/libwps/inc/pch/precompiled_wps.hxx "make 
external/libwps.build" --find-conflicts
 */
 
+#include 
 #if PCH_LEVEL >= 1
 #include 
 #include 
diff --git a/external/libwps/libtool.patch.0 b/external/libwps/libtool.patch.0
index cc4b08ba2147..bccd0ebdbc06 100644
--- a/external/libwps/libtool.patch.0
+++ b/external/libwps/libtool.patch.0
@@ -1,12 +1,11 @@
 ltmain.sh.sav  2018-08-02 14:21:34.0 +0200
-+++ ltmain.sh  2019-05-05 22:04:15.433588776 +0200
-@@ -7277,7 +7277,8 @@ func_mode_link ()
-   # -stdlib=*select c++ std lib with clang
+--- ltmain.sh.sav  2023-05-03 21:29:15.0 +0900
 ltmain.sh  2023-09-21 20:13:31.766938069 +0900
+@@ -7277,7 +7277,7 @@ func_mode_link ()
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \

-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--  
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+  
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-+  -fuse-ld=*|--ld-path=*)
+   
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+-  -fsanitize=*)
++  -fsanitize=*|-fuse-ld=*|--ld-path=*)
  func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
  func_append compile_command " $arg"

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - download.lst external/poppler

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 038bd4f5bd878bedda8cfee9cad2c28dba482d79
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Jun 14 09:58:15 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:37:24 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>
(cherry picked from commit 27e1c198a504deb4634f5f6673a77b5944c9f8cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157252
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 2e30742dcd5a..413fb57673d2 100644
--- a/download.lst
+++ b/download.lst
@@ -454,8 +454,8 @@ LIBTIFF_TARBALL := tiff-4.5.1.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 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - download.lst external/poppler

[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 8aa3645801c48f0db4a7fe4f126c4e4e7691cb08
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Mar 14 19:01:26 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:37:01 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 
(cherry picked from commit 79e60bb93f69370f23010adb078b5a5de5a1e7b2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157251

diff --git a/download.lst b/download.lst
index 2ca0caf36627..2e30742dcd5a 100644
--- a/download.lst
+++ b/download.lst
@@ -454,10 +454,10 @@ LIBTIFF_TARBALL := tiff-4.5.1.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  \

[Libreoffice-commits] core.git: Branch 'distro/allotropia/zeta-7-4' - 11 commits - bin/symstore.sh configure.ac download.lst external/openssl external/python3 readlicense_oo/license

[Taichi Haradaguchi (via logerrit)]

 bin/symstore.sh
|4 
 configure.ac   
|3 
 download.lst   
|4 
 
external/openssl/0001-x509-excessive-resource-use-verifying-policy-constra.patch.1
 |  222 --
 external/openssl/ExternalPackage_openssl.mk
|8 
 external/openssl/README
|2 
 external/openssl/UnpackedTarball_openssl.mk
|4 
 external/openssl/configurable-z-option.patch.0 
|6 
 external/openssl/openssl-no-_umul128-on-aarch64.patch.1
|   58 --
 external/openssl/openssl-no-ipc-cmd.patch.0
|   83 +++
 external/openssl/openssl-no-multilib.patch.0   
|   24 -
 external/openssl/system-cannot-find-path-for-move.patch.0  
|   11 
 external/python3/python-3.7.6-msvc-ssl.patch.1 
|6 
 readlicense_oo/license/license.xml 
|   73 ---
 14 files changed, 128 insertions(+), 380 deletions(-)

New commits:
commit 929ee378ce7536f3acd82b3669c09db8e96b7875
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Aug 6 01:57:31 2023 +0900
Commit: Michael Stahl 
CommitDate: Mon Sep 25 12:36:42 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>
(cherry picked from commit 72f28e12b15823197e42265af1f8dda21224c90a)

diff --git a/download.lst b/download.lst
index 58d5b64e265e..d269f5cfd3c3 100644
--- a/download.lst
+++ b/download.lst
@@ -439,8 +439,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.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
commit 78dee1875be7cd7f13a4d8727c152fd4241c403c
Author: Christian Lohmaier 
AuthorDate: Sat Mar 11 21:22:55 2023 +0100
Commit: Michael Stahl 
CommitDate: Mon Sep 25 12:35:15 2023 +0200

cross-compiling on windows needs openssl to build internal python

→ add back OPENSSL as a permissable sub-build target and explicitly
enable openssl when cross-compiling for windows_aarch64

partially reverts 4132bd5477c25a505f7bfbee1e7dcf6602c927d3

Change-Id: Ic162a2f0c6db377eadedb149fb428f0f015539f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148688
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 5f20f4ff21f597e55d899f5ea4dfe1c1fa5824bc)

diff --git a/configure.ac b/configure.ac
index b222b378e3b1..0c94e04acaca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5629,6 +5629,9 @@ if test "$cross_compiling" = "yes"; then
 if test "$_os" = "Emscripten"; then
 sub_conf_opts="$sub_conf_opts --without-system-libxml 
--without-system-fontconfig --without-system-freetype --without-system-zlib"
 fi
+# windows uses full-internal python and that in turn relies on openssl, so 
also enable openssl
+# when cross-compiling for aarch64, overriding the defaults below
+test "${PLATFORMID}" = "windows_aarch64" && sub_conf_opts="$sub_conf_opts 
--enable-openssl --with-tls=openssl"
 
 # Don't bother having configure look for stuff not needed for the build 
platform anyway
 # WARNING: any option with an argument containing spaces must be handled 
separately (see --with-theme)
commit bc527b17dddfe8eb204c1702bf28bfc7c1c564ba
Author: Andras Timar 
AuthorDate: Sun Feb 26 23:04:54 2023 +0100
Commit: Michael Stahl 
CommitDate: Mon Sep 25 12:34:57 2023 +0200

OpenSSL 3 is covered by Apache License v2

Change-Id: I20b30ce01b08787f560cd00cd87db9cec1699240
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147746
Tested-by: Jenkins
Reviewed-by: Andras Timar 
(cherry picked from commit 62d3da841b402f7cc9421d87f3f1db714b278d40)

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index d1dec6ad962f..5fdcdad12d0a 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1525,78 +1525,7 @@
 OpenSSL
 The following software may be included in this product: OpenSSL. 
Use of any of this software is governed by
 the terms of 

[Libreoffice-commits] core.git: configure.ac download.lst external/libwps

[Taichi Haradaguchi (via logerrit)]

 configure.ac|2 +-
 download.lst|4 ++--
 external/libwps/README  |2 +-
 external/libwps/inc/pch/precompiled_wps.hxx |3 ++-
 external/libwps/libtool.patch.0 |   13 ++---
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 6acdde8006e6b59758b00bc178f15f32796a1987
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Sep 21 20:23:26 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Sep 25 09:20:24 2023 +0200

upload libwps 0.4.14

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

diff --git a/configure.ac b/configure.ac
index 93e6bd11bfca..4931ad5bf4bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9589,7 +9589,7 @@ libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10])
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.12])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.14])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index 1c65320be412..71ab2bd818d5 100644
--- a/download.lst
+++ b/download.lst
@@ -549,8 +549,8 @@ WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-WPS_SHA256SUM := 
e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb
-WPS_VERSION_MICRO := 12
+WPS_SHA256SUM := 
365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de
+WPS_VERSION_MICRO := 14
 WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/external/libwps/README b/external/libwps/README
index 3ce52187d520..1354aaa24db2 100644
--- a/external/libwps/README
+++ b/external/libwps/README
@@ -1 +1 @@
-Microsoft Works file word processor format import library from 
[http://libwps.sourceforge.net/].
+Microsoft Works file word processor format import library from 
[https://sourceforge.net/projects/libwps/].
diff --git a/external/libwps/inc/pch/precompiled_wps.hxx 
b/external/libwps/inc/pch/precompiled_wps.hxx
index 77d92f7615b6..e25d81e9c6ca 100644
--- a/external/libwps/inc/pch/precompiled_wps.hxx
+++ b/external/libwps/inc/pch/precompiled_wps.hxx
@@ -13,13 +13,14 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2019-10-13 10:00:18 using:
+ Generated on 2023-09-21 20:32:22 using:
  ./bin/update_pch external/libwps wps --cutoff=1 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
  ./bin/update_pch_bisect ./external/libwps/inc/pch/precompiled_wps.hxx "make 
external/libwps.build" --find-conflicts
 */
 
+#include 
 #if PCH_LEVEL >= 1
 #include 
 #include 
diff --git a/external/libwps/libtool.patch.0 b/external/libwps/libtool.patch.0
index cc4b08ba2147..bccd0ebdbc06 100644
--- a/external/libwps/libtool.patch.0
+++ b/external/libwps/libtool.patch.0
@@ -1,12 +1,11 @@
 ltmain.sh.sav  2018-08-02 14:21:34.0 +0200
-+++ ltmain.sh  2019-05-05 22:04:15.433588776 +0200
-@@ -7277,7 +7277,8 @@ func_mode_link ()
-   # -stdlib=*select c++ std lib with clang
+--- ltmain.sh.sav  2023-05-03 21:29:15.0 +0900
 ltmain.sh  2023-09-21 20:13:31.766938069 +0900
+@@ -7277,7 +7277,7 @@ func_mode_link ()
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \

-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--  
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+  
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-+  -fuse-ld=*|--ld-path=*)
+   
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+-  -fsanitize=*)
++  -fsanitize=*|-fuse-ld=*|--ld-path=*)
  func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
  func_append compile_command " $arg"

[Libreoffice-commits] core.git: configure.ac

[Taichi Haradaguchi (via logerrit)]

 configure.ac |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0ff322adfecec99751b249bac0c75b02ac570bf0
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Sep 11 19:41:45 2023 +0900
Commit: Stephan Bergmann 
CommitDate: Thu Sep 14 09:47:21 2023 +0200

Latest VS 2022 Preview is 17.8.0 now

...while latest proper VS 2022 is 17.7.4

Change-Id: I949913ffd79a338b2792ad9baa88532a1406cf4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156820
Tested-by: Stephan Bergmann 
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 5a682dde4d61..be1c11e45d38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4004,7 +4004,7 @@ map_vs_year_to_version()
 2022)
 vsversion=17;;
 2022preview)
-vsversion=17.7;;
+vsversion=17.8;;
 *)
 AC_MSG_ERROR([Assertion failure - invalid argument "$1" to 
map_vs_year_to_version()]);;
 esac
@@ -4124,7 +4124,7 @@ find_msvc()
 vcyear=2019
 vctoolset=v142
 ;;
-17.0 | 17.7)
+17.0 | 17.8)
 vcyear=2022
 vctoolset=v143
 ;;
@@ -4296,7 +4296,7 @@ if test "$_os" = "WINNT"; then
 # are always "better", we list them in reverse chronological order.
 
 case "$vcnumwithdot" in
-16.0 | 17.0 | 17.7)
+16.0 | 17.0 | 17.8)
 WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0"
 ;;
 esac
@@ -6647,7 +6647,7 @@ find_msms()
 
 msmdir=
 case "$VCVER" in
-16.0 | 17.0 | 17.7)
+16.0 | 17.0 | 17.8)
 for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
 my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$l/MergeModules/"
 echo "$as_me:$LINENO: looking for $my_msm_dir${my_msm_file}])" >&5
@@ -6683,7 +6683,7 @@ find_msvc_x64_dlls()
 
 msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
 case "$VCVER" in
-16.0 | 17.0 | 17.7)
+16.0 | 17.0 | 17.8)
 for crtver in 141 142 143; do
 for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
 echo "$as_me:$LINENO: testing 
$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT" >&5

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

[Taichi Haradaguchi (via logerrit)]

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

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

libgpg-error: upgrade to release 1.47

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

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

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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - download.lst

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 6009fecd6c468f8d7e45caa43504658be2d382c4
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Aug 6 01:57:31 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Aug 15 12:15:16 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>
(cherry picked from commit 72f28e12b15823197e42265af1f8dda21224c90a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155392
Reviewed-by: Xisco Fauli 
(cherry picked from commit 6ce475503dacf47a34be8b19678befafa37bbfb1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155394

diff --git a/download.lst b/download.lst
index 754fdb56e150..5d426f7717c5 100644
--- a/download.lst
+++ b/download.lst
@@ -419,8 +419,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.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: Branch 'libreoffice-7-6' - download.lst external/openldap

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit a0348d148a3be3b64640d2809ea6c5ad168344d2
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Aug 7 17:01:24 2023 +0900
Commit: Michael Stahl 
CommitDate: Tue Aug 15 11:36:10 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>
(cherry picked from commit af3e5bef6c4e6b3158a7ab5a97c22909a7a1faa5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155606
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 7c6da561227e..5f319a6e2841 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 external/openldap

[Taichi Haradaguchi (via logerrit)]

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

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

openldap: upgrade to release 2.6.6

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

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

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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6-0' - download.lst

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit bab60c3de24b1952034f51d6155be3ee233ddf6f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Aug 6 01:57:31 2023 +0900
Commit: Christian Lohmaier 
CommitDate: Mon Aug 7 15:22:06 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>
(cherry picked from commit 72f28e12b15823197e42265af1f8dda21224c90a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155392
Reviewed-by: Xisco Fauli 
(cherry picked from commit 72c058e25bd034645efa1900dc898f065d8175dc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155398
Reviewed-by: Michael Stahl 
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index cd4f75c9d2e4..b9ed3b6e69ef 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: Branch 'libreoffice-7-6' - download.lst

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 72c058e25bd034645efa1900dc898f065d8175dc
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Aug 6 01:57:31 2023 +0900
Commit: Xisco Fauli 
CommitDate: Mon Aug 7 10:34:59 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>
(cherry picked from commit 72f28e12b15823197e42265af1f8dda21224c90a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155392
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 1bb3767bcbe8..7c6da561227e 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: configure.ac external/bzip2 external/python3 RepositoryExternal.mk

[Taichi Haradaguchi (via logerrit)]

 RepositoryExternal.mk  |4 +++-
 configure.ac   |   16 
 external/bzip2/ExternalProject_bzip2.mk|1 -
 external/python3/ExternalPackage_python3.mk|1 -
 external/python3/ExternalProject_python3.mk|4 
 external/python3/python-3.5.4-msvc-disable.patch.1 |   12 ++--
 6 files changed, 17 insertions(+), 21 deletions(-)

New commits:
commit 5cd48b4969d25400cc6634fb64706a763528ec65
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Aug 6 11:32:18 2023 +0200
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Aug 7 05:59:22 2023 +0200

Revert "tdf#116412: include bz2 in internal python"

This reverts commit 5e3510dbb62229cfb01da371d39ecc27b0d44880.

Reason for revert: occured build error at 
https://ci.libreoffice.org/view/tb%20platform%20status/job/lo_daily_tb_win_arm64/966/

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e272cf7e991e..0d70c7e966fb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4136,6 +4136,7 @@ endef
 
 endif
 
+ifneq ($(ENABLE_ONLINE_UPDATE_MAR),)
 ifneq ($(SYSTEM_BZIP2),)
 
 define gb_LinkTarget__use_bzip2
@@ -4174,7 +4175,8 @@ define gb_ExternalProject__use_bzip2
 $(call gb_ExternalProject_use_external_project,$(1),bzip2)
 endef
 
-endif # SYSTEM_BZIP2
+endif
+endif
 
 define gb_LinkTarget__use_clew
 $(call gb_LinkTarget_set_include,$(1), \
diff --git a/configure.ac b/configure.ac
index 9596d04b117f..7f5c0ff66430 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2192,8 +2192,7 @@ AC_ARG_WITH(system-libs,
 
 AC_ARG_WITH(system-bzip2,
 AS_HELP_STRING([--with-system-bzip2],
-[Use bzip2 already on system. Used when --enable-online-update=mar
- or --enable-python=internal]),,
+[Use bzip2 already on system. Used only when 
--enable-online-update=mar]),,
 [with_system_bzip2="$with_system_libs"])
 
 AC_ARG_WITH(system-headers,
@@ -13551,16 +13550,17 @@ AC_SUBST(PRIVACY_POLICY_URL)
 dnl ===
 dnl Test whether we need bzip2
 dnl ===
-if test "$ENABLE_ONLINE_UPDATE_MAR" = "TRUE" -o "$enable_python" = "internal"; 
then
+SYSTEM_BZIP2=
+if test "$ENABLE_ONLINE_UPDATE_MAR" = "TRUE"; then
 AC_MSG_CHECKING([whether to use system bzip2])
 if test "$with_system_bzip2" = yes; then
-AC_MSG_RESULT([external])
 SYSTEM_BZIP2=TRUE
-AC_CHECK_HEADER(bzlib.h, [], [AC_MSG_ERROR(bzlib.h not found. please 
install bzip2.)], [])
-AC_CHECK_LIB([bz2], [BZ2_bzDecompressInit], [:], [AC_MSG_ERROR(libbz2 
not found or functional.)], [])
+AC_MSG_RESULT([yes])
+PKG_CHECK_MODULES(BZIP2, bzip2)
+FilterLibs "${BZIP2_LIBS}"
+BZIP2_LIBS="${filteredlibs}"
 else
-AC_MSG_RESULT([internal])
-SYSTEM_BZIP2=
+AC_MSG_RESULT([no])
 BUILD_TYPE="$BUILD_TYPE BZIP2"
 fi
 fi
diff --git a/external/bzip2/ExternalProject_bzip2.mk 
b/external/bzip2/ExternalProject_bzip2.mk
index b4c93a356ccc..8b37bcd27151 100644
--- a/external/bzip2/ExternalProject_bzip2.mk
+++ b/external/bzip2/ExternalProject_bzip2.mk
@@ -27,7 +27,6 @@ $(call gb_ExternalProject_get_state_target,bzip2,build):
$(call gb_Trace_StartRange,bzip2,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(MAKE) \
-   CC="$(CC) -fPIC" \
)
$(call gb_Trace_EndRange,bzip2,EXTERNAL)
 endif
diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index 5b67765bc930..1f29c9efbebb 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -65,7 +65,6 @@ python3_EXTENSION_MODULES= \
LO_lib/binascii.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/_bisect.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/_blake2.$(python3_EXTENSION_MODULE_SUFFIX).so \
-   LO_lib/_bz2.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/cmath.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/_codecs_cn.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/_codecs_hk.$(python3_EXTENSION_MODULE_SUFFIX).so \
diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index 0b91f0774886..f1c5f6d9b4a5 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_ExternalProject_ExternalProject,python3))
 
 $(eval $(call gb_ExternalProject_use_externals,python3,\
-   bzip2 \
expat \
$(if $(filter WNT 

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

[Taichi Haradaguchi (via logerrit)]

 external/python3/ExternalPackage_python3.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f454a774053d2f631009612c78713822f6afdbd2
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Aug 6 07:51:24 2023 +0200
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Aug 6 08:41:49 2023 +0200

Revert "external/python3: fix Windows build"

This reverts commit 219bef04b7084eef49e1001312e186f390f4f735.

Reason for revert: occured build error at 
https://ci.libreoffice.org/view/tb%20platform%20status/job/lo_daily_tb_win_arm64/972/

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

diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index 7d7ff7d04c2c..5b67765bc930 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -27,7 +27,6 @@ $(eval $(call 
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYT
 endif
 python3_EXTENSION_MODULES= \
PCbuild/$(python_arch_subdir)_asyncio$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
-   PCbuild/$(python_arch_subdir)_bz2$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd 
\
PCbuild/$(python_arch_subdir)_ctypes$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
PCbuild/$(python_arch_subdir)_decimal$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
PCbuild/$(python_arch_subdir)_elementtree$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \

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

[Taichi Haradaguchi (via logerrit)]

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

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

openssl: upgrade to release 3.0.10

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

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

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

[Taichi Haradaguchi (via logerrit)]

 external/python3/ExternalPackage_python3.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 219bef04b7084eef49e1001312e186f390f4f735
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Aug 5 17:13:54 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Aug 6 04:29:29 2023 +0200

external/python3: fix Windows build

...after commit 5e3510dbb62229cfb01da371d39ecc27b0d44880
(tdf#116412: include bz2 in internal python)

add _bz2*.pyd modules.

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

diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index 5b67765bc930..7d7ff7d04c2c 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -27,6 +27,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYT
 endif
 python3_EXTENSION_MODULES= \
PCbuild/$(python_arch_subdir)_asyncio$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+   PCbuild/$(python_arch_subdir)_bz2$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd 
\
PCbuild/$(python_arch_subdir)_ctypes$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
PCbuild/$(python_arch_subdir)_decimal$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
PCbuild/$(python_arch_subdir)_elementtree$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \

[Libreoffice-commits] core.git: configure.ac external/bzip2 external/python3 RepositoryExternal.mk

[Taichi Haradaguchi (via logerrit)]

 RepositoryExternal.mk  |4 +---
 configure.ac   |   16 
 external/bzip2/ExternalProject_bzip2.mk|1 +
 external/python3/ExternalPackage_python3.mk|1 +
 external/python3/ExternalProject_python3.mk|4 
 external/python3/python-3.5.4-msvc-disable.patch.1 |   12 ++--
 6 files changed, 21 insertions(+), 17 deletions(-)

New commits:
commit 5e3510dbb62229cfb01da371d39ecc27b0d44880
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 7 11:57:48 2022 +0200
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Jul 30 09:20:29 2023 +0200

tdf#116412: include bz2 in internal python

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0d70c7e966fb..e272cf7e991e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4136,7 +4136,6 @@ endef
 
 endif
 
-ifneq ($(ENABLE_ONLINE_UPDATE_MAR),)
 ifneq ($(SYSTEM_BZIP2),)
 
 define gb_LinkTarget__use_bzip2
@@ -4175,8 +4174,7 @@ define gb_ExternalProject__use_bzip2
 $(call gb_ExternalProject_use_external_project,$(1),bzip2)
 endef
 
-endif
-endif
+endif # SYSTEM_BZIP2
 
 define gb_LinkTarget__use_clew
 $(call gb_LinkTarget_set_include,$(1), \
diff --git a/configure.ac b/configure.ac
index ca0bdbcadfe7..7e60bd70cc02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2194,7 +2194,8 @@ AC_ARG_WITH(system-libs,
 
 AC_ARG_WITH(system-bzip2,
 AS_HELP_STRING([--with-system-bzip2],
-[Use bzip2 already on system. Used only when 
--enable-online-update=mar]),,
+[Use bzip2 already on system. Used when --enable-online-update=mar
+ or --enable-python=internal]),,
 [with_system_bzip2="$with_system_libs"])
 
 AC_ARG_WITH(system-headers,
@@ -13551,17 +13552,16 @@ AC_SUBST(PRIVACY_POLICY_URL)
 dnl ===
 dnl Test whether we need bzip2
 dnl ===
-SYSTEM_BZIP2=
-if test "$ENABLE_ONLINE_UPDATE_MAR" = "TRUE"; then
+if test "$ENABLE_ONLINE_UPDATE_MAR" = "TRUE" -o "$enable_python" = "internal"; 
then
 AC_MSG_CHECKING([whether to use system bzip2])
 if test "$with_system_bzip2" = yes; then
+AC_MSG_RESULT([external])
 SYSTEM_BZIP2=TRUE
-AC_MSG_RESULT([yes])
-PKG_CHECK_MODULES(BZIP2, bzip2)
-FilterLibs "${BZIP2_LIBS}"
-BZIP2_LIBS="${filteredlibs}"
+AC_CHECK_HEADER(bzlib.h, [], [AC_MSG_ERROR(bzlib.h not found. please 
install bzip2.)], [])
+AC_CHECK_LIB([bz2], [BZ2_bzDecompressInit], [:], [AC_MSG_ERROR(libbz2 
not found or functional.)], [])
 else
-AC_MSG_RESULT([no])
+AC_MSG_RESULT([internal])
+SYSTEM_BZIP2=
 BUILD_TYPE="$BUILD_TYPE BZIP2"
 fi
 fi
diff --git a/external/bzip2/ExternalProject_bzip2.mk 
b/external/bzip2/ExternalProject_bzip2.mk
index 8b37bcd27151..b4c93a356ccc 100644
--- a/external/bzip2/ExternalProject_bzip2.mk
+++ b/external/bzip2/ExternalProject_bzip2.mk
@@ -27,6 +27,7 @@ $(call gb_ExternalProject_get_state_target,bzip2,build):
$(call gb_Trace_StartRange,bzip2,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(MAKE) \
+   CC="$(CC) -fPIC" \
)
$(call gb_Trace_EndRange,bzip2,EXTERNAL)
 endif
diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index 1f29c9efbebb..5b67765bc930 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -65,6 +65,7 @@ python3_EXTENSION_MODULES= \
LO_lib/binascii.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/_bisect.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/_blake2.$(python3_EXTENSION_MODULE_SUFFIX).so \
+   LO_lib/_bz2.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/cmath.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/_codecs_cn.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/_codecs_hk.$(python3_EXTENSION_MODULE_SUFFIX).so \
diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index f1c5f6d9b4a5..0b91f0774886 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_ExternalProject_ExternalProject,python3))
 
 $(eval $(call gb_ExternalProject_use_externals,python3,\
+   bzip2 \
expat \
$(if $(filter WNT LINUX,$(OS)),libffi) \
openssl \
@@ -36,6 +37,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(call gb_Trace_StartRange,python3,EXTERNAL)
$(call gb_ExternalProject_run,build,\
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/libtommath

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 89da375303b085e0ebb2604e1c51cc90b1099ab9
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 17:27:57 2023 +0900
Commit: خالد حسني 
CommitDate: Tue Jul 25 10:57:58 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>
(cherry picked from commit 13bc0489d98b1f49a4f82fccb89d640439db4f4e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154315
Reviewed-by: خالد حسني 

diff --git a/download.lst b/download.lst
index a218a4c388e8..cd4f75c9d2e4 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: Branch 'libreoffice-7-6' - configure.ac connectivity/Library_postgresql-sdbc-impl.mk download.lst extensions/Library_ldapbe2.mk external/openldap external/postgresql

[Taichi Haradaguchi (via logerrit)]

 configure.ac  |4 -
 connectivity/Library_postgresql-sdbc-impl.mk  |3 
 download.lst  |4 -
 extensions/Library_ldapbe2.mk |4 -
 external/openldap/ExternalProject_openldap.mk |   20 ++
 external/openldap/README  |2 
 external/openldap/openldap-2.4.44.patch.1 |   67 --
 external/postgresql/ExternalProject_postgresql.mk |6 -
 8 files changed, 18 insertions(+), 92 deletions(-)

New commits:
commit f5d1b16ca2b85901d04e6f9dcad16cd36bad2333
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Dec 5 01:47:35 2022 +0900
Commit: خالد حسني 
CommitDate: Tue Jul 25 10:57:39 2023 +0200

openldap: upgrade to release 2.6.4

Fixes CVE-2023-2953.

Because NSS support has been removed in release 2.5,
switch TLS/SSL module used by OpenLDAP to OpenSSL.

Add -pthread flag to openldap_LDFLAGS when building on Linux.
This avoids errors that occur in libcrypto.a 
(libcrypto-lib-threads_pthread.o).

Change-Id: I4779ce40233d144d930f20e85db7b4ba08f91ea1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143646
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 299ea597d154e1dc3d0f09adf67e05747cca54cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154414
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/configure.ac b/configure.ac
index b399b34ff23b..d519ee72a7d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10654,14 +10654,14 @@ dnl 
===
 
 if test "$test_openldap" = yes; then
 AC_MSG_CHECKING([whether to enable LDAP support])
-if test "$enable_ldap" = yes -a \( "$ENABLE_NSS" = TRUE -o 
"$with_system_openldap" = yes \); then
+if test "$enable_ldap" = yes -a \( "$enable_openssl" = yes -o 
"$with_system_openldap" = yes \); then
 AC_MSG_RESULT([yes])
 ENABLE_LDAP=TRUE
 else
 if test "$enable_ldap" != "yes"; then
 AC_MSG_RESULT([no])
 else
-AC_MSG_RESULT([no (needs NSS or system openldap)])
+AC_MSG_RESULT([no (needs OPENSSL or system openldap)])
 fi
 fi
 
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk 
b/connectivity/Library_postgresql-sdbc-impl.mk
index 497f5b742ef4..19a61ff92534 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -49,9 +49,6 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
 $(if $(ENABLE_OPENSSL),openssl) \
 $(if $(ENABLE_LDAP), \
 openldap \
-nss3 \
-plc4 \
-ssl3 \
 ) \
 ) \
 ))
diff --git a/download.lst b/download.lst
index 9a7ae74a1a9e..a218a4c388e8 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 := 
99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34
-OPENLDAP_TARBALL := openldap-2.4.59.tgz
+OPENLDAP_SHA256SUM := 
d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
+OPENLDAP_TARBALL := openldap-2.6.4.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index 58ea11b2d0ce..c08ed88f744e 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -46,9 +46,7 @@ else # 0S!=WNT
 $(eval $(call gb_Library_use_externals,ldapbe2,\
boost_headers \
openldap \
-   nss3 \
-   plc4 \
-   ssl3 \
+   openssl \
 ))
 endif
 
diff --git a/external/openldap/ExternalProject_openldap.mk 
b/external/openldap/ExternalProject_openldap.mk
index 6914d167b56c..e02a35d9943f 100644
--- a/external/openldap/ExternalProject_openldap.mk
+++ b/external/openldap/ExternalProject_openldap.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,openldap))
 
-$(eval $(call gb_ExternalProject_use_externals,openldap,nss3))
+$(eval $(call gb_ExternalProject_use_externals,openldap,openssl))
 
 $(eval $(call gb_ExternalProject_register_targets,openldap,\
build \
@@ -25,12 +25,10 @@ openldap_CFLAGS = -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE 
-D_BSD_SOURCE
 endif
 
 openldap_LDFLAGS = $(call gb_ExternalProject_get_link_flags,openldap)
-ifeq ($(SYSTEM_NSS),)
-openldap_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib
+ifeq ($(SYSTEM_OPENSSL),)
+openldap_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)
 endif
-# Help openldap's configure determine that it needs -lpthread even if 
libasan.so
-# contains a pthread_create override:
-ifneq ($(filter