from:"Stephan Bergmann"

core.git: Branch 'distro/allotropia/zeta-24-2' - vcl/qt5 vcl/unx

2024-11-06 Thread Stephan Bergmann (via logerrit)

 vcl/qt5/QtFrame.cxx   |   14 +++---
 vcl/qt5/QtInstance.cxx|2 +-
 vcl/unx/gtk3/gtkframe.cxx |   16 
 3 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 349eb0b74ed662b65e3313b1378feebc10fec70b
Author: Stephan Bergmann 
AuthorDate: Wed Nov 6 13:27:22 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 6 14:45:15 2024 +0100

Fix the names of the branded app icons used on Linux

...to match what we install at
/usr/share/icons/hicolor/*/apps/*.{png,svg} (so that e.g. a Linux
desktop's Alt-Tab overview will show correct icons and app names).

In a similar vein, fix the name of the .desktop file referenced in
QtInstance.cxx.

Unfortunately, there doesn't seem to be a way to compute the relevant
names at build time, so hard-code them for now.

Change-Id: Ica352c3a14820059ce69ad8019c042bb90752d3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176139
Tested-by: allotropia jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 1c3839a287d9..82a30554ff57 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -361,19 +361,19 @@ void QtFrame::SetIcon(sal_uInt16 nIcon)
 QString appicon;
 
 if (nIcon == SV_ICON_ID_TEXT)
-appicon = "libreoffice-writer";
+appicon = "zetaoffice24.2-writer";
 else if (nIcon == SV_ICON_ID_SPREADSHEET)
-appicon = "libreoffice-calc";
+appicon = "zetaoffice24.2-calc";
 else if (nIcon == SV_ICON_ID_DRAWING)
-appicon = "libreoffice-draw";
+appicon = "zetaoffice24.2-draw";
 else if (nIcon == SV_ICON_ID_PRESENTATION)
-appicon = "libreoffice-impress";
+appicon = "zetaoffice24.2-impress";
 else if (nIcon == SV_ICON_ID_DATABASE)
-appicon = "libreoffice-base";
+appicon = "zetaoffice24.2-base";
 else if (nIcon == SV_ICON_ID_FORMULA)
-appicon = "libreoffice-math";
+appicon = "zetaoffice24.2-math";
 else
-appicon = "libreoffice-startcenter";
+appicon = "zetaoffice24.2-startcenter";
 
 QIcon aIcon = QIcon::fromTheme(appicon);
 m_pQWidget->window()->setWindowIcon(aIcon);
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index 2840e6e9d5d2..2fecefcfbfb3 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -283,7 +283,7 @@ void QtInstance::AfterAppInit()
 // set the default application icon via desktop file just on Wayland,
 // as this otherwise overrides the individual desktop icons on X11.
 if (QGuiApplication::platformName() == "wayland")
-
QGuiApplication::setDesktopFileName(QStringLiteral("libreoffice-startcenter.desktop"));
+
QGuiApplication::setDesktopFileName(QStringLiteral("zetaoffice24.2-startcenter.desktop"));
 QGuiApplication::setLayoutDirection(AllSettings::GetLayoutRTL() ? 
Qt::RightToLeft
 : 
Qt::LeftToRight);
 }
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index f31274e54f4e..e8a2a0b40e1d 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -1919,19 +1919,19 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon )
 gchar* appicon;
 
 if (nIcon == SV_ICON_ID_TEXT)
-appicon = g_strdup ("libreoffice-writer");
+appicon = g_strdup ("zetaoffice24.2-writer");
 else if (nIcon == SV_ICON_ID_SPREADSHEET)
-appicon = g_strdup ("libreoffice-calc");
+appicon = g_strdup ("zetaoffice24.2-calc");
 else if (nIcon == SV_ICON_ID_DRAWING)
-appicon = g_strdup ("libreoffice-draw");
+appicon = g_strdup ("zetaoffice24.2-draw");
 else if (nIcon == SV_ICON_ID_PRESENTATION)
-appicon = g_strdup ("libreoffice-impress");
+appicon = g_strdup ("zetaoffice24.2-impress");
 else if (nIcon == SV_ICON_ID_DATABASE)
-appicon = g_strdup ("libreoffice-base");
+appicon = g_strdup ("zetaoffice24.2-base");
 else if (nIcon == SV_ICON_ID_FORMULA)
-appicon = g_strdup ("libreoffice-math");
+appicon = g_strdup ("zetaoffice24.2-math");
 else
-appicon = g_strdup ("libreoffice-startcenter");
+appicon = g_strdup ("zetaoffice24.2-startcenter");
 
 SetIcon(appicon);
 
@@ -2016,7 +2016,7 @@ void GtkSalFrame::Show( bool bVisible, bool 
/*bNoActivate*/ )
 if (bAppIdImmutable)
 {
 OString sOrigName(g_get_prgname());
-g_set_prgname("libreoffice-startcenter");
+g_set_prgname("zetaoffice24.2-startcenter");
 gtk_widget_show(m_pWindow);
 g_set_prgname(sOrigName.getStr());
 }

core.git: svx/source

2024-11-05 Thread Stephan Bergmann (via logerrit)

 svx/source/svdraw/svdotextdecomposition.cxx |2 +-
 svx/source/svdraw/svdotextpathdecomposition.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dc9dcb5c00503a8b82f7f6cc73097332ea3b802b
Author: Stephan Bergmann 
AuthorDate: Tue Nov 5 12:39:22 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 6 08:24:15 2024 +0100

loplugin:redundantcast

...after 11b15571475414ef853e21a6c96afa2ac81f848f "convert KernArray from
sal_Int32 to double"

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

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 2c04df143f8e..9d2fe097a84a 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -299,7 +299,7 @@ namespace
 aDXArray.reserve(rInfo.mnTextLen);
 for(sal_Int32 a=0; a < rInfo.mnTextLen; a++)
 {
-aDXArray.push_back(static_cast(rInfo.mpDXArray[a]));
+aDXArray.push_back(rInfo.mpDXArray[a]);
 }
 }
 
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx 
b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 0918528ce310..cc14d78c47ac 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -81,7 +81,7 @@ namespace
 
 for(sal_Int32 a=0; a < mnTextLength; a++)
 {
-
maDblDXArray.push_back(static_cast(rInfo.mpDXArray[a]));
+maDblDXArray.push_back(rInfo.mpDXArray[a]);
 }
 }
 }

core.git: connectivity/source

2024-11-05 Thread Stephan Bergmann (via logerrit)

 connectivity/source/drivers/macab/MacabDriver.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 72890bd3b96dc235b77102a396322fe72ed72a85
Author: Stephan Bergmann 
AuthorDate: Tue Nov 5 12:22:27 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 6 08:23:54 2024 +0100

loplugin:staticconstexpr (macOS)

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

diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx 
b/connectivity/source/drivers/macab/MacabDriver.cxx
index 9c68e48f12a7..04caae0609a9 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -115,7 +115,7 @@ bool MacabImplModule::impl_loadModule()
 OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc,
 "MacabImplModule::impl_loadModule: inconsistence: inconsistency (never 
attempted load before, but some values already set)!");
 
-constexpr OUString sModuleName( u"" SAL_MODULENAME( "macabdrv1" ) ""_ustr 
);
+static constexpr OUString sModuleName( u"" SAL_MODULENAME( "macabdrv1" ) 
""_ustr );
 m_hConnectorModule = osl_loadModuleRelative( &thisModule, 
sModuleName.pData, SAL_LOADMODULE_NOW );   // LAZY! #i61335#
 OSL_ENSURE( m_hConnectorModule, "MacabImplModule::impl_loadModule: could 
not load the implementation library!" );
 if ( !m_hConnectorModule )

core.git: external/zxing

2024-11-05 Thread Stephan Bergmann (via logerrit)

 external/zxing/UnpackedTarball_zxing.mk |1 +
 external/zxing/include.patch.0  |   10 ++
 2 files changed, 11 insertions(+)

New commits:
commit e7cbcdf86e2d49f246064e9d10229104451b1274
Author: Stephan Bergmann 
AuthorDate: Tue Nov 5 12:16:19 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 6 08:23:21 2024 +0100

external/zxing: Missing include (for std::nullptr_t)

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

diff --git a/external/zxing/UnpackedTarball_zxing.mk 
b/external/zxing/UnpackedTarball_zxing.mk
index 08a7943818be..dfc899496d24 100644
--- a/external/zxing/UnpackedTarball_zxing.mk
+++ b/external/zxing/UnpackedTarball_zxing.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,zxing,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,zxing, \
external/zxing/0001-add-ZXVersion-h.patch \
+   external/zxing/include.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/zxing/include.patch.0 b/external/zxing/include.patch.0
new file mode 100644
index ..77dad56b66a5
--- /dev/null
+++ b/external/zxing/include.patch.0
@@ -0,0 +1,10 @@
+--- core/src/ZXNullable.h
 core/src/ZXNullable.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include 
+ #include 
+ #include 
+

core.git: Branch 'feature/cib_contract49d' - sw/source

2024-11-05 Thread Stephan Bergmann (via logerrit)

 sw/source/core/doc/DocumentSettingManager.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4a93d9c40cd7c9c61599ba041ea20470f964be4a
Author: Stephan Bergmann 
AuthorDate: Fri Oct 4 16:35:56 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Nov 5 16:45:16 2024 +0100

Initialize sw::DocumentSettingManager::mbNoClippingWithWrapPolygon

...newly introduced in 3800ab58355385dcb482d3089accc7ce141f5ee9 "tdf#161233
paint pictures completely also with contour wrap", and which started to make
CppunitTest_vcl_pdfexport2 CPPUNIT_TEST_NAME=testTdf124272::TestBody fail 
with

> pdfexport2.cxx:180:Assertion
> Test name: (anonymous namespace)::testTdf124272::TestBody
> assertion failed
> - Expression: it != pEnd

in some builds like <https://ci.libreoffice.org/job/lo_ubsan/3327/>

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174490
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 75f3ee7e8a06ed5fec17c358c62e3efeb8d13e8d)
Conflicts:
sw/source/core/doc/DocumentSettingManager.cxx

Change-Id: Ie55e532d8490262020388a56299390f0dd158a4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176085
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index 0e8e5d26c93c..8d7fa1d7ae05 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -109,7 +109,8 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbDropCapPunctuation(true),
 mbUseVariableWidthNBSP(false),
 mbPaintHellOverHeaderFooter(false),
