configure.ac | 12 +++++++++--- vcl/unx/generic/app/geninst.cxx | 6 ++++++ 2 files changed, 15 insertions(+), 3 deletions(-)
New commits: commit 89a8b76677325f258ccaf8a37bc49541fc19e9bd Author: Stephan Bergmann <[email protected]> AuthorDate: Sun Feb 22 17:12:04 2026 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Tue Feb 24 19:23:25 2026 +0100 Adapt to change in emsdk 5.0.1 version.h (<https://github.com/emscripten-core/emscripten/commit/4cce5e9a4a245713df7fc5bf4ad1e6d7463cbf4b> "Use uppercase for version macros (#26180)"Adapt to change in emsdk 5.0.1 version.h (<https://github.com/emscripten-core/emscripten/commit/4cce5e9a4a245713df7fc5bf4ad1e6d7463cbf4b> "Use uppercase for version macros (#26180)") Change-Id: I4cdf2447213ae82763f1cb1a19e84600c6267908 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199995 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit 7bac6ec0a293eac08ace402cb69cc11c5a9d94e5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200197 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/configure.ac b/configure.ac index dd6014684dd3..bda1b620770d 100644 --- a/configure.ac +++ b/configure.ac @@ -1512,9 +1512,15 @@ if test "$_os" = "Emscripten"; then fi fi if test -f "$EMSCRIPTEN_VERSION_H"; then - EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_major__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_major__ //p') - EMSCRIPTEN_MINOR=$($GREP __EMSCRIPTEN_minor__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_minor__ //p') - EMSCRIPTEN_TINY=$($GREP __EMSCRIPTEN_tiny__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_tiny__ //p') + if $GREP -q __EMSCRIPTEN_MAJOR__ "$EMSCRIPTEN_VERSION_H"; then + EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_MAJOR__ "$EMSCRIPTEN_VERSION_H" | head -n 1 | $SED -ne 's/.*__EMSCRIPTEN_MAJOR__ //p') + EMSCRIPTEN_MINOR=$($GREP __EMSCRIPTEN_MINOR__ "$EMSCRIPTEN_VERSION_H" | head -n 1 | $SED -ne 's/.*__EMSCRIPTEN_MINOR__ //p') + EMSCRIPTEN_TINY=$($GREP __EMSCRIPTEN_TINY__ "$EMSCRIPTEN_VERSION_H" | head -n 1 | $SED -ne 's/.*__EMSCRIPTEN_TINY__ //p') + else + EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_major__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_major__ //p') + EMSCRIPTEN_MINOR=$($GREP __EMSCRIPTEN_minor__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_minor__ //p') + EMSCRIPTEN_TINY=$($GREP __EMSCRIPTEN_tiny__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_tiny__ //p') + fi else EMSCRIPTEN_DEFINES=$(echo | emcc -dM -E - | $GREP __EMSCRIPTEN_) EMSCRIPTEN_MAJOR=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 's/.*__EMSCRIPTEN_major__ //p') diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx index 28eb33141b4d..9e3ba4b6566f 100644 --- a/vcl/unx/generic/app/geninst.cxx +++ b/vcl/unx/generic/app/geninst.cxx @@ -91,9 +91,15 @@ OUString SalGenericInstance::getOSVersion() } aKernelVer = OUString::createFromAscii(stName.sysname) + " " + aKernelVer.copy(0, nIndex); #elif defined(EMSCRIPTEN) +#if defined __EMSCRIPTEN_MAJOR__ + aKernelVer = u"Emscripten "_ustr + OUString::number(__EMSCRIPTEN_MAJOR__) + u"."_ustr + + OUString::number(__EMSCRIPTEN_MINOR__) + u"."_ustr + + OUString::number(__EMSCRIPTEN_TINY__); +#else aKernelVer = u"Emscripten "_ustr + OUString::number(__EMSCRIPTEN_major__) + u"."_ustr + OUString::number(__EMSCRIPTEN_minor__) + u"."_ustr + OUString::number(__EMSCRIPTEN_tiny__); +#endif #endif return aKernelVer; }