-mbMinRowHeightInclBorder(false)
+mbMinRowHeightInclBorder(false),
+mbNoClippingWithWrapPolygon(false)
 
 // COMPATIBILITY FLAGS END
 {

core.git: compilerplugins/clang

2024-11-05 Thread Stephan Bergmann (via logerrit)

 compilerplugins/clang/check.cxx |   34 +++---
 1 file changed, 27 insertions(+), 7 deletions(-)

New commits:
commit 25673aaedacdd2a345407e29155be5ce99bdbbd4
Author: Stephan Bergmann 
AuthorDate: Tue Nov 5 08:37:12 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Nov 5 12:47:54 2024 +0100

Fix implementation of loplugin::isDerivedFrom

...where clang::CXXRecordDecl::forallBases is documented as:  "This routine
returns false if the class has non-computable base classes."  So, presumably
since

<https://github.com/llvm/llvm-project/commit/bf099f4682bf088aaa49b2c72fb1ef3250213fbb>
"[llvm][ADT] Structured bindings for move-only types in `StringMap` 
(#114676)"
changed

> -template 
> -struct tuple_element>
> -: std::conditional {};
> +template 
> +struct std::tuple_element>
> +: std::tuple_element> {};

in LLVM's llvm/include/llvm/ADT/StringMapEntry.h, our !forallBases check 
here
started to trivially always be true for that struct tuple_element
specialization, so the isDerivedFrom check in
CheckFileVisitor::VisitCXXRecordDecl in
compilerplugins/clang/sharedvisitor/analyzer.cxx started to erroneously be 
true
for that struct, so it started to generate
compilerplugins/clang/sharedvisitor/*.plugininfo files with bogus extra

> InfoVersion:1
> ClassName:tuple_element
> InfoEnd

content, which in turn caused the generated
compilerplugins/clang/sharedvisitor/sharedvisitor.cxx to contain lots of

> #include "tuple_element.cxx"

and other nonsense, which caused the build to break with

> [CXX] compilerplugins/clang/sharedvisitor/sharedvisitor.cxx
> lo/core/compilerplugins/clang/sharedvisitor/sharedvisitor.cxx:20:10: 
fatal error: 'tuple_element.cxx' file not found
>20 | #include "tuple_element.cxx"
>   |  ^~~

etc.

(And now spelling out the implementation of forAnyBase here also reveals 
that
BaseCheckSubclass will never be called with a null BaseDefinition, so the 
code
handling that has been removed.)

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

diff --git a/compilerplugins/clang/check.cxx b/compilerplugins/clang/check.cxx
index 60e476cc37b7..9fe576db612f 100644
--- a/compilerplugins/clang/check.cxx
+++ b/compilerplugins/clang/check.cxx
@@ -374,14 +374,34 @@ bool isOkToRemoveArithmeticCast(
 }
 
 
-static bool BaseCheckNotSubclass(const clang::CXXRecordDecl *BaseDefinition, 
void *p) {
-if (!BaseDefinition)
-return true;
+static bool BaseCheckSubclass(const clang::CXXRecordDecl *BaseDefinition, void 
*p) {
+assert(BaseDefinition != nullptr);
 auto const & base = *static_cast(p);
 if (base(BaseDefinition)) {
-return false;
+return true;
 }
-return true;
+return false;
+}
+
+bool forAnyBase(
+clang::CXXRecordDecl const * decl, 
clang::CXXRecordDecl::ForallBasesCallback matches)
+{
+// Based on the implementation of clang::CXXRecordDecl::forallBases in 
LLVM's
+// clang/lib/AST/CXXInheritance.cpp:
+for (auto const & i: decl->bases()) {
+auto const t = i.getType()->getAs();
+if (t == nullptr) {
+return false;
+}
+auto const b = 
llvm::cast_or_null(t->getDecl()->getDefinition());
+if (b == nullptr || (b->isDependentContext() && 
!b->isCurrentInstantiation(decl))) {
+return false;
+}
+if (matches(b) || forAnyBase(b, matches)) {
+return true;
+}
+}
+return false;
 }
 
 bool isDerivedFrom(const clang::CXXRecordDecl *decl, DeclChecker base, bool 
checkSelf) {
@@ -392,9 +412,9 @@ bool isDerivedFrom(const clang::CXXRecordDecl *decl, 
DeclChecker base, bool chec
 if (!decl->hasDefinition()) {
 return false;
 }
-if (!decl->forallBases(
+if (forAnyBase(decl,
 [&base](const clang::CXXRecordDecl *BaseDefinition) -> bool
-{ return BaseCheckNotSubclass(BaseDefinition, &base); }))
+{ return BaseCheckSubclass(BaseDefinition, &base); }))
 {
 return true;
 }

core.git: comphelper/source

2024-11-05 Thread Stephan Bergmann (via logerrit)

 comphelper/source/crypto/Crypto.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit bb9090c60b8731a35a273cb616a04d21a9b6a125
Author: Stephan Bergmann 
AuthorDate: Tue Nov 5 08:31:16 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Nov 5 10:03:35 2024 +0100

Fix USE_TLS_OPENSSL builds

...after c8cba8ae30baef6feca3b0613366d28df4a5e568 "move CryptTools from oox 
to
comphelper so we can reuse it"

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

diff --git a/comphelper/source/crypto/Crypto.cxx 
b/comphelper/source/crypto/Crypto.cxx
index a9f8b63a635d..9a90f0aa0553 100644
--- a/comphelper/source/crypto/Crypto.cxx
+++ b/comphelper/source/crypto/Crypto.cxx
@@ -73,7 +73,7 @@ struct CryptoImpl
 CryptoImpl() = default;
 
 void setupEncryptContext(std::vector& key, 
std::vector& iv,
- Crypto::CryptoType eType)
+ CryptoType eType)
 {
 mpContext.reset(EVP_CIPHER_CTX_new());
 EVP_CIPHER_CTX_init(mpContext.get());
@@ -90,7 +90,7 @@ struct CryptoImpl
 }
 
 void setupDecryptContext(std::vector& key, 
std::vector& iv,
- Crypto::CryptoType eType)
+ CryptoType eType)
 {
 mpContext.reset(EVP_CIPHER_CTX_new());
 EVP_CIPHER_CTX_init(mpContext.get());
@@ -148,15 +148,15 @@ struct CryptoImpl
 EVP_CIPHER_CTX_cleanup(mpContext.get());
 }
 
-static const EVP_CIPHER* getCipher(Crypto::CryptoType type)
+static const EVP_CIPHER* getCipher(CryptoType type)
 {
 switch (type)
 {
-case Crypto::CryptoType::AES_128_ECB:
+case CryptoType::AES_128_ECB:
 return EVP_aes_128_ecb();
-case Crypto::CryptoType::AES_128_CBC:
+case CryptoType::AES_128_CBC:
 return EVP_aes_128_cbc();
-case Crypto::CryptoType::AES_256_CBC:
+case CryptoType::AES_256_CBC:
 return EVP_aes_256_cbc();
 default:
 break;

core.git: Branch 'feature/cib_contract49d' - sc/source

2024-11-04 Thread Stephan Bergmann (via logerrit)

 sc/source/core/data/table1.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cb2f07179a054c4bd4ca9e927f73647dcab31b9a
Author: Stephan Bergmann 
AuthorDate: Tue Oct 29 14:48:24 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Nov 5 02:00:04 2024 +0100

Missing initialization of ScTable::mbTotalsRowBelow

...introduced in 26c08356d1b2a963efdca570979cb04388371400 "tdf#162262 sc add
"Summary below data" option for Subtotal dialog"

Follow up commit: 26c08356d1b2a963efdca570979cb04388371400
(tdf#162262 sc add "Summary below data" option for Subtotal dialog)

Change-Id: I9d8e12fc24e6e42f6ee28c4879ddcff497b88c18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175793
Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175812
Tested-by: allotropia jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index f90c4a73e011..d6f910d9867d 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -282,6 +282,7 @@ ScTable::ScTable( ScDocument& rDoc, SCTAB nNewTab, const 
OUString& rNewName,
 bActiveScenario(false),
 mbPageBreaksValid(false),
 mbForceBreaks(false),
+mbTotalsRowBelow(true),
 bStreamValid(false)
 {
 aDefaultColData.InitAttrArray(new ScAttrArray(static_cast(-1), 
nNewTab, rDoc, nullptr));

core.git: config_host/config_emscripten.h.in config_host.mk.in configure.ac solenv/gbuild vcl/qt5

2024-11-04 Thread Stephan Bergmann (via logerrit)

 config_host.mk.in  |1 +
 config_host/config_emscripten.h.in |2 ++
 configure.ac   |   16 
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |4 
 vcl/qt5/QtInstance.cxx |3 ++-
 5 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit f510ce620fba08e6aa8bc40af2e47f0b51caa66d
Author: Stephan Bergmann 
AuthorDate: Mon Nov 4 17:46:47 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Nov 4 20:47:05 2024 +0100

Add experimental support for Emscripten JSPI

...which I've seen fundamentally working when building with recent emsdk 
against
recent Qt6 trunk (and including <https://github.com/qt/qtbase/pull/108> 
"Update
the check for WebAssembly JSPI support") and running on recent Chrome (with 
JSPI
enabled under )

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 20c027405df2..78874b1ee149 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -176,6 +176,7 @@ export ENABLE_DEBUG=@ENABLE_DEBUG@
 ENABLE_DOTNET=@ENABLE_DOTNET@
 SYSTEM_DRAGONBOX=@SYSTEM_DRAGONBOX@
 SYSTEM_FROZEN=@SYSTEM_FROZEN@
+export ENABLE_EMSCRIPTEN_JSPI=@ENABLE_EMSCRIPTEN_JSPI@
 export 
ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS=@ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS@
 export ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD=@ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD@
 export ENABLE_EPOXY=@ENABLE_EPOXY@
diff --git a/config_host/config_emscripten.h.in 
b/config_host/config_emscripten.h.in
index d8121613a934..c42a43c31e76 100644
--- a/config_host/config_emscripten.h.in
+++ b/config_host/config_emscripten.h.in
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#define HAVE_EMSCRIPTEN_JSPI 0
+
 #define HAVE_EMSCRIPTEN_PROXY_POSIX_SOCKETS 0
 
 #define HAVE_EMSCRIPTEN_PROXY_TO_PTHREAD 0
diff --git a/configure.ac b/configure.ac
index b1bdb7ef6030..01cb56658cff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2180,6 +2180,14 @@ AC_ARG_WITH(main-module,
 Default value is 'writer'.]),
 ,)
 
+if test "$_os" = Emscripten; then
+AC_ARG_ENABLE(emscripten-jspi,
+AS_HELP_STRING([--enable-emscripten-jspi],
+[Experimentally enable use of the Emscripten -sJSPI feature.]))
+else
+enable_emscripten_jspi=
+fi
+
 if test "$_os" = Emscripten; then
 AC_ARG_ENABLE(emscripten-proxy-to-pthread,
 AS_HELP_STRING([--disable-emscripten-proxy-to-pthread],
@@ -4199,6 +4207,14 @@ AC_SUBST(ENABLE_WASM_STRIP)
 AC_SUBST(ENABLE_WASM_STRIP_WRITER)
 AC_SUBST(ENABLE_WASM_STRIP_CALC)
 
+if test "$enable_emscripten_jspi" = yes; then
+ENABLE_EMSCRIPTEN_JSPI=TRUE
+AC_DEFINE(HAVE_EMSCRIPTEN_JSPI)
+else
+ENABLE_EMSCRIPTEN_JSPI=
+fi
+AC_SUBST(ENABLE_EMSCRIPTEN_JSPI)
+
 if test "$enable_emscripten_proxy_to_pthread" = yes; then
 ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD=TRUE
 AC_DEFINE(HAVE_EMSCRIPTEN_PROXY_TO_PTHREAD)
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 4426deba0d02..4165281d1c09 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -30,6 +30,10 @@ gb_EMSCRIPTEN_LDFLAGS += -sSTACK_SIZE=131072 
-sDEFAULT_PTHREAD_STACK_SIZE=65536
 gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain","addOnPostRun","registerType","throwBindingError"$(if
 $(ENABLE_QT6),$(COMMA)"FS"$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")]
 gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
+ifeq ($(ENABLE_EMSCRIPTEN_JSPI),TRUE)
+gb_EMSCRIPTEN_LDFLAGS += -sJSPI
+endif
+
 ifeq ($(ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS),TRUE)
 gb_EMSCRIPTEN_LDFLAGS += -sPROXY_POSIX_SOCKETS -lwebsocket.js
 endif
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index fe6fd90d0bea..b6b31366abfa 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -298,7 +299,7 @@ QtInstance::QtInstance(std::unique_ptr& pQApp)
 
 #ifndef EMSCRIPTEN
 m_bSupportsOpenGL = true;
-#else
+#elif !HAVE_EMSCRIPTEN_JSPI
 ImplGetSVData()->maAppData.m_bUseSystemLoop = true;
 #endif
 }

core.git: config_host.mk.in configure.ac instsetoo_native/CustomTarget_emscripten-install.mk solenv/gbuild static/README.wasm.md

2024-10-30 Thread Stephan Bergmann (via logerrit)

 config_host.mk.in   |1 +
 configure.ac|   13 +
 instsetoo_native/CustomTarget_emscripten-install.mk |2 +-
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk  |4 ++--
 static/README.wasm.md   |2 +-
 5 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 9416bafc23bf2b9a3c6730a6c5add4a61c461ff1
Author: Stephan Bergmann 
AuthorDate: Wed Oct 30 11:00:58 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Oct 30 13:51:40 2024 +0100

Adapt to generation of .worker.js files gone from 3.1.68

...and just unused dummies since 3.1.58, so don't install them for >= 
3.1.58,
even if the dummies would still be available for < 3.1.68

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

diff --git a/config_host.mk.in b/config_host.mk.in
index d759bc2d9ce5..20c027405df2 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -148,6 +148,7 @@ export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
 export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
 export EMSDK_FILE_PACKAGER=@EMSDK_FILE_PACKAGER@
 export EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS=@EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS@
+export EMSCRIPTEN_WORKERJS=@EMSCRIPTEN_WORKERJS@
 export ENABLE_ANDROID_LOK=@ENABLE_ANDROID_LOK@
 export ENABLE_ANDROID_EDITING=@ENABLE_ANDROID_EDITING@
 export ENABLE_AVAHI=@ENABLE_AVAHI@
diff --git a/configure.ac b/configure.ac
index f622d1eb8a7b..b1bdb7ef6030 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1440,6 +1440,7 @@ EMSCRIPTEN_MIN_MINOR=1
 EMSCRIPTEN_MIN_TINY=46
 
EMSCRIPTEN_MIN_VERSION="${EMSCRIPTEN_MIN_MAJOR}.${EMSCRIPTEN_MIN_MINOR}.${EMSCRIPTEN_MIN_TINY}"
 
+EMSCRIPTEN_WORKERJS=
 if test "$_os" = "Emscripten"; then
 AC_MSG_CHECKING([if Emscripten is at least $EMSCRIPTEN_MIN_VERSION])
 if test -z "$EMSCRIPTEN_VERSION_H"; then
@@ -1490,9 +1491,21 @@ if test "$_os" = "Emscripten"; then
 
 dnl Some build-side things are conditional on "EMSCRIPTEN in 
BUILD_TYPE_FOR_HOST":
 BUILD_TYPE="$BUILD_TYPE EMSCRIPTEN"
+
+dnl Generation of .worker.js files has been dropped completely from 
Emscripten 3.1.68, and the
+dnl generated files were just unused dummies since Emscripten 3.1.58:
+AC_MSG_CHECKING([if Emscripten still depends on a separate .worker.js 
file])
+check_semantic_version_three 3 1 58 "$EMSCRIPTEN_MAJOR" 
"$EMSCRIPTEN_MINOR" "$EMSCRIPTEN_TINY"
+if test $? -ne 0; then
+AC_MSG_RESULT([yes])
+EMSCRIPTEN_WORKERJS=TRUE
+else
+AC_MSG_RESULT([no])
+fi
 fi
 AC_SUBST(EMSDK_FILE_PACKAGER)
 AC_SUBST(EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS)
+AC_SUBST(EMSCRIPTEN_WORKERJS)
 
 ###
 # Extensions switches --enable/--disable
diff --git a/instsetoo_native/CustomTarget_emscripten-install.mk 
b/instsetoo_native/CustomTarget_emscripten-install.mk
index b81d510523a7..6f89d5e37fe4 100644
--- a/instsetoo_native/CustomTarget_emscripten-install.mk
+++ b/instsetoo_native/CustomTarget_emscripten-install.mk
@@ -18,7 +18,7 @@ emscripten_install_files := \
 soffice.data.js.metadata \
 soffice.js \
 soffice.wasm \
-soffice.worker.js \
+$(if $(EMSCRIPTEN_WORKERJS),soffice.worker.js) \
 $(if $(ENABLE_SYMBOLS_FOR),soffice.wasm.dwp) \
 $(if $(DISABLE_GUI),, \
 qt_soffice.html \
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index b80471427940..4426deba0d02 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -81,7 +81,7 @@ define gb_Executable_Executable_platform
 $(call gb_LinkTarget_add_auxtargets,$(2),\
 $(patsubst %.lib,%.linkdeps,$(3)) \
 $(patsubst %.lib,%.wasm,$(3)) \
-$(patsubst %.lib,%.worker.js,$(3)) \
+$(if $(EMSCRIPTEN_WORKERJS),$(patsubst %.lib,%.worker.js,$(3))) \
 $(patsubst %.lib,%.wasm.dwp,$(3)) \
 )
 
@@ -91,7 +91,7 @@ define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_add_auxtargets,$(2),\
 $(patsubst %.lib,%.linkdeps,$(3)) \
 $(patsubst %.lib,%.wasm,$(3)) \
-$(patsubst %.lib,%.worker.js,$(3)) \
+$(if $(EMSCRIPTEN_WORKERJS),$(patsubst %.lib,%.worker.js,$(3))) \
 $(patsubst %.lib,%.wasm.dwp,$(3)) \
 )
 
diff --git a/static/README.wasm.md b/static/README.wasm.md
index 23e1d92db207..76a956219c71 100644
--- a/static/README.wasm.md
+++ b/static/README.wasm.md
@@ -252,7 +252,7 @@ Module.uno_init.then(function() {
 ```
 
 If you enter the above examples into the browser console, you need to enter 
them into the console of
-the first soffice.worker.js thread, which is the LO

core.git: vcl/CppunitTest_vcl_gtk3_a11y.mk

2024-10-30 Thread Stephan Bergmann (via logerrit)

 vcl/CppunitTest_vcl_gtk3_a11y.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 417d0d50c8822910d93fa9edddc4e53b0260a344
Author: Stephan Bergmann 
AuthorDate: Wed Oct 30 08:43:47 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Oct 30 12:40:12 2024 +0100

Missing test dependency

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

diff --git a/vcl/CppunitTest_vcl_gtk3_a11y.mk b/vcl/CppunitTest_vcl_gtk3_a11y.mk
index cf2796ce7b79..dbfefbf1cc59 100644
--- a/vcl/CppunitTest_vcl_gtk3_a11y.mk
+++ b/vcl/CppunitTest_vcl_gtk3_a11y.mk
@@ -63,4 +63,6 @@ $(eval $(call gb_CppunitTest_use_vcl,vcl_gtk3_a11y))
 $(eval $(call gb_CppunitTest_use_instdir_configuration,vcl_gtk3_a11y))
 $(eval $(call gb_CppunitTest_use_common_configuration,vcl_gtk3_a11y))
 
+$(call gb_CppunitTest_get_target,vcl_gtk3_a11y): $(call 
gb_Library_get_target,vclplug_gtk3)
+
 # vim: set noet sw=4 ts=4:

core.git: sc/source

2024-10-29 Thread Stephan Bergmann (via logerrit)

 sc/source/core/data/table1.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a2de9dd6b1b982c782daeb79da1291680408e319
Author: Stephan Bergmann 
AuthorDate: Tue Oct 29 14:48:24 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Oct 29 18:42:18 2024 +0100

Missing initialization of ScTable::mbTotalsRowBelow

...introduced in 26c08356d1b2a963efdca570979cb04388371400 "tdf#162262 sc add
"Summary below data" option for Subtotal dialog"

Follow up commit: 26c08356d1b2a963efdca570979cb04388371400
(tdf#162262 sc add "Summary below data" option for Subtotal dialog)

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

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index f90c4a73e011..d6f910d9867d 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -282,6 +282,7 @@ ScTable::ScTable( ScDocument& rDoc, SCTAB nNewTab, const 
OUString& rNewName,
 bActiveScenario(false),
 mbPageBreaksValid(false),
 mbForceBreaks(false),
+mbTotalsRowBelow(true),
 bStreamValid(false)
 {
 aDefaultColData.InitAttrArray(new ScAttrArray(static_cast(-1), 
nNewTab, rDoc, nullptr));

core.git: Branch 'distro/allotropia/zeta-24-2' - configure.ac

2024-10-29 Thread Stephan Bergmann (via logerrit)

 configure.ac |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 9da68d9ad6308c4f5d2e154d1c36fea300ef059d
Author: Stephan Bergmann 
AuthorDate: Tue Apr 9 10:37:09 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 29 15:25:08 2024 +0100

Avoid -O2 in AC_PROG_CC/CXX, work around occasional Clang 12.0.1 SEGVs

At least with one ASan/UBSan setup of mine using LODE's Clang 12.0.1,
./autogen.sh would occasionally detect -std=gnu11 as the required CC 
"option to
enable C11 features" (which would in turn cause building external/firebird 
to
fail oddly; an issue worth investigations of its own), because Clang would
occasionally crash with a SEGV on the corresponding configure test program's
first invocation (without -std=gnu11) when invoked with -O2 (and happen to
succeed on second invocation with -std=gnu11, so configure thinks that's
needed), see below for a relevant config.log excerpt.

When CC/CXX are already set (as is the case in this scenario), we could 
arguably
skip the AC_PROG_CC/CXX checks entirely (and thus avoid configure 
potentially
adding -std=gnu11 to CC), but at least AC_PROG_CC also internally sets the 
GCC
shell var, which we use in configure.ac.  So better be conservative and just
avoid -O2 during AC_PROG_CC/CXX (whatever the autoconf motivation to 
include it
in the first place).

> configure:8165: checking for 
/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang 
-fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero 
-fsanitize=local-bounds 
-fsanitize-blacklist=/home/sberg/lo0/core/sanitize-ubsan-excludelist option to 
enable C11 features
> configure:8180: 
/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang 
-fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero 
-fsanitize=local-bounds 
-fsanitize-blacklist=/home/sberg/lo0/core/sanitize-ubsan-excludelist  -c -g -O2 
 conftest.c >&5
> PLEASE submit a bug report to https://bugs.llvm.org/ and include the 
crash backtrace, preprocessed source, and associated run script.
> Stack dump:
> 0.Program arguments: 
/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang 
-fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero 
-fsanitize=local-bounds 
-fsanitize-blacklist=/home/sberg/lo0/core/sanitize-ubsan-excludelist -c -g -O2 
conftest.c
> 1. parser at end of file
> 2.Code generation
>  #0 0x55f3a890caf2 llvm::sys::PrintStackTrace(llvm::raw_ostream&, 
int) (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1c3eaf2)
>  #1 0x55f3a890a734 llvm::sys::RunSignalHandlers() 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1c3c734)
>  #2 0x55f3a887b998 CrashRecoverySignalHandler(int) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1bad998)
>  #3 0x7f750d24e520 (/lib/x86_64-linux-gnu/libc.so.6+0x42520)
>  #4 0x55f3a93f9cd4 llvm::DIE::getUnitDie() const 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x272bcd4)
>  #5 0x55f3a9404574 llvm::DwarfDebug::finishEntityDefinitions() 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2736574)
>  #6 0x55f3a941df99 llvm::DwarfDebug::finalizeModuleInfo() 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x274ff99)
>  #7 0x55f3a9421128 llvm::DwarfDebug::endModule() 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2753128)
>  #8 0x55f3a93f1219 llvm::AsmPrinter::doFinalization(llvm::Module&) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2723219)
>  #9 0x55f3a82478f5 llvm::FPPassManager::doFinalization(llvm::Module&) 
(.localalias) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x15798f5)
> #10 0x55f3a8253900 llvm::legacy::PassManagerImpl::run(llvm::Module&) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1585900)
> #11 0x55f3a8bb57d3 (anonymous 
namespace)::EmitAssemblyHelper::EmitAssembly(clang::BackendAction, 
std::unique_ptr >) (.constprop.0) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1ee77d3)
> #12 0x55f3a8bb76ea 
clang::EmitBackendOutput(clang::DiagnosticsEngine&, clang::HeaderSearchOptions 
const&, clang::CodeGenOptions const&, clang::TargetOptions const&, 
clang::LangOptions const&, llvm::DataLayout const&, llvm::Module*, 
clang::BackendAction, std::unique_ptr >) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1ee96ea)
> #13 0x55f3a9825876 
clang::BackendConsumer::HandleTranslationUnit(clang::ASTContext&) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2b57876)
> #14 0x55f3aa35c549 cla

core.git: solenv/flatpak-manifest.in

2024-10-25 Thread Stephan Bergmann (via logerrit)

 solenv/flatpak-manifest.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1a7f87a71f25f3658af7b3b6d53637480fb5e85c
Author: Stephan Bergmann 
AuthorDate: Thu Oct 24 13:07:13 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 24 23:00:14 2024 +0200

Adapt flatpak build to upstream changes


<https://github.com/flathub/org.libreoffice.LibreOffice/commit/b9c5a10b9c0cbac84e3e63ce3ec0e6a09aab8f8d>
"gvfs: Update gvfs-1.56.0.tar.xz to 1.56.1"

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

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c1c6fff75f63..0a75e0741369 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -51,8 +51,8 @@
 "sources": [
 {
 "type": "archive",
-"url": 
"https://download.gnome.org/sources/gvfs/1.56/gvfs-1.56.0.tar.xz";,
-"sha256": 
"441d2356c72616364cdb420af96199113a13ed9e146f2175fe373989adada39e",
+"url": 
"https://download.gnome.org/sources/gvfs/1.56/gvfs-1.56.1.tar.xz";,
+"sha256": 
"86731ccec679648f8734e237b1de190ebdee6e4c8c0f56f454c31588e509aa10",
 "x-checker-data": {
 "type": "gnome",
 "name": "gvfs",

core.git: Branch 'distro/allotropia/zeta-24-2' - solenv/flatpak-manifest.in

2024-10-24 Thread Stephan Bergmann (via logerrit)

 solenv/flatpak-manifest.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ddae4b6e7391c44baa85aff270c351be30a9e579
Author: Stephan Bergmann 
AuthorDate: Thu Oct 24 13:07:13 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 25 08:42:42 2024 +0200

Adapt flatpak build to upstream changes


<https://github.com/flathub/org.libreoffice.LibreOffice/commit/b9c5a10b9c0cbac84e3e63ce3ec0e6a09aab8f8d>
"gvfs: Update gvfs-1.56.0.tar.xz to 1.56.1"

Change-Id: Iaf20b7bb5662cdcd54817f15fa366df17dab53e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175548
    Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
(cherry picked from commit 1a7f87a71f25f3658af7b3b6d53637480fb5e85c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175497
Tested-by: allotropia jenkins 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 4effc5367bed..6ff7e7835380 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -51,8 +51,8 @@
 "sources": [
 {
 "type": "archive",
-"url": 
"https://download.gnome.org/sources/gvfs/1.56/gvfs-1.56.0.tar.xz";,
-"sha256": 
"441d2356c72616364cdb420af96199113a13ed9e146f2175fe373989adada39e",
+"url": 
"https://download.gnome.org/sources/gvfs/1.56/gvfs-1.56.1.tar.xz";,
+"sha256": 
"86731ccec679648f8734e237b1de190ebdee6e4c8c0f56f454c31588e509aa10",
 "x-checker-data": {
 "type": "gnome",
 "name": "gvfs",

core.git: sw/qa

2024-10-24 Thread Stephan Bergmann (via logerrit)

 sw/qa/extras/layout/layout2.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 9517639bc3189e3ea4dc4d2f7004d4b33d754d47
Author: Stephan Bergmann 
AuthorDate: Thu Oct 24 23:07:49 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri Oct 25 01:19:15 2024 +0200

-Werror,-Wunused-variable

...after 64e8d5d8b9a56f31caff66675180342773f847a0 "sw/qa: use getSwDoc() 
more"

Change-Id: Ib13fe63cac26ff083da5d8c104921c510fa5bb7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175579
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 0743cd980526..187305d9de6c 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -2577,9 +2577,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf121509)
 save(u"Office Open XML Text"_ustr);
 
 // The second part: check if the reloaded doc has flys inside a fly
-uno::Reference xComponent
-= loadFromDesktop(maTempFile.GetURL(), 
u"com.sun.star.text.TextDocument"_ustr);
-uno::Reference xTextDoc(xComponent, uno::UNO_QUERY);
+loadFromDesktop(maTempFile.GetURL(), 
u"com.sun.star.text.TextDocument"_ustr);
 auto pSecondDoc = getSwDoc();
 auto pSecondFormats = pSecondDoc->GetSpzFrameFormats();

core.git: Branch 'libreoffice-24-8' - solenv/flatpak-manifest.in

2024-10-24 Thread Stephan Bergmann (via logerrit)

 solenv/flatpak-manifest.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 25d5ce38783f994523dc5836345ff408b0ba5fab
Author: Stephan Bergmann 
AuthorDate: Thu Oct 24 13:07:13 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri Oct 25 01:01:09 2024 +0200

Adapt flatpak build to upstream changes


<https://github.com/flathub/org.libreoffice.LibreOffice/commit/b9c5a10b9c0cbac84e3e63ce3ec0e6a09aab8f8d>
"gvfs: Update gvfs-1.56.0.tar.xz to 1.56.1"

Change-Id: Iaf20b7bb5662cdcd54817f15fa366df17dab53e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175548
    Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
(cherry picked from commit 1a7f87a71f25f3658af7b3b6d53637480fb5e85c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175496
Reviewed-by: Xisco Fauli 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ece8b838605f..a4b96c079b65 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -51,8 +51,8 @@
 "sources": [
 {
 "type": "archive",
-"url": 
"https://download.gnome.org/sources/gvfs/1.56/gvfs-1.56.0.tar.xz";,
-"sha256": 
"441d2356c72616364cdb420af96199113a13ed9e146f2175fe373989adada39e",
+"url": 
"https://download.gnome.org/sources/gvfs/1.56/gvfs-1.56.1.tar.xz";,
+"sha256": 
"86731ccec679648f8734e237b1de190ebdee6e4c8c0f56f454c31588e509aa10",
 "x-checker-data": {
 "type": "gnome",
 "name": "gvfs",

core.git: Branch 'distro/allotropia/zeta-24-2' - external/lxml

2024-10-23 Thread Stephan Bergmann (via logerrit)

 external/lxml/UnpackedTarball_lxml.mk   |1 
 external/lxml/Wincompatible-pointer-types.patch |   65 
 2 files changed, 66 insertions(+)

New commits:
commit 91d9c8ffcbef8076dee39b8a3abb70264877d833
Author: Stephan Bergmann 
AuthorDate: Wed Apr 3 20:19:17 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 23 20:51:49 2024 +0200

external/lxml: Silence -Wincompatible-pointer-types

...as seen with recent GCC 14 trunk,

> gcc -Wno-unused-result -Wsign-compare -DDYNAMIC_ANNOTATIONS_ENABLED=1 -g 
-O0 -Wall -I/home/sberg/lo/core/workdir/UnpackedTarball/zlib 
-I/home/sberg/lo/core/workdir/UnpackedTarball/python3 
-I/home/sberg/lo/core/workdir/UnpackedTarball/python3/Include -fPIC 
-DCYTHON_CLINE_IN_TRACEBACK=0 
-I/home/sberg/lo/core/workdir/UnpackedTarball/libxml2/include 
-I/home/sberg/lo/core/workdir/UnpackedTarball/libxslt -Isrc -Isrc/lxml/includes 
-I/home/sberg/lo/core/workdir/UnpackedTarball/python3/Include 
-I/home/sberg/lo/core/workdir/UnpackedTarball/python3 -c src/lxml/etree.c -o 
build/temp.linux-x86_64-3.8-pydebug/src/lxml/etree.o -w
> src/lxml/etree.c: In function ‘__pyx_pf_4lxml_5etree_11TreeBuilder_4data’:
> src/lxml/etree.c:137698:66: error: passing argument 1 of 
‘__pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData’ from incompatible pointer 
type [-Wincompatible-pointer-types]
> 137698 |   __pyx_t_1 = 
__pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData(((struct 
__pyx_obj_4lxml_5etree__SaxParserTarget *)__pyx_v_self), __pyx_v_data); if 
(unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(3, 832, __pyx_L1_error)
>| 
~^~~
>|  
|
>|  
struct __pyx_obj_4lxml_5etree__SaxParserTarget *
> src/lxml/etree.c:137074:105: note: expected ‘struct 
__pyx_obj_4lxml_5etree_TreeBuilder *’ but argument is of type ‘struct 
__pyx_obj_4lxml_5etree__SaxParserTarget *’
> 137074 | static int 
__pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData(struct 
__pyx_obj_4lxml_5etree_TreeBuilder *__pyx_v_self, PyObject *__pyx_v_data) {
>|  
~~~^~~~

etc.

Change-Id: I19f6768bf031c04730972c1fa4a006e2a7d50e27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165758
Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann 
(cherry picked from commit f09b9b2785732319fd3199337b3528de3a561393)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175428
    Tested-by: Stephan Bergmann 

diff --git a/external/lxml/UnpackedTarball_lxml.mk 
b/external/lxml/UnpackedTarball_lxml.mk
index 4248b978c06a..58905943c7ee 100644
--- a/external/lxml/UnpackedTarball_lxml.mk
+++ b/external/lxml/UnpackedTarball_lxml.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,lxml, \

external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 
\
external/lxml/replace-setuptools-with-distutils.patch.1 \
external/lxml/Wincompatible-function-pointer-types.patch \
+   external/lxml/Wincompatible-pointer-types.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/lxml/Wincompatible-pointer-types.patch 
b/external/lxml/Wincompatible-pointer-types.patch
new file mode 100644
index ..68d017c4e5fb
--- /dev/null
+++ b/external/lxml/Wincompatible-pointer-types.patch
@@ -0,0 +1,65 @@
+--- src/lxml/etree.c
 src/lxml/etree.c
+@@ -137695,7 +137695,7 @@
+  * 
+  * def start(self, tag, attrs, nsmap=None):
+  */
+-  __pyx_t_1 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData(((struct 
__pyx_obj_4lxml_5etree__SaxParserTarget *)__pyx_v_self), __pyx_v_data); if 
(unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(3, 832, __pyx_L1_error)
++  __pyx_t_1 = 
__pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData((__pyx_v_self), 
__pyx_v_data); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(3, 832, 
__pyx_L1_error)
+ 
+   /* "src/lxml/saxparser.pxi":826
+  * return self._last
+@@ -137856,7 +137856,7 @@
+  * def end(self, tag):
+  */
+   __Pyx_XDECREF(__pyx_r);
+-  __pyx_t_3 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxStart(((struct 
__pyx_obj_4lxml_5etree__SaxParserTarget *)__pyx_v_self), __pyx_v_tag, 
__pyx_v_attrs, __pyx_v_nsmap); if (unlikely(!__pyx_t_3)) __PYX_ERR(3, 841, 
__pyx_L1_error)
++  __pyx_t_3 = 
__pyx_f_4lxml_5etree_11TreeBuilder__handleSaxStart((__pyx_v_self), __pyx_v_tag, 
__pyx_v_attrs, __pyx_v_nsmap); if (unlikely(!__pyx_t_3)) __PYX_ERR(3, 841, 
__pyx_L1_error)
+   __Pyx_GOTREF(__pyx_t_3);
+   __pyx_r = __pyx_t_3;
+   __pyx_t_3 = 0;
+@@ -137927,7 +137927,7 @@
+  * assert self._last.tag == tag,\
+  * f&qu

core.git: Branch 'distro/allotropia/zeta-24-2' - sysui/CustomTarget_rpm.mk sysui/desktop

2024-10-23 Thread Stephan Bergmann (via logerrit)

 sysui/CustomTarget_rpm.mk|1 +
 sysui/desktop/freedesktop/freedesktop-menus.spec |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d1c8e03b2e77b044c042b6de713a246634dbf707
Author: Stephan Bergmann 
AuthorDate: Sun Sep 22 20:34:12 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 23 20:52:09 2024 +0200

Adapt to RPM 4.20

...which builds the spec file's code in a dedicated directory now, see
<https://github.com/rpm-software-management/rpm/issues/2078> "RFE: 
introduce an
rpm-controlled per-build directory to builds", and no longer in the 
directory
from which rpm is invoked.  So invent some libo_start_dir parameter to
communicate that directory into the rpm build.

Change-Id: I28268837caafe3b892f76e936dfa747fe13fb9bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173779
    Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
(cherry picked from commit 52b3b38f1448d2468a3e9edec758515151dc067b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175484
    Tested-by: Stephan Bergmann 

diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk
index c0ef34cc7d4d..075d3e324b27 100644
--- a/sysui/CustomTarget_rpm.mk
+++ b/sysui/CustomTarget_rpm.mk
@@ -36,6 +36,7 @@ 
$(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSI
--define "version $(PKGVERSION)" \
--define "release $(LIBO_VERSION_PATCH)" \
--define "__debug_install_post %nil" \
+   --define "libo_start_dir 
$(gb_CustomTarget_workdir)/sysui/share/$(1)" \
, $$@.log \
)
 endef
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec 
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 99ea1a4b1ecd..d635b368ebf2 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -60,7 +60,7 @@ export KDEMAINDIR=/usr
 export PREFIXDIR=/usr
 export BINDIR=/usr/bin
 
-./create_tree.sh
+(cd %libo_start_dir && ./create_tree.sh)
 
 cd $RPM_BUILD_ROOT

core.git: Branch 'distro/allotropia/zeta-24-2' - bin/distro-install-desktop-integration solenv/bin solenv/flatpak-manifest.in

2024-10-23 Thread Stephan Bergmann (via logerrit)

 bin/distro-install-desktop-integration |   18 +-
 solenv/bin/assemble-flatpak-appdata.sh |   30 +++---
 solenv/bin/assemble-flatpak-desktop.sh |   28 ++--
 solenv/bin/assemble-flatpak.sh |   20 ++--
 solenv/flatpak-manifest.in |   14 +++---
 5 files changed, 55 insertions(+), 55 deletions(-)

New commits:
commit 4632048166b349f2c755c36613f57c46954d59b5
Author: Stephan Bergmann 
AuthorDate: Tue Oct 22 13:42:22 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 23 21:42:46 2024 +0200

Branding-related fixes for flatpak build

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

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index 7e1428ffba69..f28c4633e317 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -94,7 +94,7 @@ add_wrapper()
 
 # install desktop integration from plain packages
 sysui_temp=`mktemp -d -t distro-pack-desktop-integration-XX`
-cp -a workdir/CustomTarget/sysui/share/libreoffice/* "$sysui_temp"
+cp -a workdir/CustomTarget/sysui/share/zetaoffice/* "$sysui_temp"
 cp -a "${SRCDIR?}"/sysui/desktop/share/create_tree.sh "$sysui_temp"
 cd $sysui_temp
 # we want non-versioned stuff in the distro packages
@@ -145,20 +145,20 @@ fi
 
 # wrappers and man pages
 # FIXME: do not have desktop file and MIME icon for unopkg
-add_wrapper lobase soffice "--base"   "libreoffice" 
"libreoffice-base.desktop""gid_Module_Brand_Prg_Base"
-add_wrapper localc soffice "--calc"   "libreoffice" 
"libreoffice-calc.desktop""gid_Module_Brand_Prg_Calc"
-add_wrapper lodraw soffice "--draw"   "libreoffice" 
"libreoffice-draw.desktop""gid_Module_Brand_Prg_Draw"
-add_wrapper lomath soffice "--math"   "libreoffice" 
"libreoffice-math.desktop""gid_Module_Brand_Prg_Math"
-add_wrapper loimpress  soffice "--impress""libreoffice" 
"libreoffice-impress.desktop" "gid_Module_Brand_Prg_Impress"
+add_wrapper lobase soffice "--base"   "libreoffice" 
"zetaoffice-base.desktop""gid_Module_Brand_Prg_Base"
+add_wrapper localc soffice "--calc"   "libreoffice" 
"zetaoffice-calc.desktop""gid_Module_Brand_Prg_Calc"
+add_wrapper lodraw soffice "--draw"   "libreoffice" 
"zetaoffice-draw.desktop""gid_Module_Brand_Prg_Draw"
+add_wrapper lomath soffice "--math"   "libreoffice" 
"zetaoffice-math.desktop""gid_Module_Brand_Prg_Math"
+add_wrapper loimpress  soffice "--impress""libreoffice" 
"zetaoffice-impress.desktop" "gid_Module_Brand_Prg_Impress"
 add_wrapper loweb  soffice "--web""libreoffice" "" 
   "gid_Module_Brand_Prg_Wrt"
-add_wrapper lowriter   soffice "--writer" "libreoffice" 
"libreoffice-writer.desktop"  "gid_Module_Brand_Prg_Wrt"
+add_wrapper lowriter   soffice "--writer" "libreoffice" 
"zetaoffice-writer.desktop"  "gid_Module_Brand_Prg_Wrt"
 add_wrapper lofromtemplate soffice ".uno:NewDoc"  "libreoffice" "" 
   "gid_Module_Root_Brand"
-add_wrapper libreofficesoffice """libreoffice" 
"libreoffice-startcenter.desktop" "gid_Module_Root_Brand"
+add_wrapper zetaofficesoffice """libreoffice" 
"zetaoffice-startcenter.desktop" "gid_Module_Root_Brand"
 add_wrapper lofficesoffice """libreoffice" ""  
  "gid_Module_Root_Brand"
 add_wrapper unopkg unopkg  """unopkg"  ""  
  "gid_Module_Root_Brand"
 
 # there are two more desktop files for optional filters
-test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples && echo 
"$PREFIXDIR/share/applications/libreoffice-xsltfilter.desktop" 
>>"$DESTDIR/gid_Module_Optional_Xsltfiltersamples"
+test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples &&am

core.git: Branch 'distro/allotropia/zeta-24-2' - external/lxml

2024-10-23 Thread Stephan Bergmann (via logerrit)

 external/lxml/UnpackedTarball_lxml.mk|3 
 external/lxml/Wincompatible-function-pointer-types.patch |   83 +++
 2 files changed, 86 insertions(+)

New commits:
commit ddbe1f9139c7758c3fd9e5a4b98a55178895ec8b
Author: Stephan Bergmann 
AuthorDate: Fri Jan 5 15:29:37 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Oct 23 20:51:32 2024 +0200

external/lxml: Silence -Wincompatible-function-pointer-types

...with Clang since

<https://github.com/llvm/llvm-project/commit/af01f717c48f0fd2481600ed6c00441763365b62>
"Default implicit function pointer conversions diagnostic to be an error",
causing

> src/lxml/etree.c:113121:38: error: incompatible function pointer types 
assigning to 'xmlStructuredErrorFunc' (aka 'void (*)(void *, const struct 
_xmlError *)') from 'void (void *, xmlError *)' (aka 'void (void *, struct 
_xmlError *)') [-Wincompatible-function-pointer-types]
>  113121 |   __pyx_v_self->_c_ctxt->sax->serror = 
__pyx_f_4lxml_5etree__receiveParserError;
> |  ^ 

> src/lxml/etree.c:117609:25: error: incompatible function pointer types 
assigning to 'xmlStructuredErrorFunc' (aka 'void (*)(void *, const struct 
_xmlError *)') from 'void (void *, xmlError *)' (aka 'void (void *, struct 
_xmlError *)') [-Wincompatible-function-pointer-types]
>  117609 | __pyx_v_sax->serror = 
__pyx_f_4lxml_5etree__receiveParserError;
> | ^ 

> src/lxml/etree.c:181693:28: error: incompatible function pointer types 
assigning to 'xmlStructuredErrorFunc' (aka 'void (*)(void *, const struct 
_xmlError *)') from 'void (void *, xmlError *)' (aka 'void (void *, struct 
_xmlError *)') [-Wincompatible-function-pointer-types]
>  181693 |   __pyx_v_xpathCtxt->error = 
__pyx_f_4lxml_5etree__receiveXPathError;
> |^ 
~~~
> src/lxml/etree.c:218967:60: error: incompatible function pointer types 
passing 'void (void *, xmlError *)' (aka 'void (void *, struct _xmlError *)') 
to parameter of type 'xmlStructuredErrorFunc' (aka 'void (*)(void *, const 
struct _xmlError *)') [-Wincompatible-function-pointer-types]
>  218967 |   xmlRelaxNGSetParserStructuredErrors(__pyx_v_parser_ctxt, 
__pyx_f_4lxml_5etree__receiveError, ((void 
*)__pyx_v_self->__pyx_base._error_log));
> |
^~
> workdir/UnpackedTarball/libxml2/include/libxml/relaxng.h:156:30: note: 
passing argument to parameter 'serror' here
>   156 |  xmlStructuredErrorFunc 
serror,
>   | ^
> src/lxml/etree.c:219385:60: error: incompatible function pointer types 
passing 'void (void *, xmlError *)' (aka 'void (void *, struct _xmlError *)') 
to parameter of type 'xmlStructuredErrorFunc' (aka 'void (*)(void *, const 
struct _xmlError *)') [-Wincompatible-function-pointer-types]
>  219385 | xmlRelaxNGSetValidStructuredErrors(__pyx_v_valid_ctxt, 
__pyx_f_4lxml_5etree__receiveError, ((void 
*)__pyx_v_self->__pyx_base._error_log));
> |
^~
> workdir/UnpackedTarball/libxml2/include/libxml/relaxng.h:185:31: note: 
passing argument to parameter 'serror' here
>   185 |   xmlStructuredErrorFunc 
serror, void *ctx);
>   |  ^
> src/lxml/etree.c:220274:59: error: incompatible function pointer types 
passing 'void (void *, xmlError *)' (aka 'void (void *, struct _xmlError *)') 
to parameter of type 'xmlStructuredErrorFunc' (aka 'void (*)(void *, const 
struct _xmlError *)') [-Wincompatible-function-pointer-types]
>  220274 |   xmlSchemaSetParserStructuredErrors(__pyx_v_parser_ctxt, 
__pyx_f_4lxml_5etree__receiveError, ((void 
*)__pyx_v_self->__pyx_base._error_log));
> |   
^~
> workdir/UnpackedTarball/libxml2/include/libxml/xmlschemas.h:156:30: note: 
passing argument to parameter 'serror' here
>   156 |  xmlStructuredErrorFunc 
serror,
>   |

core.git: Branch 'distro/allotropia/zeta-24-2' - instsetoo_native/util

2024-10-23 Thread Stephan Bergmann (via logerrit)

 instsetoo_native/util/openoffice.lst.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 977612e22b9bf77f7eeb810fd09a753970e05800
Author: Stephan Bergmann 
AuthorDate: Wed Oct 23 13:44:39 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 23 20:51:12 2024 +0200

Add major.minor back to UNIXBASISROOTNAME

...as is also how it is upstream.  Without that, at least RPM packages 
installed
to an unversioned /opt/zetaoffice (instead of the versioned 
/opt/zetaoffice24.2
that will now be used), and

/usr/bin/zetaoffice24.2 -> /opt/zetaoffice24.2/program/soffice

and

/usr/share/applications/zetaoffice24.2-*.desktop -> 
/opt/zetaoffice24.2/share/xdg/*.desktop

(all from the zetaoffice24.2-freedesktop-menus RPM) were all dangling 
symlinks.

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

diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 0b8f7fab1a41..b662521b00d9 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -9,7 +9,7 @@ Globals
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 4.1
 WINDOWSBASISROOTNAME ZetaOffice
-UNIXBASISROOTNAME zetaoffice
+UNIXBASISROOTNAME 
zetaoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
 HIDELICENSEDIALOG 1
 PACKAGEPREFIX
 BASISPACKAGEPREFIX zetaofficebasis

core.git: tools/source

2024-10-23 Thread Stephan Bergmann (via logerrit)

 tools/source/misc/fix16.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b0195d40f3abc343b88f767f4fe109a9c1d44347
Author: Stephan Bergmann 
AuthorDate: Wed Oct 23 10:26:38 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 23 12:10:21 2024 +0200

Avoid signed integer overflow

...as seen at

> /tools/source/misc/fix16.cxx:79:53: runtime error: signed integer 
overflow: -2147483648 - 1 cannot be represented in type 'int'
> #0 0x7fc2f9f50a60 in mask(int) /tools/source/misc/fix16.cxx:79:53
> #1 0x7fc2f9f505fd in fix16_div(int, int) 
/tools/source/misc/fix16.cxx:122:34
> #2 0x7fc2f00d12e0 in vcl::fixedDiv(int, int) 
/vcl/source/fontsubset/sft.cxx:127:12
> #3 0x7fc2f00d11c1 in vcl::fixedMulDiv(int, int, int) 
/vcl/source/fontsubset/sft.cxx:135:12
> #4 0x7fc2f00d0851 in 
vcl::GetCompoundTTOutline(vcl::AbstractTrueTypeFont*, unsigned int, 
std::__debug::vector >&, 
vcl::(anonymous namespace)::TTGlyphMetrics*, std::__debug::vector >&) /vcl/source/fontsubset/sft.cxx:544:91
> #5 0x7fc2f00af5f1 in 
vcl::GetTTGlyphOutline(vcl::AbstractTrueTypeFont*, unsigned int, 
std::__debug::vector >&, 
vcl::(anonymous namespace)::TTGlyphMetrics*, std::__debug::vector >*) /vcl/source/fontsubset/sft.cxx:621:15
> #6 0x7fc2f00aea34 in 
vcl::GetTTGlyphPoints(vcl::AbstractTrueTypeFont*, unsigned int, 
std::__debug::vector >&) 
/vcl/source/fontsubset/sft.cxx:1239:12
> #7 0x7fc2f00b92de in 
vcl::GetTTRawGlyphData(vcl::AbstractTrueTypeFont*, unsigned int) 
/vcl/source/fontsubset/sft.cxx:1667:9
> #8 0x7fc2f00b23ed in 
vcl::CreateTTFromTTGlyphs(vcl::AbstractTrueTypeFont*, 
std::__debug::vector >&, unsigned 
short const*, unsigned char const*, int) /vcl/source/fontsubset/sft.cxx:1374:32
> #9 0x7fc2f00bc71a in 
vcl::CreateTTFfontSubset(vcl::AbstractTrueTypeFont&, 
std::__debug::vector >&, unsigned 
int const*, unsigned char const*, int, FontSubsetInfo&) 
/vcl/source/fontsubset/sft.cxx:1549:13
> #10 0x7fc2eff57836 in 
vcl::font::PhysicalFontFace::CreateFontSubset(std::__debug::vector >&, unsigned int const*, unsigned char 
const*, int, FontSubsetInfo&) const /vcl/source/font/PhysicalFontFace.cxx:367:12
> #11 0x7fc2ee4e0472 in vcl::PDFWriterImpl::emitFonts() 
/vcl/source/gdi/pdfwriter_impl.cxx:3152:24
> #12 0x7fc2ee4e9cb9 in vcl::PDFWriterImpl::emitResources() 
/vcl/source/gdi/pdfwriter_impl.cxx:3363:10
> #13 0x7fc2ee53f91d in vcl::PDFWriterImpl::emitCatalog() 
/vcl/source/gdi/pdfwriter_impl.cxx:5288:10
> #14 0x7fc2ee567ae3 in vcl::PDFWriterImpl::emit() 
/vcl/source/gdi/pdfwriter_impl.cxx:6341:10
> #15 0x7fc2ee3d3f2a in vcl::PDFWriter::Emit() 
/vcl/source/gdi/pdfwriter.cxx:53:29
> #16 0x7fc249b4b82a in PDFExport::Export(rtl::OUString const&, 
com::sun::star::uno::Sequence const&) 
/filter/source/pdf/pdfexport.cxx:1127:39
> #17 0x7fc249bb2782 in 
PDFFilter::implExport(com::sun::star::uno::Sequence
 const&) /filter/source/pdf/pdffilter.cxx:182:24
> #18 0x7fc249bb342b in 
PDFFilter::filter(com::sun::star::uno::Sequence
 const&) /filter/source/pdf/pdffilter.cxx:247:23
> #19 0x7fc2a51ebec6 in SfxObjectShell::ExportTo(SfxMedium&) 
/sfx2/source/doc/objstor.cxx:2945:25
> #20 0x7fc2a51d7bec in SfxObjectShell::SaveTo_Impl(SfxMedium&, 
SfxItemSet const*) /sfx2/source/doc/objstor.cxx:1943:19
> #21 0x7fc2a5213f83 in SfxObjectShell::PreDoSaveAs_Impl(rtl::OUString 
const&, rtl::OUString const&, SfxItemSet const&, 
com::sun::star::uno::Sequence const&) 
/sfx2/source/doc/objstor.cxx:3459:39
> #22 0x7fc2a520b709 in SfxObjectShell::CommonSaveAs_Impl(INetURLObject 
const&, rtl::OUString const&, SfxItemSet&, 
com::sun::star::uno::Sequence const&) 
/sfx2/source/doc/objstor.cxx:3249:9
> #23 0x7fc2a5147a8b in 
SfxObjectShell::APISaveAs_Impl(std::basic_string_view >, SfxItemSet&, 
com::sun::star::uno::Sequence const&) 
/sfx2/source/doc/objserv.cxx:320:19
> #24 0x7fc2a543024c in SfxBaseModel::impl_store(rtl::OUString const&, 
com::sun::star::uno::Sequence const&, 
bool) /sfx2/source/doc/sfxbasemodel.cxx:3231:42
> #25 0x7fc2a54374f4 in SfxBaseModel::storeToURL(rtl::OUString const&, 
com::sun::star::uno::Sequence const&) 
/sfx2/source/doc/sfxbasemodel.cxx:1813:13
> #26 0x7fc2c74053ae in 
ScPDFExportTest::exportToPDF(com::sun::star::uno::Reference
 const&, ScRange const&) /sc/qa/extras/scpdfexport.cxx:179:16
> #27 0x7fc2c7437e0f in ScPDFExportTest::testForcepoint97() 
/sc/qa/extras/scpdfexport.cxx:915:5
    
during CppunitTest_sc_pdf_export
(<https://ci.libreoffice.org/job/lo_ubsan/3346/>)

Change-Id: I3074479ea

core.git: Branch 'distro/allotropia/zeta-24-2' - sysui/Package_share.mk

2024-10-22 Thread Stephan Bergmann (via logerrit)

 sysui/Package_share.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c8d2595a1bf9908e46a7b780a4117ea0bd082983
Author: Stephan Bergmann 
AuthorDate: Tue Oct 22 20:39:55 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 23 08:25:33 2024 +0200

Branding-related build fix

...after 5ce7a548004c9e5cdcd8ee7eb5424f234219d180 "Branding for ZetaOffice
without any branding image" caused some Linux builds to fail 
Package_sysui_share
with

> /usr/bin/perl /home/me/lo/core/sysui/desktop/share/brand.pl -p 
'${PRODUCTNAME} ${PRODUCTVERSION}' -u  \
>\
>   --iconprefix '${UNIXBASISROOTNAME}-' 
/home/me/lo/core/sysui/desktop/menus/writer.desktop 
/home/me/lo/core/sysui/desktop/menus/calc.desktop 
/home/me/lo/core/sysui/desktop/menus/draw.desktop 
/home/me/lo/core/sysui/desktop/menus/impress.desktop 
/home/me/lo/core/sysui/desktop/menus/math.desktop 
/home/me/lo/core/sysui/desktop/menus/base.desktop 
/home/me/lo/core/sysui/desktop/menus/startcenter.desktop 
/home/me/lo/core/sysui/desktop/menus/xsltfilter.desktop 
/home/me/lo/core/workdir/CustomTarget/sysui/share/libreoffice
> Can't open input file ${UNIXBASISROOTNAME}-: No such file or directory
> make[1]: *** [/home/me/lo/core/sysui/CustomTarget_share.mk:208: 
/home/me/lo/core/workdir/CustomTarget/sysui/share/libreoffice/build.flag] Error 
1

(because the argument $(UNIXFILENAME.$*) for -u expanded to nothing in the
recipe for $(share_WORKDIR)/%/build.flag in sysui/CustomTarget_share.mk, 
due to
the changes to sysui/productlist.mk, so it mistakenly took --iconprefix as 
the
argument for -u; other Linux builds happened to not cause a failure, but 
rather
do something nonsensical, when $(brand_URIPARAM) expands to --urls, so that 
was
mistakenly taken as the argument for -u)

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

diff --git a/sysui/Package_share.mk b/sysui/Package_share.mk
index 25ae39bdf1b4..600b12029d84 100644
--- a/sysui/Package_share.mk
+++ b/sysui/Package_share.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,sysui_share,$(share_WORKDIR)/libreoffice))
+$(eval $(call gb_Package_Package,sysui_share,$(share_WORKDIR)/zetaoffice))
 
 $(eval $(call gb_Package_add_files,sysui_share,share/xdg,\
$(addsuffix .desktop,$(LAUNCHERLIST)) \

core.git: Branch 'distro/allotropia/zeta-24-2' - 2 commits - solenv/gbuild vcl/qt5

2024-10-17 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 +-
 vcl/qt5/QtInstance.cxx |   18 ++
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 73c46041a4d0c2f7c3a0cd5d7819a6cd298e941b
Author: Stephan Bergmann 
AuthorDate: Thu Oct 17 14:11:13 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Oct 17 21:08:05 2024 +0200

Adapt experimental Emscripten --enable-qt6 to recent Qt6 upstream

At least when building against recent upstream dev branch, qtloader.js 
needs FS
due to

<https://github.com/qt/qtbase/commit/64007c749703090ebf7f9b1b49b4267bb9993b99>
"wasm: add 'preload' qtloader config property"

Change-Id: Ie505d531670649635774152032123389b6d106ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175085
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 4df8414e919f2ff82429dfa302db9cd2d1261b26)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175043
Tested-by: allotropia jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 4951bb1cae03..b80471427940 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -27,7 +27,7 @@ gb_EMSCRIPTEN_LDFLAGS += -sSTACK_SIZE=131072 
-sDEFAULT_PTHREAD_STACK_SIZE=65536
 # To keep the link time (and memory) down, prevent all rewriting options from 
wasm-emscripten-finalize
 # See emscripten.py, finalize_wasm, modify_wasm = True
 # So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK)
-gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain","addOnPostRun","registerType","throwBindingError"$(if
 $(ENABLE_QT6),$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")]
+gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain","addOnPostRun","registerType","throwBindingError"$(if
 $(ENABLE_QT6),$(COMMA)"FS"$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")]
 gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
 ifeq ($(ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS),TRUE)
commit a394c36dc5c425b65964230ed5fb9844f34580f8
Author: Stephan Bergmann 
AuthorDate: Thu Oct 17 14:13:01 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Oct 17 21:07:53 2024 +0200

    Fix experimental Emscripten --enable-qt6 build resource issues

...where window decoration icons and menu text glyphs were missing

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175088
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 7be32268e086e122e64f7aa12566b6a092c63d20)
Conflicts:
vcl/qt5/QtInstance.cxx

Change-Id: Iadff019a99fbe96442fc010df0d019ba5e2b98e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175046
Tested-by: allotropia jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index d3ae92b82d78..2840e6e9d5d2 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -64,6 +65,9 @@
 #ifdef EMSCRIPTEN
 #include 
 Q_IMPORT_PLUGIN(QWasmIntegrationPlugin)
+#if defined DISABLE_DYNLOADING && ENABLE_QT6
+#include 
+#endif
 #endif
 
 namespace
@@ -764,9 +768,23 @@ void QtInstance::setActivePopup(QtFrame* pFrame)
 m_pActivePopup = pFrame;
 }
 
+static void initResources()
+{
+#if defined EMSCRIPTEN && defined DISABLE_DYNLOADING && ENABLE_QT6
+// Make sure the resources from Qt6's plugins/platforms/libqwasm.a are not 
stripped out of a
+// statically linked binary (and this code cannot be directly in extern 
"C" create_SalInstance,
+// as the expansion of Q_INIT_RESOURCE contains extern function 
declarations that would then
+// erroneously be C function declarations):
+Q_INIT_RESOURCE(wasmfonts);
+Q_INIT_RESOURCE(wasmwindow);
+#endif
+}
+
 extern "C" {
 VCLPLUG_QT_PUBLIC SalInstance* create_SalInstance()
 {
+initResources();
+
 std::unique_ptr pFakeArgv;
 std::unique_ptr pFakeArgc;
 std::vector aFakeArgvFreeable;

core.git: vcl/qt5

2024-10-17 Thread Stephan Bergmann (via logerrit)

 vcl/qt5/QtInstance.cxx |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit 7be32268e086e122e64f7aa12566b6a092c63d20
Author: Stephan Bergmann 
AuthorDate: Thu Oct 17 14:13:01 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 17 17:39:03 2024 +0200

Fix experimental Emscripten --enable-qt6 build resource issues

...where window decoration icons and menu text glyphs were missing

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

diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index 8a0ace0509f9..e3348828a5bd 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -70,6 +71,9 @@
 #ifdef EMSCRIPTEN
 #include 
 Q_IMPORT_PLUGIN(QWasmIntegrationPlugin)
+#if defined DISABLE_DYNLOADING && ENABLE_QT6
+#include 
+#endif
 #endif
 
 namespace
@@ -868,9 +872,23 @@ weld::MessageDialog* 
QtInstance::CreateMessageDialog(weld::Widget* pParent,
 }
 }
 
+static void initResources()
+{
+#if defined EMSCRIPTEN && defined DISABLE_DYNLOADING && ENABLE_QT6
+// Make sure the resources from Qt6's plugins/platforms/libqwasm.a are not 
stripped out of a
+// statically linked binary (and this code cannot be directly in extern 
"C" create_SalInstance,
+// as the expansion of Q_INIT_RESOURCE contains extern function 
declarations that would then
+// erroneously be C function declarations):
+Q_INIT_RESOURCE(wasmfonts);
+Q_INIT_RESOURCE(wasmwindow);
+#endif
+}
+
 extern "C" {
 VCLPLUG_QT_PUBLIC SalInstance* create_SalInstance()
 {
+initResources();
+
 std::unique_ptr pFakeArgv;
 std::unique_ptr pFakeArgc;
 std::vector aFakeArgvFreeable;

core.git: solenv/gbuild

2024-10-17 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4df8414e919f2ff82429dfa302db9cd2d1261b26
Author: Stephan Bergmann 
AuthorDate: Thu Oct 17 14:11:13 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 17 17:01:31 2024 +0200

Adapt experimental Emscripten --enable-qt6 to recent Qt6 upstream

At least when building against recent upstream dev branch, qtloader.js 
needs FS
due to

<https://github.com/qt/qtbase/commit/64007c749703090ebf7f9b1b49b4267bb9993b99>
"wasm: add 'preload' qtloader config property"

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

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 4951bb1cae03..b80471427940 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -27,7 +27,7 @@ gb_EMSCRIPTEN_LDFLAGS += -sSTACK_SIZE=131072 
-sDEFAULT_PTHREAD_STACK_SIZE=65536
 # To keep the link time (and memory) down, prevent all rewriting options from 
wasm-emscripten-finalize
 # See emscripten.py, finalize_wasm, modify_wasm = True
 # So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK)
-gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain","addOnPostRun","registerType","throwBindingError"$(if
 $(ENABLE_QT6),$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")]
+gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain","addOnPostRun","registerType","throwBindingError"$(if
 $(ENABLE_QT6),$(COMMA)"FS"$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")]
 gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
 ifeq ($(ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS),TRUE)

core.git: Branch 'distro/allotropia/zeta-24-2' - vcl/source

2024-10-17 Thread Stephan Bergmann (via logerrit)

 vcl/source/pdf/XmpMetadata.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit d188db666836fbf4decd9c35c6197236791184cb
Author: Stephan Bergmann 
AuthorDate: Wed Dec 13 13:11:03 2023 +0100
Commit: Balazs Varga 
CommitDate: Thu Oct 17 11:22:59 2024 +0200

Work around strange error seen at least with VS 2022 Preview 17.9.0 Preview 
2.0

> vcl/source/pdf/XmpMetadata.cxx(39): error C2440: '': 
cannot convert from 'initializer list' to 'rtl::OStringLiteral<55>'
> vcl/source/pdf/XmpMetadata.cxx(39): note: Invalid aggregate initialization
> vcl/source/pdf/XmpMetadata.cxx(39): note: too many initializers

(Smells like a bug in that compiler's u8"..." handling, where it maybe gets
tripped by the 3-byte UTF-8 encoding of \uFEFF?)

Change-Id: I1c6a856a67c8328ed5fcc2f2fa6bb26f16319f55
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160681
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174993
Reviewed-by: Balazs Varga 
Tested-by: allotropia jenkins 

diff --git a/vcl/source/pdf/XmpMetadata.cxx b/vcl/source/pdf/XmpMetadata.cxx
index 53bf3902ab2b..ddd638551bd5 100644
--- a/vcl/source/pdf/XmpMetadata.cxx
+++ b/vcl/source/pdf/XmpMetadata.cxx
@@ -8,6 +8,10 @@
  *
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
 
@@ -35,8 +39,8 @@ void XmpMetadata::write()
 mpMemoryStream = std::make_unique(4096 /*Initial*/, 64 
/*Resize*/);
 
 // Header
-mpMemoryStream->WriteOString(
-OStringLiteral(u8"
"));
+mpMemoryStream->WriteOString(std::string_view(reinterpret_cast(
+u8"
")));
 
 {
 tools::XmlWriter aXmlWriter(mpMemoryStream.get());

core.git: odk/build-examples_common.mk

2024-10-16 Thread Stephan Bergmann (via logerrit)

 odk/build-examples_common.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2455a0d8e1fcc63e41b39ebf2cf8cc669803ad58
Author: Stephan Bergmann 
AuthorDate: Wed Oct 16 11:09:40 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 16 15:18:59 2024 +0200

Drop extra quoting

...introduced in 074714fab8db751e2aa0138391a270124733977d ".NET Bindings: 
Create
nuget package for LO SDK".  The assumption is that none of the variables 
used in
that block of code represent paths that contain characters that would need 
any
form of quoting.  (And if they did, the solution would not be to just wrap 
them
in "..." quoting, but to use '...' and escape any contained ' properly.)

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

diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index e71e60714a0f..9f608e5d196a 100644
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -67,7 +67,7 @@ $(gb_CustomTarget_workdir)/$(1)/setsdkenv: \
-e 's!@OFFICE_HOME@!$(INSTROOTBASE)!' -e 's!@OO_SDK_MAKE_HOME@!!' \
-e 's!@OO_SDK_ZIP_HOME@!!' -e 's!@OO_SDK_CAT_HOME@!!' \
-e 's!@OO_SDK_SED_HOME@!!' -e 's!@OO_SDK_CPP_HOME@!!' \
-   -e 's!@OO_SDK_DOTNET_ROOT@!"$(DOTNET_ROOT)"!' \
+   -e 's!@OO_SDK_DOTNET_ROOT@!$(DOTNET_ROOT)!' \
-e 's!@OO_SDK_JAVA_HOME@!$(JAVA_HOME)!' \
-e 's!@OO_SDK_OUTPUT_DIR@!$(gb_CustomTarget_workdir)/$(1)/out!' \
-e 's!@SDK_AUTO_DEPLOYMENT@!YES!' $$< > $$@

core.git: Branch 'distro/allotropia/zeta-24-2' - 2 commits - config_host/config_emscripten.h.in config_host.mk.in configure.ac desktop/Executable_soffice_bin.mk desktop/source instsetoo_native/CustomT

2024-10-13 Thread Stephan Bergmann (via logerrit)

 RepositoryFixes.mk  |4 
 config_host.mk.in   |1 +
 config_host/config_emscripten.h.in  |2 ++
 configure.ac|   17 +
 desktop/Executable_soffice_bin.mk   |6 --
 desktop/source/app/appinit.cxx  |9 +
 instsetoo_native/CustomTarget_emscripten-install.mk |3 +--
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk  |8 +---
 solenv/gbuild/platform/unxgcc.mk|4 ++--
 9 files changed, 41 insertions(+), 13 deletions(-)

New commits:
commit 2257282a4cac8245c8055df0329dd9c918751207
Author: Stephan Bergmann 
AuthorDate: Wed Oct 9 19:00:21 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Oct 14 08:06:04 2024 +0200

Make --disable-emscripten-proxy-to-pthread configurable

...as is convenient for some experiments

Change-Id: I74aedb38ecc0f7b5a0d913799f649dce77dc7bba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174753
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
(cherry picked from commit 33aa490cd6c18474f83ddd2b5f91ffc5c42a34d9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174679
Tested-by: allotropia jenkins 

diff --git a/config_host.mk.in b/config_host.mk.in
index a2a7f7b21c41..c95e9141f04f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -167,6 +167,7 @@ export ENABLE_DEBUG=@ENABLE_DEBUG@
 SYSTEM_DRAGONBOX=@SYSTEM_DRAGONBOX@
 SYSTEM_FROZEN=@SYSTEM_FROZEN@
 export 
ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS=@ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS@
+export ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD=@ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD@
 export ENABLE_EPOXY=@ENABLE_EPOXY@
 export ENABLE_EOT=@ENABLE_EOT@
 export ENABLE_EVOAB2=@ENABLE_EVOAB2@
diff --git a/config_host/config_emscripten.h.in 
b/config_host/config_emscripten.h.in
index 24d1a9ca5dd8..d8121613a934 100644
--- a/config_host/config_emscripten.h.in
+++ b/config_host/config_emscripten.h.in
@@ -11,4 +11,6 @@
 
 #define HAVE_EMSCRIPTEN_PROXY_POSIX_SOCKETS 0
 
+#define HAVE_EMSCRIPTEN_PROXY_TO_PTHREAD 0
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/configure.ac b/configure.ac
index 8b3db0f48339..712cefcca6e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2144,6 +2144,15 @@ AC_ARG_WITH(main-module,
 Default value is 'writer'.]),
 ,)
 
+if test "$_os" = Emscripten; then
+AC_ARG_ENABLE(emscripten-proxy-to-pthread,
+AS_HELP_STRING([--disable-emscripten-proxy-to-pthread],
+[Experimentally disable use of the Emscripten -sPROXY_TO_PTHREAD 
feature.]),,
+enable_emscripten_proxy_to_pthread=yes)
+else
+enable_emscripten_proxy_to_pthread=
+fi
+
 if test "$_os" = Emscripten; then
 AC_ARG_ENABLE(emscripten-proxy-posix-sockets,
 AS_HELP_STRING([--enable-emscripten-proxy-posix-sockets],
@@ -4114,6 +4123,14 @@ AC_SUBST(ENABLE_WASM_STRIP)
 AC_SUBST(ENABLE_WASM_STRIP_WRITER)
 AC_SUBST(ENABLE_WASM_STRIP_CALC)
 
+if test "$enable_emscripten_proxy_to_pthread" = yes; then
+ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD=TRUE
+AC_DEFINE(HAVE_EMSCRIPTEN_PROXY_TO_PTHREAD)
+else
+ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD=
+fi
+AC_SUBST(ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD)
+
 if test "$enable_emscripten_proxy_posix_sockets" = yes; then
 ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS=TRUE
 AC_DEFINE(HAVE_EMSCRIPTEN_PROXY_POSIX_SOCKETS)
diff --git a/desktop/Executable_soffice_bin.mk 
b/desktop/Executable_soffice_bin.mk
index fcf16e041fb9..a791e8f362e4 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -63,8 +63,10 @@ $(call gb_Executable_get_linktarget_target,soffice_bin): \
 
 $(eval $(call gb_Executable_add_ldflags,soffice_bin,\
-s 
EXPORTED_FUNCTIONS=@$(gb_CustomTarget_workdir)/desktop/soffice_bin-emscripten-exports/exports
 -Wl$(COMMA)--whole-archive $(call gb_StaticLibrary_get_target,unoembind) 
-Wl$(COMMA)--no-whole-archive \
-   -sPROXY_TO_PTHREAD=1 \
-   $(if $(DISABLE_GUI),,-sOFFSCREENCANVAS_SUPPORT=1 
-sOFFSCREENCANVASES_TO_PTHREAD=\#qtcanvas) \
+   $(if $(ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD), \
+   -sPROXY_TO_PTHREAD=1 \
+   $(if $(DISABLE_GUI),, \
+   -sOFFSCREENCANVAS_SUPPORT=1 
-sOFFSCREENCANVASES_TO_PTHREAD=\#qtcanvas)) \
 ))
 ifeq ($(ENABLE_QT6),TRUE)
 $(eval $(call gb_Executable_add_ldflags,soffice_bin, \
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index ad2c25f64dab..f1c821a5297e 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 #endif
 
 using namespace ::com::sun::star::uno;
@@ -97,12 +98,20 @@ EM_JS(void, setupMainChannel, (), {
 });
 
 extern "C" void resolveUnoMain(pthread_t id) {
+#if H

core.git: dbaccess/qa

2024-10-13 Thread Stephan Bergmann (via logerrit)

 dbaccess/qa/extras/hsql_schema_import.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f72c9777f510332105b39c1c9bb78c66e4550d82
Author: Stephan Bergmann 
AuthorDate: Sun Oct 13 21:05:35 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Oct 14 08:05:29 2024 +0200

-Werror,-Wdeprecated-literal-operator

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

diff --git a/dbaccess/qa/extras/hsql_schema_import.cxx 
b/dbaccess/qa/extras/hsql_schema_import.cxx
index e8f7cfa26f3a..2f7810d8d16e 100644
--- a/dbaccess/qa/extras/hsql_schema_import.cxx
+++ b/dbaccess/qa/extras/hsql_schema_import.cxx
@@ -18,7 +18,7 @@ using namespace dbahsql;
 
 namespace
 {
-constexpr std::size_t operator"" _z(unsigned long long n) { return n; }
+constexpr std::size_t operator""_z(unsigned long long n) { return n; }
 
 const ColumnDefinition* lcl_findByType(const std::vector& 
columns,
sal_Int32 nType)

core.git: config_host/config_emscripten.h.in config_host.mk.in configure.ac desktop/Executable_soffice_bin.mk desktop/source solenv/gbuild

2024-10-10 Thread Stephan Bergmann (via logerrit)

 config_host.mk.in  |1 +
 config_host/config_emscripten.h.in |2 ++
 configure.ac   |   17 +
 desktop/Executable_soffice_bin.mk  |6 --
 desktop/source/app/appinit.cxx |9 +
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |4 
 6 files changed, 37 insertions(+), 2 deletions(-)

New commits:
commit 33aa490cd6c18474f83ddd2b5f91ffc5c42a34d9
Author: Stephan Bergmann 
AuthorDate: Wed Oct 9 19:00:21 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 10 14:39:24 2024 +0200

Make --disable-emscripten-proxy-to-pthread configurable

...as is convenient for some experiments

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 15b82b07ffb2..d759bc2d9ce5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -176,6 +176,7 @@ ENABLE_DOTNET=@ENABLE_DOTNET@
 SYSTEM_DRAGONBOX=@SYSTEM_DRAGONBOX@
 SYSTEM_FROZEN=@SYSTEM_FROZEN@
 export 
ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS=@ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS@
+export ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD=@ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD@
 export ENABLE_EPOXY=@ENABLE_EPOXY@
 export ENABLE_EOT=@ENABLE_EOT@
 export ENABLE_EVOAB2=@ENABLE_EVOAB2@
diff --git a/config_host/config_emscripten.h.in 
b/config_host/config_emscripten.h.in
index 24d1a9ca5dd8..d8121613a934 100644
--- a/config_host/config_emscripten.h.in
+++ b/config_host/config_emscripten.h.in
@@ -11,4 +11,6 @@
 
 #define HAVE_EMSCRIPTEN_PROXY_POSIX_SOCKETS 0
 
+#define HAVE_EMSCRIPTEN_PROXY_TO_PTHREAD 0
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/configure.ac b/configure.ac
index 026e81caeb85..dd2954a283b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2167,6 +2167,15 @@ AC_ARG_WITH(main-module,
 Default value is 'writer'.]),
 ,)
 
+if test "$_os" = Emscripten; then
+AC_ARG_ENABLE(emscripten-proxy-to-pthread,
+AS_HELP_STRING([--disable-emscripten-proxy-to-pthread],
+[Experimentally disable use of the Emscripten -sPROXY_TO_PTHREAD 
feature.]),,
+enable_emscripten_proxy_to_pthread=yes)
+else
+enable_emscripten_proxy_to_pthread=
+fi
+
 if test "$_os" = Emscripten; then
 AC_ARG_ENABLE(emscripten-proxy-posix-sockets,
 AS_HELP_STRING([--enable-emscripten-proxy-posix-sockets],
@@ -4177,6 +4186,14 @@ AC_SUBST(ENABLE_WASM_STRIP)
 AC_SUBST(ENABLE_WASM_STRIP_WRITER)
 AC_SUBST(ENABLE_WASM_STRIP_CALC)
 
+if test "$enable_emscripten_proxy_to_pthread" = yes; then
+ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD=TRUE
+AC_DEFINE(HAVE_EMSCRIPTEN_PROXY_TO_PTHREAD)
+else
+ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD=
+fi
+AC_SUBST(ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD)
+
 if test "$enable_emscripten_proxy_posix_sockets" = yes; then
 ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS=TRUE
 AC_DEFINE(HAVE_EMSCRIPTEN_PROXY_POSIX_SOCKETS)
diff --git a/desktop/Executable_soffice_bin.mk 
b/desktop/Executable_soffice_bin.mk
index fcf16e041fb9..a791e8f362e4 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -63,8 +63,10 @@ $(call gb_Executable_get_linktarget_target,soffice_bin): \
 
 $(eval $(call gb_Executable_add_ldflags,soffice_bin,\
-s 
EXPORTED_FUNCTIONS=@$(gb_CustomTarget_workdir)/desktop/soffice_bin-emscripten-exports/exports
 -Wl$(COMMA)--whole-archive $(call gb_StaticLibrary_get_target,unoembind) 
-Wl$(COMMA)--no-whole-archive \
-   -sPROXY_TO_PTHREAD=1 \
-   $(if $(DISABLE_GUI),,-sOFFSCREENCANVAS_SUPPORT=1 
-sOFFSCREENCANVASES_TO_PTHREAD=\#qtcanvas) \
+   $(if $(ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD), \
+   -sPROXY_TO_PTHREAD=1 \
+   $(if $(DISABLE_GUI),, \
+   -sOFFSCREENCANVAS_SUPPORT=1 
-sOFFSCREENCANVASES_TO_PTHREAD=\#qtcanvas)) \
 ))
 ifeq ($(ENABLE_QT6),TRUE)
 $(eval $(call gb_Executable_add_ldflags,soffice_bin, \
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 16f023b0a414..6c7637f32f9e 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -54,6 +54,7 @@
 #include 
 #include 
 #include 
+#include 
 #endif
 
 using namespace ::com::sun::star::uno;
@@ -94,12 +95,20 @@ EM_JS(void, setupMainChannel, (), {
 });
 
 extern "C" void resolveUnoMain(pthread_t id) {
+#if HAVE_EMSCRIPTEN_PROXY_TO_PTHREAD
 EM_ASM({
 const sofficeMain = PThread.pthreads[$0];
 const channel = new MessageChannel();
 sofficeMain.postMessage({cmd:"LOWA-channel"}, [channel.port2]);
 Module.uno_main$resolve(channel.port1);
 }, id);
+#else
+EM_ASM({
+const channel = new MessageChannel();
+postMessage({cmd:"LOWA-channel"

core.git: instsetoo_native/CustomTarget_emscripten-install.mk RepositoryFixes.mk solenv/gbuild

2024-10-10 Thread Stephan Bergmann (via logerrit)

 RepositoryFixes.mk  |4 
 instsetoo_native/CustomTarget_emscripten-install.mk |3 +--
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk  |4 +---
 solenv/gbuild/platform/unxgcc.mk|4 ++--
 4 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit ce8ac330eb4d995f29be4a4e12ef5f63481dcd03
Author: Stephan Bergmann 
AuthorDate: Wed Oct 9 16:18:35 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 10 10:21:42 2024 +0200

Emscripten: For executables, only build .js files, not .html files

...as for the by-default --enable-qt5 case we generate an additional
qt_soffice.html anyway (and for a --disable-gui --disable-qt5 build, client 
code
probably wants to embed the results into its own HTML document and wouldn't 
rely
on an soffice.html); this simplifies the build infrastructure a little

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

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 2139b2f823ff..4cacbbce35b9 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -35,12 +35,8 @@ ifeq ($(OS),MACOSX)
 gb_Executable_FILENAMES := $(patsubst 
soffice_bin:soffice_bin,soffice_bin:soffice,$(gb_Executable_FILENAMES))
 else
 ifeq ($(OS),EMSCRIPTEN)
-ifeq ($(ENABLE_QT6),TRUE)
 gb_Executable_FILENAMES := $(patsubst 
soffice_bin:soffice_bin%,soffice_bin:soffice.js,$(gb_Executable_FILENAMES))
 else
-gb_Executable_FILENAMES := $(patsubst 
soffice_bin:soffice_bin%,soffice_bin:soffice.html,$(gb_Executable_FILENAMES))
-endif
-else
 gb_Executable_FILENAMES := $(patsubst 
soffice_bin:soffice_bin%,soffice_bin:soffice.bin,$(gb_Executable_FILENAMES))
 endif
 endif
diff --git a/instsetoo_native/CustomTarget_emscripten-install.mk 
b/instsetoo_native/CustomTarget_emscripten-install.mk
index f4e63f729ab6..b81d510523a7 100644
--- a/instsetoo_native/CustomTarget_emscripten-install.mk
+++ b/instsetoo_native/CustomTarget_emscripten-install.mk
@@ -20,8 +20,7 @@ emscripten_install_files := \
 soffice.wasm \
 soffice.worker.js \
 $(if $(ENABLE_SYMBOLS_FOR),soffice.wasm.dwp) \
-$(if $(DISABLE_GUI), \
-soffice.html, \
+$(if $(DISABLE_GUI),, \
 qt_soffice.html \
 qtloader.js \
 qtlogo.svg) \
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 227ef83990de..2b55b4ba1218 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -30,7 +30,7 @@ ifeq ($(ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS),TRUE)
 gb_EMSCRIPTEN_LDFLAGS += -sPROXY_POSIX_SOCKETS -lwebsocket.js
 endif
 
-gb_Executable_EXT := .html
+gb_Executable_EXT := .js
 gb_EMSCRIPTEN_EXCEPT = -fwasm-exceptions -s SUPPORT_LONGJMP=wasm
 
 gb_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS)
@@ -77,7 +77,6 @@ define gb_Executable_Executable_platform
 $(call gb_LinkTarget_add_auxtargets,$(2),\
 $(patsubst %.lib,%.linkdeps,$(3)) \
 $(patsubst %.lib,%.wasm,$(3)) \
-$(patsubst %.lib,%.js,$(3)) \
 $(patsubst %.lib,%.worker.js,$(3)) \
 $(patsubst %.lib,%.wasm.dwp,$(3)) \
 )
@@ -88,7 +87,6 @@ define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_add_auxtargets,$(2),\
 $(patsubst %.lib,%.linkdeps,$(3)) \
 $(patsubst %.lib,%.wasm,$(3)) \
-$(patsubst %.lib,%.js,$(3)) \
 $(patsubst %.lib,%.worker.js,$(3)) \
 $(patsubst %.lib,%.wasm.dwp,$(3)) \
 )
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 0e4f01b4249e..1c289b193d4e 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -171,7 +171,7 @@ $(call gb_Helper_abbreviate_dirs,\
 ) \
-o $(1) \
$(if $(SOVERSIONSCRIPT),&& ln -sf ../../program/$(notdir $(1)) 
$(ILIBTARGET)) \
-   $(if $(filter EMSCRIPTEN,$(OS)),$(if $(filter 
TRUE,$(HAVE_EXTERNAL_DWARF)),&& emdwp -e $(patsubst %.html,%.wasm,$(1)) -o 
$(patsubst %.html,%.wasm.dwp,$(1 \
+   $(if $(filter EMSCRIPTEN,$(OS)),$(if $(filter 
TRUE,$(HAVE_EXTERNAL_DWARF)),&& emdwp -e $(patsubst 
%$(gb_Executable_EXT),%.wasm,$(1)) -o $(patsubst 
%$(gb_Executable_EXT),%.wasm.dwp,$(1 \
$(if $(call gb_LinkTarget__WantLock,$(2)),; RC=$$? ; rm -f 
$(gb_LinkTarget__Lock); if test $$RC -ne 0; then exit $$RC; fi))
 
 $(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\
@@ -182,7 +182,7 @@ $(if $(filter Library,$(TARGETTYPE)), $(call 
gb_Helper_abbreviate_dirs,\
 $(WORKDIR)/LinkTarget/$(2).exports,$(1
 $(if $(and $(filter CppunitTest Executable,$(TARGETTYPE)),$(filter 
EMSCRIPTEN,$(OS))), \
 $(if $(filter TRUE,$(ENABLE_QT5)), \
-sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' 
$(QT5_PLATFORMS_S

core.git: Branch 'distro/allotropia/zeta-24-2' - solenv/gbuild

2024-10-07 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/LinkTarget.mk|3 ++-
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |6 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 1325f465e08641d3a974fe1c58e5587233d31351
Author: Stephan Bergmann 
AuthorDate: Mon Oct 7 20:47:47 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 07:59:07 2024 +0200

Emscripten: Silence -Wlimited-postlink-optimizations

...when building with --enable-optimized --enable-symbols --enable-werror,

> em++: error: running limited binaryen optimizations because DWARF info 
requested (or indirectly required) [-Wlimited-postlink-optimizations] [-Werror]
> make[3]: *** [Makefile:506: spellout] Error 1
> make[2]: *** [Makefile:366: all] Error 2
> make[1]: *** [external/libnumbertext/ExternalProject_libnumbertext.mk:25: 
core/workdir/ExternalProject/libnumbertext/build] Error 1

etc.

Change-Id: I62ff0a750d62d6bc50de670623e872beddfb4809
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174642
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 0a004f1a1528b8a85245de4672852b574bdc2cb2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174661
Tested-by: allotropia jenkins 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index a4e44d52d6e9..47d1b949bcf6 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -51,7 +51,8 @@ gb_LinkTarget__get_debugflags= \
 
 # T_LDFLAGS is just expanded once. Override the flags here, so that the linker 
and compiler use the same.
 ifeq (EMSCRIPTEN,$(OS))
-gb_LinkTarget__get_debugldflags=$(call gb_LinkTarget__get_debugflags,$1)
+gb_LinkTarget__get_debugldflags=$(call gb_LinkTarget__get_debugflags,$1) \
+$(gb_LinkTarget__emscripten_warnings_ldflags)
 else
 # similar for LDFLAGS, use linker optimization flags in non-debug case,
 # but moreover strip debug from libraries for which debuginfo is not wanted
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 37d23aabcfe9..227ef83990de 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -48,6 +48,12 @@ endif
 gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) \
 $(gb_EMSCRIPTEN_EXCEPT) -sEXPORT_EXCEPTION_HANDLING_HELPERS
 
+ifeq ($(ENABLE_OPTIMIZED),TRUE)
+ifneq ($(ENABLE_SYMBOLS_FOR),)
+gb_LinkTarget__emscripten_warnings_ldflags := 
-Wno-limited-postlink-optimizations
+endif
+endif
+
 # Linker and compiler optimize + debug flags are handled in LinkTarget.mk
 gb_LINKEROPTFLAGS :=
 gb_LINKERSTRIPDEBUGFLAGS :=

core.git: solenv/gbuild

2024-10-07 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/LinkTarget.mk|3 ++-
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |6 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0a004f1a1528b8a85245de4672852b574bdc2cb2
Author: Stephan Bergmann 
AuthorDate: Mon Oct 7 20:47:47 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Oct 7 22:56:39 2024 +0200

Emscripten: Silence -Wlimited-postlink-optimizations

...when building with --enable-optimized --enable-symbols --enable-werror,

> em++: error: running limited binaryen optimizations because DWARF info 
requested (or indirectly required) [-Wlimited-postlink-optimizations] [-Werror]
> make[3]: *** [Makefile:506: spellout] Error 1
> make[2]: *** [Makefile:366: all] Error 2
> make[1]: *** [external/libnumbertext/ExternalProject_libnumbertext.mk:25: 
core/workdir/ExternalProject/libnumbertext/build] Error 1

etc.

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index accb3a400df5..5dbdadc23f87 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -51,7 +51,8 @@ gb_LinkTarget__get_debugflags= \
 
 # T_LDFLAGS is just expanded once. Override the flags here, so that the linker 
and compiler use the same.
 ifeq (EMSCRIPTEN,$(OS))
-gb_LinkTarget__get_debugldflags=$(call gb_LinkTarget__get_debugflags,$1)
+gb_LinkTarget__get_debugldflags=$(call gb_LinkTarget__get_debugflags,$1) \
+$(gb_LinkTarget__emscripten_warnings_ldflags)
 else
 # similar for LDFLAGS, use linker optimization flags in non-debug case,
 # but moreover strip debug from libraries for which debuginfo is not wanted
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 37d23aabcfe9..227ef83990de 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -48,6 +48,12 @@ endif
 gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) \
 $(gb_EMSCRIPTEN_EXCEPT) -sEXPORT_EXCEPTION_HANDLING_HELPERS
 
+ifeq ($(ENABLE_OPTIMIZED),TRUE)
+ifneq ($(ENABLE_SYMBOLS_FOR),)
+gb_LinkTarget__emscripten_warnings_ldflags := 
-Wno-limited-postlink-optimizations
+endif
+endif
+
 # Linker and compiler optimize + debug flags are handled in LinkTarget.mk
 gb_LINKEROPTFLAGS :=
 gb_LINKERSTRIPDEBUGFLAGS :=

core.git: Branch 'distro/allotropia/zeta-24-2' - desktop/source

2024-10-05 Thread Stephan Bergmann (via logerrit)

 desktop/source/app/appinit.cxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit c3d32f43aa956a745828d7357ac73825e0ed4cd7
Author: Stephan Bergmann 
AuthorDate: Fri Aug 23 13:26:16 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Oct 5 20:57:25 2024 +0200

Emscritpen: Use WorkerGlobalScope.importScripts

Change-Id: I19be38564aca4fdd3d827657055b41a867582ba0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172315
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
(cherry picked from commit 5dbc995f73da45ad99b95bc3119c75451b2c415d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174451
Tested-by: Stephan Bergmann 

diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index b7e7f0e921dd..ad2c25f64dab 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -80,13 +80,7 @@ extern "C" void getUnoScriptUrls(std::vector * 
urls) {
 }
 
 EM_JS(void, runUnoScriptUrl, (char16_t const * url), {
-fetch(UTF16ToString(url)).then(res => {
-if (!res.ok) {
-throw Error(
-"Loading <" + res.url + "> failed with " + res.status + " " + 
res.statusText);
-}
-return res.blob();
-}).then(blob => blob.text()).then(text => eval(text));
+importScripts(UTF16ToString(url));
 });
 
 EM_JS(void, setupMainChannel, (), {

core.git: sw/source

2024-10-04 Thread Stephan Bergmann (via logerrit)

 sw/source/core/doc/DocumentSettingManager.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 75f3ee7e8a06ed5fec17c358c62e3efeb8d13e8d
Author: Stephan Bergmann 
AuthorDate: Fri Oct 4 16:35:56 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 4 21:29:48 2024 +0200

Initialize sw::DocumentSettingManager::mbNoClippingWithWrapPolygon

...newly introduced in 3800ab58355385dcb482d3089accc7ce141f5ee9 "tdf#161233
paint pictures completely also with contour wrap", and which started to make
CppunitTest_vcl_pdfexport2 CPPUNIT_TEST_NAME=testTdf124272::TestBody fail 
with

> pdfexport2.cxx:180:Assertion
> Test name: (anonymous namespace)::testTdf124272::TestBody
> assertion failed
> - Expression: it != pEnd

in some builds like <https://ci.libreoffice.org/job/lo_ubsan/3327/>

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

diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index 942272abc3b6..9f3858f8c0b6 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -110,7 +110,8 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbUseVariableWidthNBSP(false),
 mbPaintHellOverHeaderFooter(false),
 mbMinRowHeightInclBorder(false),
-mbMsWordCompGridMetrics(false) // tdf#129808
+mbMsWordCompGridMetrics(false), // tdf#129808
+mbNoClippingWithWrapPolygon(false)
 
 // COMPATIBILITY FLAGS END
 {

core.git: Branch 'distro/allotropia/zeta-24-2' - solenv/gbuild

2024-10-03 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/AllLangMoTarget.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f12343f4cf698a9e62d4eaf88c7b8f31fa26c2b4
Author: Stephan Bergmann 
AuthorDate: Wed Aug 28 07:48:44 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 3 21:54:21 2024 +0200

Put back the mkdir

...that 1c84943890afea8eaa8fdaeabbd4394680d657f9 "run msguniq .. | msgfmt 
in a
subshell to help out wsl1", and which caused all kinds of from-scratch 
builds to
fail now with

> [build MO ] accde
> msgfmt: error while opening 
"/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/MoTarget/accde.mo" for 
writing: No such file or directory
> make[1]: *** 
[/home/tdf/lode/jenkins/workspace/lo_ubsan/solenv/gbuild/AllLangMoTarget.mk:40: 
/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/MoTarget/accde.mo] Error 1

etc. (<https://ci.libreoffice.org/job/lo_ubsan/3288/>

Change-Id: I756ebdf68f09367d24181ed47b6b5735c45aebf9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172484
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 07fda011173917aaad75678b86e2b0570e004f93)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174443
Tested-by: Stephan Bergmann 

diff --git a/solenv/gbuild/AllLangMoTarget.mk b/solenv/gbuild/AllLangMoTarget.mk
index f590f4d84ac0..3811ff4ee478 100644
--- a/solenv/gbuild/AllLangMoTarget.mk
+++ b/solenv/gbuild/AllLangMoTarget.mk
@@ -37,6 +37,7 @@ $(call gb_MoTarget_get_clean_target,%) :
 $(call gb_MoTarget_get_target,%) : $(gb_Helper_MISCDUMMY)
$(call gb_Output_announce,$*,$(true),MO ,2)
$(call gb_Trace_StartRange,$*,MO )
+   $(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@)) && \
$(call gb_Helper_wsl_path,$(WSL) /bin/sh -c "$(MSGUNIQ) --force-po 
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@")
$(call gb_Trace_EndRange,$*,MO )

core.git: Branch 'distro/allotropia/zeta-24-2' - oox/source

2024-10-03 Thread Stephan Bergmann (via logerrit)

 oox/source/drawingml/chart/plotareaconverter.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bb0ac5a39ebf276287fae8960a3e9380650ad24a
Author: Stephan Bergmann 
AuthorDate: Fri Jan 19 08:42:13 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Oct 3 17:15:40 2024 +0200

PlotAreaConverter::mbSingleSeriesTitle is apparently read uninitialized

...in code newly introduced in 135ce256ce9e879663d828ec6e699de521fad867
"tdf#146487 Don't show generic diagram title when there is an empty title
given", which caused CppunitTest_chart2_export2 to fail with

> /oox/inc/drawingml/chart/plotareaconverter.hxx:78:62: runtime error: load 
of value 222, which is not a valid value for type 'bool'
> #0 0x7f95cd9ed87c in 
oox::drawingml::chart::PlotAreaConverter::isSingleSeriesTitle() const 
/oox/inc/drawingml/chart/plotareaconverter.hxx:78:62
> #1 0x7f95cd9e506f in 
oox::drawingml::chart::ChartSpaceConverter::convertFromModel(com::sun::star::uno::Reference
 const&, com::sun::star::awt::Point const&) 
/oox/source/drawingml/chart/chartspaceconverter.cxx:189:53
> #2 0x7f95cd9b6c34 in 
oox::drawingml::chart::ChartConverter::convertFromModel(oox::core::XmlFilterBase&,
 oox::drawingml::chart::ChartSpaceModel&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::awt::Point const&, com::sun::star::awt::Size const&) 
/oox/source/drawingml/chart/chartconverter.cxx:93:20
> #3 0x7f95ce548f59 in 
oox::drawingml::Shape::finalizeXShape(oox::core::XmlFilterBase&, 
com::sun::star::uno::Reference const&) 
/oox/source/drawingml/shape.cxx:2245:50
> #4 0x7f95438150b2 in 
oox::xls::Shape::finalizeXShape(oox::core::XmlFilterBase&, 
com::sun::star::uno::Reference const&) 
/sc/source/filter/oox/drawingfragment.cxx:113:30
> #5 0x7f95ce5267bb in 
oox::drawingml::Shape::createAndInsert(oox::core::XmlFilterBase&, rtl::OUString 
const&, oox::drawingml::Theme const*, 
com::sun::star::uno::Reference const&, bool, 
bool, basegfx::B2DHomMatrix&, oox::drawingml::FillProperties const&, 
std::shared_ptr) /oox/source/drawingml/shape.cxx:1964:9
> #6 0x7f95ce4edb54 in 
oox::drawingml::Shape::addShape(oox::core::XmlFilterBase&, 
oox::drawingml::Theme const*, 
com::sun::star::uno::Reference const&, 
basegfx::B2DHomMatrix const&, oox::drawingml::FillProperties const&, 
std::__debug::map, 
std::less, std::allocator > > >*, 
std::shared_ptr) /oox/source/drawingml/shape.cxx:366:41
> #7 0x7f954381ef79 in oox::xls::DrawingFragment::onEndElement() 
/sc/source/filter/oox/drawingfragment.cxx:335:30
> #8 0x7f95cdcaee54 in 
oox::core::ContextHandler2Helper::implEndElement(int) 
/oox/source/core/contexthandler2.cxx:125:9
> #9 0x7f95cdd5c116 in oox::core::FragmentHandler2::endFastElement(int) 
/oox/source/core/fragmenthandler2.cxx:91:5
> #10 0x7f95caf68fca in (anonymous namespace)::Entity::endElement() 
/sax/source/fastparser/fastparser.cxx:514:27
> #11 0x7f95caf68998 in 
sax_fastparser::FastSaxParserImpl::callbackEndElement() 
/sax/source/fastparser/fastparser.cxx:1331:17
> #12 0x7f95caf58444 in (anonymous 
namespace)::call_callbackEndElement(void*, unsigned char const*, unsigned char 
const*, unsigned char const*) /sax/source/fastparser/fastparser.cxx:338:18
> #13 0x7f960adebeda in xmlParseEndTag2 
/workdir/UnpackedTarball/libxml2/parser.c:10090:2
> #14 0x7f960ad929b5 in xmlParseTryOrFinish 
/workdir/UnpackedTarball/libxml2/parser.c:11868:14
> #15 0x7f960ad86334 in xmlParseChunk 
/workdir/UnpackedTarball/libxml2/parser.c:12151:5
> #16 0x7f95caf53231 in sax_fastparser::FastSaxParserImpl::parse() 
/sax/source/fastparser/fastparser.cxx:1085:21
> #17 0x7f95caf4cd18 in 
sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource
 const&) /sax/source/fastparser/fastparser.cxx:890:9
> #18 0x7f95caf6e950 in 
sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource
 const&) /sax/source/fastparser/fastparser.cxx:1470:13
> #19 0x7f95cdce50d1 in 
oox::core::FastParser::parseStream(com::sun::star::xml::sax::InputSource 
const&, bool) /oox/source/core/fastparser.cxx:121:15
> #20 0x7f95cdce5868 in 
oox::core::FastParser::parseStream(com::sun::star::uno::Reference
 const&, rtl::OUString const&) /oox/source/core/fastparser.cxx:129:5
> #21 0x7f95cddbb234 in 
oox::core::XmlFilterBase::importFragment(rtl::Reference
 const&, oox::core::FastParser&) /oox/source/core/xmlfilterbase.cxx:414:21
> #22 0x7f95cddb9b8d in 
oox::core::XmlFilterBase::importFragment(rtl::Reference
 const&) /oox/source/core/xmlfilterbase.cxx:344:12
>

core.git: Branch 'distro/allotropia/zeta-24-2' - bridges/source

2024-10-02 Thread Stephan Bergmann (via logerrit)

 bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6808f5547e1ecd73f55ecbcd964d15b2c1a8e502
Author: Stephan Bergmann 
AuthorDate: Tue Sep 3 11:19:53 2024 +0200
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:50:33 2024 +0200

tdf#160945: queryInterface must pass back indirect return value address in 
x0

Change-Id: I28dacffbbcdf26ee453fd32aeb82166484612846
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172791
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174260
Tested-by: Balazs Varga 
Reviewed-by: Balazs Varga 

diff --git a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
index 9a79ce543940..f864e193c729 100644
--- a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
@@ -278,6 +278,7 @@ extern "C" void vtableCall(sal_Int32 functionIndex, 
sal_Int32 vtableOffset, sal_
   
reinterpret_cast(uno::cpp_acquire));
 ifc->release();
 TYPELIB_DANGER_RELEASE(td);
+gpr[0] = reinterpret_cast(indirectRet);
 break;
 }
 TYPELIB_DANGER_RELEASE(td);

core.git: Branch 'distro/allotropia/zeta-24-2' - bin/odfvalidator.sh.in bin/officeotron.sh.in configure.ac

2024-10-02 Thread Stephan Bergmann (via logerrit)

 bin/odfvalidator.sh.in |2 +-
 bin/officeotron.sh.in  |2 +-
 configure.ac   |3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3a3a5cad6f5a590ee8788218486ea7d5c141b1f9
Author: Stephan Bergmann 
AuthorDate: Fri Apr 26 10:51:47 2024 +0200
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:44:55 2024 +0200

Make odfvalidator and officeotron work in WSL_ONLY_AS_HELPER mode

...where e.g. CppunitTest_oox_testscene3d
CPPUNIT_TEST_NAME=test_material_wireframe::TestBody had failed with

> forced failure
> - Error: Unable to access jarfile 
/mnt/d/lo/tar/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar

and e.g. CppunitTest_oox_mcgr
CPPUNIT_TEST_NAME=testAxialColorLinearTrans::TestBody had failed with

> equality assertion failed
> - Expected: 0
> - Actual  : 1
> - failed to execute: sh D:/lo-wsl/core/bin/officeotron.sh 
C:\Users\steph\AppData\Local\Temp   est_oox_mcgr.dll2epgul.tmp > 
C:\Users\steph\AppData\Local\Temp  est_oox_mcgr.dll2epgup.tmp 2>&1
> Error: Unable to access jarfile 
/mnt/d/lo/tar/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar

Change-Id: I094b76daff6eef2cb6a9874a4776bab9c4424f49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166703
    Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174250
Tested-by: Balazs Varga 
Reviewed-by: Balazs Varga 

diff --git a/bin/odfvalidator.sh.in b/bin/odfvalidator.sh.in
index 605e74731f20..99b2207ad138 100644
--- a/bin/odfvalidator.sh.in
+++ b/bin/odfvalidator.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-java 
-Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl
 
-Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl
 -jar @TARFILE_LOCATION@/@ODFVALIDATOR_JAR@ "$@"
+java 
-Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl
 
-Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl
 -jar @TARFILE_LOCATION_NATIVE@/@ODFVALIDATOR_JAR@ "$@"
diff --git a/bin/officeotron.sh.in b/bin/officeotron.sh.in
index 7281f1bcd17c..935ec5809cdd 100644
--- a/bin/officeotron.sh.in
+++ b/bin/officeotron.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-java -jar @TARFILE_LOCATION@/@OFFICEOTRON_JAR@ "$@"
+java -jar @TARFILE_LOCATION_NATIVE@/@OFFICEOTRON_JAR@ "$@"
diff --git a/configure.ac b/configure.ac
index 94e2ebb21379..460a4ef68802 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6267,7 +6267,10 @@ else
 PathFormat "${absolute_path}"
 TARFILE_LOCATION="${formatted_path_unix}"
 fi
+PathFormat "$TARFILE_LOCATION"
+TARFILE_LOCATION_NATIVE="$formatted_path"
 AC_SUBST(TARFILE_LOCATION)
+AC_SUBST(TARFILE_LOCATION_NATIVE)
 
 AC_MSG_CHECKING([whether we want to fetch tarballs])
 if test "$enable_fetch_external" != "no"; then

core.git: Branch 'distro/allotropia/zeta-24-2' - configure.ac

2024-10-02 Thread Stephan Bergmann (via logerrit)

 configure.ac |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b70a8d72bbf9cad94a7efa871f684d70f6bba80f
Author: Stephan Bergmann 
AuthorDate: Tue Apr 23 11:16:52 2024 +0200
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:44:26 2024 +0200

Support --with-junit/hamcrest in WSL_ONLY_AS_HELPER mode

...where it failed with

> checking for JUnit 4... ./configure: line 47354: cygpath: command not 
found

Change-Id: I56c930b6c8b738b39f26766f90476c32efb383e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166508
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174249
Tested-by: Balazs Varga 
Reviewed-by: Balazs Varga 

diff --git a/configure.ac b/configure.ac
index bec99703c502..94e2ebb21379 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14232,7 +14232,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" 
-a "$cross_compiling" != "
 OOO_JUNIT_JAR=$with_junit
 fi
 if test "$_os" = "WINNT"; then
-OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"`
+PathFormat "$OOO_JUNIT_JAR"
+OOO_JUNIT_JAR="$formatted_path"
 fi
 printf 'import org.junit.Before;' > conftest.java
 if "$JAVACOMPILER" -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then
@@ -14268,7 +14269,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" 
-a "$cross_compiling" != "
 HAMCREST_JAR=$with_hamcrest
 fi
 if test "$_os" = "WINNT"; then
-HAMCREST_JAR=`cygpath -m "$HAMCREST_JAR"`
+PathFormat "$HAMCREST_JAR"
+HAMCREST_JAR="$formatted_path"
 fi
 if "$JAVACOMPILER" -classpath "$HAMCREST_JAR" conftest.java >&5 2>&5; 
then
 AC_MSG_RESULT([$HAMCREST_JAR])

core.git: Branch 'distro/allotropia/zeta-24-2' - configure.ac

2024-10-02 Thread Stephan Bergmann (via logerrit)

 configure.ac |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 703fceba67e0161beca89c0995adc47f7c8d7282
Author: Stephan Bergmann 
AuthorDate: Tue Apr 23 10:44:53 2024 +0200
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:43:53 2024 +0200

Honor TMPDIR configure option in WSL_ONLY_AS_HELPER mode

(It needs to be passed-in as a TMPDIR=/mnt/c/... style path, because 
configure
uses it early on and otherwise fails with some

> checking build system type... config.guess: cannot create a temporary 
directory in C:/...

error.)

Change-Id: I798ed7dd363eb5fd7614c5984861f77cf9d38266
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166506
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174248
Reviewed-by: Balazs Varga 
Tested-by: Balazs Varga 

diff --git a/configure.ac b/configure.ac
index 1c4a25ca73f8..bec99703c502 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15129,6 +15129,9 @@ AC_SUBST(PERL)
 
 if test -n "$TMPDIR"; then
 TEMP_DIRECTORY="$TMPDIR"
+if test -n "$WSL_ONLY_AS_HELPER"; then
+   TEMP_DIRECTORY=$(wslpath -m "$TEMP_DIRECTORY")
+fi
 else
 TEMP_DIRECTORY="/tmp"
 fi
@@ -15259,8 +15262,10 @@ if test -n "$WSL_ONLY_AS_HELPER"; then
 # append strawberry tools dir to PATH (for e.g. windres, ar)
 LO_PATH="$LO_PATH:$STRAWBERRY_TOOLS"
 # temp-dir needs to be in windows realm, hardcode for now
-mkdir -p tmp
-TEMP_DIRECTORY="$BUILDDIR/tmp"
+if test "$TEMP_DIRECTORY" = /tmp; then
+mkdir -p tmp
+TEMP_DIRECTORY="$BUILDDIR/tmp"
+fi
 fi
 
 # Keep in sync with list of files far up, at AC_MSG_CHECKING([for

core.git: Branch 'distro/allotropia/zeta-24-2' - configure.ac

2024-10-02 Thread Stephan Bergmann (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e1e5d17ba73cc24ce4649d88df1910bc0685888e
Author: Stephan Bergmann 
AuthorDate: Tue Apr 23 08:49:46 2024 +0200
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:43:26 2024 +0200

Don't hardcode build as x86_64 for WSL_ONLY_AS_HELPER

...to also make it work builds on aarch64

Change-Id: Ibc502b11eedceddb84481c2ad5d351bf8404c8cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166501
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174247
Tested-by: Balazs Varga 
Reviewed-by: Balazs Varga 

diff --git a/configure.ac b/configure.ac
index bb5a2650f20b..1c4a25ca73f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15237,7 +15237,7 @@ AC_CONFIG_LINKS([include:include])
 
 if test -n "$WSL_ONLY_AS_HELPER"; then
 # while we configure in linux, we actually compile in "cygwin" (close 
enough at least)
-build="x86_64-pc-cygwin"
+build=$host
 PathFormat "$SRC_ROOT"
 SRC_ROOT="$formatted_path"
 PathFormat "$BUILDDIR"

core.git: Branch 'distro/allotropia/zeta-24-2' - external/icu

2024-10-02 Thread Stephan Bergmann (via logerrit)

 external/icu/UnpackedTarball_icu.mk |1 +
 external/icu/no-python.patch|   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 586c560ca95404891d01979a772db5ac84453035
Author: Stephan Bergmann 
AuthorDate: Mon Apr 22 22:02:28 2024 +0200
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:22:00 2024 +0200

external/icu: Drop hidden dependency on Python

...which was always satisfied directly from the system, regardless of our
--enable-python=... setting.  (And which was a problem for my Git Bash and 
WSL
based Windows build attempt, where it happened to find a dysfunctional 
Python
wrapper at C:/Users/steph/AppData/Local/Microsoft/WindowsApps/python3 which
caused a

[...]
> Not rebuilding data/rules.mk, assuming prebuilt data in data/in
> Spawning Python to generate test/testdata/rules.mk...
> Python was not found; run without arguments to install from the Microsoft 
Store, or disable this shortcut from Settings > Manage App Execution Aliases.
> configure: error: Python failed to run; see above error.

error when building ExternalProject_icu.)

There are three uses of that PYTHON setting across 
workdir/UnpackedTarget/icu:

1  In source/configure.ac to generate source/data/rules.mk if
source/data/locales/root.txt would exist---but which doesn't, so we don't
actually need PYTHON there.

2  In source/configure.ac to generate source/test/testdata/rules.mk, but 
which
our (non-check) build apparently doesn't need anyway.

3  In source/data/Makefile.in for target check-local, which is a sub-target 
of
check (which we don't build).

Change-Id: I7455cc91fc67f36582bf54851c07030830cd3b8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166500
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174225
Tested-by: Balazs Varga 
Reviewed-by: Balazs Varga 

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 655614447d53..019bec6546ce 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
+   external/icu/no-python.patch \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/no-python.patch b/external/icu/no-python.patch
new file mode 100644
index ..33960fcae321
--- /dev/null
+++ b/external/icu/no-python.patch
@@ -0,0 +1,11 @@
+--- source/configure.ac
 source/configure.ac
+@@ -202,7 +202,7 @@
+ m4_ifndef([AX_CHECK_COMPILE_FLAG], [AC_MSG_ERROR(['autoconf-archive' is 
missing])])
+ 
+ # TODO(ICU-20301): Remove fallback to Python 2.
+-AC_CHECK_PROGS(PYTHON, python3 "py -3" python "py")
++PYTHON=
+ AC_SUBST(PYTHON)
+ 
+ # Check for the platform make

core.git: Branch 'distro/allotropia/zeta-24-2' - bridges/source

2024-10-02 Thread Stephan Bergmann (via logerrit)

 bridges/source/cpp_uno/msvc_win32_arm64/abi.cxx |  102 
 bridges/source/cpp_uno/msvc_win32_arm64/abi.hxx |2 
 bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx |   26 -
 bridges/source/cpp_uno/msvc_win32_arm64/uno2cpp.cxx |   22 
 4 files changed, 1 insertion(+), 151 deletions(-)

New commits:
commit 3af9a33aadd29d6c7d76cd09a50ec2b478b8bc63
Author: Stephan Bergmann 
AuthorDate: Fri Apr 26 10:17:36 2024 +0200
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:21:35 2024 +0200

Drop unused RETURN_KIND_HFA_FLOAT/DOUBLE from msvc_win32_arm64 UNO bridge

Change-Id: I8c6fbed8c587affda69285c203a3a93fa2e2e603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166699
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174224
Tested-by: Balazs Varga 
Reviewed-by: Balazs Varga 

diff --git a/bridges/source/cpp_uno/msvc_win32_arm64/abi.cxx 
b/bridges/source/cpp_uno/msvc_win32_arm64/abi.cxx
index b8a1c73fb6f3..fbfdb1f34f40 100644
--- a/bridges/source/cpp_uno/msvc_win32_arm64/abi.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_arm64/abi.cxx
@@ -18,96 +18,11 @@
  */
 
 #include 
-#include 
 
 #include 
 
 #include "abi.hxx"
 
-enum StructKind
-{
-STRUCT_KIND_EMPTY,
-STRUCT_KIND_FLOAT,
-STRUCT_KIND_DOUBLE,
-STRUCT_KIND_POD,
-STRUCT_KIND_DTOR
-};
-
-static StructKind getStructKind(typelib_CompoundTypeDescription const* type)
-{
-StructKind k = type->pBaseTypeDescription == 0 ? STRUCT_KIND_EMPTY
-   : 
getStructKind(type->pBaseTypeDescription);
-
-for (sal_Int32 i = 0; i != type->nMembers; ++i)
-{
-StructKind k2 = StructKind();
-switch (type->ppTypeRefs[i]->eTypeClass)
-{
-case typelib_TypeClass_BOOLEAN:
-case typelib_TypeClass_BYTE:
-case typelib_TypeClass_SHORT:
-case typelib_TypeClass_UNSIGNED_SHORT:
-case typelib_TypeClass_LONG:
-case typelib_TypeClass_UNSIGNED_LONG:
-case typelib_TypeClass_HYPER:
-case typelib_TypeClass_UNSIGNED_HYPER:
-case typelib_TypeClass_CHAR:
-case typelib_TypeClass_ENUM:
-k2 = STRUCT_KIND_POD;
-break;
-case typelib_TypeClass_FLOAT:
-k2 = STRUCT_KIND_FLOAT;
-break;
-case typelib_TypeClass_DOUBLE:
-k2 = STRUCT_KIND_DOUBLE;
-break;
-case typelib_TypeClass_STRING:
-case typelib_TypeClass_TYPE:
-case typelib_TypeClass_ANY:
-case typelib_TypeClass_SEQUENCE:
-case typelib_TypeClass_INTERFACE:
-k2 = STRUCT_KIND_DTOR;
-break;
-case typelib_TypeClass_STRUCT:
-{
-typelib_TypeDescription* td = 0;
-TYPELIB_DANGER_GET(&td, type->ppTypeRefs[i]);
-k2 = 
getStructKind(reinterpret_cast(td));
-TYPELIB_DANGER_RELEASE(td);
-break;
-}
-default:
-assert(false);
-}
-switch (k2)
-{
-case STRUCT_KIND_EMPTY:
-// this means an empty sub-object, which nevertheless obtains 
a byte
-// of storage (TODO: does it?), so the full object cannot be a
-// homogeneous collection of float or double
-case STRUCT_KIND_POD:
-assert(k != STRUCT_KIND_DTOR);
-k = STRUCT_KIND_POD;
-break;
-case STRUCT_KIND_FLOAT:
-case STRUCT_KIND_DOUBLE:
-if (k == STRUCT_KIND_EMPTY)
-{
-k = k2;
-}
-else if (k != k2)
-{
-assert(k != STRUCT_KIND_DTOR);
-k = STRUCT_KIND_POD;
-}
-break;
-case STRUCT_KIND_DTOR:
-return STRUCT_KIND_DTOR;
-}
-}
-return k;
-}
-
 ReturnKind getReturnKind(typelib_TypeDescription const* type)
 {
 switch (type->eTypeClass)
@@ -134,24 +49,9 @@ ReturnKind getReturnKind(typelib_TypeDescription const* 
type)
 case typelib_TypeClass_TYPE:
 case typelib_TypeClass_ANY:
 case typelib_TypeClass_SEQUENCE:
+case typelib_TypeClass_STRUCT:
 case typelib_TypeClass_INTERFACE:
 return RETURN_KIND_INDIRECT;
-case typelib_TypeClass_STRUCT:
-if (type->nSize > 16)
-{
-return RETURN_KIND_INDIRECT;
-}
-switch 
(getStructKind(reinterpret_cast(type)))
-{
-case STRUCT_KIND_FLOAT:
-return RETURN_KIND_INDIRECT;
-case STRUCT_KIND_DOUBLE:
-

core.git: Branch 'distro/allotropia/zeta-24-2' - basic/Library_sb.mk basic/source

2024-10-02 Thread Stephan Bergmann (via logerrit)

 basic/Library_sb.mk  |2 +-
 basic/source/runtime/dllmgr-none.cxx |2 +-
 basic/source/runtime/dllmgr.hxx  |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4a0239929945d38187bd5c0ce5cd46e311653d9c
Author: Stephan Bergmann 
AuthorDate: Fri Apr 26 09:21:17 2024 +0200
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:20:57 2024 +0200

Use Windows dllmgr-x64 also for aarch64

At least, CppunitTest_basic_macros 
CPPUNIT_TEST_NAME=Coverage::Coverage_Iterator
(which exercises it in basic/qa/basic_coverage/test_declare_from_dll.bas)
succeeds.

Change-Id: Ife90d5b84d5fb7bb4948cfeaf48180a6929a1dff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166695
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174223
Tested-by: Balazs Varga 
Reviewed-by: Balazs Varga 

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 4976eb5eda8b..c5fb659300c5 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -150,7 +150,7 @@ $(eval $(call gb_Library_add_asmobjects,sb,\
basic/source/runtime/wnt-x86 \
 ))
 else
-ifeq ($(OS)$(CPUNAME),WNTX86_64)
+ifeq ($(OS)$(filter-out AARCH64 X86_64,$(CPUNAME)),WNT)
 $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/dllmgr-x64 \
 ))
diff --git a/basic/source/runtime/dllmgr-none.cxx 
b/basic/source/runtime/dllmgr-none.cxx
index 4c7f700a9eef..2a03e2ae7855 100644
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
@@ -106,7 +106,7 @@ void SbiDllMgr::FreeDll(SAL_UNUSED_PARAMETER OUString const 
&) {}
 
 SbiDllMgr::SbiDllMgr() = default;
 
-#if defined(_WIN32) && !defined(_ARM64_)
+#if defined(_WIN32)
 SbiDllMgr::~SbiDllMgr() = default;
 #endif
 
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index a280e89b64db..fe76cfb681b6 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -33,7 +33,7 @@ public:
 
 SbiDllMgr();
 
-#if defined(_WIN32) && !defined(_ARM64_)
+#if defined(_WIN32)
 ~SbiDllMgr();
 #endif
 
@@ -44,7 +44,7 @@ public:
 void FreeDll(OUString const & library);
 
 private:
-#if defined(_WIN32) && !defined(_ARM64_)
+#if defined(_WIN32)
 struct Impl;
 
 std::unique_ptr< Impl > impl_;

core.git: Branch 'distro/allotropia/zeta-24-2' - bridges/source

2024-10-02 Thread Stephan Bergmann (via logerrit)

 bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 217dd12214f6e743327ade178a82489263bf5115
Author: Stephan Bergmann 
AuthorDate: Thu Apr 25 14:16:16 2024 +0200
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:20:27 2024 +0200

Adapt queryInterface in fixed msvc_win32_arm64 UNO bridge

...where the function's argument is in x2, not x1 (see commit message of
ae6ee262d7649222a137f8722886a10db274ddf5 "Some fixing of msvc_win32_arm64 
UNO
bridge" for details)

Change-Id: I00ef5df1ebad4609918c0c6845ebdcfe810f6152
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166622
Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174222
Reviewed-by: Balazs Varga 
Tested-by: Balazs Varga 

diff --git a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
index da8694667b3c..a43cd3e24698 100644
--- a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
@@ -290,7 +290,7 @@ extern "C" void vtableCall(sal_Int32 functionIndex, 
sal_Int32 vtableOffset, sal_
 {
 typelib_TypeDescription* td = nullptr;
 TYPELIB_DANGER_GET(&td,
-   
(reinterpret_cast(gpr[1])->getTypeLibType()));
+   
(reinterpret_cast(gpr[2])->getTypeLibType()));
 if (td != 0 && td->eTypeClass == 
typelib_TypeClass_INTERFACE)
 {
 uno::XInterface* ifc = nullptr;

core.git: Branch 'distro/allotropia/zeta-24-2' - bridges/source

2024-10-02 Thread Stephan Bergmann (via logerrit)

 bridges/source/cpp_uno/msvc_win32_arm64/callvirtualfunction.S |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit e5199109d558899afc0d9e21a364c8afd6ca0ac6
Author: Stephan Bergmann 
AuthorDate: Thu Apr 25 09:48:40 2024 +0200
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:20:02 2024 +0200

Add back the callVirtualFunction_fake boilerplate

...that ae6ee262d7649222a137f8722886a10db274ddf5 "Some fixing of
msvc_win32_arm64 UNO bridge" had removed, assuming it wasn't actually 
necessary.
But looks like Windows exception handling stack unwinding somehow needs it 
after
all.  Getting past the CustomTarget_testtools/uno_test getRaiseAttr1() call 
now
(but still failing at some later place).

Change-Id: I1e84345f2f355ab1e480c779da6b221b744132b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166616
    Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174221
Tested-by: Balazs Varga 
Reviewed-by: Balazs Varga 

diff --git a/bridges/source/cpp_uno/msvc_win32_arm64/callvirtualfunction.S 
b/bridges/source/cpp_uno/msvc_win32_arm64/callvirtualfunction.S
index 546c02cf5040..55fd3f95ff85 100644
--- a/bridges/source/cpp_uno/msvc_win32_arm64/callvirtualfunction.S
+++ b/bridges/source/cpp_uno/msvc_win32_arm64/callvirtualfunction.S
@@ -25,7 +25,12 @@
x3 function
 */
 
-NESTED_ENTRY callVirtualFunction
+NESTED_ENTRY callVirtualFunction_fake
+
+// for unwind information, Windows has to store fp and lr
+PROLOG_SAVE_REG_PAIR   x29, x30, #-32!
+
+ALTERNATE_ENTRY callVirtualFunction
 
 sub   sp, sp, #32
 stp   fp, lr, [sp]
@@ -75,7 +80,7 @@ done
 ldp   fp, lr, [sp, #-32]
 ret
 
-NESTED_END callVirtualFunction
+NESTED_END callVirtualFunction_fake
 
 END

core.git: Branch 'distro/allotropia/zeta-24-2' - bridges/source

2024-10-02 Thread Stephan Bergmann (via logerrit)

 bridges/source/cpp_uno/msvc_win32_arm64/abi.cxx   |6 
 bridges/source/cpp_uno/msvc_win32_arm64/callvirtualfunction.S |   74 +-
 bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx   |6 
 bridges/source/cpp_uno/msvc_win32_arm64/uno2cpp.cxx   |   18 +-
 bridges/source/cpp_uno/msvc_win32_arm64/vtableslotcall.S  |1 
 5 files changed, 60 insertions(+), 45 deletions(-)

New commits:
commit 3b3f7edbea05d7ee63d91af6eec9df3ab9684445
Author: Stephan Bergmann 
AuthorDate: Wed Apr 24 14:06:11 2024 +0200
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:19:37 2024 +0200

Some fixing of msvc_win32_arm64 UNO bridge

For one, the Windows ABI deviates from the generic aarch64 ABI regarding
returning class instances by value from non-static member functions, see

<https://learn.microsoft.com/en-us/cpp/build/arm64-windows-abi-conventions?view=msvc-170#return-values>:
"The caller shall reserve a block of memory of sufficient size and 
alignment to
hold the result.  The address of the memory block shall be passed as an
additional argument to the function in x0, or x1 if $this is passed in x0.  
The
callee may modify the result memory block at any point during the execution 
of
the subroutine.  The callee returns the address of the memory block in x0."
That means RETURN_KIND_HFA_FLOAT and RETURN_KIND_HFA_DOUBLE are not needed, 
and
can be cleaned up in a follow-up commit.

And for another, setting up a call stack frame in call() in uno2cpp.cxx for
callVirtualFunction() didn't actually work, so go with a slightly less 
ambitious
aproach (as also used by the gcc_linux_aarch64 bridge) and explicitly copy 
the
arguments that end up on the stack around in callVirtualFunction().

This allows CustomTarget_testtools/uno_test to proceed at least as far as 
the
call of getRaiseAttr1(), which still leads to an uncaught
css::uno::RuntimeException.

Change-Id: I4a8ec09c270864ac4de246d7e8d1f923198236b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166585
Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174220
Tested-by: Balazs Varga 
Reviewed-by: Balazs Varga 

diff --git a/bridges/source/cpp_uno/msvc_win32_arm64/abi.cxx 
b/bridges/source/cpp_uno/msvc_win32_arm64/abi.cxx
index c88873143898..b8a1c73fb6f3 100644
--- a/bridges/source/cpp_uno/msvc_win32_arm64/abi.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_arm64/abi.cxx
@@ -144,13 +144,13 @@ ReturnKind getReturnKind(typelib_TypeDescription const* 
type)
 switch 
(getStructKind(reinterpret_cast(type)))
 {
 case STRUCT_KIND_FLOAT:
-return RETURN_KIND_HFA_FLOAT;
+return RETURN_KIND_INDIRECT;
 case STRUCT_KIND_DOUBLE:
-return RETURN_KIND_HFA_DOUBLE;
+return RETURN_KIND_INDIRECT;
 case STRUCT_KIND_DTOR:
 return RETURN_KIND_INDIRECT;
 default:
-return RETURN_KIND_REG;
+return RETURN_KIND_INDIRECT;
 }
 }
 }
diff --git a/bridges/source/cpp_uno/msvc_win32_arm64/callvirtualfunction.S 
b/bridges/source/cpp_uno/msvc_win32_arm64/callvirtualfunction.S
index a058e47d0038..546c02cf5040 100644
--- a/bridges/source/cpp_uno/msvc_win32_arm64/callvirtualfunction.S
+++ b/bridges/source/cpp_uno/msvc_win32_arm64/callvirtualfunction.S
@@ -19,53 +19,63 @@
 /*
extern void callVirtualFunction
 
-   x0 stack
-   x1 frame
-   x2 function
-   x3 return
+   x0 regs
+   x1 stack
+   x2 stack count
+   x3 function
 */
 
-NESTED_ENTRY callVirtualFunction_fake
+NESTED_ENTRY callVirtualFunction
 
-// for unwind information, Windows has to store fp and lr
-PROLOG_SAVE_REG_PAIR   x29, x30, #-32!
+sub   sp, sp, #32
+stp   fp, lr, [sp]
+mov   fp, sp
 
-ALTERNATE_ENTRY callVirtualFunction
+// Stack space for arguments >= 8 (16-byte aligned):
+lsl   x2, x2, #3
+sub   x9, sp, x2
+bfc   x9, #0, #4
+mov   sp, x9
 
-// use a stack frame allocated by our caller
-stp   x29, x30, [x1]
-mov   x29, x1
-mov   sp, x0
+// Copy arguments >= 8:
+cbz   x2, done
+loop
+sub   x2, x2, #8
+ldr   x9, [x1, x2]
+str   x9, [sp, x2]
+cbnz  x2, loop
+done
 
-mov   x9, x2  // function
-mov   x8, x3  // complex return
-str   x3, [x29, #16]  // save rvalue
+mov   x9, x3  // function
+
+mov   x10, x0
+str   x10, [fp, #16]
 
 // load the core argument passing registers
-ldp   x0, x1, [sp, #-128]
-ldp   x2, x3, [sp, #-112]
-ldp   x4, x5, [sp, #-96]
-

core.git: Branch 'distro/allotropia/zeta-24-2' - download.lst external/rhino scripting/Jar_ScriptProviderForJavaScript.mk scripting/java

2024-10-02 Thread Stephan Bergmann (via logerrit)

 download.lst   
   |4 
 external/rhino/ExternalPackage_rhino.mk
   |2 
 external/rhino/ExternalProject_rhino.mk
   |   36 
 external/rhino/OfficeScriptInfo.java   
   |  118 -
 external/rhino/UnpackedTarball_rhino.mk
   |   11 
 external/rhino/filelist.txt
   |  330 +++
 external/rhino/rhino-classpath.patch.1 
   |   13 
 external/rhino/rhino1_5R5-find_swing.patch 
   |   16 
 external/rhino/rhino1_5R5-updateToolTip.patch  
   |   23 
 external/rhino/rhino1_5R5.patch
   | 1067 --
 scripting/Jar_ScriptProviderForJavaScript.mk   
   |6 
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
   |  319 --
 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
 |   59 
 scripting/java/com/sun/star/script/framework/provider/javascript/template.js   
   |   54 
 14 files changed, 363 insertions(+), 1695 deletions(-)

New commits:
commit 80ea8b17332c6382cbf6d216e28bb839a45460de
Author: Stephan Bergmann 
AuthorDate: Fri Mar 22 15:53:49 2024 +0100
Commit: Balazs Varga 
CommitDate: Wed Oct 2 19:18:56 2024 +0200

Update to latest Rhino 1.7.14

...at the expense of losing, at least for now, the script editor for it 
(which
had been hacked into the old upstream sources in a hard-to-maintain way).

rhino-1.7.14.zip is taken from

<https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip>.
Building it would now use Gradle, but instead just hack together an 
invocation
of javac and jar in external/rhino/ExternalProject_rhino.mk that effectively
generates the same jar as the upstream-built jar available at

<https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.jar>.

All the various patches are no longer necessary:
* external/rhino/rhino1_5R5.patch and external/rhino/OfficeScriptInfo.java 
were
  mostly for the hacked-in script editor, which has been abandoned at least 
for
  now (see above).
* external/rhino/rhino1_5R5-find_swing.patch (originally from
  0a7f9346503a557f583bced269655fa1996550af "ause109: #i106296# make 
build.xml
  aware of TARFILE_LOCATION") appears to be obsolete.
* external/rhino/rhino1_5R5-updateToolTip.patch is covered by
  
<https://github.com/mozilla/rhino/commit/ab20a73b16f68daf715c7ac4808c119bb15d698c>
  "Fix bug 414869: Rhino debugger fails to launch due to updates in mac os x
  leopard".
* external/rhino/rhino-classpath.patch.1 from
  bb58293296f843654045d7b0eba6899d11533a4a "rhino: unbreak build on Fedora 
34"
  was only relevant when building with Ant.

Change-Id: I5fca5915d785716f7aaf313ff2469a20f55f707a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165190
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174219
Tested-by: Balazs Varga 
Reviewed-by: Balazs Varga 

diff --git a/download.lst b/download.lst
index 18469c101aab..39d8a92356dc 100644
--- a/download.lst
+++ b/download.lst
@@ -586,8 +586,8 @@ REVENGE_TARBALL := 
librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-RHINO_SHA256SUM := 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
-RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+RHINO_SHA256SUM := 
bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c
+RHINO_TARBALL := rhino-1.7.14.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/rhino/ExternalPackage_rhino.mk 
b/external/rhino/ExternalPackage_rhino.mk
index 0ee1d60e309d..faac15c6978e 100644
--- a/external/rhino/ExternalPackage_rhino.mk
+++ b/external/rhino/ExternalPackage_rhino.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,rhino,rhino))
 
 $(eval $(call gb_ExternalPackage_use_external_project,rhino,rhino))
 
-$(eval $(call 
gb_ExternalPackage_add_file,rhino,$(LIBO_SHARE_JAVA_FOLDER)/js.jar,build/rhino1_5R5/js.jar))
+$(eval $(call 
gb_ExternalPackage_add_file,rhino,$(LIBO_SHARE_JAVA_FOLDER)/js.jar,build/js.jar))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/

core.git: desktop/source

2024-10-02 Thread Stephan Bergmann (via logerrit)

 desktop/source/app/updater.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ea5e3865b4d47c796a36852c5d5e5a7b736a21cf
Author: Stephan Bergmann 
AuthorDate: Wed Oct 2 15:42:34 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 2 17:35:48 2024 +0200

Hack reordering includes to avoid Windows Yield macro fallout

No idea why my local Windows build started to only now fail with

> [build CXX] desktop/source/app/updater.cxx
> C:\lo> C:\lo
or how to potentially address that properly with prewin.h/postwin.h...

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

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 39810c2cbbdc..39699b90dec5 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+// Include this early, as it uses the identifier "Yield" which is defined as a 
macro in Windows
+// system files indirectly included via some of the later includes here:
+#include 
+
 #include "updater.hxx"
 
 #if UNX
@@ -48,8 +52,6 @@
 
 #include 
 
-#include 
-
 #include 
 #include 
 #include

core.git: solenv/gbuild

2024-10-02 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/com_MSC_defs.mk |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 064937d0b5f6786e3ec347fdc5b2c771de348ffa
Author: Stephan Bergmann 
AuthorDate: Wed Oct 2 15:37:40 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 2 17:35:18 2024 +0200

Avoid C4847 with --with-latest-c++ when compiling CLR

> [build CLR] cli_ure/source/climaker/climaker_emit.cxx
> c1xx: error C2220: the following warning is treated as an error
> c1xx: warning C4857: C++/CLI mode does not support C++ versions newer 
than C++20; setting language to /std:c++20

etc., as seen now with at least VS2022 Preview 17.12.0 Preview 2.1

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

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 36ce2b1f964b..e915036b54c8 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -263,10 +263,16 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
 # be suppressed by -wd4857, only by -Wv:18. The warning seems incorrect, 
because
 # using -std:c++17 produces errors about undeclared 'char8_t'. VS2022 doesn't
 # have the problem, so drop -Wv:18 when bumping baseline.
+# Similarly, at least VS2022 Preview 17.12.0 Preview 2.1 with 
--with-latest-c++ emits a "warning
+# C4857: C++/CLI mode does not support C++ versions newer than C++20; setting 
language to
+# /std:c++20" that cannot be disabled by adding -wd4857, so hardcode a 
-std:c++20 substitution in
+# that case:
 gb_CXXCLRFLAGS := \
$(if $(COM_IS_CLANG), \
$(patsubst -std=%,-std:c++20 -Zc:__cplusplus,$(gb_CXXFLAGS)), \
-   $(gb_CXXFLAGS)) \
+   $(if $(filter -std:c++latest,$(CXXFLAGS_CXX11)), \
+   $(patsubst -std:c++latest,-std:c++20,$(gb_CXXFLAGS)), \
+   $(gb_CXXFLAGS))) \
$(gb_LinkTarget_EXCEPTIONFLAGS) \
-AI $(INSTDIR)/$(LIBO_URE_LIB_FOLDER) \
-EHa \
@@ -274,6 +280,7 @@ gb_CXXCLRFLAGS := \
$(if $(filter 16.0,$(VCVER)),-Wv:18) \
-Zc:twoPhase- \
 
+
 ifeq ($(COM_IS_CLANG),TRUE)
 
 gb_CFLAGS += \

core.git: connectivity/source

2024-10-01 Thread Stephan Bergmann (via logerrit)

 connectivity/source/inc/odbc/OTools.hxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit a9f006bf03ace169663cd2697b7596c51ed4f273
Author: Stephan Bergmann 
AuthorDate: Mon Sep 30 10:05:47 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 1 09:54:33 2024 +0200

Avoid some macOS loplugin warnings around SQLWChars

...like

> connectivity/source/drivers/odbc/OPreparedStatement.cxx:285:136: error: 
replace function parameter of type 'const OUString &' with 
'std::u16string_view' [loplugin:stringviewparam]
>   285 | void OPreparedStatement::setParameter(const sal_Int32 
parameterIndex, const sal_Int32 _nType, const sal_Int16 _nScale, const OUString 
&_sData)
>   |   
 ^~

and

> connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx:851:117: 
error: directly use a 'std::u16string_view' (aka 'basic_string_view') 
value instead of a _ustr user-defined string literal [loplugin:ostr]
>   851 | SQLWChars aCOL = !uCOL.isEmpty() ? 
SQLWChars(uCOL.makeStringAndClear()) : SQLWChars(u"" SQL_ALL_TABLE_TYPES 
""_ustr);
>   |   
  ^~~

caused by SQLWCHAR being 32-bit wchar_t on macOS (rather than 16-bit 
unsigned
short, as on Linux), so SQLWChars is CHARS (rather than
CHARS) with a ctor taking a std::u16string_view argument 
(rather
than an OUString argument)

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

diff --git a/connectivity/source/inc/odbc/OTools.hxx 
b/connectivity/source/inc/odbc/OTools.hxx
index adac0cd0c75c..c97ce4f4654a 100644
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
@@ -333,6 +333,10 @@ public:
 m_len = p - m_buf.get();
 *p = 0;
 }
+// Explicitly define a redundant overload for OUString to avoid certain 
loplugin warnings in
+// code prepared to work with SQLWCHAR being either 16-bit unsigned short 
(Linux) or 32-bit
+// wchar_t (macOS):
+CHARS(OUString const & str): CHARS(static_cast(str)) 
{}
 C* get() { return reinterpret_cast(m_buf.get()); }
 
 private:

core.git: avmedia/source

2024-09-30 Thread Stephan Bergmann (via logerrit)

 avmedia/source/macavf/framegrabber.mm |9 +
 avmedia/source/macavf/player.mm   |4 
 avmedia/source/macavf/window.mm   |4 
 3 files changed, 17 insertions(+)

New commits:
commit e7c4129a5cc55c52c16af049f74cf67c48a10878
Author: Stephan Bergmann 
AuthorDate: Mon Sep 30 10:04:52 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Sep 30 12:07:21 2024 +0200

Silence -Werror,-Wdeprecated-declarations (macOS 15.0)

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

diff --git a/avmedia/source/macavf/framegrabber.mm 
b/avmedia/source/macavf/framegrabber.mm
index e0b8bad61171..35f55e87b1b8 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -44,7 +44,11 @@ FrameGrabber::~FrameGrabber()
 
 bool FrameGrabber::create( AVAsset* pMovie )
 {
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
+// 'tracksWithMediaType:' is deprecated: first deprecated in macOS 
15.0 - Use
+// loadTracksWithMediaType:completionHandler: instead
 if( [[pMovie tracksWithMediaType:AVMediaTypeVideo] count] == 0)
+SAL_WNODEPRECATED_DECLARATIONS_POP
 {
 SAL_WARN("avmedia", "AVGrabber::create() found no video content!" );
 return false;
@@ -63,7 +67,12 @@ uno::Reference< graphic::XGraphic > SAL_CALL 
FrameGrabber::grabFrame( double fMe
 return xRet;
 
 // get the requested image from the movie
+
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
+// 'copyCGImageAtTime:actualTime:error:' is deprecated: first 
deprecated in macOS 15.0 -
+// Use generateCGImageAsynchronouslyForTime:completionHandler: instead
 CGImage* pCGImage = [mpImageGen 
copyCGImageAtTime:CMTimeMakeWithSeconds(fMediaTime,1000) actualTime:nullptr 
error:nullptr];
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 
 // convert the image to a TIFF-formatted byte-array
 CFMutableDataRef pCFData = CFDataCreateMutable( kCFAllocatorDefault, 0 );
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 401cba74c2d2..190840f6b11f 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -295,7 +295,11 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
 awt::Size aSize( 0, 0 ); // default size
 
 AVAsset* pMovie = [[mpPlayer currentItem] asset];
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
+// 'tracksWithMediaType:' is deprecated: first deprecated in macOS 
15.0 - Use
+// loadTracksWithMediaType:completionHandler: instead
 NSArray* pVideoTracks = [pMovie tracksWithMediaType:AVMediaTypeVideo];
+SAL_WNODEPRECATED_DECLARATIONS_POP
 if ([pVideoTracks count] > 0)
 {
 AVAssetTrack* pFirstVideoTrack = 
static_cast([pVideoTracks objectAtIndex:0]);
diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm
index fdb2e50655e8..dbf4b496131f 100644
--- a/avmedia/source/macavf/window.mm
+++ b/avmedia/source/macavf/window.mm
@@ -42,7 +42,11 @@ Window::Window( Player& i_rPlayer, NSView* i_pParentView )
 // check the media asset for video content
 AVPlayer* pAVPlayer = mrPlayer.getAVPlayer();
 AVAsset* pMovie = [[pAVPlayer currentItem] asset];
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
+// 'tracksWithMediaType:' is deprecated: first deprecated in macOS 
15.0 - Use
+// loadTracksWithMediaType:completionHandler: instead
 const int nVideoCount = [pMovie 
tracksWithMediaType:AVMediaTypeVideo].count;
+SAL_WNODEPRECATED_DECLARATIONS_POP
 if( nVideoCount <= 0 )
 return;

core.git: tools/inc tools/source

2024-09-30 Thread Stephan Bergmann (via logerrit)

 tools/inc/poly.h  |2 +-
 tools/source/generic/poly.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c3b3b27e57e476ba0ee7060ccd2fccd687188893
Author: Stephan Bergmann 
AuthorDate: Mon Sep 30 10:03:46 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Sep 30 11:21:34 2024 +0200

loplugin:noexceptmove (macOS, LLVM 20 trunk libc++)

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

diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index d1187d5251c1..6576beecaf97 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -34,7 +34,7 @@ public:
 ImplPolygon( sal_uInt16 nInitSize );
 ImplPolygon( sal_uInt16 nPoints, const Point* pPtAry, 
const PolyFlags* pInitFlags );
 ImplPolygon( const ImplPolygon& rImplPoly );
-ImplPolygon( ImplPolygon&& rImplPoly );
+ImplPolygon( ImplPolygon&& rImplPoly ) noexcept;
 ImplPolygon( const tools::Rectangle& rRect );
 ImplPolygon( const tools::Rectangle& rRect, sal_uInt32 
nHorzRound, sal_uInt32 nVertRound);
 ImplPolygon( const Point& rCenter, tools::Long nRadX, 
tools::Long nRadY );
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 8026f238773a..0b8350bd8638 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -84,7 +84,7 @@ ImplPolygon::ImplPolygon( const ImplPolygon& rImpPoly )
 mnPoints = rImpPoly.mnPoints;
 }
 
-ImplPolygon::ImplPolygon(ImplPolygon&& rImpPoly)
+ImplPolygon::ImplPolygon(ImplPolygon&& rImpPoly) noexcept
 {
 mxPointAry = std::move(rImpPoly.mxPointAry);
 mxFlagAry = std::move(rImpPoly.mxFlagAry);

core.git: desktop/win32 vcl/win

2024-09-30 Thread Stephan Bergmann (via logerrit)

 desktop/win32/source/loader.cxx |   24 
 vcl/win/window/salframe.cxx |   39 +--
 2 files changed, 1 insertion(+), 62 deletions(-)

New commits:
commit 250f35740d0916845761f54f64c1f37f35420978
Author: Stephan Bergmann 
AuthorDate: Thu Feb 15 10:54:33 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Sep 30 09:44:34 2024 +0200

Revert "Fall back to old bootstrap.ini [Win32] section, for backwards 
compatibility"

This reverts commit ebd3f0971b843527ed493a35b2303c8c15b94109.
Conflicts:
desktop/win32/source/loader.cxx
vcl/win/window/salframe.cxx

Reason for revert:  This fallback functionality was documented as 
deprecated at

<https://wiki.documentfoundation.org/index.php?title=ReleaseNotes/24.8&oldid=738731>
"fundamental.override.ini", to "be removed in a later version", which is
happening now for LO 25.2.

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

diff --git a/desktop/win32/source/loader.cxx b/desktop/win32/source/loader.cxx
index ca74c13ab92d..5374c286aa41 100644
--- a/desktop/win32/source/loader.cxx
+++ b/desktop/win32/source/loader.cxx
@@ -218,8 +218,6 @@ int officeloader_impl(bool bAllowConsole)
 // read limit values from fundamental.override.ini
 unsigned int nMaxMemoryInMB = 0;
 bool bExcludeChildProcesses = true;
-bool fallbackForMaxMemoryInMB = true;
-bool fallbackForExcludeChildProcesses = true;
 
 try
 {
@@ -227,34 +225,12 @@ int officeloader_impl(bool bAllowConsole)
 std::ifstream aFile(szIniDirectory + L"\fundamental.override.ini");
 boost::property_tree::ini_parser::read_ini(aFile, pt);
 nMaxMemoryInMB = pt.get("Bootstrap.LimitMaximumMemoryInMB", 
nMaxMemoryInMB);
-fallbackForMaxMemoryInMB = 
!pt.get_child_optional("Bootstrap.LimitMaximumMemoryInMB");
 bExcludeChildProcesses = 
pt.get("Bootstrap.ExcludeChildProcessesFromLimit", bExcludeChildProcesses);
-fallbackForExcludeChildProcesses
-= 
!pt.get_child_optional("Bootstrap.ExcludeChildProcessesFromLimit");
 }
 catch (...)
 {
 nMaxMemoryInMB = 0;
 }
-// For backwards compatibility, for now also try to read the values from 
bootstrap.ini if
-// fundamental.override.ini does not provide them:
-if (fallbackForMaxMemoryInMB || fallbackForExcludeChildProcesses) {
-try
-{
-boost::property_tree::ptree pt;
-std::ifstream aFile(szIniDirectory + L"\bootstrap.ini");
-boost::property_tree::ini_parser::read_ini(aFile, pt);
-if (fallbackForMaxMemoryInMB) {
-nMaxMemoryInMB = pt.get("Win32.LimitMaximumMemoryInMB", 
nMaxMemoryInMB);
-}
-if (fallbackForExcludeChildProcesses) {
-bExcludeChildProcesses = 
pt.get("Win32.ExcludeChildProcessesFromLimit", bExcludeChildProcesses);
-}
-}
-catch (...)
-{
-}
-}
 
 // create a Windows JobObject with a memory limit
 HANDLE hJobObject = nullptr;
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index f1a753f05f82..4c7f6814c6f0 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -32,12 +32,6 @@
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-
 #include 
 #include 
 #include 
@@ -1958,38 +1952,7 @@ static bool EnableAttachThreadInputHack()
 {
 OUString s("$EnableAttachThreadInputHack");
 rtl::Bootstrap::expandMacros(s);
-bool bEnabled;
-if (!s.isEmpty()) {
-bEnabled = s == "true";
-} else {
-// For backwards compatibility, for now also try to read the value 
from a [Win32] section of
-// bootstrap.ini if it is not set as a bootstrap variable:
-bEnabled = false;
-OUString aBootstrapUri;
-if (osl_getProcessWorkingDir(&aBootstrapUri.pData) == 
osl_Process_E_None) {
-aBootstrapUri += "/bootstrap.ini";
-
-OUString aSystemFileName;
-if (osl::FileBase::getSystemPathFromFileURL(aBootstrapUri, 
aSystemFileName)
-== osl::FileBase::E_None
-&& aSystemFileName.getLength() <= MAX_PATH)
-{
-// this uses the Boost ini parser, instead of tools::Config, 
as we already use it to
-// read other values from bootstrap.ini in 
desktop/win32/source/loader.cxx, because
-// that watchdog process can't access LO libs. This way the 
handling is consistent.
-try
-{
-boost::propert

core.git: codemaker/source

2024-09-29 Thread Stephan Bergmann (via logerrit)

 codemaker/source/netmaker/netproduce.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 15492ec2d25db324ce60d5994563eb86bbbf992f
Author: Stephan Bergmann 
AuthorDate: Sun Sep 29 17:20:12 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Sun Sep 29 19:05:47 2024 +0200

Add "f" suffix to literals of type float

...to avoid

> error CS0266: Cannot implicitly convert type 'double' to 'float'. An 
explicit conversion exists (are you missing a cast?)

(as would e.g. happen if offapi/org/libreoffice/embindtest/Constants.idl 
were
included in regular builds)

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

diff --git a/codemaker/source/netmaker/netproduce.cxx 
b/codemaker/source/netmaker/netproduce.cxx
index ab3495b9e641..b11569c2130b 100644
--- a/codemaker/source/netmaker/netproduce.cxx
+++ b/codemaker/source/netmaker/netproduce.cxx
@@ -881,7 +881,7 @@ void NetProducer::produceConstantGroup(std::string_view 
name,
 break;
 case unoidl::ConstantValue::TYPE_FLOAT:
 type = "float"_ostr;
-value = OString::number(member.value.floatValue);
+value = OString::number(member.value.floatValue) + "f";
 break;
 case unoidl::ConstantValue::TYPE_DOUBLE:
 type = "double"_ostr;

core.git: Branch 'distro/allotropia/zeta-24-2' - solenv/flatpak-manifest.in

2024-09-26 Thread Stephan Bergmann (via logerrit)

 solenv/flatpak-manifest.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 70f9a7e6fe5c0012d9fd7f4dd65c8be726c561f1
Author: Stephan Bergmann 
AuthorDate: Tue Sep 24 20:42:30 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 26 09:34:06 2024 +0200

Adapt flatpak build to upstream changes


<https://github.com/flathub/org.libreoffice.LibreOffice/commit/fb1a63fc872e6ddc8c9ae4b0b366072253e58ddc>
"gvfs: Update gvfs-1.54.2.tar.xz to 1.56.0 (#303)"


<https://github.com/flathub/org.libreoffice.LibreOffice/commit/8b55ceec9bf4f3298672ad6685455b0bb035d470>
"Update org.freedesktop.Platform to 24.08 (#302)"

Change-Id: Ib0bffe9652ed3e9c4107c15dfff75a0f57f682c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173881
Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann 
(cherry picked from commit 3b6dbc60d1344f290367fe9f887855f408700bf5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173921
Tested-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ad004c1868bb..c213c62e0238 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -1,7 +1,7 @@
 {
 "id": "org.libreoffice.LibreOffice",
 "runtime": "org.freedesktop.Platform",
-"runtime-version": "23.08",
+"runtime-version": "24.08",
 "sdk": "org.freedesktop.Sdk",
 "sdk-extensions": [
 "org.freedesktop.Sdk.Extension.openjdk21"
@@ -51,8 +51,8 @@
 "sources": [
 {
 "type": "archive",
-"url": 
"https://download.gnome.org/sources/gvfs/1.54/gvfs-1.54.2.tar.xz";,
-"sha256": 
"54908f4e10b5f1c231e90330c8c15b7f21f2bb610f194c034b338e379c508e3c",
+"url": 
"https://download.gnome.org/sources/gvfs/1.56/gvfs-1.56.0.tar.xz";,
+"sha256": 
"441d2356c72616364cdb420af96199113a13ed9e146f2175fe373989adada39e",
 "x-checker-data": {
 "type": "gnome",
 "name": "gvfs",

core.git: config_host/config_options.h.in configure.ac include/i18nlangtag include/o3tl

2024-09-25 Thread Stephan Bergmann (via logerrit)

 config_host/config_options.h.in |2 ++
 configure.ac|3 +++
 include/i18nlangtag/lang.h  |7 +--
 include/o3tl/strong_int.hxx |7 +--
 4 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit fea3c9d69cad1a0408883bf5dc44670cc53fcbc2
Author: Stephan Bergmann 
AuthorDate: Wed Sep 25 08:56:30 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 25 15:13:11 2024 +0200

Confine a hack to known-broken --enable-pch

The hack was introduced in 7db1150b2c4a9adb993084d2dceedb450781b1dc "fix 
macos
build with clang 16".  (And for our --enable-pch for Clang being 
known-broken,
also see ffc1ab15ae358315516aab319778a254688afbd3 "Work around some Clang 
PCH
consteval issue by disabling HAVE_CPP_CONSTEVAL".)

Change-Id: I5dcd7f96ba39bf4d0748940778699cb7d368f449
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173891
Reviewed-by: Stephan Bergmann 
Reviewed-by: Noel Grandin 
Tested-by: Jenkins

diff --git a/config_host/config_options.h.in b/config_host/config_options.h.in
index e87f6e8db806..7339d48a47e5 100644
--- a/config_host/config_options.h.in
+++ b/config_host/config_options.h.in
@@ -9,6 +9,8 @@
 
 #define ENABLE_MERGELIBS_MORE 0
 
+#define ENABLE_PCH 0
+
 #define ENABLE_RUNTIME_OPTIMIZATIONS 0
 
 // Used to turn off visibility for some classes/symbols when linking with 
--enable-mergelibs
diff --git a/configure.ac b/configure.ac
index 32df06e53e70..459ce88b930e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6595,6 +6595,9 @@ else
 AC_MSG_ERROR([Unknown value for --enable-pch])
 fi
 AC_SUBST(ENABLE_PCH)
+if test -n "$ENABLE_PCH"; then
+AC_DEFINE(ENABLE_PCH)
+fi
 # ccache 3.7.1 and older do not properly detect/handle -include .gch in 
CCACHE_DEPEND mode
 if test -n "$ENABLE_PCH" -a -n "$CCACHE_DEPEND_MODE" -a "$GCC" = "yes" -a 
"$COM_IS_CLANG" != "TRUE"; then
 AC_PATH_PROG([CCACHE_BIN],[ccache],[not found])
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 1bd03fb51c98..18d92a2a1038 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -80,6 +80,7 @@
http://support.microsoft.com/default.aspx?scid=KB;en-us;q221435
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -90,8 +91,10 @@ constexpr LanguageType primary(LanguageType lt) { return 
LanguageType(sal_uInt16
 
 namespace o3tl
 {
-// when compiling LO on macOS, debug builds will display a linking error
-#if !(defined MACOSX && defined __clang__ && __clang_major__ == 16)
+// when compiling LO on macOS, debug builds will display a linking error 
where, see
+// 
<https://lists.freedesktop.org/archives/libreoffice/2024-February/091564.html>, 
"Our Clang
+// --enable-pch setup is known broken":
+#if !(defined MACOSX && defined __clang__ && __clang_major__ == 16 && 
ENABLE_PCH)
 // delete "sal_Int16" constructor via specialization: values > 0x7FFF are
 // actually used, and unfortunately passed around in the API as signed
 // "short", so use this to find all places where casts must be inserted
diff --git a/include/o3tl/strong_int.hxx b/include/o3tl/strong_int.hxx
index aea775805bda..c0df5f75efc8 100644
--- a/include/o3tl/strong_int.hxx
+++ b/include/o3tl/strong_int.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace o3tl
 {
@@ -84,8 +85,10 @@ template 
 struct strong_int
 {
 public:
-// when compiling LO on macOS, debug builds will display a linking error
-#if defined MACOSX && defined __clang__ && __clang_major__ == 16
+// when compiling LO on macOS, debug builds will display a linking error 
where, see
+// 
<https://lists.freedesktop.org/archives/libreoffice/2024-February/091564.html>, 
"Our Clang
+// --enable-pch setup is known broken":
+#if defined MACOSX && defined __clang__ && __clang_major__ == 16 && ENABLE_PCH
 explicit constexpr strong_int(unsigned long long value) : m_value(value) {}
 explicit constexpr strong_int(unsigned long value) : m_value(value) {}
 explicit constexpr strong_int(long value) : m_value(value) {}

core.git: Branch 'libreoffice-24-8' - solenv/flatpak-manifest.in

2024-09-25 Thread Stephan Bergmann (via logerrit)

 solenv/flatpak-manifest.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 85799e686b9a4fc2b2c7344786528e7c9a6c83a6
Author: Stephan Bergmann 
AuthorDate: Tue Sep 24 20:42:30 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed Sep 25 11:13:41 2024 +0200

Adapt flatpak build to upstream changes


<https://github.com/flathub/org.libreoffice.LibreOffice/commit/fb1a63fc872e6ddc8c9ae4b0b366072253e58ddc>
"gvfs: Update gvfs-1.54.2.tar.xz to 1.56.0 (#303)"


<https://github.com/flathub/org.libreoffice.LibreOffice/commit/8b55ceec9bf4f3298672ad6685455b0bb035d470>
"Update org.freedesktop.Platform to 24.08 (#302)"

Change-Id: Ib0bffe9652ed3e9c4107c15dfff75a0f57f682c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173881
Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann 
(cherry picked from commit 3b6dbc60d1344f290367fe9f887855f408700bf5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173796
Reviewed-by: Xisco Fauli 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 3aef4468fa0d..ece8b838605f 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -1,7 +1,7 @@
 {
 "id": "org.libreoffice.LibreOffice",
 "runtime": "org.freedesktop.Platform",
-"runtime-version": "23.08",
+"runtime-version": "24.08",
 "sdk": "org.freedesktop.Sdk",
 "sdk-extensions": [
 "org.freedesktop.Sdk.Extension.openjdk21"
@@ -51,8 +51,8 @@
 "sources": [
 {
 "type": "archive",
-"url": 
"https://download.gnome.org/sources/gvfs/1.54/gvfs-1.54.2.tar.xz";,
-"sha256": 
"54908f4e10b5f1c231e90330c8c15b7f21f2bb610f194c034b338e379c508e3c",
+"url": 
"https://download.gnome.org/sources/gvfs/1.56/gvfs-1.56.0.tar.xz";,
+"sha256": 
"441d2356c72616364cdb420af96199113a13ed9e146f2175fe373989adada39e",
 "x-checker-data": {
 "type": "gnome",
 "name": "gvfs",

core.git: solenv/flatpak-manifest.in

2024-09-24 Thread Stephan Bergmann (via logerrit)

 solenv/flatpak-manifest.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3b6dbc60d1344f290367fe9f887855f408700bf5
Author: Stephan Bergmann 
AuthorDate: Tue Sep 24 20:42:30 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 24 22:51:05 2024 +0200

Adapt flatpak build to upstream changes


<https://github.com/flathub/org.libreoffice.LibreOffice/commit/fb1a63fc872e6ddc8c9ae4b0b366072253e58ddc>
"gvfs: Update gvfs-1.54.2.tar.xz to 1.56.0 (#303)"


<https://github.com/flathub/org.libreoffice.LibreOffice/commit/8b55ceec9bf4f3298672ad6685455b0bb035d470>
"Update org.freedesktop.Platform to 24.08 (#302)"

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

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 3595baffb935..c1c6fff75f63 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -1,7 +1,7 @@
 {
 "id": "org.libreoffice.LibreOffice",
 "runtime": "org.freedesktop.Platform",
-"runtime-version": "23.08",
+"runtime-version": "24.08",
 "sdk": "org.freedesktop.Sdk",
 "sdk-extensions": [
 "org.freedesktop.Sdk.Extension.openjdk21"
@@ -51,8 +51,8 @@
 "sources": [
 {
 "type": "archive",
-"url": 
"https://download.gnome.org/sources/gvfs/1.54/gvfs-1.54.2.tar.xz";,
-"sha256": 
"54908f4e10b5f1c231e90330c8c15b7f21f2bb610f194c034b338e379c508e3c",
+"url": 
"https://download.gnome.org/sources/gvfs/1.56/gvfs-1.56.0.tar.xz";,
+"sha256": 
"441d2356c72616364cdb420af96199113a13ed9e146f2175fe373989adada39e",
 "x-checker-data": {
 "type": "gnome",
 "name": "gvfs",

core.git: xmlsecurity/qa

2024-09-24 Thread Stephan Bergmann (via logerrit)

 xmlsecurity/qa/unit/signing/signing.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1c4f7139e9a20d495f1577792758cf742d34dc2e
Author: Stephan Bergmann 
AuthorDate: Tue Sep 24 10:46:09 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 24 15:38:30 2024 +0200

Let test operate on temp copy of source document

The CppunitTest_xmlsecurity_signing
CPPUNIT_TEST_NAME=testImplicitScriptSign::TestBody introduced in
e5a0209d4b1e1f09191a442e04d626b21c49b9df "cool#9992 lok doc sign: allow 
sign of
macros & the document itself in one step" failed on a read-only source tree 
with

> An uncaught UNO exception
> - com.sun.star.ucb.InteractiveAugmentedIOException: {Message: "an error 
occurred during file opening (18/28) at 
/home/libo/src/core/ucbhelper/source/provider/cancelcommandexecution.cxx:83", 
Context: @0x7ff5cb43cf90, Classification: 
com.sun.star.task.InteractionClassification 0, Code: 
com.sun.star.ucb.IOErrorCode 1, Arguments: [com.sun.star.beans.PropertyValue: 
{Name: "Uri", Handle: -1, Value: string: 
"file:///home/libo/src/core//xmlsecurity/qa/unit/signing/data//macro.odt", 
State: com.sun.star.beans.PropertyState 0}, com.sun.star.beans.PropertyValue: 
{Name: "ResourceName", Handle: -1, Value: string: 
"/home/libo/src/core//xmlsecurity/qa/unit/signing/data//macro.odt", State: 
com.sun.star.beans.PropertyState 0}]}

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

diff --git a/xmlsecurity/qa/unit/signing/signing.cxx 
b/xmlsecurity/qa/unit/signing/signing.cxx
index 2a3819768bcd..e8b4a2f9653c 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -1154,10 +1154,12 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testSignatureLineODF)
 CPPUNIT_TEST_FIXTURE(SigningTest, testImplicitScriptSign)
 {
 // Given an ODT file with macros, and two signature managers to create 
macro + doc signatures:
-OUString aFileURL = createFileURL(u"macro.odt");
+createTempCopy(u"macro.odt");
+OUString aFileURL = maTempFile.GetURL();
 uno::Reference xWriteableZipStor
 = 
comphelper::OStorageHelper::GetStorageOfFormatFromURL(ZIP_STORAGE_FORMAT_STRING,
 aFileURL,
 
embed::ElementModes::READWRITE);
+
 uno::Reference xMetaInf
 = xWriteableZipStor->openStorageElement(u"META-INF"_ustr, 
embed::ElementModes::READWRITE);
 uno::Reference xStream = xMetaInf->openStreamElement(

core.git: 2 commits - ucb/source unotest/source

2024-09-23 Thread Stephan Bergmann (via logerrit)

 ucb/source/ucp/file/filglob.cxx|5 -
 unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx |2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit a446bfd0f379a2a976cf707c85a5f3c8ed68de0c
Author: Stephan Bergmann 
AuthorDate: Mon Sep 23 22:25:44 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 24 07:55:00 2024 +0200

Surround printed struct/exception members with {...}

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

diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx 
b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index 19b84b8cbfb1..6811c9470104 100644
--- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -124,6 +124,7 @@ void printUnoValue(
 case css::uno::TypeClass_STRUCT:
 case css::uno::TypeClass_EXCEPTION:
 {
+out << '{';
 auto first = true;
 for (auto const & f: 
css::uno::Reference(
  reflections->forName(type.getTypeName()),
@@ -137,6 +138,7 @@ void printUnoValue(
 out << f->getName() << ": ";
 printUnoValue(out, reflections, translateType(f->getType()), 
f->get(value));
 }
+out << '}';
 break;
 }
 case css::uno::TypeClass_INTERFACE:
commit d7a608cc25f81c7c5de0edacf91b36cde2803410
Author: Stephan Bergmann 
AuthorDate: Mon Sep 23 22:55:57 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 24 07:54:51 2024 +0200

Make an exceptin message more informative

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

diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 93fb4ad81a4d..6e42d975646c 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -365,7 +366,9 @@ namespace fileaccess {
 ioErrorCode,
 generateErrorArguments(aUncPath),
 xEnv,
-u"an error occurred during file opening"_ustr,
+"an error occurred during file opening ("
++ OUString::number(o3tl::to_underlying(errorCode)) + "/"
++ OUString::number(minorCode) + ")",
 xComProc);
 }
 else if( errorCode == TaskHandlerErr::OPEN_FOR_DIRECTORYLISTING  ||

core.git: unotest/Library_unoexceptionprotector.mk unotest/source

2024-09-23 Thread Stephan Bergmann (via logerrit)

 unotest/Library_unoexceptionprotector.mk   |1 
 unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx |  141 
+-
 2 files changed, 130 insertions(+), 12 deletions(-)

New commits:
commit 7ccfc0277a44d0a9eee943fdbb952e16df36590c
Author: Stephan Bergmann 
AuthorDate: Mon Sep 23 14:52:40 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Sep 23 21:17:44 2024 +0200

Best effort to print more details about caught UNO exception

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

diff --git a/unotest/Library_unoexceptionprotector.mk 
b/unotest/Library_unoexceptionprotector.mk
index 52417c9883a9..ae751ac6e0a0 100644
--- a/unotest/Library_unoexceptionprotector.mk
+++ b/unotest/Library_unoexceptionprotector.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Library_Library,unoexceptionprotector))
 $(eval $(call gb_Library_use_sdk_api,unoexceptionprotector))
 
 $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\
+   comphelper \
cppu \
cppuhelper \
sal \
diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx 
b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index 5a76cbdb11c1..19b84b8cbfb1 100644
--- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -17,16 +17,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 
@@ -34,12 +45,106 @@
 
 namespace {
 
-// Best effort conversion:
-std::string convert(std::u16string_view s16) {
-OString s8(OUStringToOString(s16, osl_getThreadTextEncoding()));
-static_assert(sizeof (sal_Int32) <= sizeof (std::string::size_type), "got 
to be at least equal");
-// ensure following cast is legitimate
-return std::string(s8);
+css::uno::Type translateType(css::uno::Reference 
const & type) {
+return css::uno::Type(type->getTypeClass(), type->getName());
+}
+
+void printUnoValue(
+std::ostream & out, css::uno::Reference 
const & reflections,
+css::uno::Type const & type, css::uno::Any const & value)
+{
+switch (type.getTypeClass()) {
+case css::uno::TypeClass_VOID:
+out << "void";
+break;
+case css::uno::TypeClass_BOOLEAN:
+out << *o3tl::forceAccess(value);
+break;
+case css::uno::TypeClass_BYTE:
+out << int(*o3tl::forceAccess(value));
+break;
+case css::uno::TypeClass_SHORT:
+out << *o3tl::forceAccess(value);
+break;
+case css::uno::TypeClass_UNSIGNED_SHORT:
+out << *o3tl::forceAccess(value);
+break;
+case css::uno::TypeClass_LONG:
+out << *o3tl::forceAccess(value);
+break;
+case css::uno::TypeClass_UNSIGNED_LONG:
+out << *o3tl::forceAccess(value);
+break;
+case css::uno::TypeClass_HYPER:
+out << *o3tl::forceAccess(value);
+break;
+case css::uno::TypeClass_UNSIGNED_HYPER:
+out << *o3tl::forceAccess(value);
+break;
+case css::uno::TypeClass_FLOAT:
+out << std::uppercase << *o3tl::forceAccess(value);
+break;
+case css::uno::TypeClass_DOUBLE:
+out << std::uppercase << *o3tl::forceAccess(value);
+break;
+case css::uno::TypeClass_CHAR:
+out << "\u" << std::hex << std::uppercase << std::setw(4) << 
std::setfill('0')
+<< std::uint_least16_t(*o3tl::forceAccess(value)) << 
std::dec;
+break;
+case css::uno::TypeClass_STRING:
+out << '"' << *o3tl::forceAccess(value) << '"'; //TODO: 
encode content
+break;
+case css::uno::TypeClass_TYPE:
+out << o3tl::forceAccess(value)->getTypeName();
+break;
+case css::uno::TypeClass_ANY:
+out << value.getValueTypeName() << ": ";
+printUnoValue(out, reflections, value.getValueType(), value);
+break;
+case css::uno::TypeClass_SEQUENCE:
+{
+css::uno::Reference const refl(
+reflections->forName(type.getTypeName()), 
css::uno::UNO_SET_THROW);
+auto const t = translateType(refl->getComponentType());
+auto const array = refl->getArray();
+auto const n = array->getLen(value);
+out << '[&

core.git: Branch 'distro/allotropia/zeta-24-2' - external/redland

2024-09-23 Thread Stephan Bergmann (via logerrit)

 external/redland/UnpackedTarball_redland.mk |1 +
 external/redland/redland/ubsan.patch|   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 39d64d5e302df37ff453c69183beb6e5e97bdbe9
Author: Stephan Bergmann 
AuthorDate: Wed Jul 10 11:19:36 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Sep 23 15:35:51 2024 +0200

Fix UBSan build of ExternalProject_redland

...after c75c21eef670fce33eb5a501357935dbd25be923 "Upgrade raptor to 
2.0.16",
where it now started to fail with

> libtool: link: LD_RUN_PATH="/usr/local/lib:" /usr/bin/ccache 
/home/tdf/lode/opt_private/clang-llvmorg-12.0.1/bin/clang 
--gcc-toolchain=/opt/rh/gcc-toolset-12/root/usr -fsanitize=address 
-fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=local-bounds 
-fsanitize-blacklist=/home/tdf/lode/jenkins/workspace/lo_ubsan/sanitize-ubsan-excludelist
 -fno-sanitize=function -DLIBRDF_INTERNAL=1 -O0 -Wp,-U_FORTIFY_SOURCE 
-fstrict-aliasing -fstrict-overflow -ggdb2 -gsplit-dwarf -Xclang 
-debug-info-kind=constructor -Wl,-z -Wl,origin -Wl,-rpath -Wl,\$ORIGIN 
-Wl,-rpath-link -Wl,/home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program 
-Wl,-z -Wl,origin -Wl,-rpath -Wl,\$ORIGIN -Wl,-rpath-link 
-Wl,/home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program -o 
.libs/redland-db-upgrade db_upgrade.o  
-L/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/raptor/src/.libs
 
/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/raptor/src/.libs/libraptor2.so
 -L/home/tdf/
 lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/libxml2/.libs 
/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/libxml2/.libs/libxml2.so
 
-L/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/rasqal/src/.libs
 
/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/rasqal/src/.libs/librasqal.so
 ../src/.libs/librdf.so
> /opt/rh/gcc-toolset-12/root/usr/bin/ld: 
/home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program/libicuuc.so.74: 
undefined reference to `__ubsan_vptr_type_cache'
> /opt/rh/gcc-toolset-12/root/usr/bin/ld: 
/home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program/libicuuc.so.74: 
undefined reference to `__ubsan_handle_function_type_mismatch_v1'
> /opt/rh/gcc-toolset-12/root/usr/bin/ld: 
/home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program/libicuuc.so.74: 
undefined reference to `__ubsan_handle_dynamic_type_cache_miss'
> clang-12: error: linker command failed with exit code 1 (use -v to see 
invocation)
> make[3]: *** [Makefile:489: redland-db-upgrade] Error 1

(<https://ci.libreoffice.org/job/lo_ubsan/3239/>) because $(CC) is used to 
link
a (nominally C-only) executable that links against C++ ICU shared libraries 
that
in turn require a C++-specific UBSan library to be linked in.  So just use
$(CXX) for linking instead.

Change-Id: If7c61c6ee7e1b43965a928b1560f8ab4ae2b0603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170277
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit b3300387f2e14ea59c70db513a8f6eda6fe17afa)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173793
Tested-by: Stephan Bergmann 

diff --git a/external/redland/UnpackedTarball_redland.mk 
b/external/redland/UnpackedTarball_redland.mk
index 66e766d20fee..31ebcb8f2f0a 100644
--- a/external/redland/UnpackedTarball_redland.mk
+++ b/external/redland/UnpackedTarball_redland.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,redland,\
external/redland/redland/rpath.patch \
external/redland/redland/clang-cl.patch \
external/redland/redland/libtool.patch \
+   external/redland/redland/ubsan.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/redland/ubsan.patch 
b/external/redland/redland/ubsan.patch
new file mode 100644
index ..8226258ea38b
--- /dev/null
+++ b/external/redland/redland/ubsan.patch
@@ -0,0 +1,11 @@
+--- utils/Makefile.in
 utils/Makefile.in
+@@ -106,7 +106,7 @@
+ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+-CCLD = $(CC)
++CCLD = $(CXX)
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+   $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+   $(AM_LDFLAGS) $(LDFLAGS) -o $@

core.git: sysui/CustomTarget_rpm.mk sysui/desktop

2024-09-22 Thread Stephan Bergmann (via logerrit)

 sysui/CustomTarget_rpm.mk|1 +
 sysui/desktop/freedesktop/freedesktop-menus.spec |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 52b3b38f1448d2468a3e9edec758515151dc067b
Author: Stephan Bergmann 
AuthorDate: Sun Sep 22 20:34:12 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Sun Sep 22 22:26:18 2024 +0200

Adapt to RPM 4.20

...which builds the spec file's code in a dedicated directory now, see
<https://github.com/rpm-software-management/rpm/issues/2078> "RFE: 
introduce an
rpm-controlled per-build directory to builds", and no longer in the 
directory
from which rpm is invoked.  So invent some libo_start_dir parameter to
communicate that directory into the rpm build.

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

diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk
index c0ef34cc7d4d..075d3e324b27 100644
--- a/sysui/CustomTarget_rpm.mk
+++ b/sysui/CustomTarget_rpm.mk
@@ -36,6 +36,7 @@ 
$(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSI
--define "version $(PKGVERSION)" \
--define "release $(LIBO_VERSION_PATCH)" \
--define "__debug_install_post %nil" \
+   --define "libo_start_dir 
$(gb_CustomTarget_workdir)/sysui/share/$(1)" \
, $$@.log \
)
 endef
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec 
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index ff083d71fe9c..9c84305e51b6 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -60,7 +60,7 @@ export KDEMAINDIR=/usr
 export PREFIXDIR=/usr
 export BINDIR=/usr/bin
 
-./create_tree.sh
+(cd %libo_start_dir && ./create_tree.sh)
 
 cd $RPM_BUILD_ROOT

core.git: configure.ac

2024-09-20 Thread Stephan Bergmann (via logerrit)

 configure.ac |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 3b4ecb07a6f0295441317ab889796034506bc8af
Author: Stephan Bergmann 
AuthorDate: Fri Sep 20 15:21:34 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 20 21:25:03 2024 +0200

Invent --with-extra-cc/cxx-flags

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

diff --git a/configure.ac b/configure.ac
index 698fadaf1940..32df06e53e70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2190,6 +2190,16 @@ AC_ARG_ENABLE(cli,
 [Disable the generation of old CLI bindings.]),
 ,enable_cli=yes)
 
+AC_ARG_WITH(extra-cc-flags,
+AS_HELP_STRING([--with-extra-cc-flags=...],
+[Specify extra flags (like GCC's -fdiagnostics-color=always, which is 
useful in combination
+ with the GNU Make --output-sync option) to add to the end of the CC 
variable.]))
+
+AC_ARG_WITH(extra-cxx-flags,
+AS_HELP_STRING([--with-extra-cxx-flags=...],
+[Specify extra flags (like GCC's -fdiagnostics-color=always, which is 
useful in combination
+ with the GNU Make --output-sync option) to add to the end of the CXX 
variable.]))
+
 dnl ===
 dnl Optional Packages (--with/without-)
 dnl ===
@@ -7323,6 +7333,9 @@ if test "$_os" != "WINNT"; then
 fi
 fi
 
+CC="$CC $with_extra_cc_flags"
+CXX="$CXX $with_extra_cxx_flags"
+
 dnl check for GNU C++ compiler version
 if test "$GXX" = "yes" -a -z "$COM_IS_CLANG"; then
 AC_MSG_CHECKING([the GNU C++ compiler version])

core.git: configure.ac

2024-09-20 Thread Stephan Bergmann (via logerrit)

 configure.ac |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f231ca7a43c7ac6d31973eb45168f2dd87f694bd
Author: Stephan Bergmann 
AuthorDate: Fri Sep 20 09:20:36 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 20 13:28:09 2024 +0200

GCC_HOME no longer needs to be SUBST'ed

...since 411e8c24a289649797c679afc084113f7f61667a "vscode: make it work 
better
when srcdir=buildir and add mac lldb config" removed its use in
.vscode/vs-code-template.code-workspace.in

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

diff --git a/configure.ac b/configure.ac
index 9d3c459b8559..25324da03940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3582,7 +3582,6 @@ if test "$_os" != "WINNT"; then
 GCC_HOME="$with_gcc_home"
 fi
 AC_MSG_RESULT($GCC_HOME)
-AC_SUBST(GCC_HOME)
 
 if test "$GCC_HOME_SET" = "true"; then
 if test -z "$CC"; then

Re: Bug 143148 - "make allheaders.hxx" not working

2024-09-19 Thread Stephan Bergmann


On 9/19/24 21:23, Marc wrote:

make[1]: *** No rule to make target 'CustomTarget_odk/allheaders'.  Stop.
make: *** [Makefile:175: CustomTarget_odk/allheaders] Error 2


since 
 
"make --disable-odk the default", you need to explicitly configure your 
build with --enable-odk (i.e., add that to your autogen.input) for that 
to work

core.git: Branch 'feature/allo_contract45533b' - 2 commits - configure.ac oox/source

2024-09-19 Thread Stephan Bergmann (via logerrit)

 configure.ac |8 ++--
 oox/source/drawingml/chart/plotareaconverter.cxx |3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 5306df81b8069feeb4755a9f4e6d13e954521f04
Author: Stephan Bergmann 
AuthorDate: Fri Jan 19 08:42:13 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Sep 19 22:19:22 2024 +0200

PlotAreaConverter::mbSingleSeriesTitle is apparently read uninitialized

...in code newly introduced in 135ce256ce9e879663d828ec6e699de521fad867
"tdf#146487 Don't show generic diagram title when there is an empty title
given", which caused CppunitTest_chart2_export2 to fail with

> /oox/inc/drawingml/chart/plotareaconverter.hxx:78:62: runtime error: load 
of value 222, which is not a valid value for type 'bool'
> #0 0x7f95cd9ed87c in 
oox::drawingml::chart::PlotAreaConverter::isSingleSeriesTitle() const 
/oox/inc/drawingml/chart/plotareaconverter.hxx:78:62
> #1 0x7f95cd9e506f in 
oox::drawingml::chart::ChartSpaceConverter::convertFromModel(com::sun::star::uno::Reference
 const&, com::sun::star::awt::Point const&) 
/oox/source/drawingml/chart/chartspaceconverter.cxx:189:53
> #2 0x7f95cd9b6c34 in 
oox::drawingml::chart::ChartConverter::convertFromModel(oox::core::XmlFilterBase&,
 oox::drawingml::chart::ChartSpaceModel&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::awt::Point const&, com::sun::star::awt::Size const&) 
/oox/source/drawingml/chart/chartconverter.cxx:93:20
> #3 0x7f95ce548f59 in 
oox::drawingml::Shape::finalizeXShape(oox::core::XmlFilterBase&, 
com::sun::star::uno::Reference const&) 
/oox/source/drawingml/shape.cxx:2245:50
> #4 0x7f95438150b2 in 
oox::xls::Shape::finalizeXShape(oox::core::XmlFilterBase&, 
com::sun::star::uno::Reference const&) 
/sc/source/filter/oox/drawingfragment.cxx:113:30
> #5 0x7f95ce5267bb in 
oox::drawingml::Shape::createAndInsert(oox::core::XmlFilterBase&, rtl::OUString 
const&, oox::drawingml::Theme const*, 
com::sun::star::uno::Reference const&, bool, 
bool, basegfx::B2DHomMatrix&, oox::drawingml::FillProperties const&, 
std::shared_ptr) /oox/source/drawingml/shape.cxx:1964:9
> #6 0x7f95ce4edb54 in 
oox::drawingml::Shape::addShape(oox::core::XmlFilterBase&, 
oox::drawingml::Theme const*, 
com::sun::star::uno::Reference const&, 
basegfx::B2DHomMatrix const&, oox::drawingml::FillProperties const&, 
std::__debug::map, 
std::less, std::allocator > > >*, 
std::shared_ptr) /oox/source/drawingml/shape.cxx:366:41
> #7 0x7f954381ef79 in oox::xls::DrawingFragment::onEndElement() 
/sc/source/filter/oox/drawingfragment.cxx:335:30
> #8 0x7f95cdcaee54 in 
oox::core::ContextHandler2Helper::implEndElement(int) 
/oox/source/core/contexthandler2.cxx:125:9
> #9 0x7f95cdd5c116 in oox::core::FragmentHandler2::endFastElement(int) 
/oox/source/core/fragmenthandler2.cxx:91:5
> #10 0x7f95caf68fca in (anonymous namespace)::Entity::endElement() 
/sax/source/fastparser/fastparser.cxx:514:27
> #11 0x7f95caf68998 in 
sax_fastparser::FastSaxParserImpl::callbackEndElement() 
/sax/source/fastparser/fastparser.cxx:1331:17
> #12 0x7f95caf58444 in (anonymous 
namespace)::call_callbackEndElement(void*, unsigned char const*, unsigned char 
const*, unsigned char const*) /sax/source/fastparser/fastparser.cxx:338:18
> #13 0x7f960adebeda in xmlParseEndTag2 
/workdir/UnpackedTarball/libxml2/parser.c:10090:2
> #14 0x7f960ad929b5 in xmlParseTryOrFinish 
/workdir/UnpackedTarball/libxml2/parser.c:11868:14
> #15 0x7f960ad86334 in xmlParseChunk 
/workdir/UnpackedTarball/libxml2/parser.c:12151:5
> #16 0x7f95caf53231 in sax_fastparser::FastSaxParserImpl::parse() 
/sax/source/fastparser/fastparser.cxx:1085:21
> #17 0x7f95caf4cd18 in 
sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource
 const&) /sax/source/fastparser/fastparser.cxx:890:9
> #18 0x7f95caf6e950 in 
sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource
 const&) /sax/source/fastparser/fastparser.cxx:1470:13
> #19 0x7f95cdce50d1 in 
oox::core::FastParser::parseStream(com::sun::star::xml::sax::InputSource 
const&, bool) /oox/source/core/fastparser.cxx:121:15
> #20 0x7f95cdce5868 in 
oox::core::FastParser::parseStream(com::sun::star::uno::Reference
 const&, rtl::OUString const&) /oox/source/core/fastparser.cxx:129:5
> #21 0x7f95cddbb234 in 
oox::core::XmlFilterBase::importFragment(rtl::Reference
 const&, oox::core::FastParser&) /oox/source/core/xmlfilterbase.cxx:414:21
> #22 0x7f95cddb9b8d in 
oox::core::XmlFilterBase::importFragment(rtl::Refere

core.git: pyuno/source solenv/gbuild

2024-09-18 Thread Stephan Bergmann (via logerrit)

 pyuno/source/module/pyuno.cxx  |7 +++
 pyuno/source/module/pyuno_module.cxx   |7 +++
 pyuno/source/module/pyuno_struct.cxx   |7 +++
 solenv/gbuild/platform/com_GCC_defs.mk |7 ---
 4 files changed, 21 insertions(+), 7 deletions(-)

New commits:
commit d02310ba14a4c400eef4821c99287c797d376714
Author: Stephan Bergmann 
AuthorDate: Wed Sep 18 17:42:59 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 19 07:35:49 2024 +0200

Remaining GCC -Wcast-function-type issues

As Clang supports that warning now too, lots of occurrences have meanwhile 
been
cleaned up for good (0c29c417ef3f0b749042e5a461abae9c36cf655b "Avoid
-Werror,-Wcast-function-type-mismatch", 
1344e6261a1d856c71eca1e0cc29215a586bf335
"Avoid -Werror,-Wcast-function-type-mismatch",
85a2bb9f52a0d834b02681344ce56e0b091e1abd "Avoid
-Werror,-Wcast-function-type-mismatch", etc.), so
ce99754e9b5b954be4360f39356ed7198b298265 "Globally disable 
-Wcast-function-type
new with upcoming GCC 8" in solenv/gbuild/platform/com_GCC_defs.mk should no
longer be necessary.

One remaining issue I encountered was 
dae7304df68493afcf6e9c9e490d65ea20d8211f
"Silence Clang 19 trunk -Werror,-Wcast-function-type-mismatch", where GCC 
needs
a different way for silencing the warnings in pyuno/source/module/ than had 
been
used there for Clang.

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

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index af35283e6139..56836aed7498 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -1529,6 +1529,10 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject 
*that, int op )
 return result;
 }
 
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
 static PyMethodDef PyUNOMethods[] =
 {
 #if defined __clang__
@@ -1545,6 +1549,9 @@ static PyMethodDef PyUNOMethods[] =
 #endif
 {nullptr, nullptr,0,   
 nullptr}
 };
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic pop
+#endif
 
 static PyNumberMethods PyUNONumberMethods[] =
 {
diff --git a/pyuno/source/module/pyuno_module.cxx 
b/pyuno/source/module/pyuno_module.cxx
index 1fc2e8bf00a2..216f4f5a663a 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -907,6 +907,10 @@ static PyObject *sal_debug(
 
 }
 
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
 struct PyMethodDef PyUNOModule_methods [] =
 {
 {"private_initTestEnvironment", initTestEnvironment, METH_VARARGS, 
nullptr},
@@ -942,6 +946,9 @@ struct PyMethodDef PyUNOModule_methods [] =
 {"sal_debug", sal_debug, METH_VARARGS, nullptr},
 {nullptr, nullptr, 0, nullptr}
 };
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic pop
+#endif
 
 }
 
diff --git a/pyuno/source/module/pyuno_struct.cxx 
b/pyuno/source/module/pyuno_struct.cxx
index 6f4dd47a4b35..e1592eac929d 100644
--- a/pyuno/source/module/pyuno_struct.cxx
+++ b/pyuno/source/module/pyuno_struct.cxx
@@ -281,6 +281,10 @@ static PyObject* PyUNOStruct_cmp( PyObject *self, PyObject 
*that, int op )
 return result;
 }
 
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
 static PyMethodDef PyUNOStructMethods[] =
 {
 #if defined __clang__
@@ -297,6 +301,9 @@ static PyMethodDef PyUNOStructMethods[] =
 #endif
 {nullptr, nullptr,  0, 
   nullptr}
 };
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic pop
+#endif
 
 static PyTypeObject PyUNOStructType =
 {
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 29a1942faa7b..528e45630b25 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -146,13 +146,6 @@ gb_CXXFLAGS_COMMON += \
 -Wunused-const-variable=1
 endif
 
-# GCC 8 -Wcast-function-type (included in -Wextra) unhelpfully even warns on 
reinterpret_cast
-# between incompatible function types:
-ifeq ($(shell expr '$(GCC_VERSION)' '>=' 800),1)
-gb_CXXFLAGS_COMMON += \
--Wno-cast-function-type
-endif
-
 # If CC or CXX already include -fvisibility=hidden, don't duplicate it
 ifeq (,$(filter -fvisibility=hidden,$(CC)))
 gb_VISIBILITY_FLAGS := -fvisibility=hidden

core.git: Branch 'distro/allotropia/zeta-24-2' - configure.ac

2024-09-18 Thread Stephan Bergmann (via logerrit)

 configure.ac |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 24a367eccdbe7d71134e874d565a3cd34f0d207c
Author: Stephan Bergmann 
AuthorDate: Wed Sep 18 13:53:08 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 18 22:11:24 2024 +0200

Do not hardcode --with-locales=en for Emscripten build

...which had been done in 7a9e4c4ba8c6b8e068005f3831b989e3c929e8eb "WASM add
strip flags to configure.ac", but without giving a rationale.  For
--enable-assert-always-abort builds, it could have caused the

> assert(pUpperMonthText[0] == "JANUAR");

in ImpSvNumberInputScan::GetMonth (svl/source/numbers/zforfind.cxx) to fire 
when
running in a German-locale browser, because the rule to generate the
DISABLE_DYNLOADING-specific localedata_static.hxx in
i18npool/Library_i18npool.mk then only included English-locale fallback
locale data, so pUpperMonthText[0] was always the English "JANUARY", 
regardless
of locale used.

With with_locales left uninitialized here, the generated 
localedata_static.hxx
now includes the full set of locale data.  Which comes with a small 
increase in
size, though:  For one non-debug build scenario, sofice.data stayed at ca. 
68M
but soffice.wasm grew from ca. 138M to ca. 143M.

Change-Id: I46dae3f5c795ae30fc44d3ac4cb8dd162cd72966
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173619
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 80d4e666dde9954a1f7387e7833e8a52d24e22df)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173632
Tested-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index e6e69f047c83..b061edda4da1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3153,7 +3153,6 @@ if test "$enable_wasm_strip" = "yes"; then
 with_x=no
 
 test "${with_fonts+set}" = set || with_fonts=yes
-test "${with_locales+set}" = set || with_locales=en
 
 AC_DEFINE(ENABLE_WASM_STRIP_ACCESSIBILITY)
 AC_DEFINE(ENABLE_WASM_STRIP_WRITER)

core.git: configure.ac

2024-09-18 Thread Stephan Bergmann (via logerrit)

 configure.ac |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 80d4e666dde9954a1f7387e7833e8a52d24e22df
Author: Stephan Bergmann 
AuthorDate: Wed Sep 18 13:53:08 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 18 22:10:50 2024 +0200

Do not hardcode --with-locales=en for Emscripten build

...which had been done in 7a9e4c4ba8c6b8e068005f3831b989e3c929e8eb "WASM add
strip flags to configure.ac", but without giving a rationale.  For
--enable-assert-always-abort builds, it could have caused the

> assert(pUpperMonthText[0] == "JANUAR");

in ImpSvNumberInputScan::GetMonth (svl/source/numbers/zforfind.cxx) to fire 
when
running in a German-locale browser, because the rule to generate the
DISABLE_DYNLOADING-specific localedata_static.hxx in
i18npool/Library_i18npool.mk then only included English-locale fallback
locale data, so pUpperMonthText[0] was always the English "JANUARY", 
regardless
of locale used.

With with_locales left uninitialized here, the generated 
localedata_static.hxx
now includes the full set of locale data.  Which comes with a small 
increase in
size, though:  For one non-debug build scenario, sofice.data stayed at ca. 
68M
but soffice.wasm grew from ca. 138M to ca. 143M.

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

diff --git a/configure.ac b/configure.ac
index 5597a9d6f198..9d3c459b8559 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3265,7 +3265,6 @@ if test "$enable_wasm_strip" = "yes"; then
 with_x=no
 
 test "${with_fonts+set}" = set || with_fonts=yes
-test "${with_locales+set}" = set || with_locales=en
 
 AC_DEFINE(ENABLE_WASM_STRIP_ACCESSIBILITY)
 AC_DEFINE(ENABLE_WASM_STRIP_WRITER)

core.git: basic/source

2024-09-18 Thread Stephan Bergmann (via logerrit)

 basic/source/sbx/sbxscan.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c54b8e5682373934c826702a965f97f4a7a36193
Author: Stephan Bergmann 
AuthorDate: Wed Sep 18 09:51:44 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 18 20:12:09 2024 +0200

Avoid -Werror,-Wunused-function

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

diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index bc87c2af158f..dbb45c34b88e 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -535,6 +535,7 @@ void BasicFormatNum(double d, const OUString* pFmt, 
SbxDataType eType, OUString&
 ImpCvtNum(d, eType == SbxSINGLE ? 6 : eType == SbxDOUBLE ? 14 : 0, 
rRes);
 }
 
+#if HAVE_FEATURE_SCRIPTING
 // For numeric types, takes the number directly; otherwise, tries to take 
string and convert it
 bool GetNumberIntl(const SbxValue& val, double& ret)
 {
@@ -558,6 +559,7 @@ bool GetNumberIntl(const SbxValue& val, double& ret)
 return SbxValue::ScanNumIntnl(val.GetOUString(), ret) == 
ERRCODE_NONE;
 }
 }
+#endif
 } // namespace
 
 void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const

core.git: Branch 'distro/allotropia/zeta-24-2' - external/libexttextcat

2024-09-18 Thread Stephan Bergmann (via logerrit)

 external/libexttextcat/ExternalProject_libexttextcat.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f01975a0877170e89bc486eb05e8256bd295c170
Author: Stephan Bergmann 
AuthorDate: Wed Jul 31 09:56:21 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 18 16:11:00 2024 +0200

external/libexttextcat: Only pass gb_DEBUGINFO_FLAGS in debug builds

broken since 797681b4f569212a0f306151167534e23a2e37af "Pass all relevant 
CFLAGS
on to external/libexttextcat"

Change-Id: Idd648c8cd7eaa7e78815dd2071d0a3b786fa6d23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171273
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 374c785daff03f10116781d364f3024aff19d46c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173631
Tested-by: Stephan Bergmann 

diff --git a/external/libexttextcat/ExternalProject_libexttextcat.mk 
b/external/libexttextcat/ExternalProject_libexttextcat.mk
index 479bc9bb3b60..37ed06aded7d 100644
--- a/external/libexttextcat/ExternalProject_libexttextcat.mk
+++ b/external/libexttextcat/ExternalProject_libexttextcat.mk
@@ -20,7 +20,7 @@ $(call 
gb_ExternalProject_get_state_target,libexttextcat,build):
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(ENABLE_WERROR),--enable-werror,--disable-werror) 
\
$(gb_CONFIGURE_PLATFORMS) \
-   CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_DEBUGINFO_FLAGS) 
$(call gb_ExternalProject_get_build_flags,libexttextcat) \
+   CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(if 
$(debug),$(gb_DEBUGINFO_FLAGS)) $(call 
gb_ExternalProject_get_build_flags,libexttextcat) \
$(if $(COM_IS_CLANG),-Qunused-arguments)" \
LDFLAGS="$(call 
gb_ExternalProject_get_link_flags,libexttextcat)" \
&& $(MAKE) \

core.git: Branch 'distro/allotropia/zeta-24-2' - include/osl solenv/bin

2024-09-17 Thread Stephan Bergmann (via logerrit)

 include/osl/detail/component-mapping.h |2 +-
 solenv/bin/native-code.py  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 64f484854be274d621abd42d32c04d773b5dac15
Author: Stephan Bergmann 
AuthorDate: Mon Sep 16 17:52:53 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 17 21:02:29 2024 +0200

Avoid -Werror,-Wcast-function-type-mismatch

...as seen when building LOWA (i.e., --disable-dynloading) with a recent 
Clang
with

<https://github.com/llvm/llvm-project/commit/999d4f840777bf8de26d45947192aa0728edc0fb>
"Split -Wcast-function-type into a separate group (#86131)", where
-Wcast-function-type-mismatch generally warns about casts between 
incompatible
function types...

> cppuhelper/source/shlib.cxx:294:23: error: cast from 'void *(*)(void *, 
void *)' to 'ImplementationConstructorFn *' (aka 'css::uno::XInterface 
*(*)(css::uno::XComponentContext *, const css::uno::Sequence 
&)') converts to incompatible function type 
[-Werror,-Wcast-function-type-mismatch]
>   294 | = 
reinterpret_cast(
>   |   
^~~~
>   295 | map[i].constructor_function);
>   | 

...but not for the special case of casting from/to void(*)(void).

(Using the correct function type

> css::uno::XInterface * (*)(css::uno::XComponentContext *, 
css::uno::Sequence const &)

throughout would be even better, but doesn't easily fit into this C code 
that is
included in low-level places that don't know those UNO types and is shared
between LOWA and Android etc.)

Change-Id: Ic4dbabbff0f772b34cf692db968c3ad257c37cb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173463
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
(cherry picked from commit 4bbe329ef07bb38c939c6bef53ae4aa9928b9a52)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173496
Tested-by: Stephan Bergmann 

diff --git a/include/osl/detail/component-mapping.h 
b/include/osl/detail/component-mapping.h
index 4d4264180476..64c967019ba0 100644
--- a/include/osl/detail/component-mapping.h
+++ b/include/osl/detail/component-mapping.h
@@ -31,7 +31,7 @@ typedef struct {
 
 typedef struct {
 const char *name;
-void * (*constructor_function)(void *, void *);
+void (*constructor_function)(void);
 } lib_to_constructor_mapping;
 
 const lib_to_factory_mapping *lo_get_factory_map(void);
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 955317ebc0ca..18c907fad0ef 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -879,7 +879,7 @@ for constructor in sorted(full_constructor_map.keys()):
 constructor_guard = get_constructor_guard(constructor)
 if constructor_guard:
 print (constructor_guard)
-print ('void * '+constructor+'( void *, void * );')
+print ('void '+constructor+'( void );')
 if constructor_guard:
 print ('#endif')

core.git: include/osl solenv/bin

2024-09-17 Thread Stephan Bergmann (via logerrit)

 include/osl/detail/component-mapping.h |2 +-
 solenv/bin/native-code.py  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4bbe329ef07bb38c939c6bef53ae4aa9928b9a52
Author: Stephan Bergmann 
AuthorDate: Mon Sep 16 17:52:53 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 17 21:01:48 2024 +0200

Avoid -Werror,-Wcast-function-type-mismatch

...as seen when building LOWA (i.e., --disable-dynloading) with a recent 
Clang
with

<https://github.com/llvm/llvm-project/commit/999d4f840777bf8de26d45947192aa0728edc0fb>
"Split -Wcast-function-type into a separate group (#86131)", where
-Wcast-function-type-mismatch generally warns about casts between 
incompatible
function types...

> cppuhelper/source/shlib.cxx:294:23: error: cast from 'void *(*)(void *, 
void *)' to 'ImplementationConstructorFn *' (aka 'css::uno::XInterface 
*(*)(css::uno::XComponentContext *, const css::uno::Sequence 
&)') converts to incompatible function type 
[-Werror,-Wcast-function-type-mismatch]
>   294 | = 
reinterpret_cast(
>   |   
^~~~
>   295 | map[i].constructor_function);
>   | 

...but not for the special case of casting from/to void(*)(void).

(Using the correct function type

> css::uno::XInterface * (*)(css::uno::XComponentContext *, 
css::uno::Sequence const &)

throughout would be even better, but doesn't easily fit into this C code 
that is
included in low-level places that don't know those UNO types and is shared
between LOWA and Android etc.)

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

diff --git a/include/osl/detail/component-mapping.h 
b/include/osl/detail/component-mapping.h
index 4d4264180476..64c967019ba0 100644
--- a/include/osl/detail/component-mapping.h
+++ b/include/osl/detail/component-mapping.h
@@ -31,7 +31,7 @@ typedef struct {
 
 typedef struct {
 const char *name;
-void * (*constructor_function)(void *, void *);
+void (*constructor_function)(void);
 } lib_to_constructor_mapping;
 
 const lib_to_factory_mapping *lo_get_factory_map(void);
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index bd84bd68e305..b64606bac16e 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -879,7 +879,7 @@ for constructor in sorted(full_constructor_map.keys()):
 constructor_guard = get_constructor_guard(constructor)
 if constructor_guard:
 print (constructor_guard)
-print ('void * '+constructor+'( void *, void * );')
+print ('void '+constructor+'( void );')
 if constructor_guard:
 print ('#endif')

core.git: configure.ac

2024-09-17 Thread Stephan Bergmann (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 45ffeed6674e4f3c5b92f951094d41a0d0ec8002
Author: Stephan Bergmann 
AuthorDate: Mon Sep 16 21:29:40 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 17 21:01:18 2024 +0200

Fix missing quotation

...that appears to be broken ever since 
9892af3cbf85e9793f21683aa16c84354d866ad5
"Modernize wasm debug symbol generation" and to have gone largely 
unnoticed, but
now happened to cause

> ./configure: line 14652: -gpubnames: command not found
> checking whether ccache emcc supports ... configure: error: no

in an odd Emscripten build of mine where I accidentally used a broken emcc 
(so
that autogen.sh started to draw bogus conclusions and get into otherwise
untested code branches)

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

diff --git a/configure.ac b/configure.ac
index 5e4dc02eddb1..5597a9d6f198 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5035,7 +5035,7 @@ if test "$enable_split_debug" != no; then
 fi
 if test -n "$use_split_debug"; then
 if test "$_os" = "Emscripten"; then
-TEST_CC_FLAG=-gsplit-dwarf -gpubnames
+TEST_CC_FLAG='-gsplit-dwarf -gpubnames'
 else
 TEST_CC_FLAG=-gsplit-dwarf
 fi

core.git: Branch 'distro/allotropia/zeta-24-2' - 2 commits - sal/osl sw/source

2024-09-17 Thread Stephan Bergmann (via logerrit)

 sal/osl/unx/signal.cxx  |   43 +++-
 sw/source/core/docnode/node2lay.cxx |4 +--
 2 files changed, 25 insertions(+), 22 deletions(-)

New commits:
commit d4186da423f393f042ae98aeb5747c3fca23224b
Author: Stephan Bergmann 
AuthorDate: Mon Apr 8 07:52:38 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Sep 16 22:42:39 2024 +0200

-Werror,-Wunused-but-set-variable

...ever since the code got introduced in
9dc6e2c9062725ef1f9d7e321cae5f4dbe8ca749 "sw: fix expansion of 
SetGetExpField in
headers with split table rows"

Change-Id: I44e8d375a47286b625ce9a7808484a32dc1f0aa6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165879
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit a57ade9be3aa03634933e767eab5e8fb640760ca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173404
Tested-by: Stephan Bergmann 

diff --git a/sw/source/core/docnode/node2lay.cxx 
b/sw/source/core/docnode/node2lay.cxx
index 607ebada8ef4..312ce2dff440 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -146,7 +146,7 @@ SwFrame const* FindNeighbourFrameForNode(SwNode const& 
rNode)
 {
 SwNodeIndex idx(rNode);
 SwFlowFrame const* pFlow(nullptr);
-if (SwNode *const pNode = GoPreviousWithFrame(&idx, &pFlow))
+if (GoPreviousWithFrame(&idx, &pFlow))
 {
 if (::CheckNodesRange(rNode, idx.GetNode(), true))
 {
@@ -158,7 +158,7 @@ SwFrame const* FindNeighbourFrameForNode(SwNode const& 
rNode)
 }
 }
 idx = rNode;
-if (SwNode *const pNode = GoNextWithFrame(idx.GetNodes(), &idx, &pFlow))
+if (GoNextWithFrame(idx.GetNodes(), &idx, &pFlow))
 {
 if (::CheckNodesRange(rNode, idx.GetNode(), true))
 {
commit 8f3437b1c0db184d7b6c5180aaa832beea2cd0ea
Author: Stephan Bergmann 
AuthorDate: Sun Mar 24 18:17:28 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Sep 16 22:42:19 2024 +0200

Avoid -Werror,-Wcast-function-type-mismatch

Change-Id: I93a69c57856169aeff613e34d5c0bf7fa08a0de7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165251
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 85a2bb9f52a0d834b02681344ce56e0b091e1abd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173403
Tested-by: Stephan Bergmann 

diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index 50c260f9d592..2e49918c71a6 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -49,14 +49,17 @@
 
 namespace
 {
-extern "C" using Handler1 = void (*)(int);
-extern "C" using Handler2 = void (*)(int, siginfo_t *, void *);
+extern "C" using Handler1_t = void (*)(int);
+extern "C" using Handler2_t = void (*)(int, siginfo_t *, void *);
 struct SignalAction
 {
 int Signal;
 int Action;
-Handler1 Handler;
-bool siginfo; // Handler's type is Handler2
+union {
+Handler1_t Handler1;
+Handler2_t Handler2;
+};
+bool siginfo; // Handler2 is active
 } Signals[] =
 {
 { SIGHUP,ACT_HIDE,   SIG_DFL, false }, /* hangup */
@@ -204,13 +207,13 @@ bool onInitSignal()
 if (sigaction(rSignal.Signal, &ign, &oact) == 0) {
 rSignal.siginfo = (oact.sa_flags & SA_SIGINFO) != 0;
 if (rSignal.siginfo) {
-rSignal.Handler = reinterpret_cast(
-oact.sa_sigaction);
+rSignal.Handler2 =
+oact.sa_sigaction;
 } else {
-rSignal.Handler = oact.sa_handler;
+rSignal.Handler1 = oact.sa_handler;
 }
 } else {
-rSignal.Handler = SIG_DFL;
+rSignal.Handler1 = SIG_DFL;
 rSignal.siginfo = false;
 }
 }
@@ -220,13 +223,13 @@ bool onInitSignal()
 if (sigaction(rSignal.Signal, &act, &oact) == 0) {
 rSignal.siginfo = (oact.sa_flags & SA_SIGINFO) != 0;
 if (rSignal.siginfo) {
-rSignal.Handler = reinterpret_cast(
-oact.sa_sigaction);
+rSignal.Handler2 =
+oact.sa_sigaction;
 } else {
-rSignal.Handler = oact.sa_handler;
+rSignal.Handler1 = oact.sa_handler;
 }
 } else {
-rSignal.Handler = SIG_DFL;
+rSignal.Handler1 = SIG_DFL;

core.git: Branch 'distro/allotropia/zeta-24-2' - 210 commits - android/CustomTarget_lo_android.mk bin/find-unneeded-includes bridges/CustomTarget_gcc3_linux_arm.mk bridges/CustomTarget_gcc3_wasm.mk br

2024-09-13 Thread Stephan Bergmann (via logerrit)

 
   |2 
 winaccessibility/CustomTarget_ia2_idl.mk   
   |2 
 wizards/CustomTarget_share.mk  
   |8 
 wizards/CustomTarget_wizards.mk
   |2 
 wizards/Package_share.mk   
   |2 
 wizards/Package_wizards_properties.mk  
   |2 
 writerfilter/CustomTarget_source.mk
   |4 
 writerperfect/CppunitTest_writerperfect_epubexport.mk  
   |2 
 xmloff/CustomTarget_generated.mk   
   |4 
 xmlsecurity/source/xmlsec/xmlsec_init.cxx  
   |1 
 309 files changed, 9635 insertions(+), 2385 deletions(-)

New commits:
commit 80a44ed45822a716fd4e7906ca232052531af918
Author: Stephan Bergmann 
AuthorDate: Tue Sep 10 12:49:49 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 13 11:11:42 2024 +0200

Demonstrate that Embind is not multi-threading capable

Enabling the line commented out with "TODO" in embindtest.js would fail with
something like

> Aborted(Assertion failed: invalid handle: 8)
> worker.js onmessage() captured an uncaught exception: RuntimeError: 
unreachable
> RuntimeError: unreachable
> at soffice.wasm.__trap 
(http://localhost:6931/soffice.wasm:wasm-function[446445]:0x8f952b3)
> at ___trap 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:16657:54)
> at abort 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:1091:5)
> at assert 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:731:5)
> at HandleAllocator.get 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:7212:11)
> at Object.toValue 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:7270:30)
> at __emval_call_void_method 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:10183:22)
> at 
soffice.wasm.the_wrappers::com::sun::star::task::XJobExecutor::trigger(rtl::OUString
 const&) (http://localhost:6931/soffice.wasm:wasm-function[77042]:0xafbb24)
> at soffice.wasm.(anonymous namespace)::JobExecutorThread::execute() 
(http://localhost:6931/soffice.wasm:wasm-function[243534]:0x43250b5)
> at soffice.wasm.non-virtual thunk to salhelper::Thread::run() 
(http://localhost:6931/soffice.wasm:wasm-function[87641]:0xdff5cf)

(cherry-picked from b418f3d8d332276e6990cf7532a8f66aeb1d2f6c)

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

diff --git a/offapi/org/libreoffice/embindtest/XTest.idl 
b/offapi/org/libreoffice/embindtest/XTest.idl
index 276ce260a8e1..e579a606202a 100644
--- a/offapi/org/libreoffice/embindtest/XTest.idl
+++ b/offapi/org/libreoffice/embindtest/XTest.idl
@@ -129,7 +129,7 @@ interface XTest {
 [out] XTest value18);
 void throwRuntimeException();
 void passJob([in] com::sun::star::task::XJob object);
-void passJobExecutor([in] com::sun::star::task::XJobExecutor object);
+void passJobExecutor([in] com::sun::star::task::XJobExecutor object, [in] 
boolean newThread);
 void passInterface([in] com::sun::star::uno::XInterface object);
 boolean checkAttributes([in] org::libreoffice::embindtest::XAttributes 
object);
 [attribute] string StringAttribute;
diff --git a/unotest/source/embindtest/embindtest.cxx 
b/unotest/source/embindtest/embindtest.cxx
index 60150dcd2ad9..4a335f6f6be3 100644
--- a/unotest/source/embindtest/embindtest.cxx
+++ b/unotest/source/embindtest/embindtest.cxx
@@ -67,6 +67,21 @@ private:
 }
 };
 
+class JobExecutorThread : public salhelper::Thread
+{
+public:
+JobExecutorThread(css::uno::Reference const& 
object)
+: Thread("jobexecutor")
+, object_(object)
+{
+}
+
+private:
+void execute() override { object_->trigger(u"executor thread"_ustr); }
+
+css::uno::Reference object_;
+};
+
 class Test : public cppu::WeakImplHelper
 {
 sal_Bool SAL_CALL getBoolean() override { return true; }
@@ -861,10 +876,19 @@ class Test : public 
cppu::WeakImplHelper
 }
 }
 
-void SAL_CALL
-passJobExecutor(css::uno::Reference const& 
object) override
+void SAL_CALL passJobExecutor(css::uno::Reference 
const& object,
+  sal_Bool newThread) override
 {
-object->trigger(u"executor"_ustr);
+if (newThread)
+{
+

core.git: include/vcl

2024-09-13 Thread Stephan Bergmann (via logerrit)

 include/vcl/dndhelp.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e5ef04874a73d87bc66578b73b44ca3e3a0e76ee
Author: Stephan Bergmann 
AuthorDate: Fri Sep 13 08:35:02 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 13 11:03:46 2024 +0200

UBSan CppunitTest_editeng_borderline etc. need more RTTI now

...presumably since 5ba893dfb8838b0ef946b52de9ef1336d2ab0512 "use more 
concrete
UNO type in editeng",

> DynamicLibraryManagerException: "Failed to load dynamic library: 
/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/LinkTarget/CppunitTest/libtest_editeng_borderline.so
> 
/home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program/libeditenglo.so: 
undefined symbol: _ZTIN3vcl9unohelper18DragAndDropWrapperE"

(<https://ci.libreoffice.org/job/lo_ubsan/3306/>)

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

diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx
index 0d1af70d69e8..bb0f75aef853 100644
--- a/include/vcl/dndhelp.hxx
+++ b/include/vcl/dndhelp.hxx
@@ -64,7 +64,7 @@ public:
 SAL_DLLPRIVATE virtual void dragOver( const 
css::datatransfer::dnd::DropTargetDragEvent& dtde );
 };
 
-class DragAndDropWrapper final :
+class SAL_DLLPUBLIC_RTTI DragAndDropWrapper final :
 public 
css::datatransfer::dnd::XDragGestureListener,
 public css::datatransfer::dnd::XDragSourceListener,
 public css::datatransfer::dnd::XDropTargetListener,

core.git: connectivity/source vcl/source

2024-09-11 Thread Stephan Bergmann (via logerrit)

 connectivity/source/manager/mdrivermanager.cxx |4 ++--
 vcl/source/window/layout.cxx   |   12 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 294b4cc5458b9e20da98d12405a5942ae1551aee
Author: Stephan Bergmann 
AuthorDate: Wed Sep 11 20:22:25 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 12 08:03:43 2024 +0200

These bogus -Wdangling-reference still hit with current GCC 15 trunk

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

diff --git a/connectivity/source/manager/mdrivermanager.cxx 
b/connectivity/source/manager/mdrivermanager.cxx
index 61b5b528f624..3d9754867bf7 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -565,12 +565,12 @@ Reference< XDriver > 
OSDBCDriverManager::implGetDriverForURL(const OUString& _rU
 m_aDriversBS.end(), // end of search range
 [&_rURL, this] (const DriverAccessArray::value_type& 
driverAccess) {
 // extract the driver from the access, then ask the 
resulting driver for acceptance
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-reference"
 #endif
 const DriverAccess& ensuredAccess = 
EnsureDriver(m_xContext)(driverAccess);
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
 #pragma GCC diagnostic pop
 #endif
 const Reference driver = 
ExtractDriverFromAccess()(ensuredAccess);
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index d9ce06bc1ae0..988b470ca31f 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -964,12 +964,12 @@ static array_type assembleGrid(const VclGrid &rGrid)
 {
 for (sal_Int32 y = 0; y < nMaxY; ++y)
 {
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-reference"
 #endif
 const GridEntry &rEntry = A[x][y];
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
 #pragma GCC diagnostic pop
 #endif
 const vcl::Window *pChild = rEntry.pChild;
@@ -1101,7 +1101,7 @@ static void calcMaxs(const array_type &A, 
std::vector &rWidths,
 {
 for (sal_Int32 y = 0; y < nMaxY; ++y)
 {
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-reference"
 #elif defined _MSC_VER
@@ -1109,7 +1109,7 @@ static void calcMaxs(const array_type &A, 
std::vector &rWidths,
 #pragma warning(disable : 4459)
 #endif
 const GridEntry &rEntry = A[x][y];
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
 #pragma GCC diagnostic pop
 #elif defined _MSC_VER
 #pragma warning(pop)
@@ -1144,12 +1144,12 @@ static void calcMaxs(const array_type &A, 
std::vector &rWidths,
 {
 for (sal_Int32 y = 0; y < nMaxY; ++y)
 {
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-reference"
 #endif
 const GridEntry &rEntry = A[x][y];
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
 #pragma GCC diagnostic pop
 #endif
 const vcl::Window *pChild = rEntry.pChild;

core.git: offapi/org unotest/source

2024-09-10 Thread Stephan Bergmann (via logerrit)

 offapi/org/libreoffice/embindtest/XTest.idl |2 -
 unotest/source/embindtest/embindtest.cxx|   30 +---
 unotest/source/embindtest/embindtest.js |3 +-
 3 files changed, 30 insertions(+), 5 deletions(-)

New commits:
commit b418f3d8d332276e6990cf7532a8f66aeb1d2f6c
Author: Stephan Bergmann 
AuthorDate: Tue Sep 10 12:49:49 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 10 19:52:15 2024 +0200

Demonstrate that Embind is not multi-threading capable

Enabling the line commented out with "TODO" in embindtest.js would fail with
something like

> Aborted(Assertion failed: invalid handle: 8)
> worker.js onmessage() captured an uncaught exception: RuntimeError: 
unreachable
> RuntimeError: unreachable
> at soffice.wasm.__trap 
(http://localhost:6931/soffice.wasm:wasm-function[446445]:0x8f952b3)
> at ___trap 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:16657:54)
> at abort 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:1091:5)
> at assert 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:731:5)
> at HandleAllocator.get 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:7212:11)
> at Object.toValue 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:7270:30)
> at __emval_call_void_method 
(blob:http://localhost:6931/7e945427-df90-49c0-a2b5-28c5ecfbe1a5:10183:22)
> at 
soffice.wasm.the_wrappers::com::sun::star::task::XJobExecutor::trigger(rtl::OUString
 const&) (http://localhost:6931/soffice.wasm:wasm-function[77042]:0xafbb24)
> at soffice.wasm.(anonymous namespace)::JobExecutorThread::execute() 
(http://localhost:6931/soffice.wasm:wasm-function[243534]:0x43250b5)
> at soffice.wasm.non-virtual thunk to salhelper::Thread::run() 
(http://localhost:6931/soffice.wasm:wasm-function[87641]:0xdff5cf)

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

diff --git a/offapi/org/libreoffice/embindtest/XTest.idl 
b/offapi/org/libreoffice/embindtest/XTest.idl
index 276ce260a8e1..e579a606202a 100644
--- a/offapi/org/libreoffice/embindtest/XTest.idl
+++ b/offapi/org/libreoffice/embindtest/XTest.idl
@@ -129,7 +129,7 @@ interface XTest {
 [out] XTest value18);
 void throwRuntimeException();
 void passJob([in] com::sun::star::task::XJob object);
-void passJobExecutor([in] com::sun::star::task::XJobExecutor object);
+void passJobExecutor([in] com::sun::star::task::XJobExecutor object, [in] 
boolean newThread);
 void passInterface([in] com::sun::star::uno::XInterface object);
 boolean checkAttributes([in] org::libreoffice::embindtest::XAttributes 
object);
 [attribute] string StringAttribute;
diff --git a/unotest/source/embindtest/embindtest.cxx 
b/unotest/source/embindtest/embindtest.cxx
index 60150dcd2ad9..4a335f6f6be3 100644
--- a/unotest/source/embindtest/embindtest.cxx
+++ b/unotest/source/embindtest/embindtest.cxx
@@ -67,6 +67,21 @@ private:
 }
 };
 
+class JobExecutorThread : public salhelper::Thread
+{
+public:
+JobExecutorThread(css::uno::Reference const& 
object)
+: Thread("jobexecutor")
+, object_(object)
+{
+}
+
+private:
+void execute() override { object_->trigger(u"executor thread"_ustr); }
+
+css::uno::Reference object_;
+};
+
 class Test : public cppu::WeakImplHelper
 {
 sal_Bool SAL_CALL getBoolean() override { return true; }
@@ -861,10 +876,19 @@ class Test : public 
cppu::WeakImplHelper
 }
 }
 
-void SAL_CALL
-passJobExecutor(css::uno::Reference const& 
object) override
+void SAL_CALL passJobExecutor(css::uno::Reference 
const& object,
+  sal_Bool newThread) override
 {
-object->trigger(u"executor"_ustr);
+if (newThread)
+{
+JobExecutorThread t(object);
+t.launch();
+t.join();
+}
+else
+{
+object->trigger(u"executor"_ustr);
+}
 }
 
 void SAL_CALL passInterface(css::uno::Reference 
const& object) override
diff --git a/unotest/source/embindtest/embindtest.js 
b/unotest/source/embindtest/embindtest.js
index 9551a9a56bca..082150ff6605 100644
--- a/unotest/source/embindtest/embindtest.js
+++ b/unotest/source/embindtest/embindtest.js
@@ -878,7 +878,8 @@ Module.uno_init.then(function() {
 s.delete();
 }
 test.passJob(css.task.XJob.query(obj));
-test.passJobExecutor(css.task.XJobExecutor.query(obj));
+test.passJobExecutor(css.task.XJobExecutor.query(obj), false);
+//TODO: test.passJobExecutor(css.task.XJobExecutor.query(obj), true);
 test.passInterface(obj);
 css.task.XJobExecutor.query(obj).trigger('from JS');
 {

core.git: svx/source

2024-09-10 Thread Stephan Bergmann (via logerrit)

 svx/source/fmcomp/gridctrl.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit b472e1cedddf083d6b04d233cdefe686c8aa07ae
Author: Stephan Bergmann 
AuthorDate: Tue Sep 10 13:04:00 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 10 18:24:11 2024 +0200

-Werror,-Wunused-private-field

...since f9ff22db058180d161b32f5dcd87e72cfa3b6889 
"tsan:lock-order-inversion in
forms"

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

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index b891f2081a04..e716d9eeb0ab 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -123,7 +123,6 @@ private:
 
 class GridFieldValueListener : protected ::comphelper::OPropertyChangeListener
 {
-osl::Mutex  m_aMutex;
 DbGridControl&  m_rParent;
 rtl::Reference<::comphelper::OPropertyChangeMultiplexer> m_pRealListener;
 sal_uInt16  m_nId;
@@ -240,8 +239,6 @@ class FmXGridSourcePropListener : public 
::comphelper::OPropertyChangeListener
 {
 VclPtr m_pParent;
 
-// a DbGridControl has no mutex, so we use our own as the base class 
expects one
-osl::Mutex  m_aMutex;
 sal_Int16   m_nSuspended;
 
 public:

core.git: sw/source

2024-09-10 Thread Stephan Bergmann (via logerrit)

 sw/source/core/doc/docfld.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e663655d04b6f2d65722a83475bf4d997b4a4078
Author: Stephan Bergmann 
AuthorDate: Tue Sep 10 08:33:56 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 10 14:42:32 2024 +0200

Fix certain build configurations

...after 8849c1d9cc7fbf990b1e1633b59a09c818dabc72 "dont use 
GetItemSurrogates
for gathering SwFormatField",

> 
/home/tdf/lode/jenkins/workspace/lo_gerrit/tb/src_wasm/sw/source/core/doc/docfld.cxx:941:37:
 error: use of undeclared identifier 'bIsDBManager'
>   941 | [this, eGetMode, &rDoc, bIsDBManager] (const 
SwFormatField& rFormatField) -> bool
>   | ^

(<https://ci.libreoffice.org/job/lo_daily_tb_linux_wasm/825/>)

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

diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 45fda23a806a..eb4737575a71 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -938,7 +938,11 @@ void SwDocUpdateField::MakeFieldList_( SwDoc& rDoc, int 
eGetMode )
 for (const TypedWhichId & nWhichHint : { RES_TXTATR_FIELD, 
RES_TXTATR_INPUTFIELD })
 {
 rDoc.ForEachFormatField(nWhichHint,
-[this, eGetMode, &rDoc, bIsDBManager] (const SwFormatField& 
rFormatField) -> bool
+[this, eGetMode, &rDoc
+#if HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS
+  , bIsDBManager
+#endif
+] (const SwFormatField& rFormatField) -> bool
 {
 const SwTextField* pTextField = rFormatField.GetTextField();

core.git: Branch 'feature/cib_contract49c' - configure.ac

2024-09-10 Thread Stephan Bergmann (via logerrit)

 configure.ac |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 5d2297f35201a14543b6fe551cb8a238d6742f23
Author: Stephan Bergmann 
AuthorDate: Tue Apr 9 10:37:09 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 10 13:34:37 2024 +0200

Avoid -O2 in AC_PROG_CC/CXX, work around occasional Clang 12.0.1 SEGVs

At least with one ASan/UBSan setup of mine using LODE's Clang 12.0.1,
./autogen.sh would occasionally detect -std=gnu11 as the required CC 
"option to
enable C11 features" (which would in turn cause building external/firebird 
to
fail oddly; an issue worth investigations of its own), because Clang would
occasionally crash with a SEGV on the corresponding configure test program's
first invocation (without -std=gnu11) when invoked with -O2 (and happen to
succeed on second invocation with -std=gnu11, so configure thinks that's
needed), see below for a relevant config.log excerpt.

When CC/CXX are already set (as is the case in this scenario), we could 
arguably
skip the AC_PROG_CC/CXX checks entirely (and thus avoid configure 
potentially
adding -std=gnu11 to CC), but at least AC_PROG_CC also internally sets the 
GCC
shell var, which we use in configure.ac.  So better be conservative and just
avoid -O2 during AC_PROG_CC/CXX (whatever the autoconf motivation to 
include it
in the first place).

> configure:8165: checking for 
/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang 
-fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero 
-fsanitize=local-bounds 
-fsanitize-blacklist=/home/sberg/lo0/core/sanitize-ubsan-excludelist option to 
enable C11 features
> configure:8180: 
/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang 
-fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero 
-fsanitize=local-bounds 
-fsanitize-blacklist=/home/sberg/lo0/core/sanitize-ubsan-excludelist  -c -g -O2 
 conftest.c >&5
> PLEASE submit a bug report to https://bugs.llvm.org/ and include the 
crash backtrace, preprocessed source, and associated run script.
> Stack dump:
> 0.Program arguments: 
/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang 
-fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero 
-fsanitize=local-bounds 
-fsanitize-blacklist=/home/sberg/lo0/core/sanitize-ubsan-excludelist -c -g -O2 
conftest.c
> 1. parser at end of file
> 2.Code generation
>  #0 0x55f3a890caf2 llvm::sys::PrintStackTrace(llvm::raw_ostream&, 
int) (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1c3eaf2)
>  #1 0x55f3a890a734 llvm::sys::RunSignalHandlers() 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1c3c734)
>  #2 0x55f3a887b998 CrashRecoverySignalHandler(int) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1bad998)
>  #3 0x7f750d24e520 (/lib/x86_64-linux-gnu/libc.so.6+0x42520)
>  #4 0x55f3a93f9cd4 llvm::DIE::getUnitDie() const 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x272bcd4)
>  #5 0x55f3a9404574 llvm::DwarfDebug::finishEntityDefinitions() 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2736574)
>  #6 0x55f3a941df99 llvm::DwarfDebug::finalizeModuleInfo() 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x274ff99)
>  #7 0x55f3a9421128 llvm::DwarfDebug::endModule() 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2753128)
>  #8 0x55f3a93f1219 llvm::AsmPrinter::doFinalization(llvm::Module&) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2723219)
>  #9 0x55f3a82478f5 llvm::FPPassManager::doFinalization(llvm::Module&) 
(.localalias) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x15798f5)
> #10 0x55f3a8253900 llvm::legacy::PassManagerImpl::run(llvm::Module&) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1585900)
> #11 0x55f3a8bb57d3 (anonymous 
namespace)::EmitAssemblyHelper::EmitAssembly(clang::BackendAction, 
std::unique_ptr >) (.constprop.0) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1ee77d3)
> #12 0x55f3a8bb76ea 
clang::EmitBackendOutput(clang::DiagnosticsEngine&, clang::HeaderSearchOptions 
const&, clang::CodeGenOptions const&, clang::TargetOptions const&, 
clang::LangOptions const&, llvm::DataLayout const&, llvm::Module*, 
clang::BackendAction, std::unique_ptr >) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1ee96ea)
> #13 0x55f3a9825876 
clang::BackendConsumer::HandleTranslationUnit(clang::ASTContext&) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2b57876)
> #14 0x55f3aa35c549 cla

core.git: Branch 'libreoffice-24-8-1' - bridges/source

2024-09-05 Thread Stephan Bergmann (via logerrit)

 bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 79ca1a3c7697a85ea272faad3861792f97da2b5e
Author: Stephan Bergmann 
AuthorDate: Tue Sep 3 11:19:53 2024 +0200
Commit: Xisco Fauli 
CommitDate: Thu Sep 5 15:37:34 2024 +0200

tdf#160945: queryInterface must pass back indirect return value address in 
x0

Change-Id: I28dacffbbcdf26ee453fd32aeb82166484612846
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172791
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit f610a602c94925f2cae7765bae4a53816dd46aa5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172764
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Michael Stahl 

diff --git a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
index 9a79ce543940..f864e193c729 100644
--- a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
@@ -278,6 +278,7 @@ extern "C" void vtableCall(sal_Int32 functionIndex, 
sal_Int32 vtableOffset, sal_
   
reinterpret_cast(uno::cpp_acquire));
 ifc->release();
 TYPELIB_DANGER_RELEASE(td);
+gpr[0] = reinterpret_cast(indirectRet);
 break;
 }
 TYPELIB_DANGER_RELEASE(td);

core.git: Branch 'libreoffice-24-8' - bridges/source

2024-09-04 Thread Stephan Bergmann (via logerrit)

 bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0c8443c69a8e8c3c6da24748050d238ba3227b17
Author: Stephan Bergmann 
AuthorDate: Tue Sep 3 11:19:53 2024 +0200
Commit: Michael Stahl 
CommitDate: Wed Sep 4 10:52:02 2024 +0200

tdf#160945: queryInterface must pass back indirect return value address in 
x0

Change-Id: I28dacffbbcdf26ee453fd32aeb82166484612846
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172791
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit f610a602c94925f2cae7765bae4a53816dd46aa5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172763
Reviewed-by: Michael Stahl 

diff --git a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
index 9a79ce543940..f864e193c729 100644
--- a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
@@ -278,6 +278,7 @@ extern "C" void vtableCall(sal_Int32 functionIndex, 
sal_Int32 vtableOffset, sal_
   
reinterpret_cast(uno::cpp_acquire));
 ifc->release();
 TYPELIB_DANGER_RELEASE(td);
+gpr[0] = reinterpret_cast(indirectRet);
 break;
 }
 TYPELIB_DANGER_RELEASE(td);

core.git: solenv/gbuild

2024-09-03 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7d3251adf2e95768c9169b92c8b3366c95f71bfa
Author: Stephan Bergmann 
AuthorDate: Tue Sep 3 15:24:50 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 3 21:04:51 2024 +0200

Emscripten: Move -sEXPORT_EXCEPTION_HANDLING_HELPERS to 
gb_LinkTarget_LDFLAGS

...following up on 95e719730dc62cee3edc959bd9d96edfb992a642 "Emscripten:
Explicitly set -sEXPORT_EXCEPTION_HANDLING_HELPERS".  For one, it should 
indeed
only be relevant for linking.  For another, the previous change had caused 
at
least ExternalProject_libtiff to fail with "checking whether the C compiler
works... no" because of "emcc: error: EXPORT_EXCEPTION_HANDLING_HELPERS 
requires
either of -fexceptions or -fwasm-exceptions".

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

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 313b7280a0fe..37d23aabcfe9 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -23,7 +23,7 @@ gb_EMSCRIPTEN_LDFLAGS += -sSTACK_SIZE=131072 
-sDEFAULT_PTHREAD_STACK_SIZE=65536
 # To keep the link time (and memory) down, prevent all rewriting options from 
wasm-emscripten-finalize
 # See emscripten.py, finalize_wasm, modify_wasm = True
 # So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK)
-gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain","addOnPostRun","registerType","throwBindingError"$(if
 $(ENABLE_QT6),$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")] 
-sEXPORT_EXCEPTION_HANDLING_HELPERS
+gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain","addOnPostRun","registerType","throwBindingError"$(if
 $(ENABLE_QT6),$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")]
 gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
 ifeq ($(ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS),TRUE)
@@ -45,7 +45,8 @@ ifeq ($(ENABLE_QT5),TRUE)
 gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_QTDEFS)
 gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_QTDEFS)
 endif
-gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) 
$(gb_EMSCRIPTEN_EXCEPT)
+gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) \
+$(gb_EMSCRIPTEN_EXCEPT) -sEXPORT_EXCEPTION_HANDLING_HELPERS
 
 # Linker and compiler optimize + debug flags are handled in LinkTarget.mk
 gb_LINKEROPTFLAGS :=

core.git: bridges/source

2024-09-03 Thread Stephan Bergmann (via logerrit)

 bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f610a602c94925f2cae7765bae4a53816dd46aa5
Author: Stephan Bergmann 
AuthorDate: Tue Sep 3 11:19:53 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 3 14:21:55 2024 +0200

tdf#160945: queryInterface must pass back indirect return value address in 
x0

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

diff --git a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
index 9a79ce543940..f864e193c729 100644
--- a/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_arm64/cpp2uno.cxx
@@ -278,6 +278,7 @@ extern "C" void vtableCall(sal_Int32 functionIndex, 
sal_Int32 vtableOffset, sal_
   
reinterpret_cast(uno::cpp_acquire));
 ifc->release();
 TYPELIB_DANGER_RELEASE(td);
+gpr[0] = reinterpret_cast(indirectRet);
 break;
 }
 TYPELIB_DANGER_RELEASE(td);

core.git: desktop/source

2024-09-03 Thread Stephan Bergmann (via logerrit)

 desktop/source/app/appinit.cxx |   17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 24a3a7c72714c4f45c46cd2b6274013503d444d6
Author: Stephan Bergmann 
AuthorDate: Tue Sep 3 09:38:58 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 3 13:47:21 2024 +0200

Emscripten: workerID is only defined under -sASSERTIONS

...and explicitly passing in pthread_self() on the calling side is better 
than
trying to identify the calling thread on the callee side, anyway

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

diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 3a8bce551d6a..16f023b0a414 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -93,20 +93,13 @@ EM_JS(void, setupMainChannel, (), {
 };
 });
 
-extern "C" void resolveUnoMain() {
-EM_ASM(
-let sofficeMain;
-for (const i in PThread.pthreads) {
-const worker = PThread.pthreads[i];
-if (worker.workerID === 1) {
-sofficeMain = worker;
-break;
-}
-}
+extern "C" void resolveUnoMain(pthread_t id) {
+EM_ASM({
+const sofficeMain = PThread.pthreads[$0];
 const channel = new MessageChannel();
 sofficeMain.postMessage({cmd:"LOWA-channel"}, [channel.port2]);
 Module.uno_main$resolve(channel.port1);
-);
+}, id);
 }
 
 void initUno() {
@@ -120,7 +113,7 @@ void initUno() {
 runUnoScriptUrl(url.getStr());
 }
 setupMainChannel();
-emscripten_async_run_in_main_runtime_thread(EM_FUNC_SIG_V, resolveUnoMain);
+emscripten_async_run_in_main_runtime_thread(EM_FUNC_SIG_VI, 
resolveUnoMain, pthread_self());
 }
 
 }

core.git: solenv/gbuild

2024-09-03 Thread Stephan Bergmann (via logerrit)

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 95e719730dc62cee3edc959bd9d96edfb992a642
Author: Stephan Bergmann 
AuthorDate: Tue Sep 3 09:52:12 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 3 12:07:54 2024 +0200

Emscripten: Explicitly set -sEXPORT_EXCEPTION_HANDLING_HELPERS

...so that getCppExceptionTag and
getCppExceptionThrownObjectFromWebAssemblyException are available in
static/emscripten/uno.js.  Those apparently happen to already be available 
due
to -sASSERTIONS=1, but better make that explicit (e.g., when we ever want 
to do
-sASSERTIONS=0 builds).

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

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 416cdbc4c1a4..313b7280a0fe 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -23,7 +23,7 @@ gb_EMSCRIPTEN_LDFLAGS += -sSTACK_SIZE=131072 
-sDEFAULT_PTHREAD_STACK_SIZE=65536
 # To keep the link time (and memory) down, prevent all rewriting options from 
wasm-emscripten-finalize
 # See emscripten.py, finalize_wasm, modify_wasm = True
 # So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK)
-gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain","addOnPostRun","registerType","throwBindingError"$(if
 $(ENABLE_QT6),$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")]
+gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","ccall","cwrap","addOnPreMain","addOnPostRun","registerType","throwBindingError"$(if
 $(ENABLE_QT6),$(COMMA)"callMain"$(COMMA)"specialHTMLTargets")] 
-sEXPORT_EXCEPTION_HANDLING_HELPERS
 gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
 ifeq ($(ENABLE_EMSCRIPTEN_PROXY_POSIX_SOCKETS),TRUE)

core.git: static/emscripten

2024-09-02 Thread Stephan Bergmann (via logerrit)

 static/emscripten/uno.js |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 32ce555c9daff2d4044c041e220fde44cf4aff67
Author: Stephan Bergmann 
AuthorDate: Mon Sep 2 08:48:21 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Sep 2 10:57:36 2024 +0200

Explicitly .delete() one more interface object in uno.js

...accidentally left over from 91842724235bca73690d67d8084ec7581512d791
"Explicitly .delete() type and interface objects in uno.js"

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

diff --git a/static/emscripten/uno.js b/static/emscripten/uno.js
index 6591a7441220..714dbf20dc3a 100644
--- a/static/emscripten/uno.js
+++ b/static/emscripten/uno.js
@@ -40,10 +40,13 @@ Module.unoObject = function(interfaces, obj) {
 obj.queryInterface = function(type) {
 for (const i in obj.impl_typemap) {
 if (i === type.toString()) {
-return new Module.uno_Any(
-type,
-Module['uno_Type_' + i.replace(/\./g, '$')].reference(
-obj.impl_interfaces[obj.impl_typemap[i]]));
+const ifc = Module['uno_Type_' + i.replace(/\./g, 
'$')].reference(
+obj.impl_interfaces[obj.impl_typemap[i]]);
+try {
+return new Module.uno_Any(type, ifc);
+} finally {
+ifc.delete();
+}
 }
 }
 const ty = Module.uno_Type.Void();

core.git: static/emscripten

2024-08-30 Thread Stephan Bergmann (via logerrit)

 static/emscripten/uno.js |   30 ++
 1 file changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 91842724235bca73690d67d8084ec7581512d791
Author: Stephan Bergmann 
AuthorDate: Fri Aug 30 16:19:10 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Aug 31 08:29:23 2024 +0200

Explicitly .delete() type and interface objects in uno.js

These objects use smart proxies, so Embind adds them to a JS finalizer (in 
JS
runtimes where FinalizationRegistry is available), so it shouldn't be 
necessary
to manually .delete() them, but Embind then emits "Embind found a leaked C++
instance..." warnings about them, which clutter the JS console.

While it is probably impractical for client code to manually .delete() all 
such
instances, we can at least explicitly .delete() those that occur in uno.js
itself.

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

diff --git a/static/emscripten/uno.js b/static/emscripten/uno.js
index fb634cc63c9d..6591a7441220 100644
--- a/static/emscripten/uno.js
+++ b/static/emscripten/uno.js
@@ -46,7 +46,10 @@ Module.unoObject = function(interfaces, obj) {
 obj.impl_interfaces[obj.impl_typemap[i]]));
 }
 }
-return new Module.uno_Any(Module.uno_Type.Void(), undefined);
+const ty = Module.uno_Type.Void();
+const ret = new Module.uno_Any(ty, undefined);
+ty.delete();
+return ret;
 };
 obj.acquire = function() { ++obj.impl_refcount; };
 obj.release = function() {
@@ -59,7 +62,9 @@ Module.unoObject = function(interfaces, obj) {
 obj.getTypes = function() {
 const types = new Module.uno_Sequence_type(interfaces.length, 
Module.uno_Sequence.FromSize);
 for (let i = 0; i !== interfaces.length; ++i) {
-types.set(i, Module.uno_Type.Interface(interfaces[i]));
+const type = Module.uno_Type.Interface(interfaces[i]);
+types.set(i, type);
+type.delete();
 }
 return types;
 };
@@ -76,23 +81,32 @@ Module.unoObject = function(interfaces, obj) {
 throw new Error('not a UNO interface type: ' + name);
 }
 obj.impl_typemap[name] = impl;
-const bases = 
Module.uno.com.sun.star.reflection.XInterfaceTypeDescription2.query(td)
-  .getBaseTypes();
+const itd = 
Module.uno.com.sun.star.reflection.XInterfaceTypeDescription2.query(td);
+const bases = itd.getBaseTypes();
+itd.delete();
 for (let i = 0; i !== bases.size(); ++i) {
 walk(bases.get(i), impl);
 }
 bases.delete();
 }
+td.delete();
 };
-const tdmAny = Module.getUnoComponentContext().getValueByName(
+const ctx = Module.getUnoComponentContext();
+const tdmAny = ctx.getValueByName(
 '/singletons/com.sun.star.reflection.theTypeDescriptionManager');
-const tdm = 
Module.uno.com.sun.star.container.XHierarchicalNameAccess.query(tdmAny.get());
+ctx.delete();
+const ifc = tdmAny.get();
+tdmAny.delete();
+const tdm = 
Module.uno.com.sun.star.container.XHierarchicalNameAccess.query(ifc);
+ifc.delete();
 interfaces.forEach((i) => {
 const td = tdm.getByHierarchicalName(i);
-
walk(Module.uno.com.sun.star.reflection.XTypeDescription.query(td.get()), i);
+const ifc = td.get();
 td.delete();
+walk(Module.uno.com.sun.star.reflection.XTypeDescription.query(ifc), 
i);
+ifc.delete();
 })
-tdmAny.delete();
+tdm.delete();
 return Module.uno.com.sun.star.uno.XInterface.reference(
 obj.impl_interfaces[obj.impl_typemap['com.sun.star.uno.XInterface']]);
 };

core.git: static/emscripten

2024-08-30 Thread Stephan Bergmann (via logerrit)

 static/emscripten/uno.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1732bf1c47d7b53cee55097620aa574ab78d85b8
Author: Stephan Bergmann 
AuthorDate: Fri Aug 30 16:24:43 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 30 22:34:29 2024 +0200

Consistenly terminate statements with semicolons in JS code

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

diff --git a/static/emscripten/uno.js b/static/emscripten/uno.js
index af1f20dd5cdb..fb634cc63c9d 100644
--- a/static/emscripten/uno.js
+++ b/static/emscripten/uno.js
@@ -79,7 +79,7 @@ Module.unoObject = function(interfaces, obj) {
 const bases = 
Module.uno.com.sun.star.reflection.XInterfaceTypeDescription2.query(td)
   .getBaseTypes();
 for (let i = 0; i !== bases.size(); ++i) {
-walk(bases.get(i), impl)
+walk(bases.get(i), impl);
 }
 bases.delete();
 }

core.git: vcl/qt5

2024-08-28 Thread Stephan Bergmann (via logerrit)

 vcl/qt5/QtInstance.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54385e8952e89fd00feb0e8c3e623c522bc6eb09
Author: Stephan Bergmann 
AuthorDate: Wed Aug 28 16:38:16 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 28 23:03:13 2024 +0200

`ImplGetSVData()->mpDefInst` is `this` here

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

diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index dfcf0c2c4f08..089ec9dc7488 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -774,7 +774,7 @@ bool QtInstance::DoExecute(int& nExitCode)
 #if defined EMSCRIPTEN
 // For Emscripten, QApplication::exec() will unwind the stack by 
throwing a JavaScript
 // exception, so we need to manually undo the call of 
AcquireYieldMutex() done in InitVCL:
-ImplGetSVData()->mpDefInst->ReleaseYieldMutex(false);
+ReleaseYieldMutex(false);
 #endif
 nExitCode = QApplication::exec();
 #if defined EMSCRIPTEN

core.git: desktop/Executable_soffice_bin.mk instsetoo_native/CustomTarget_emscripten-install.mk vcl/headless vcl/inc

2024-08-28 Thread Stephan Bergmann (via logerrit)

 desktop/Executable_soffice_bin.mk   |3 +
 instsetoo_native/CustomTarget_emscripten-install.mk |8 +++--
 vcl/headless/svpinst.cxx|   32 
 vcl/inc/headless/svpinst.hxx|8 -
 4 files changed, 46 insertions(+), 5 deletions(-)

New commits:
commit 858fed2a98ad5a04ca65dc504722e2db52746e64
Author: Stephan Bergmann 
AuthorDate: Wed Aug 28 16:30:10 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 28 23:02:51 2024 +0200

Emscripten: Support --disable-gui

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

diff --git a/desktop/Executable_soffice_bin.mk 
b/desktop/Executable_soffice_bin.mk
index f50cfb17633e..fcf16e041fb9 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -63,7 +63,8 @@ $(call gb_Executable_get_linktarget_target,soffice_bin): \
 
 $(eval $(call gb_Executable_add_ldflags,soffice_bin,\
-s 
EXPORTED_FUNCTIONS=@$(gb_CustomTarget_workdir)/desktop/soffice_bin-emscripten-exports/exports
 -Wl$(COMMA)--whole-archive $(call gb_StaticLibrary_get_target,unoembind) 
-Wl$(COMMA)--no-whole-archive \
-   -sPROXY_TO_PTHREAD=1 -sOFFSCREENCANVAS_SUPPORT=1 
-sOFFSCREENCANVASES_TO_PTHREAD=\#qtcanvas \
+   -sPROXY_TO_PTHREAD=1 \
+   $(if $(DISABLE_GUI),,-sOFFSCREENCANVAS_SUPPORT=1 
-sOFFSCREENCANVASES_TO_PTHREAD=\#qtcanvas) \
 ))
 ifeq ($(ENABLE_QT6),TRUE)
 $(eval $(call gb_Executable_add_ldflags,soffice_bin, \
diff --git a/instsetoo_native/CustomTarget_emscripten-install.mk 
b/instsetoo_native/CustomTarget_emscripten-install.mk
index 23a5ee81885b..f4e63f729ab6 100644
--- a/instsetoo_native/CustomTarget_emscripten-install.mk
+++ b/instsetoo_native/CustomTarget_emscripten-install.mk
@@ -14,15 +14,17 @@ $(if $(or $(gb_not $(filter 
emscripten,$(PKGFORMAT))),$(filter-out emscripten,$(
 
 emscripten_install_files := \
 favicon.ico \
-qt_soffice.html \
-qtloader.js \
-qtlogo.svg \
 soffice.data \
 soffice.data.js.metadata \
 soffice.js \
 soffice.wasm \
 soffice.worker.js \
 $(if $(ENABLE_SYMBOLS_FOR),soffice.wasm.dwp) \
+$(if $(DISABLE_GUI), \
+soffice.html, \
+qt_soffice.html \
+qtloader.js \
+qtlogo.svg) \
 
 .PHONY: $(call gb_CustomTarget_get_target,instsetoo_native/emscripten-install)
 $(call gb_CustomTarget_get_target,instsetoo_native/emscripten-install): \
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 82c24771027a..0b65626947aa 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -50,6 +50,11 @@
 #include 
 #include 
 #include 
+#include 
+
+#if defined EMSCRIPTEN
+#include 
+#endif
 
 SvpSalInstance* SvpSalInstance::s_pDefaultInstance = nullptr;
 
@@ -95,6 +100,9 @@ SvpSalInstance::SvpSalInstance( 
std::unique_ptr pMutex )
 #if !defined(ANDROID) && !defined(IOS) && !defined(EMSCRIPTEN)
 pthread_atfork(nullptr, nullptr, atfork_child);
 #endif
+#if defined EMSCRIPTEN
+ImplGetSVData()->maAppData.m_bUseSystemLoop = true;
+#endif
 }
 
 SvpSalInstance::~SvpSalInstance()
@@ -272,6 +280,30 @@ void SvpSalInstance::ProcessEvent( SalUserEvent aEvent )
 pMutex->m_NonMainWaitingYieldCond.set();
 }
 
+#if defined EMSCRIPTEN
+
+static void loop(void * arg) {
+SolarMutexGuard g;
+static_cast(arg)->ImplYield(false, false);
+}
+
+bool SvpSalInstance::DoExecute(int &) {
+assert(Application::IsOnSystemEventLoop());
+// emscripten_set_main_loop will unwind the stack by throwing a JavaScript 
exception, so we need
+// to manually undo the call of AcquireYieldMutex() done in InitVCL:
+ReleaseYieldMutex(false);
+// Somewhat randomly use an fps=100 argument so the loop callback is 
called 100 times per
+// second:
+emscripten_set_main_loop_arg(loop, this, 100, 1);
+O3TL_UNREACHABLE;
+}
+
+void SvpSalInstance::DoQuit() {
+assert(Application::IsOnSystemEventLoop());
+}
+
+#endif
+
 SvpSalYieldMutex::SvpSalYieldMutex()
 {
 }
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 34f3019c7b70..f3d9205a8981 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -100,7 +100,11 @@ class VCL_DLLPUBLIC SvpSalInstance : public 
SalGenericInstance, public SalUserEv
 
 virtual voidTriggerUserEventProcessing() override;
 virtual voidProcessEvent( SalUserEvent aEvent ) override;
-SAL_DLLPRIVATE bool ImplYield(bool bWait, bool bHandleAllCurrentEvents);
+
+#if defined EMSCRIPTEN
+bool DoExecute(int &nExitCode) override;
+void DoQuit() override;
+#endif
 
 public:
 static SvpSalInstance*  s_pDefaultInstance;
@@ -108,6 +112,8 @@ public:
 SvpSalInstance( std::unique_ptr pMutex );
 virtual ~SvpSalInstance() override;
 
+SAL_DLLPRIVAT

core.git: Branch 'distro/collabora/co-24.04' - 8 commits - connectivity/source download.lst hwpfilter/source sal/osl sal/rtl sc/source sw/qa sw/source vcl/source writerfilter/source

2024-08-28 Thread Stephan Bergmann (via logerrit)

 connectivity/source/manager/mdrivermanager.cxx   |4 -
 download.lst |4 -
 hwpfilter/source/hstyle.cxx  |4 -
 sal/osl/unx/thread.cxx   |2 
 sal/rtl/byteseq.cxx  |7 ++
 sal/rtl/hash.cxx |2 
 sc/source/core/tool/compiler.cxx |6 +-
 sw/qa/extras/uiwriter/uiwriter7.cxx  |4 -
 sw/qa/extras/unowriter/data/textboxInColumn2.fodt|   39 +++
 sw/qa/extras/unowriter/unowriter.cxx |   19 +++
 sw/source/core/doc/textboxhelper.cxx |   36 +++--
 sw/source/uibase/inc/textsh.hxx  |2 
 sw/source/uibase/shells/textsh.cxx   |   34 ++---
 vcl/source/window/layout.cxx |   12 ++--
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |9 ++-
 15 files changed, 140 insertions(+), 44 deletions(-)

New commits:
commit ee7138afe13f0f3a53447605e3f019520507a284
Author: Stephan Bergmann 
AuthorDate: Wed Apr 3 23:58:18 2024 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 28 16:12:17 2024 +0200

A number of bogus GCC 13 warnings still hit with recent GCC 14 trunk

Change-Id: I0ec7743cd79429591fcfc3eb9715ff36d06fc00b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165765
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 6b7245f51274424a6c634424161e8766f8827033)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172464
Reviewed-by: Michael Stahl 

diff --git a/connectivity/source/manager/mdrivermanager.cxx 
b/connectivity/source/manager/mdrivermanager.cxx
index ee80460621f5..d301b2c4841b 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -601,12 +601,12 @@ Reference< XDriver > 
OSDBCDriverManager::implGetDriverForURL(const OUString& _rU
 m_aDriversBS.end(), // end of search range
 [&_rURL, this] (const DriverAccessArray::value_type& 
driverAccess) {
 // extract the driver from the access, then ask the 
resulting driver for acceptance
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 13
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-reference"
 #endif
 const DriverAccess& ensuredAccess = 
EnsureDriver(m_xContext)(driverAccess);
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 13
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
 #pragma GCC diagnostic pop
 #endif
 const Reference driver = 
ExtractDriverFromAccess()(ensuredAccess);
diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx
index 013f755496a5..9a0040edcf08 100644
--- a/hwpfilter/source/hstyle.cxx
+++ b/hwpfilter/source/hstyle.cxx
@@ -68,14 +68,14 @@ void HWPStyle::SetName(int n, char const* name)
 
 if (name)
 {
-#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 13) && !defined __clang__
+#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 14) && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
 #endif
 auto const p = style[n].name;
 strncpy(p, name, MAXSTYLENAME);
 p[MAXSTYLENAME] = '
-#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 13) && !defined __clang__
+#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 14) && !defined __clang__
 #pragma GCC diagnostic pop
 #endif
 }
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 5639d8e62d57..ec4331528f9a 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -954,12 +954,12 @@ array_type assembleGrid(const VclGrid &rGrid)
 {
 for (sal_Int32 y = 0; y < nMaxY; ++y)
 {
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 13
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-reference"
 #endif
 const GridEntry &rEntry = A[x][y];
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 13
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
 #pragma GCC diagnostic pop
 #endif
 const vcl::Window *pChild = rEntry.pChi

Re: Help with XImplementationLoader for .NET Bindings

2024-08-28 Thread Stephan Bergmann


On 8/27/24 17:56, Ritobroto Mukherjee wrote:

Based on my current understanding, the steps involved are:
1. Adding an IDL file for com.sun.star.loader.Dotnet.
2. Creating a C++ implementation of css.loader.Dotnet in the stoc/
module along with a .component file, similar to stoc/source/javaloader.
3. Modifying dp_component.cxx and dp_package.cxx in the desktop/ module
to support css.loader.Dotnet (I believe this is for .oxt support?).


yes, the above is for .oxt support


4. Adding css.loader.Dotnet support to cpputools/source/unoexe.cxx for
the UNO executable runner.

Could you please let me know if these steps are sufficient? Are there
any additional changes that need to be made?


I don't remember the details myself either, but yeah, the most important 
thing would be step (2) above, to have a 
css.loader.XImplementationLoader implementation (and to put the code 
somewhere in stoc sounds like a good idea), with a corresponding 
.component file similar to the 
stoc/source/javaloader/javaloader.component one, but just a single 
`` entry.


Then, it should work to have other .component files (for components 
implemented in .Net) to use `loader="com.sun.star.loader.Dotnet" ...`.


All the other points above are of secondary relevance (point (3) being 
perhaps the most important of them, as otherwise extensions couldn't 
bring along components implemented in .Net, I think).

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 11997 matches

Mail list logo