subject:"core.git\: configure.ac"

core.git: configure.ac

2024-05-27 Thread Julien Nabet (via logerrit)

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

New commits:
commit a9f77afabf98d98e14308a82aab86a2a3715fced
Author: Julien Nabet 
AuthorDate: Sat May 25 13:27:36 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Mon May 27 10:00:09 2024 +0200

Bump emscripten minimum to 2.0.32 for as_handle

Reading https://github.com/emscripten-core/emscripten/blob/main/ChangeLog.md
val::as_handle() has been added with 2.0.32

It'll allow WASM Jenkins to fail at the configure check step instead in the 
build with:

/home/tdf/jenkins/workspace/lo_gerrit/tb/src_wasm/static/source/unoembindhelpers/PrimaryBindings.cxx:231:37:
 error: no member named 'as_handle' in 'emscripten::val'
= _emval_as(rObject.as_handle(), getTypeId(rUnoType), 
);
~~~ ^

/home/tdf/jenkins/workspace/lo_gerrit/tb/src_wasm/static/source/unoembindhelpers/PrimaryBindings.cxx:240:37:
 error: no member named 'as_handle' in 'emscripten::val'
= _emval_as(rObject.as_handle(), getTypeId(rUnoType), 
);
~~~ ^
2 errors generated.

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

diff --git a/configure.ac b/configure.ac
index 88dd106f574a..22c95079f2d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1433,7 +1433,7 @@ dnl 
===
 
 EMSCRIPTEN_MIN_MAJOR=2
 EMSCRIPTEN_MIN_MINOR=0
-EMSCRIPTEN_MIN_TINY=31
+EMSCRIPTEN_MIN_TINY=32
 
EMSCRIPTEN_MIN_VERSION="${EMSCRIPTEN_MIN_MAJOR}.${EMSCRIPTEN_MIN_MINOR}.${EMSCRIPTEN_MIN_TINY}"
 
 if test "$_os" = "Emscripten"; then

core.git: configure.ac

2024-05-21 Thread Chris Mayo (via logerrit)

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

New commits:
commit 4dd9e8fd585210a31bd8a99630a4d958d794ab28
Author: Chris Mayo 
AuthorDate: Sat May 18 17:13:31 2024 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Tue May 21 12:50:09 2024 +0200

Fix bashism in configure tests for curl and libcmis

When /bin/sh is dash:

./configure: 35165: test: yes: unexpected operator
checking whether to enable breakpad... no
./configure: 35218: test: yes: unexpected operator

Causing HAVE_FEATURE_CURL not to be set to 1 and build to fail:

sw/source/ui/misc/translatelangselect.cxx:160:24: error: no member named 
'TranslateDocumentCancellable' in namespace 'SwTranslateHelper'
  160 | SwTranslateHelper::TranslateDocumentCancellable(m_rWrtSh, 
aConfig, m_bCancelTranslation);
  | ~~~^

Introduced in:

5bf7c2fa5794 ("Fix --disable-curl build", 2023-09-14)

Change-Id: Ifbc4bc1a7cde86101ff13b05ec7cee6836798605
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167831
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index fbd6196921a5..59f1c97dbef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11079,7 +11079,7 @@ AC_SUBST(ICU_MINOR)
 dnl ==
 dnl CURL
 dnl ==
-if test "$enable_curl" == "yes"; then
+if test "$enable_curl" = "yes"; then
 AC_DEFINE([HAVE_FEATURE_CURL])
 fi
 
@@ -11125,7 +11125,7 @@ AC_SUBST(DEFAULT_CRASHDUMP_VALUE)
 dnl ==
 dnl libcmis
 dnl ==
-if test "$enable_libcmis" == "yes"; then
+if test "$enable_libcmis" = "yes"; then
 if test "$enable_curl" != "yes"; then
 AC_MSG_ERROR([--disable-libcmis must be used when --disable-curl is 
used])
 fi

core.git: configure.ac

2024-05-14 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit f6c9cb470e2786ada58b7ba401975375239b610b
Author: Christian Lohmaier 
AuthorDate: Tue May 14 19:38:30 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 14 19:38:30 2024 +0200

bump product version to 24.8.0.0.alpha1+

Change-Id: I96d168560db02ea3cad2eb3e428e1d17bc8d10d6

diff --git a/configure.ac b/configure.ac
index b27504e56dac..815900fc21ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[24.8.0.0.alpha0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.8.0.0.alpha1+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

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

2024-05-13 Thread Taichi Haradaguchi (via logerrit)

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

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

Update to ICU 74.1

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

Unicode 15.1

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

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

New Unicode blocks:
UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I

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

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

core.git: configure.ac odk/CustomTarget_doxygen.mk

2024-05-07 Thread Christian Lohmaier (via logerrit)

 configure.ac|   18 --
 odk/CustomTarget_doxygen.mk |8 
 2 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit 83d3f9b819ee23efa314953fc2fde4412d90a60b
Author: Christian Lohmaier 
AuthorDate: Tue May 7 14:19:50 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 7 17:08:44 2024 +0200

use windows doxygen in wsl-as-helper case

basically reverts f7fe6a0bed2c2aee19535a26181a2edfb103e587

avoiding the penalty for accessing files in the windows-realm from
within the wsl-container significantly accelerates the doc-generation

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

diff --git a/configure.ac b/configure.ac
index e04f4a846642..5954533a7f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9488,8 +9488,9 @@ else
 fi
 else
 AC_MSG_CHECKING([for doxygen])
-DOXYGEN=$with_doxygen
-AC_MSG_RESULT([$DOXYGEN])
+PathFormat "$with_doxygen"
+DOXYGEN="$formatted_path_unix"
+AC_MSG_RESULT([$formatted_path])
 fi
 if test -n "$DOXYGEN"; then
 DOXYGEN_VERSION=`$DOXYGEN --version 2>/dev/null`
@@ -9498,6 +9499,19 @@ else
 AC_MSG_ERROR([found doxygen is too old; need at least version 
1.8.4 or specify --without-doxygen])
 fi
 fi
+if test -n "$WSL_ONLY_AS_HELPER"; then
+dnl what really should be tested is whether it is doxygen from 
windows-realm
+dnl i.e. one that runs on the windows-side and deals with 
windows-pathnames
+dnl using doxygen from wsl container would be possible, but 
there's a performance
+dnl penalty when accessing the files outside the container
+AC_MSG_CHECKING([whether doxygen is a windows executable])
+if $(file "$DOXYGEN" | grep -q "PE32"); then
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
+AC_MSG_ERROR([please provide a path to a windows version of 
doxygen or use --without-doxygen])
+fi
+fi
 fi
 fi
 AC_SUBST([DOXYGEN])
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 42132387457b..03b43c0c7180 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -22,8 +22,8 @@ odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \
com/sun/star/uno/Type.h \
com/sun/star/uno/Type.hxx
 
-# Cygwin Doxygen needs unix paths, wsl-as-helper needs paths into windows-realm
-odk_cygwin_path = $(if $(MSYSTEM),$(call gb_Helper_wsl_path,$(1)),$(call 
gb_Helper_cyg_path,$(1)))
+# Cygwin Doxygen needs unix paths, wsl-as-helper works in windows-realm
+odk_cygwin_path = $(if $(MSYSTEM),$(1),$(call gb_Helper_cyg_path,$(1)))
 odk_cpp_PREFIX := $(call odk_cygwin_path,$(INSTDIR)/$(SDKDIRNAME)/include/)
 odk_cpp_DOXY_INPUT := $(call odk_cygwin_path,$(SRCDIR)/odk/docs/cpp/main.dox \
$(SRCDIR)/include/sal/log-areas.dox \
@@ -57,7 +57,7 @@ $(gb_CustomTarget_workdir)/odk/docs/cpp/doxygen.log : \
$(call gb_Package_get_target,odk_headers_generated)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GEN)
-   rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(call gb_Helper_wsl_path,$(WSL) 
$(DOXYGEN) $<) > $@
+   rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),GEN)
 
 $(eval $(call gb_CustomTarget_register_targets,odk/docs,\
@@ -98,7 +98,7 @@ $(gb_CustomTarget_workdir)/odk/docs/idl/doxygen.log : \
$(SRCDIR)/odk/docs/idl/main.dox
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GEN)
-   rm -rf $(odk_idl_DOXY_WORKDIR)/ && $(call gb_Helper_wsl_path,$(WSL) 
$(DOXYGEN) $<) > $@
+   rm -rf $(odk_idl_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),GEN)
 
 # vim: set noet sw=4 ts=4:

core.git: configure.ac

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

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

New commits:
commit b68d717360d7141de62bf9391d8af5b07f9d
Author: Stephan Bergmann 
AuthorDate: Tue Apr 23 11:16:52 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 14:03:03 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

diff --git a/configure.ac b/configure.ac
index 48faa25c4acc..6c2cd76b904a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14318,7 +14318,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
@@ -14354,7 +14355,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: configure.ac solenv/gbuild

2024-04-22 Thread Caolán McNamara (via logerrit)

 configure.ac   |5 -
 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 0cf755adbb39591e9f6d273bfe5dce2469a86dbf
Author: Caolán McNamara 
AuthorDate: Mon Apr 22 15:11:07 2024 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 22 20:44:23 2024 +0200

add undefining FORTIFY_SOURCE to the gcc no-opt flags

We build non-optimized files by adding the no-opt flags to the compiler
options that include the optimized flags, so add undefining
FORTIFY_SOURCE to the -O0 line

motivation here to have --enable-hardening-flags not add unhelpful
extra warnings to the build for the parts built with -O0

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

diff --git a/configure.ac b/configure.ac
index b1ace35b8d1f..4aa7b055 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7417,8 +7417,11 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 AC_MSG_CHECKING([whether $CC_BASE supports -D_FORTIFY_SOURCE=2])
 save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -Werror -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2"
+if test "$ENABLE_OPTIMIZED" = TRUE; then
+CFLAGS="$CFLAGS -O2"
+fi
 AC_LINK_IFELSE(
-[AC_LANG_PROGRAM(, [[#include  return 0;]])],
+[AC_LANG_PROGRAM([[#include ]], [[return 0;]])],
 [AC_MSG_RESULT([yes]); HARDENING_OPT_CFLAGS="$HARDENING_OPT_CFLAGS 
-Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2"],
 [AC_MSG_RESULT([no])])
 CFLAGS=$save_CFLAGS
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index a09ee850e96a..e3e84181664a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -223,7 +223,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := 
$(gb_LinkTarget_EXCEPTIONFLAGS)
 gb_PrecompiledHeader_ignore_flags_for_flags_file := -Wunused-macros
 
 # optimization level
-gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
+gb_COMPILERNOOPTFLAGS := -O0 -Wp,-U_FORTIFY_SOURCE -fstrict-aliasing 
-fstrict-overflow
 gb_COMPILERDEBUGOPTFLAGS := -Og
 
 ifeq ($(OS),ANDROID)

core.git: configure.ac connectivity/Library_mysqlc.mk external/mariadb-connector-c

2024-04-22 Thread Julien Nabet (via logerrit)

 configure.ac|   22 
++
 connectivity/Library_mysqlc.mk  |1 
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |9 
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |6 ++
 4 files changed, 38 insertions(+)

New commits:
commit 53ab6269215d4e37af3f9dfaae2a306e040c5b88
Author: Julien Nabet 
AuthorDate: Sat Nov 25 15:04:07 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Apr 22 19:56:48 2024 +0200

tdf#150082: LO Base MariaDB/MySQL connector don't accept auth via gssapi

Exclude Windows since we're not sure gssapi.h is available (at least 
Jenkins Windows machine doesn't have it)

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

diff --git a/configure.ac b/configure.ac
index 8c434dd5243e..b1ace35b8d1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2725,6 +2725,7 @@ AC_ARG_WITH(locales,
 ,)
 
 # Kerberos and GSSAPI used only by PostgreSQL as of LibO 3.5
+# and also by Mariadb/Mysql since LibO 24.8
 libo_FUZZ_ARG_WITH(krb5,
 AS_HELP_STRING([--with-krb5],
 [Enable MIT Kerberos 5 support in modules that support it.
@@ -10229,6 +10230,11 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
 dnl ===
 dnl Check for system MariaDB
 dnl ===
+
+if test "$with_gssapi" = "yes" -a "$enable_openssl" = "no"; then
+AC_MSG_ERROR([GSSAPI needs OpenSSL, but --disable-openssl was given.])
+fi
+
 AC_MSG_CHECKING([which MariaDB to use])
 if test "$with_system_mariadb" = "yes"; then
 AC_MSG_RESULT([external])
@@ -10277,10 +10283,26 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
 /g' | grep -E '(mysqlclient|mariadb)')
 if test "$_os" = "Darwin"; then
 LIBMARIADB=${LIBMARIADB}.dylib
+if test "$with_gssapi" != "no"; then
+WITH_GSSAPI=TRUE
+save_LIBS=$LIBS
+AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 
'gssapi -lkrb5 -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 
'gss_init_sec_context' required for GSSAPI])])
+GSSAPI_LIBS=$LIBS
+LIBS=$save_LIBS
+fi
 elif test "$_os" = "WINNT"; then
 LIBMARIADB=${LIBMARIADB}.dll
 else
 LIBMARIADB=${LIBMARIADB}.so
+if test "$with_gssapi" != "no"; then
+WITH_GSSAPI=TRUE
+save_LIBS=$LIBS
+AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 
'gssapi -lkrb5 -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 
'gss_init_sec_context' required for GSSAPI])])
+GSSAPI_LIBS=$LIBS
+LIBS=$save_LIBS
+fi
 fi
 LIBMARIADB_PATH=$($MARIADBCONFIG --variable=pkglibdir)
 AC_MSG_CHECKING([for $LIBMARIADB in $LIBMARIADB_PATH])
diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index af46fb9ba137..33ffc5cb28b0 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\
 ))
 
 $(eval $(call gb_Library_add_libs,mysqlc,\
+   $(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \
$(if $(filter-out WNT,$(OS)),$(if $(filter HAIKU MACOSX SOLARIS,$(OS)),\
-lz -lm,-rdynamic -lz -lcrypt -lm)) \
$(if $(filter LINUX,$(OS)),-ldl,) \
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index b8802e16695e..a5b485b74d13 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -53,6 +53,11 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/ma_net \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_password \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_pvio \
+   $(ifneq $(filter $(OS),WNT), \
+   
UnpackedTarball/mariadb-connector-c/plugins/auth/auth_gssapi_client \
+   UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_client \
+   UnpackedTarball/mariadb-connector-c/plugins/auth/gssapi_errmsg \
+   ) \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_sha1 \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_stmt_codec \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_string \
@@ -65,6 +70,10 @@ $(eval $(call

core.git: configure.ac

2024-04-22 Thread Vasily Melenchuk (via logerrit)

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

New commits:
commit 07137ccd7fbbf3afb1cabfc6ca71375293910a3a
Author: Vasily Melenchuk 
AuthorDate: Fri Apr 19 13:14:13 2024 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Apr 22 14:38:34 2024 +0200

configure: cygwin issue with date fixed

previous variant was causing: "bash: /dev/null: ambiguous redirect"
and value was written

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

diff --git a/configure.ac b/configure.ac
index 4d96c1e90cf5..8c434dd5243e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,7 +519,7 @@ AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
 
-git_date=`git log -1 --pretty=format:"%cd" --date=format:'%Y' 2>&/dev/null`
+git_date=`git log -1 --pretty=format:"%cd" --date=format:'%Y' 2>/dev/null`
 LIBO_THIS_YEAR=${git_date:-2024}
 AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)

core.git: configure.ac

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

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

New commits:
commit 42f6e89d5e6458966de452af2978f206115394af
Author: Stephan Bergmann 
AuthorDate: Tue Apr 9 10:37:09 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Apr 9 23:40:49 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 clang::ParseAST(clang::Sema&, bool, bool) 
(/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x368e549)
> #15 0x55f3a91ef2d9

core.git: configure.ac download.lst external/rhino Makefile.fetch solenv/flatpak-manifest.in

2024-04-08 Thread Rene Engelhard (via logerrit)

 Makefile.fetch |1 -
 configure.ac   |7 ++-
 download.lst   |5 -
 external/rhino/README  |9 -
 solenv/flatpak-manifest.in |7 ---
 5 files changed, 2 insertions(+), 27 deletions(-)

New commits:
commit 479a39cbf0f4564abe93066d7a3f6b2e82de0e76
Author: Rene Engelhard 
AuthorDate: Wed Apr 3 23:26:08 2024 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 8 10:48:19 2024 +0200

clean up after removal of patched rhino

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

diff --git a/Makefile.fetch b/Makefile.fetch
index b96cb573c2bf..afb7d176e79e 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -224,7 +224,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,REDLAND,REDLAND_TARBALL) \
$(call fetch_Optional,REVENGE,REVENGE_TARBALL) \
$(call fetch_Optional,RHINO,RHINO_TARBALL) \
-   $(call fetch_Optional,RHINO,SWING_TARBALL) \
$(call fetch_Optional,SKIA,SKIA_TARBALL) \
$(call fetch_Optional,STAROFFICE,STAROFFICE_TARBALL) \
$(if $(filter WNT,$(OS)),TWAIN_DSM_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 507fef7e9d34..799b88d39abb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2390,11 +2390,8 @@ libo_FUZZ_ARG_ENABLE(scripting-javascript,
 
 AC_ARG_WITH(system-rhino,
 AS_HELP_STRING([--with-system-rhino],
-[Use rhino already on system.]),,)
-#[with_system_rhino="$with_system_jars"])
-# Above is not used as we have different debug interface
-# patched into internal rhino. This code needs to be fixed
-# before we can enable it by default.
+[Use rhino already on system.]),,
+[with_system_rhino="$with_system_jars"])
 
 AC_ARG_WITH(rhino-jar,
 AS_HELP_STRING([--with-rhino-jar=JARFILE],
diff --git a/download.lst b/download.lst
index 8c732bdb41b0..d8793dbeb620 100644
--- a/download.lst
+++ b/download.lst
@@ -602,11 +602,6 @@ STAROFFICE_TARBALL := 
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-SWING_SHA256SUM := 
64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
-SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-# three static lines
-# so that git cherry-pick
-# will not run into conflicts
 TWAIN_DSM_SHA256SUM := 
82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6
 TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz
 # three static lines
diff --git a/external/rhino/README b/external/rhino/README
index 83e4135d0b89..c60378c32262 100644
--- a/external/rhino/README
+++ b/external/rhino/README
@@ -3,12 +3,3 @@ JavaScript engine/interpreter written in Java, used to provide 
JavaScript extens
 The Scripting Framework makes use of the Rhino 
([http://www.mozilla.org/rhino/])
 JavaScript interpreter, available under the Mozilla Public License
 ([http://www.mozilla.org/MPL/MPL-1.1.html]).
-
-In addition, to support the debugging of scripts contained in OpenOffice.org
-documents, we have modified the Java source file Main.java.
-
-The Rhino source tarball is unpacked and patched with the modified code. The
-Rhino Jar file (js.jar) is then built (download/swingExSrc.zip is unpacked and
-built as part of this procesS) and delivered to the solver. The file
-rhino1_5R5.patch contains the changes made in order to build Rhino. The patch
-was generated using the command: diff -wurN
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 74beb39f21b9..1ba678b81d12 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -709,13 +709,6 @@
 "dest": "external/tarballs",
 "dest-filename": "@JFREEREPORT_SAC_TARBALL@"
 },
-{
-"url": 
"https://dev-www.libreoffice.org/src/@SWING_TARBALL@;,
-"sha256": "@SWING_SHA256SUM@",
-"type": "file",
-"dest": "external/tarballs",
-"dest-filename": "@SWING_TARBALL@"
-},
 {
 "url": 
"https://dev-www.libreoffice.org/src/@LIBNUMBERTEXT_TARBALL@;,
 "sha256": "@LIBNUMBERTEXT_SHA256SUM@",

core.git: configure.ac

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

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

New commits:
commit 14bf98b9bb3765b935316bd3a972f8ef7bb4d21e
Author: Stephan Bergmann 
AuthorDate: Wed Mar 20 22:19:08 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Mar 21 16:57:37 2024 +0100

Update the Android "enough memory for linking" check

...which had been introduced with 149792414e767c7526123f0e2abb7c4dc9491fa0
"android: add a check for the installed memory in the machine", presumably 
at a
time when there were ENABLE_SYMBOLS and ENABLE_DEBUGINFO_FOR variables, 
both of
which appear to no longer exist.  So use the existing ENABLE_SYMBOLS_FOR
instead.

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

diff --git a/configure.ac b/configure.ac
index e03fa2363f03..507fef7e9d34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5027,7 +5027,7 @@ else
 fi
 AC_SUBST(ENABLE_SYMBOLS_FOR)
 
-if test -n "$with_android_ndk" -a \( -n "$ENABLE_SYMBOLS" -o -n 
"$ENABLE_DEBUG" -o -n "$ENABLE_DBGUTIL" \) -a "$ENABLE_DEBUGINFO_FOR" = "all"; 
then
+if test -n "$with_android_ndk" -a \( -n "$ENABLE_DEBUG" -o -n 
"$ENABLE_DBGUTIL" \) -a "$ENABLE_SYMBOLS_FOR" = "all"; then
 # Building on Android with full symbols: without enough memory the linker 
never finishes currently.
 AC_MSG_CHECKING([whether enough memory is available for linking])
 mem_size=$(grep -o 'MemTotal: *.\+ kB' /proc/meminfo | sed 's/MemTotal: 
*\(.\+\) kB//')

core.git: configure.ac

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

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

New commits:
commit 31b18d5a5f652dc1bb82ec2828e5f3a951590301
Author: Stephan Bergmann 
AuthorDate: Wed Mar 20 15:02:02 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Mar 20 21:51:47 2024 +0100

Allow extra options in JAVACOMPILER env var

...similar to how we support this for other vars like CC and CXX.  (I 
currently
need this to add -J-Xint to JAVACOMPILER in an attempt to work around the 
issue
described in  where 
macOS
now sends uncatchable SIGKILL instead of SIGSEGV to the JVM process in 
response
to a Java null pointer deref.)

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

diff --git a/configure.ac b/configure.ac
index 81d9ec93ac19..e03fa2363f03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14165,7 +14165,7 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" 
-a "$cross_compiling" != "
 OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"`
 fi
 printf 'import org.junit.Before;' > conftest.java
-if "$JAVACOMPILER" -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then
+if $JAVACOMPILER -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then
 AC_MSG_RESULT([$OOO_JUNIT_JAR])
 else
 AC_MSG_ERROR(
@@ -14179,7 +14179,7 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" 
-a "$cross_compiling" != "
 
 AC_MSG_CHECKING([for included Hamcrest])
 printf 'import org.hamcrest.BaseDescription;' > conftest.java
-if "$JAVACOMPILER" -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then
+if $JAVACOMPILER -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then
 AC_MSG_RESULT([Included in $OOO_JUNIT_JAR])
 else
 AC_MSG_RESULT([Not included])
@@ -14200,7 +14200,7 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" 
-a "$cross_compiling" != "
 if test "$_os" = "WINNT"; then
 HAMCREST_JAR=`cygpath -m "$HAMCREST_JAR"`
 fi
-if "$JAVACOMPILER" -classpath "$HAMCREST_JAR" conftest.java >&5 2>&5; 
then
+if $JAVACOMPILER -classpath "$HAMCREST_JAR" conftest.java >&5 2>&5; 
then
 AC_MSG_RESULT([$HAMCREST_JAR])
 else
 AC_MSG_ERROR([junit does not contain hamcrest; please use a junit 
jar that includes hamcrest, install a hamcrest jar in the default location 
(/usr/share/java),

core.git: configure.ac download.lst

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

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0633e4b4205334dd65ec64d7f3e306ee125e31be
Author: Michael Stahl 
AuthorDate: Wed Mar 20 10:52:09 2024 +0100
Commit: Michael Stahl 
CommitDate: Wed Mar 20 21:37:59 2024 +0100

python3: upgrade to release 3.8.19

Fixes CVE-2023-6597 and also CVE-2024-0450

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

diff --git a/configure.ac b/configure.ac
index 051934a3cce1..81d9ec93ac19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10069,7 +10069,7 @@ if test \( "$cross_compiling" = yes -a -z 
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.18
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.19
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 8589b1fc..27391725e6a5 100644
--- a/download.lst
+++ b/download.lst
@@ -555,8 +555,8 @@ POSTGRESQL_TARBALL := postgresql-13.11.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PYTHON_SHA256SUM := 
3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f
-PYTHON_TARBALL := Python-3.8.18.tar.xz
+PYTHON_SHA256SUM := 
d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
+PYTHON_TARBALL := Python-3.8.19.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: configure.ac

2024-03-12 Thread Fridrich Strba (via logerrit)

 configure.ac |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 06dd867d05b807b346b24d9b1e7535d376d4c14d
Author: Fridrich Strba 
AuthorDate: Tue Mar 12 11:34:52 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Mar 12 16:07:58 2024 +0100

Fix build with autoconf 2.72

This commit http://git.savannah.gnu.org/gitweb/
?p=autoconf.git;a=commitdiff;
h=cf09f48841b66fe76f606dd6018bb3a93242a7c9
changed the internal cache variable name and its content

The effects show later in message like
/tmp/ccyB6wS6.ltrans9.ltrans.o: in function 
`comphelper::DocPasswordHelper::decryptGpgSession(com::sun::star::uno::Sequence
 > const&)':

/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/docpasswordhelper.cxx:705:(.text+0x4fb7):
 undefined reference to `GpgME::Data::seek(long, int)'
/usr/bin/ld.bfd: 
/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/docpasswordhelper.cxx:716:(.text+0x5402):
 undefined reference to `GpgME::Data::seek(long, int)'
/usr/bin/ld.bfd: /tmp/ccyB6wS6.ltrans13.ltrans.o: in function 
`comphelper::OStorageHelper::CreateGpgPackageEncryptionData()':

/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/storagehelper.cxx:507:(.text+0x64e3):
 undefined reference to `GpgME::Data::seek(long, int)'
/usr/bin/ld.bfd: 
/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/storagehelper.cxx:520:(.text+0x6583):
 undefined reference to `GpgME::Data::seek(long, int)'
collect2: error: ld returned 1 exit status

Where the type 'off_t' at the time of inclusion of the header and
at the time of compilation of the library differ.

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

diff --git a/configure.ac b/configure.ac
index 94a7c2fe6d9b..051934a3cce1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7222,7 +7222,9 @@ if test "$_os" != "WINNT"; then
 
 dnl Check for large file support
 AC_SYS_LARGEFILE
-if test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" 
!= "no"; then
+if test -n "$ac_cv_sys_largefile_opts"  -a "$ac_cv_sys_largefile_opts" != 
"none needed" -a "$ac_cv_sys_largefile_opts" != "support not detected"; then
+LFS_CFLAGS="$ac_cv_sys_largefile_opts"
+elif test -n "$ac_cv_sys_file_offset_bits" -a 
"$ac_cv_sys_file_offset_bits" != "no"; then
 LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
 fi
 if test -n "$ac_cv_sys_large_files" -a "$ac_cv_sys_large_files" != "no"; 
then

core.git: configure.ac filter/qa

2024-03-09 Thread Mike Kaganski (via logerrit)

 configure.ac   |   14 --
 filter/qa/unit/svg.cxx |3 ++-
 2 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 4c65ab909598766e5859a5f0ce4bf55b23c9551b
Author: Mike Kaganski 
AuthorDate: Sat Mar 9 08:03:08 2024 +0100
Commit: Mike Kaganski 
CommitDate: Sat Mar 9 15:18:00 2024 +0100

Enable CVE tests on Windows by default

Since commit c16969b9bc73fdd77e763299d6aea7b614e203e2
(tdf#84553 Detect and warn of Windows Antivirus., 2020-02-08),
it is checked that antivirus is disabled in $SRC_ROOT and $BUILDDIR.

This reverts commit a6b2c618cb02168bba950652367f494a1021cf53
(disable cve tests by default on windows, 2014-10-01).

Change-Id: I3816e97cfb4559f7647167ed291b75468b03dc4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164612
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 6d56df8625f1..94a7c2fe6d9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11129,20 +11129,6 @@ dnl 
===
 dnl Check for disabling cve_tests
 dnl ===
 AC_MSG_CHECKING([whether to execute CVE tests])
-# If not explicitly enabled or disabled, default
-if test -z "$enable_cve_tests"; then
-case "$OS" in
-WNT)
-# Default cves off for Windows with its wild and wonderful
-# variety of AV software kicking in and panicking
-enable_cve_tests=no
-;;
-*)
-# otherwise yes
-enable_cve_tests=yes
-;;
-esac
-fi
 if test "$enable_cve_tests" = "no"; then
 AC_MSG_RESULT([no])
 DISABLE_CVE_TESTS=TRUE
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index 120b75be4a2c..82dc3832e1b8 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -46,7 +46,8 @@ void SvgFilterTest::registerNamespaces(xmlXPathContextPtr& 
pXmlXpathCtx)
 
 CPPUNIT_TEST_FIXTURE(SvgFilterTest, testPreserveJpg)
 {
-#if !defined(MACOSX)
+// On Windows, SVGFilter::filterWriterOrCalc can't get current frame to obtain 
selection
+#if !defined(MACOSX) && !defined(_WIN32)
 // Load a document with a jpeg image in it.
 loadFromFile(u"preserve-jpg.odt");

core.git: configure.ac

2024-03-04 Thread Andrea Gelmini (via logerrit)

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

New commits:
commit 3b044878a411e50775e2fbdb5f2715b6f62ec038
Author: Andrea Gelmini 
AuthorDate: Tue Feb 27 15:53:08 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Mar 4 10:38:14 2024 +0100

Fix typo

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

diff --git a/configure.ac b/configure.ac
index b218120773d1..6d56df8625f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1512,7 +1512,7 @@ libo_FUZZ_ARG_ENABLE(pdfimport,
 
 libo_FUZZ_ARG_ENABLE(pdfium,
 AS_HELP_STRING([--disable-pdfium],
-[Disable building PDFium. Results in unsecure PDF signature 
verification.])
+[Disable building PDFium. Results in insecure PDF signature 
verification.])
 )
 
 libo_FUZZ_ARG_ENABLE(skia,

core.git: configure.ac solenv/gbuild vcl/source

2024-03-01 Thread Noel Grandin (via logerrit)

 configure.ac   |1 
 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 
 vcl/source/helper/svtaccessiblefactory.cxx |  193 +
 3 files changed, 16 insertions(+), 179 deletions(-)

New commits:
commit 15df1df235cbe199d770d67a03fe923c94aa2dcc
Author: Noel Grandin 
AuthorDate: Fri Mar 1 08:35:53 2024 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 1 14:47:08 2024 +0100

add accessibility to --enable-mergedlibs=more

Also
(*) fix the definition of ENABLE_MERGELIBS_MORE in configure.ac
(*) Remove the dummy accessible factory in vcl, it creates
more problems than it solves, because code will break when
trying to use it, and then I get crashes far removed from the
source of the problem (failure to find the acc factory).

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

diff --git a/configure.ac b/configure.ac
index b46ecdfbec4d..dd4ed7107aa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14875,6 +14875,7 @@ if test -n "$enable_mergelibs" -a "$enable_mergelibs" 
!= "no"; then
 MERGELIBS_MORE="TRUE"
 AC_MSG_RESULT([yes (more)])
 AC_DEFINE(ENABLE_MERGELIBS)
+AC_DEFINE(ENABLE_MERGELIBS_MORE)
 elif test "$enable_mergelibs" = "yes" -o "$enable_mergelibs" = ""; then
 MERGELIBS="TRUE"
 AC_MSG_RESULT([yes])
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 6a6cb1eebe11..91e40b381181 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -118,6 +118,7 @@ gb_MERGE_LIBRARY_LIST := \
 ifneq ($(MERGELIBS_MORE),)
 
 gb_MERGE_LIBRARY_LIST += \
+   acc \
analysis \
animcore \
$(call gb_Helper_optional,AVMEDIA, \
diff --git a/vcl/source/helper/svtaccessiblefactory.cxx 
b/vcl/source/helper/svtaccessiblefactory.cxx
index fa9e151fcc23..06f482863576 100644
--- a/vcl/source/helper/svtaccessiblefactory.cxx
+++ b/vcl/source/helper/svtaccessiblefactory.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -49,166 +50,6 @@ namespace vcl
 #endif
 #endif
 ::rtl::Reference< IAccessibleFactory >   s_pFactory;
-
-
-//= AccessibleDummyFactory
-
-class AccessibleDummyFactory:
-public IAccessibleFactory
-{
-public:
-AccessibleDummyFactory();
-AccessibleDummyFactory(const AccessibleDummyFactory&) = delete;
-AccessibleDummyFactory& operator=(const AccessibleDummyFactory&) = 
delete;
-
-protected:
-virtual ~AccessibleDummyFactory() override;
-
-public:
-// IAccessibleFactory
-virtual vcl::IAccessibleTabListBox*
-createAccessibleTabListBox(
-const css::uno::Reference< css::accessibility::XAccessible 
>& /*rxParent*/,
-SvHeaderTabListBox& /*rBox*/
-) const override
-{
-return nullptr;
-}
-
-virtual css::uno::Reference< css::accessibility::XAccessible >
-createAccessibleTreeListBox(
-SvTreeListBox& /*_rListBox*/,
-const css::uno::Reference< css::accessibility::XAccessible 
>& /*_xParent*/
-) const override
-{
-return nullptr;
-}
-
-virtual css::uno::Reference< css::accessibility::XAccessible >
-createAccessibleIconView(
-SvTreeListBox& /*_rListBox*/,
-const css::uno::Reference< css::accessibility::XAccessible 
>& /*_xParent*/
-) const override
-{
-return nullptr;
-}
-
-virtual rtl::Reference
-createAccessibleBrowseBox(
-const css::uno::Reference< css::accessibility::XAccessible 
>& /*_rxParent*/,
-vcl::IAccessibleTableProvider& /*_rBrowseBox*/
-) const override
-{
-return nullptr;
-}
-
-virtual rtl::Reference
-createAccessibleTableControl(
-const css::uno::Reference< css::accessibility::XAccessible 
>& /*_rxParent*/,
-table::IAccessibleTable& /*_rTable*/
-) const override
-{
-return nullptr;
-}
-
-virtual css::uno::Reference< css::accessibility::XAccessible >
-createAccessibleIconChoiceCtrl(
-SvtIconChoiceCtrl& /*_rIconCtrl*/,
-const css::uno::Reference< css::accessibility::XAccessible 
>& /*_xParent*/
-) const override
-{
-return

core.git: configure.ac

2024-02-29 Thread Noel Grandin (via logerrit)

 configure.ac |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 38ec9348eeea29611c1c7ebc626f88474b850ebc
Author: Noel Grandin 
AuthorDate: Thu Feb 29 19:45:45 2024 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 1 07:06:50 2024 +0100

remove mergelibs warning from configure

It is now known working on Linux/macOS/Windows

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

diff --git a/configure.ac b/configure.ac
index ae808e69c5b0..b46ecdfbec4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14871,17 +14871,11 @@ fi
 
 if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then
 if test "$enable_mergelibs" = "more"; then
-if test $_os != Linux; then
-add_warning "--enable-mergelibs=more is not tested for this 
platform"
-fi
 MERGELIBS="TRUE"
 MERGELIBS_MORE="TRUE"
 AC_MSG_RESULT([yes (more)])
 AC_DEFINE(ENABLE_MERGELIBS)
 elif test "$enable_mergelibs" = "yes" -o "$enable_mergelibs" = ""; then
-if test $_os != Linux -a $_os != WINNT; then
-add_warning "--enable-mergelibs is not tested for this platform"
-fi
 MERGELIBS="TRUE"
 AC_MSG_RESULT([yes])
 AC_DEFINE(ENABLE_MERGELIBS)

core.git: configure.ac

2024-02-27 Thread Andrea Gelmini (via logerrit)

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

New commits:
commit a403fcd3a0f9e6e57f57b9961f7732d9fd95ab17
Author: Andrea Gelmini 
AuthorDate: Tue Feb 27 15:52:40 2024 +0100
Commit: Julien Nabet 
CommitDate: Tue Feb 27 19:12:54 2024 +0100

Fix typo

Change-Id: I30bd7ed93eedf241fde23b35ac674d010c9e6575
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164043
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/configure.ac b/configure.ac
index 6c6509ad3fd8..ae808e69c5b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6834,7 +6834,7 @@ if test "$_os" = "WINNT"; then
 IFS='.' read -r SDK_v1 SDK_v2 SDK_v3 SDK_v4 <<< 
"$WINDOWS_SDK_LIB_SUBDIR"
 # Assuming maximum of 5 digits for each part and ignoring last part
 SDK_NORMALIZED_VER=$((SDK_v1 * 100 + SDK_v2 * 10 + SDK_v3))
-# 10.0.20348.0 is the minumum required version
+# 10.0.20348.0 is the minimum required version
 if test "$SDK_NORMALIZED_VER" -lt 10020348; then
 AC_MSG_ERROR([You need Windows SDK greater than or equal 
10.0.20348.0])
 fi

core.git: configure.ac

2024-02-27 Thread Hossein (via logerrit)

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

New commits:
commit 8f7d4f1da306fc7e104050c96ae1538c3f04c52f
Author: Hossein 
AuthorDate: Thu Feb 22 13:20:09 2024 +
Commit: Michael Stahl 
CommitDate: Tue Feb 27 10:49:29 2024 +0100

Check Windows SDK version

Because of a regression in Windows SDK version 10.0.19 which
is now fixed in 10.0.20348, it is good to check that the
required SDK version is installed:

More information

https://developercommunity.visualstudio.com/t/std:c17-generates-warning-compiling-Win/1249671

It is important to know that both Windows 10 and Windows 11 SDK should
work.

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

diff --git a/configure.ac b/configure.ac
index 276657f3cae1..6c6509ad3fd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6829,6 +6829,15 @@ if test "$_os" = "WINNT"; then
 fi
 
 WINDOWS_SDK_LIB_SUBDIR=$winsdklibsubdir
+# The variable also contains the Windows SDK version
+echo $WINDOWS_SDK_LIB_SUBDIR
+IFS='.' read -r SDK_v1 SDK_v2 SDK_v3 SDK_v4 <<< 
"$WINDOWS_SDK_LIB_SUBDIR"
+# Assuming maximum of 5 digits for each part and ignoring last part
+SDK_NORMALIZED_VER=$((SDK_v1 * 100 + SDK_v2 * 10 + SDK_v3))
+# 10.0.20348.0 is the minumum required version
+if test "$SDK_NORMALIZED_VER" -lt 10020348; then
+AC_MSG_ERROR([You need Windows SDK greater than or equal 
10.0.20348.0])
+fi
 fi
 
 if test -n "$WINDOWS_SDK_HOME"; then

core.git: configure.ac

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

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

New commits:
commit 670de4eadcbb84394fd49c1c0c949dd35bd2303b
Author: Stephan Bergmann 
AuthorDate: Fri Feb 16 13:27:00 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Feb 18 01:45:59 2024 +0100

Latest VS 2022 Preview is 17.10.0 now

...while latest proper VS 2022 is 17.9.0

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

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

core.git: configure.ac

2024-02-15 Thread Andrea Gelmini (via logerrit)

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

New commits:
commit 63236e47b8d8b128a5696c1f667addd6584926ad
Author: Andrea Gelmini 
AuthorDate: Thu Feb 15 19:07:14 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 15 22:24:12 2024 +0100

Fix file name to rm

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

diff --git a/configure.ac b/configure.ac
index aca1d243ced5..61d6f5f3d5b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14818,7 +14818,7 @@ then
 CXXFLAGS=$save_CXXFLAGS
 LDFLAGS=$save_LDFLAGS
 AC_LANG_POP([C++])
-rm confetst.pcm
+rm conftest.pcm
 fi
 if test -n "$have_cpp_consteval"; then
 AC_DEFINE([HAVE_CPP_CONSTEVAL],[1])

core.git: configure.ac

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

 configure.ac |   36 +++-
 1 file changed, 35 insertions(+), 1 deletion(-)

New commits:
commit ffc1ab15ae358315516aab319778a254688afbd3
Author: Stephan Bergmann 
AuthorDate: Thu Feb 15 08:44:22 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 15 14:52:01 2024 +0100

Work around some Clang PCH consteval issue by disabling HAVE_CPP_CONSTEVAL

(see the links in the configure.ac check for details)

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

diff --git a/configure.ac b/configure.ac
index 48b325790b80..aca1d243ced5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14724,6 +14724,7 @@ dnl 
`cast(getOperand(1)->getType())->isOpaqueOrPointeeTypeMatches(g
 dnl && "Ptr must be a pointer to Val type!"' failed." (which should be fixed 
since Clang 17), or
 dnl 

 dnl "Bogus error C2440 with consteval constructor (/std:c++20)":
+have_cpp_consteval=
 AC_LANG_PUSH([C++])
 save_CXX=$CXX
 if test "$COM" = MSC && test "$COM_IS_CLANG" != TRUE; then
@@ -14783,12 +14784,45 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
 ], [
 return (s.i == 1) ? 0 : 1;
 ])], [
-AC_DEFINE([HAVE_CPP_CONSTEVAL],[1])
+have_cpp_consteval=1
 AC_MSG_RESULT([yes])
 ], [AC_MSG_RESULT([no])], [AC_MSG_RESULT([assumed no (cross compiling)])])
 CXX=$save_CXX
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
+if test -n "$have_cpp_consteval" && test "$COM_IS_CLANG" = TRUE && test -n 
"$BUILDING_PCH_WITH_OBJ"
+then
+AC_MSG_CHECKING([whether $CXX_BASE has working consteval in combination 
with PCH])
+dnl ...that does not suffer from 
 "undefined
+dnl reference to consteval constructor exported from module" (which also 
affects PCH, see
+dnl 
 
"Our Clang
+dnl --enable-pch setup is known broken"):
+printf 'export module M;
export struct S1 { consteval S1(int) {} };' >conftest.cppm
+$CXX $CXXFLAGS $CXXFLAGS_CXX11 --precompile conftest.cppm
+rm conftest.cppm
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+save_LDFLAGS=$LDFLAGS
+CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
+LDFLAGS="$LDFLAGS -fmodule-file=M=conftest.pcm conftest.pcm"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([
+import M;
+], [
+struct S2 { S1 s = 0; };
+S2 s;
+])], [
+AC_MSG_RESULT([yes])
+], [
+have_cpp_consteval=
+AC_MSG_RESULT([no])])
+CXXFLAGS=$save_CXXFLAGS
+LDFLAGS=$save_LDFLAGS
+AC_LANG_POP([C++])
+rm confetst.pcm
+fi
+if test -n "$have_cpp_consteval"; then
+AC_DEFINE([HAVE_CPP_CONSTEVAL],[1])
+fi
 
 AC_MSG_CHECKING([whether $CXX_BASE supports a working C++20 std::strong_order])
 dnl ...which is known to not be implemented in libc++ prior to

core.git: configure.ac

2024-02-14 Thread René Engelhard (via logerrit)

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

New commits:
commit 5111a0b9bf3c36cd01beefbc6e47fd45836877d3
Author: René Engelhard 
AuthorDate: Wed Feb 14 18:21:50 2024 +0100
Commit: René Engelhard 
CommitDate: Wed Feb 14 18:52:58 2024 +0100

Revert "configure: clean up not needed abseil libs for the system-abseil 
case"

This reverts commit 89a0933968e4b9160613707301d1f5dd36d97282.

Reason for revert: we still need absl_inlined_vector, Linking test doesn't 
work, this is header-only but we should check for it being there to be sure

Change-Id: I55b4d645876d7080ee41917413e02cba930c9060
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163349
Tested-by: René Engelhard 
Reviewed-by: René Engelhard 

diff --git a/configure.ac b/configure.ac
index fc0fd16524f3..48b325790b80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12246,7 +12246,7 @@ if test "$ENABLE_PDFIUM" = "TRUE"; then
 AC_MSG_RESULT([external])
 SYSTEM_ABSEIL=TRUE
 AC_LANG_PUSH([C++])
-PKG_CHECK_MODULES(ABSEIL, absl_bad_variant_access )
+PKG_CHECK_MODULES(ABSEIL, absl_bad_optional_access 
absl_bad_variant_access absl_inlined_vector )
 AC_LANG_POP([C++])
 ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${ABSEIL_LIBS}"

core.git: configure.ac

2024-02-14 Thread Miklos Vajna (via logerrit)

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

New commits:
commit 89a0933968e4b9160613707301d1f5dd36d97282
Author: Miklos Vajna 
AuthorDate: Wed Feb 14 15:48:58 2024 +0100
Commit: Miklos Vajna 
CommitDate: Wed Feb 14 18:17:00 2024 +0100

configure: clean up not needed abseil libs for the system-abseil case

Noticed by Rene, found by emptying the list and then adding items back
till the linker succeeded again.

Change-Id: I0b68ad8c50659af2d3a9ff3abfad60990f25bd79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163378
Tested-by: René Engelhard 
Reviewed-by: René Engelhard 

diff --git a/configure.ac b/configure.ac
index 48b325790b80..fc0fd16524f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12246,7 +12246,7 @@ if test "$ENABLE_PDFIUM" = "TRUE"; then
 AC_MSG_RESULT([external])
 SYSTEM_ABSEIL=TRUE
 AC_LANG_PUSH([C++])
-PKG_CHECK_MODULES(ABSEIL, absl_bad_optional_access 
absl_bad_variant_access absl_inlined_vector )
+PKG_CHECK_MODULES(ABSEIL, absl_bad_variant_access )
 AC_LANG_POP([C++])
 ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${ABSEIL_LIBS}"

core.git: configure.ac

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

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

New commits:
commit 4179056285395319d5fd5af77090359fc8b874a8
Author: Stephan Bergmann 
AuthorDate: Sun Feb 11 13:10:21 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Feb 11 15:26:04 2024 +0100

Fix quoting of [ ]

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

diff --git a/configure.ac b/configure.ac
index 721851c52d87..e6c35380e91d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14767,13 +14767,13 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
 auto s5 = S5().f();
 
 struct S6 {
-consteval S6(char const ()[2]) {
-buf[0] = lit[0];
-buf[1] = lit[1];
+consteval S6(char const ()[[2]]) {
+buf[[0]] = lit[[0]];
+buf[[1]] = lit[[1]];
 }
 union {
 int x;
-char buf[2];
+char buf[[2]];
 };
 };
 void f6() { S6("a"); }

core.git: configure.ac

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

 configure.ac |   19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit cf11a0dfca5470baea8429c41021527187a5c32d
Author: Stephan Bergmann 
AuthorDate: Wed Feb 7 08:33:35 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 7 16:39:55 2024 +0100

MSVC 2022 Preview: One HAVE_CPP_CONSTEVAL blocker down, one up

While the previously known issue appears to be fixed in VS 2022 Preview 
17.9.0
Preview 5.0, a new one showed up that now caused

> sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx(63): error 
C2440: '': cannot convert from 'initializer list' to 
'rtl::OUStringLiteral<2>'
> sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx(63): note: 
Invalid aggregate initialization
> sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx(63): note: too 
many initializers

etc.

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

diff --git a/configure.ac b/configure.ac
index 1f31be2e512b..5937983f7ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14713,11 +14713,14 @@ dnl expression' with consteval constructor", 
 "Bogus error
-dnl C7595 with consteval constructor in ternary expression (/std:c++latest)", 
or
+dnl C7595 with consteval constructor in ternary expression (/std:c++latest)" 
(which appears to be
+dnl fixed at least in Visual Studio Community 2022 Preview 17.9.0 Preview 5.0),
 dnl  "C++20, consteval, 
anonymous union:
 dnl llvm/lib/IR/Instructions.cpp:1491: void llvm::StoreInst::AssertOK(): 
Assertion
 dnl 
`cast(getOperand(1)->getType())->isOpaqueOrPointeeTypeMatches(getOperand(0)->getType())
-dnl && "Ptr must be a pointer to Val type!"' failed." (which should be fixed 
since Clang 17):
+dnl && "Ptr must be a pointer to Val type!"' failed." (which should be fixed 
since Clang 17), or
+dnl 

+dnl "Bogus error C2440 with consteval constructor (/std:c++20)":
 AC_LANG_PUSH([C++])
 save_CXX=$CXX
 if test "$COM" = MSC && test "$COM_IS_CLANG" != TRUE; then
@@ -14762,6 +14765,18 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
 };
 };
 auto s5 = S5().f();
+
+struct S6 {
+consteval S6(char const ()[2]) {
+buf[0] = lit[0];
+buf[1] = lit[1];
+}
+union {
+int x;
+char buf[2];
+};
+};
+void f6() { S6("a"); }
 ], [
 return (s.i == 1) ? 0 : 1;
 ])], [

core.git: configure.ac

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

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

New commits:
commit c37b0a694a32537ed4c216106b5c98a79222f3c9
Author: Stephan Bergmann 
AuthorDate: Mon Feb 5 11:42:32 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 5 14:31:41 2024 +0100

Allow to build against a non-EMSDK Emscripten installation built from source

The EMSDK variable was only used to find the Emscripten version.h file, but 
for
a build from source there would be no value it could be set to in order to 
find
the installation's cache/sysroot/include/emscripten/version.h at the
$EMSDK/upstream/emscripten/cache/sysroot/include/emscripten/version.h 
location
where configure.ac wants to look for it.  (And using the configure.ac code 
that
does not use version.h at all wouldn't work either, as the only
EMSCRIPTEN_DEFINES found with at least a contemporary emcc would be just an
unhelpful __EMSCRIPTEN__=1, but no version information.)  So allow to 
explicitly
set EMSCRIPTEN_VERSION_H in autogen.input to use that for the version check.

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

diff --git a/configure.ac b/configure.ac
index 44f626618d6e..1f31be2e512b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1382,9 +1382,11 @@ 
EMSCRIPTEN_MIN_VERSION="${EMSCRIPTEN_MIN_MAJOR}.${EMSCRIPTEN_MIN_MINOR}.${EMSCRI
 
 if test "$_os" = "Emscripten"; then
 AC_MSG_CHECKING([if Emscripten is at least $EMSCRIPTEN_MIN_VERSION])
-AS_IF([test -z "$EMSDK"],
-  [AC_MSG_ERROR([No \$EMSDK environment variable.])])
-
EMSCRIPTEN_VERSION_H=$EMSDK/upstream/emscripten/cache/sysroot/include/emscripten/version.h
+if test -z "$EMSCRIPTEN_VERSION_H"; then
+AS_IF([test -z "$EMSDK"],
+  [AC_MSG_ERROR([No \$EMSDK environment variable.])])
+
EMSCRIPTEN_VERSION_H=$EMSDK/upstream/emscripten/cache/sysroot/include/emscripten/version.h
+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')

core.git: configure.ac

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

 configure.ac |4 
 1 file changed, 4 deletions(-)

New commits:
commit e49f4e17b162c72875a73e5ec85babb1fd5a1ef7
Author: Stephan Bergmann 
AuthorDate: Mon Feb 5 09:42:15 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 5 11:50:16 2024 +0100

Allow qmake, moc to be explicitly set in autogen.input

(I need that for a wasm cross-build with Qt6, where MOC6 needs to 
explicitly be
set to the build-time moc tool, not a non-existing anyway host moc tool.)

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

diff --git a/configure.ac b/configure.ac
index 3387786c2f89..44f626618d6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13080,8 +13080,6 @@ dnl 
===
 
 QT5_CFLAGS=""
 QT5_LIBS=""
-QMAKE5="qmake"
-MOC5="moc"
 QT5_GOBJECT_CFLAGS=""
 QT5_GOBJECT_LIBS=""
 QT5_HAVE_GOBJECT=""
@@ -13235,8 +13233,6 @@ dnl 
===
 
 QT6_CFLAGS=""
 QT6_LIBS=""
-QMAKE6="qmake"
-MOC6="moc"
 QT6_PLATFORMS_SRCDIR=""
 if test \( "$test_kf6" = "yes" -a "$ENABLE_KF6" = "TRUE" \) -o \
 \( "$test_qt6" = "yes" -a "$ENABLE_QT6" = "TRUE" \)

core.git: configure.ac desktop/Executable_soffice_bin.mk external/argon2 RepositoryFixes.mk solenv/gbuild static/README.wasm.md static/source

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

 RepositoryFixes.mk |4 
 configure.ac   |3 
 desktop/Executable_soffice_bin.mk  |8 +
 external/argon2/UnpackedTarball_argon2.mk  |1 
 external/argon2/private-symbols.patch.0|  192 +
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 
 solenv/gbuild/platform/unxgcc.mk   |5 
 static/README.wasm.md  |4 
 static/source/embindmaker/embindmaker.cxx  |8 -
 9 files changed, 218 insertions(+), 9 deletions(-)

New commits:
commit b476dccd11a1f9d7f39876ad23dd3e14c6671909
Author: Stephan Bergmann 
AuthorDate: Fri Jan 26 14:12:31 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jan 29 19:51:57 2024 +0100

Experimental support for latest Emscripten (and Qt6)

What I'm after in the context of our Embind-related code is the claim at

:
"JavaScript only gained support for finalizers in ECMAScript 2021, or 
ECMA-262
Edition 12.  The new API is called FinalizationRegistry and it still does 
not
offer any guarantees that the provided finalization callback will be called.
Embind uses this for cleanup if available, but only for smart pointers, and 
only
as a last resort."  However, with the recommended emsdk 2.0.31 my tests did 
not
show any use of that finalization support.  So I wanted to try with the 
latest
emsdk 3.1.51 instead.  But then, linking vcldemo failed with

> wasm-ld: error: ~/allotropia-qt5/lib/libQt5Core.a(qlogging.o): undefined 
symbol: std::__2::__vector_base_common::__throw_length_error() const

etc., so I gave it a try to rather build against latest Qt6.7, with

> --with-distro=LibreOfficeWASM32
> --disable-qt5
> --enable-qt6
> QT6DIR=...

TODO: The result is highly experimental, and it uses ENABLE_QT5 (i.e., the
recommended setup with emsdk 2.0.31 and the
 v5.15.2+wasm branch) vs. ENABLE_QT6
(i.e., my experimental setup with emsdk 3.1.51 and the
 6.7 branch) not only to distinguish between 
Qt5-
vs. Qt6-specific behavior, but also to distinguish between old- vs.
new-Emscripten-specific behavior.  Of note:

* The startup code appears to have changed substantially (and required 
setting
  -s MODULARIZE=1 and -s EXPORT_NAME=soffice_entry now, and telling emcc to
  build just soffice.js and not the wrapper soffice.html.  TODO: This also
  required hacking into qt_soffice.html:  (1) The command-line arguments
  (--norestore, --nologo, --writer, and the exammple.odt; all of which we 
should
  eventually get rid of, anyway).  (2) Saving the generated instance as
  window.Module (and adapting the embindmaker-generated code, cf. the 
changes to
  static/README.wasm.md).

* There were some symbol clashes between external/argon2 and
  libQt6Core.a(qcryptographichash.cpp.o, so renamed the problematic symbols 
in
  external/argon2.

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

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 0cbb5ad93e6c..2139b2f823ff 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -35,7 +35,11 @@ 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
diff --git a/configure.ac b/configure.ac
index 6a85728e2248..3387786c2f89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5540,6 +5540,7 @@ if test "$using_x11" = yes; then
 disable_x11_tests
 if test "$DISABLE_DYNLOADING" = TRUE; then
 test_qt5=yes
+test_qt6=yes
 fi
 fi
 else
@@ -13322,7 +13323,7 @@ then
 QT6_CFLAGS=$(printf '%s' "$QT6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 QT6_LIBS="-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network"
 if test "$_os" = "Emscripten"; then
-QT6_LIBS="$QT6_LIBS -lqtpcre2 -lQt6EventDispatcherSupport 
-lQt6FontDatabaseSupport -L${qt6_platformsdir} -lqwasm"
+QT6_LIBS="$QT6_LIBS -lQt6BundledPcre2 -lQt6BundledZLIB 
-L${qt6_platformsdir} -lqwasm -sGL_ENABLE_GET_PROC_ADDRESS"
 fi
 
 if test "$USING_X11" = TRUE; then
diff --git

core.git: configure.ac

2024-01-24 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 6cad8d3a96c5425fe787765e5664463242958a78
Author: Christian Lohmaier 
AuthorDate: Wed Jan 24 13:09:36 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Jan 24 22:20:19 2024 +0100

fix windows aarch64 cross-build wrt REPORTBUILDER

broken after a2a9850217b3f711440283131fdfc58a9a254919 which added the
REPORTBUILDER conditional, but didn't also put it into the special
PERMITTED_BUILD_TARGETS list - so it wasn't set during cross-compilation
and broke the build

C:/cygwin/home/tdf/jenkins/dly/s_master/solenv/gbuild/Configuration.mk:169: 
*** There is no target

C:/cygwin/home/tdf/jenkins/dly/b_master/workdir_for_build/XcuModuleTarget/officecfg/registry/data/org/openoffice/Setup-reportbuilder.xcu.
Stop.

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

diff --git a/configure.ac b/configure.ac
index 33f64d0de3e0..6a85728e2248 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5909,6 +5909,7 @@ if test "$cross_compiling" = "yes"; then
 OPENSSL
 ORCUS
 PYTHON
+REPORTBUILDER
 SCRIPTING
 ZLIB
 ZXCVBN

core.git: configure.ac solenv/gbuild

2024-01-23 Thread Caolán McNamara (via logerrit)

 configure.ac   |2 +-
 solenv/gbuild/platform/com_GCC_defs.mk |1 -
 solenv/gbuild/platform/com_MSC_defs.mk |1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 98623ff0cddb15af0086885e5bf3361da8106ff8
Author: Caolán McNamara 
AuthorDate: Mon Jan 22 20:11:15 2024 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 23 11:14:35 2024 +0100

BOOST_ERROR_CODE_HEADER_ONLY doesn't do anything in boost >= 1.69

which was released on Dec 12th, 2018

https: //lists.boost.org/Archives/boost/2021/10/252209.php
Change-Id: I8d65d98648a44d7303fc46338bfdeba7801749e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162423
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 6136428fc689..33f64d0de3e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10573,7 +10573,7 @@ AC_MSG_CHECKING([which boost to use])
 if test "$with_system_boost" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_BOOST=TRUE
-AX_BOOST_BASE([1.66],,[AC_MSG_ERROR([no suitable Boost found])])
+AX_BOOST_BASE([1.69],,[AC_MSG_ERROR([no suitable Boost found])])
 AX_BOOST_DATE_TIME
 AX_BOOST_FILESYSTEM
 AX_BOOST_IOSTREAMS
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 3f50c4089b09..57338bc7f170 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -44,7 +44,6 @@ endif
 gb_AFLAGS := $(AFLAGS)
 
 gb_COMPILERDEFS := \
-   -DBOOST_ERROR_CODE_HEADER_ONLY \
-DBOOST_SYSTEM_NO_DEPRECATED \
-DCPPU_ENV=$(CPPU_ENV) \
$(if $(filter EMSCRIPTEN,$(OS)),-U_FORTIFY_SOURCE) \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 2e7b2728de32..3bf1a9d0a041 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -49,7 +49,6 @@ endif
 # like std::copy, std::transform (when MSVC_USE_DEBUG_RUNTIME is enabled)
 
 gb_COMPILERDEFS := \
-   -DBOOST_ERROR_CODE_HEADER_ONLY \
-DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE \
-DBOOST_SYSTEM_NO_DEPRECATED \
-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING \

core.git: configure.ac

2024-01-13 Thread Thorsten Behrens (via logerrit)

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

New commits:
commit 0b4510c060dc881fdc7d95379b06a02c413ae051
Author: Thorsten Behrens 
AuthorDate: Sat Jan 13 19:42:18 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Jan 13 21:43:12 2024 +0100

system poppler cannot be used with dbgutil

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

diff --git a/configure.ac b/configure.ac
index 299fcba5b011..7bc3f5d65f0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4696,6 +4696,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != 
"no"; then
 else
 with_system_zxing=no
 fi
+if test "$with_system_poppler" = "yes"; then
+AC_MSG_ERROR([--with-system-poppler conflicts with --enable-dbgutil])
+else
+with_system_poppler=no
+fi
 # As mixing system libwps and non-system libnumbertext or vice versa 
likely causes trouble (see
 # 603074c5f2b84de8a24593faf807da784b040625 "Pass _GLIBCXX_DEBUG into 
external/libwps" and the
 # mail thread starting at 
 "libstdc++: ODR

core.git: configure.ac

2024-01-13 Thread Thorsten Behrens (via logerrit)

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

New commits:
commit 9fdf51275beb617abd67a82a76efe1d1f6fdf0a6
Author: Thorsten Behrens 
AuthorDate: Fri Jan 12 15:02:45 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Jan 13 14:01:28 2024 +0100

system zxing cannot be used with dbgutil

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

diff --git a/configure.ac b/configure.ac
index b73437ade406..299fcba5b011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4691,6 +4691,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != 
"no"; then
 else
 with_system_gpgmepp=no
 fi
+if test "$with_system_zxing" = "yes"; then
+AC_MSG_ERROR([--with-system-zxing conflicts with --enable-dbgutil])
+else
+with_system_zxing=no
+fi
 # As mixing system libwps and non-system libnumbertext or vice versa 
likely causes trouble (see
 # 603074c5f2b84de8a24593faf807da784b040625 "Pass _GLIBCXX_DEBUG into 
external/libwps" and the
 # mail thread starting at 
 "libstdc++: ODR

core.git: configure.ac

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

 configure.ac |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 79e006cfc81728f1da39b9bf63b28074b7ccca50
Author: Stephan Bergmann 
AuthorDate: Wed Jan 3 15:16:31 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 3 16:14:42 2024 +0100

Actually drop --with-online-update-mar-channel

...which had accidentally been forgotten by
6910b1e3511701de5f0541fcaa98babf530f55ce "Hard-code
--with-online-update-mar-channel=LOOnlineUpdater"

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

diff --git a/configure.ac b/configure.ac
index e7857109be88..66e113ddcd7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1893,13 +1893,6 @@ libo_FUZZ_ARG_WITH(online-update-mar-certificatepath,
  non-functional.)]),
 ,)
 
-libo_FUZZ_ARG_WITH(online-update-mar-channel,
-AS_HELP_STRING([--with-online-update-mar-channel=...],
-[Set the channel value for --enable-online-update-mar.
- (Can be left off for debug purposes, even if that may render the 
feature
- non-functional.)]),
-,)
-
 libo_FUZZ_ARG_WITH(online-update-mar-serverurl,
 AS_HELP_STRING([--with-online-update-mar-serverurl=...],
 [Set the server URL value for --enable-online-update-mar.

core.git: configure.ac

2024-01-01 Thread Rene Engelhard (via logerrit)

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

New commits:
commit a9008aa942c1f98f8b00b2bd2f73edc576713e92
Author: Rene Engelhard 
AuthorDate: Mon Jan 1 18:13:20 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Jan 1 23:28:32 2024 +0100

update LIBO_THIS_YEAR

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

diff --git a/configure.ac b/configure.ac
index 1c2a9c86cf5e..737ad29d7364 100644
--- a/configure.ac
+++ b/configure.ac
@@ -520,7 +520,7 @@ AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
 
 git_date=`git log -1 --pretty=format:"%cd" --date=format:'%Y' 2>&/dev/null`
-LIBO_THIS_YEAR=${git_date:-2023}
+LIBO_THIS_YEAR=${git_date:-2024}
 AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
 
 dnl ===

core.git: configure.ac external/argon2

2023-12-23 Thread Thorsten Behrens (via logerrit)

 configure.ac   |1 
 external/argon2/0002-Add-WinARM64-vcxproj-config.patch |  185 +
 external/argon2/UnpackedTarball_argon2.mk  |1 
 3 files changed, 187 insertions(+)

New commits:
commit 401e9408d14dc2b9d07183a04c223831a59f71a3
Author: Thorsten Behrens 
AuthorDate: Sat Dec 23 01:08:09 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Dec 23 20:10:57 2023 +0100

tdf#105844 argon2: add vcxproj files for WinARM64 builds

Also add argon2 to crossbuild tools side.

Change-Id: I8704b2d8362a051c2d634b9db7416cdc2cf9add4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161206
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Reviewed-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index 788342733d1c..1c2a9c86cf5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5883,6 +5883,7 @@ if test "$cross_compiling" = "yes"; then
 
 # filter permitted build targets
 PERMITTED_BUILD_TARGETS="
+ARGON2
 AVMEDIA
 BOOST
 BZIP2
diff --git a/external/argon2/0002-Add-WinARM64-vcxproj-config.patch 
b/external/argon2/0002-Add-WinARM64-vcxproj-config.patch
new file mode 100644
index ..063296dd107c
--- /dev/null
+++ b/external/argon2/0002-Add-WinARM64-vcxproj-config.patch
@@ -0,0 +1,185 @@
+diff -ur argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj 
argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj
+--- argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj2023-12-23 
01:00:49.231059537 +0100
 argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj2023-12-23 
01:02:40.375527010 +0100
+@@ -13,6 +13,10 @@
+   ReleaseStatic
+   x64
+ 
++
++  Release
++  AMR64
++
+ 
+   Release
+   Win32
+@@ -50,6 +54,12 @@
+ true
+ MultiByte
+   
++  
++DynamicLibrary
++false
++true
++MultiByte
++  
+   
+ DynamicLibrary
+ false
+@@ -84,6 +94,9 @@
+   
+ 
+   
++  
++
++  
+   
+ 
+   
+@@ -107,6 +120,11 @@
+ $(SolutionDir)vs2015uild\$(ProjectName)\
+ $(SolutionDir)include;$(IncludePath)
+   
++  
++$(SolutionDir)vs2015uild\
++$(SolutionDir)vs2015uild\$(ProjectName)\
++$(SolutionDir)include;$(IncludePath)
++  
+   
+ $(SolutionDir)vs2015uild\
+ $(SolutionDir)vs2015uild\$(ProjectName)\
+@@ -158,6 +176,21 @@
+   true
+ 
+   
++  
++
++  Level3
++  MaxSpeed
++  true
++  false
++  true
++  
_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
++
++
++  true
++  true
++  true
++
++  
+   
+ 
+   Level3
+@@ -209,7 +242,6 @@
+ 
+ 
+ 
+-
+ 
+ 
+@@ -221,7 +253,7 @@
+ 
+ 
+-
++
+ 
+   
+   
+Only in argon2/vs2015/Argon2OptDll: Argon2OptDll.vcxproj~
+diff -ur argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj 
argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj
+--- argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj  2023-12-23 
01:00:49.231059537 +0100
 argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj  2023-12-23 
01:02:12.518576081 +0100
+@@ -17,6 +17,10 @@
+   Release
+   Win32
+ 
++
++  Release
++  ARM64
++
+ 
+   Debug
+   x64
+@@ -51,6 +55,12 @@
+ true
+ MultiByte
+   
++  
++Application
++false
++true
++MultiByte
++  
+   
+ Application
+ false
+@@ -85,6 +95,9 @@
+   
+ 
+   
++  
++
++  
+   
+ 
+   
+@@ -108,6 +121,11 @@
+ $(SolutionDir)vs2015uild\
+ $(SolutionDir)vs2015uild\$(ProjectName)\
+   
++  
++$(SolutionDir)include;$(IncludePath)
++$(SolutionDir)vs2015uild\
++$(SolutionDir)vs2015uild\$(ProjectName)\
++  
+   
+ $(SolutionDir)include;$(IncludePath)
+ $(SolutionDir)vs2015uild\
+@@ -162,6 +180,21 @@
+   true
+ 
+   
++  
++
++  Level3
++  MaxSpeed
++  true
++  false
++  true
++  
_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
++
++
++  true
++  true
++  true
++
++  
+   
+ 
+   Level3
+@@ -214,7 +247,7 @@
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -222,7 +255,6 @@
+ 
+ 
+ 
+-
+ 
+ 
+@@ -232,4 +264,4 @@
+   
+   
+   
+-
+\ No newline at end of file
++
+Only in argon2/vs2015/Argon2OptTestCI: Argon2OptTestCI.vcxproj~
diff --git a/external/argon2/UnpackedTarball_argon2.mk 
b/external/argon2/UnpackedTarball_argon2.mk
index 0b35c2f58caf..3addfad639d5 100644
--- a/external/argon2/UnpackedTarball_argon2.mk
+++ b/external/argon2/UnpackedTarball_argon2.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,argon2,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,argon2,\

external/argon2/0001-Fix-possible-compiler-error-due-to-undefined-_MSC_VE.patch 
\
+   external/argon2/0002-Add-WinARM64-vcxproj-config.patch \
 ))
 
 # vim: set noet sw=4 ts=4:

core.git: configure.ac filter/Configuration_filter.mk officecfg/Configuration_officecfg.mk postprocess/CustomTarget_registry.mk solenv/bin

2023-12-20 Thread Andras Timar (via logerrit)

 configure.ac |1 +
 filter/Configuration_filter.mk   |2 ++
 officecfg/Configuration_officecfg.mk |   32 
 postprocess/CustomTarget_registry.mk |   15 +++
 solenv/bin/removereportbuilder.xslt  |   19 +++
 5 files changed, 61 insertions(+), 8 deletions(-)

New commits:
commit a2a9850217b3f711440283131fdfc58a9a254919
Author: Andras Timar 
AuthorDate: Sun Dec 17 17:37:51 2023 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 21 07:03:28 2023 +0100

get rid of warnings when reportbuilder is not configured for build

In the LOK case for example, where there is no reportbuilder, there
were a lot of bogus warning messages at startup, confimgr complained
that there were translations for non existing configuration nodes,
all belonged to reportbuilder.

Change-Id: I7f9cef3206bddd9e333b97ee966fb950fbb352d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160887
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161048
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index e9755b9ee584..788342733d1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12974,6 +12974,7 @@ if test "$enable_report_builder" != "no" -a 
"$with_java" != "no"; then
 BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
 NEED_ANT=TRUE
 fi
+BUILD_TYPE="$BUILD_TYPE REPORTBUILDER"
 else
 AC_MSG_RESULT([no])
 ENABLE_REPORTBUILDER=
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 8a323e83fd54..29d503c0cc33 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -307,6 +307,7 @@ $(eval $(call 
filter_Configuration_add_others,fcfg_langpack,fcfg_database_others
frameloaders/org_openoffice_comp_dbflt_DBContentLoader2 \
 ))
 
+ifeq ($(ENABLE_REPORTBUILDER),TRUE)
 # fcfg_reportbuilder
 $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_reportbuilder_types.xcu,filter/source/config/fragments/types,\
StarBaseReport \
@@ -317,6 +318,7 @@ $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_reportbuilder_
StarBaseReport \
StarBaseReportChart \
 ))
+endif
 
 # fcfg_writer
 $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter/source/config/fragments/types,\
diff --git a/officecfg/Configuration_officecfg.mk 
b/officecfg/Configuration_officecfg.mk
index fc5a4ed6ebe7..aa4eec7b054c 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -64,12 +64,16 @@ $(eval $(call 
gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Setup-base.xcu \
org/openoffice/Setup-math.xcu \
org/openoffice/Setup-report.xcu \
-   org/openoffice/Setup-reportbuilder.xcu \
+   $(call gb_Helper_optional,REPORTBUILDER, \
+   org/openoffice/Setup-reportbuilder.xcu \
+   ) \
org/openoffice/Setup-start.xcu \
org/openoffice/UserProfile-unixdesktop.xcu \
org/openoffice/VCL-unixdesktop.xcu \
org/openoffice/Office/Accelerators-macosx.xcu \
-   org/openoffice/Office/Accelerators-reportbuilder.xcu \
+   $(call gb_Helper_optional,REPORTBUILDER, \
+   org/openoffice/Office/Accelerators-reportbuilder.xcu \
+   ) \
org/openoffice/Office/Accelerators-unxwnt.xcu \
$(call gb_Helper_optional,LIBRELOGO, \
org/openoffice/Office/Addons-librelogo.xcu \
@@ -93,7 +97,9 @@ $(eval $(call 
gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Common-ctl.xcu \
org/openoffice/Office/Common-ctlseqcheck.xcu \
org/openoffice/Office/DataAccess-evoab2.xcu \
-   org/openoffice/Office/DataAccess-reportbuilder.xcu \
+   $(call gb_Helper_optional,REPORTBUILDER, \
+   org/openoffice/Office/DataAccess-reportbuilder.xcu \
+   ) \
org/openoffice/Office/Paths-macosx.xcu \
org/openoffice/Office/Paths-unxwnt.xcu \
org/openoffice/Office/Paths-unixdesktop.xcu \
@@ -109,13 +115,17 @@ $(eval $(call 
gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Embedding-impress.xcu \
org/openoffice/Office/Embedding-math.xcu \
org/openoffice/Office/Embedding-base.xcu \
-   org/openoffice/Office/Embedding-reportbuilder.xcu \
+   $(call gb_Helper_optional,REPORTBUILDER, \
+   org/openoffice/Office/Embedding-reportbuilder.xcu \
+   ) \
org/openoffice/Office/Embedding-writer.xcu \
$(call gb_Helper_optional,LIBRELOGO, \
org/openoffice/Office/UI/WriterCommands-librelogo.xcu \
org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \
) \
-

core.git: configure.ac external/pdfium

2023-12-17 Thread Rene Engelhard (via logerrit)

 configure.ac  |   19 +--
 external/pdfium/Library_pdfium.mk |5 +
 external/pdfium/UnpackedTarball_pdfium.mk |2 ++
 external/pdfium/system-abseil.diff|   15 +++
 4 files changed, 23 insertions(+), 18 deletions(-)

New commits:
commit d7577174b541e68158d228aa41192227c10a252f
Author: Rene Engelhard 
AuthorDate: Fri Dec 15 23:45:04 2023 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 18 08:51:38 2023 +0100

fix system-abseil build even with 2022 version

actually it seems it was a internal abseil header from pdfium vs. system
header mismatch. Include proper absl/container/inlined_vector.h if using
system-abseil.

While at it we can also just use pkg-config, no idea why I did it
without back then. Also gets the advantage that it knows that the libs
needed for absl_inlined_vector is actually
-labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity

This effectively reverts e89723103313ec4366ee58144c47d7a5c16bf838

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

diff --git a/configure.ac b/configure.ac
index 97de2b514d3a..586e31f8bae5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12234,24 +12234,7 @@ if test "$ENABLE_PDFIUM" = "TRUE"; then
 AC_MSG_RESULT([external])
 SYSTEM_ABSEIL=TRUE
 AC_LANG_PUSH([C++])
-AC_CHECK_HEADER(absl/types/bad_optional_access.h, [],
-[AC_MSG_ERROR(abseil headers not found.)], [])
-AC_CHECK_HEADER(absl/types/bad_variant_access.h, [],
-[AC_MSG_ERROR(abseil headers not found.)], [])
-AC_CHECK_LIB([absl_bad_optional_access], [main], [],
- [AC_MSG_ERROR([libabsl_bad_optional_access library not 
found.])])
-AC_CHECK_LIB([absl_bad_variant_access], [main], [],
- [AC_MSG_ERROR([libabsl_bad_variant_access library not 
found.])])
-ABSEIL_LIBS="-labsl_bad_optional_access -labsl_bad_variant_access"
-   AC_MSG_CHECKING([whether abseil is >= 20230125])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-   #include 
-   #if ABSL_LTS_RELEASE_VERSION < 20230125
-   #error Too old.
-#endif
-   ])],
-[AC_MSG_RESULT([ok])],
-[AC_MSG_ERROR([too old. Need >= 20230125])])
+PKG_CHECK_MODULES(ABSEIL, absl_bad_optional_access 
absl_bad_variant_access absl_inlined_vector )
 AC_LANG_POP([C++])
 ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${ABSEIL_LIBS}"
diff --git a/external/pdfium/Library_pdfium.mk 
b/external/pdfium/Library_pdfium.mk
index fc0903d873d1..85f9d953b752 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -40,6 +40,11 @@ $(eval $(call gb_Library_add_defs,pdfium,\
 -DUSE_SYSTEM_LIBOPENJPEG2 \
 ))
 endif
+ifeq ($(SYSTEM_ABSEIL),TRUE)
+$(eval $(call gb_Library_add_defs,pdfium,\
+-DUSE_SYSTEM_ABSEIL \
+))
+endif
 
 
 $(eval $(call gb_Library_set_generated_cxx_suffix,pdfium,cpp))
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk 
b/external/pdfium/UnpackedTarball_pdfium.mk
index 924bbe23a8b8..f8d95d2785c7 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -16,6 +16,8 @@ pdfium_patches += c++20-comparison.patch
 
 pdfium_patches += constexpr-template.patch
 
+pdfium_patches += system-abseil.diff
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,pdfium,$(PDFIUM_TARBALL)))
diff --git a/external/pdfium/system-abseil.diff 
b/external/pdfium/system-abseil.diff
new file mode 100644
index ..841bc8ce9468
--- /dev/null
+++ b/external/pdfium/system-abseil.diff
@@ -0,0 +1,15 @@
+--- core/fpdfapi/page/cpdf_sampledfunc.cpp 2023-12-15 23:27:10.955659091 
+0100
 core/fpdfapi/page/cpdf_sampledfunc.cpp 2023-12-15 23:27:43.420136476 
+0100
+@@ -16,8 +16,11 @@
+ #include "core/fxcrt/cfx_bitstream.h"
+ #include "core/fxcrt/fx_memory_wrappers.h"
+ #include "core/fxcrt/fx_safe_types.h"
++#ifdef USE_SYSTEM_ABSEIL
++#include 
++#else
+ #include "third_party/abseil-cpp/absl/container/inlined_vector.h"
+-
++#endif
+ namespace {
+ 
+ // See PDF Reference 1.7, page 170, table 3.36.

core.git: configure.ac

2023-12-15 Thread Rene Engelhard (via logerrit)

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

New commits:
commit e89723103313ec4366ee58144c47d7a5c16bf838
Author: Rene Engelhard 
AuthorDate: Fri Dec 15 17:45:27 2023 +0100
Commit: René Engelhard 
CommitDate: Fri Dec 15 19:32:10 2023 +0100

check abseil version

since 918515d6fc6e2eaa000c4a997d604b7b00b492e3 updated to a pdfium
version which only builds with >= 20230125.3 (earliest I could get hand
on).

Ideally we should test for the feature, but this suffices too and we do
that for other libs, too...

Change-Id: I14719186d415b9df82f607b26233c9be154492c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160833
Tested-by: René Engelhard 
Tested-by: Jenkins
Reviewed-by: René Engelhard 

diff --git a/configure.ac b/configure.ac
index 151f68f7bb22..97de2b514d3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12243,6 +12243,15 @@ if test "$ENABLE_PDFIUM" = "TRUE"; then
 AC_CHECK_LIB([absl_bad_variant_access], [main], [],
  [AC_MSG_ERROR([libabsl_bad_variant_access library not 
found.])])
 ABSEIL_LIBS="-labsl_bad_optional_access -labsl_bad_variant_access"
+   AC_MSG_CHECKING([whether abseil is >= 20230125])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+   #include 
+   #if ABSL_LTS_RELEASE_VERSION < 20230125
+   #error Too old.
+#endif
+   ])],
+[AC_MSG_RESULT([ok])],
+[AC_MSG_ERROR([too old. Need >= 20230125])])
 AC_LANG_POP([C++])
 ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${ABSEIL_LIBS}"

core.git: configure.ac

2023-12-11 Thread Stephan Bergmann (via logerrit)

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

New commits:
commit 7530ef02827c7e62ce5313c99e84ce8ff15513ab
Author: Stephan Bergmann 
AuthorDate: Mon Dec 11 16:14:43 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 11 21:29:22 2023 +0100

Fail when explicit --enable-ccache cannot be honored

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

diff --git a/configure.ac b/configure.ac
index 98068c7f7c08..455686cf20ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3364,6 +3364,9 @@ elif test -n "$enable_ccache" -o \( "$enable_ccache" = "" 
-a "$enable_icecream"
 fi
 fi
 fi
+if test "$enable_ccache" = yes && test -z "$CCACHE"; then
+AC_MSG_ERROR([No suitable ccache found])
+fi
 ;;
 esac
 else

core.git: configure.ac

2023-12-08 Thread Michael Weghorn (via logerrit)

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

New commits:
commit 5829cf7e96d3b2fcbc91b9c5c15438202629bc03
Author: Michael Weghorn 
AuthorDate: Fri Dec 8 15:20:04 2023 +0100
Commit: Michael Weghorn 
CommitDate: Fri Dec 8 17:37:47 2023 +0100

configure: Pass '--auto-servernum' to xvfb-run here, too

Pass that param in configure.ac as well, to avoid multiple
instances of xvfb-run potentially getting into each other's
way.

See the commit message of

commit ca01deadcbc480b6e79618b227a2b73a61ecb7ff
Author: Michael Weghorn 
Date:   Mon Oct 16 11:03:46 2023 +0200

gtk3 a11y test: Let xvfb-run auto-determine free server num

for more details, which added that param at the place where
the tests using xvfb-run are run.

Maybe this has a positive effect on occasional test failures like [1]:

checking for xvfb-run... /usr/bin/xvfb-run
checking whether /usr/bin/xvfb-run works.. no

configure: error: xvfb-run required by --enable-atspi-tests not found

Error running configure at ./autogen.sh line 321.

[1] https://ci.libreoffice.org/job/gerrit_linux_gcc_release/154929/console

Change-Id: Ie7ba6ec58ea44e5cf8a52d18f0359d3c2335a4ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160466
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/configure.ac b/configure.ac
index 1cc8b72ad25e..98068c7f7c08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11856,7 +11856,7 @@ if ! test "$enable_atspi_tests" = no; then
 if ! test "$XVFB_RUN" = no; then
 dnl make sure the found xvfb-run actually works
 AC_MSG_CHECKING([whether $XVFB_RUN works...])
-if $XVFB_RUN true >_MESSAGE_LOG_FD 2>_MESSAGE_LOG_FD; then
+if $XVFB_RUN --auto-servernum true >_MESSAGE_LOG_FD 
2>_MESSAGE_LOG_FD; then
 AC_MSG_RESULT([yes])
 else
 AC_MSG_RESULT([no])

core.git: configure.ac

2023-12-08 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 9fb3970a1a599eae2447f6746597843434ee758b
Author: Christian Lohmaier 
AuthorDate: Fri Dec 8 16:09:10 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Fri Dec 8 16:09:10 2023 +0100

bump product version to 24.8.0.0.alpha0+

Change-Id: If1f03b745fa3855daf18ddc531a0bf7d949d21a7

diff --git a/configure.ac b/configure.ac
index d77e27499230..1cc8b72ad25e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[24.2.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.8.0.0.alpha0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: configure.ac distro-configs/Jenkins

2023-12-07 Thread Stephan Bergmann (via logerrit)

 configure.ac|   42 +---
 distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf |2 
 2 files changed, 30 insertions(+), 14 deletions(-)

New commits:
commit b17d051ad56ab706d15a3b696266be1ac1df2e5d
Author: Stephan Bergmann 
AuthorDate: Thu Dec 7 11:18:12 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 7 13:42:15 2023 +0100

Make --enable-online-update and --enable-online-update=mar orthogonal

...by turning the latter into its own option --enable-online-update-mar.  
(The
intention is to potentially have the experimental --enable-online-update-mar
configured in alongside any traditional --enable-online-update, and have it
disabled by default at runtime---for which some configuration is needed and
which is forthcoming.)

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

diff --git a/configure.ac b/configure.ac
index 1f3398fd5a0b..c800a6afd611 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1872,9 +1872,14 @@ AC_ARG_ENABLE(z7-debug,
 libo_FUZZ_ARG_ENABLE(online-update,
 AS_HELP_STRING([--enable-online-update],
 [Enable the online update service that will check for new versions of
- LibreOffice. Disabled by default. Requires --with-privacy-policy-url 
to be set.
- If the value is "mar", the experimental Mozilla-like update will be
- enabled instead of the traditional update mechanism.]),
+ LibreOffice. Disabled by default. Requires --with-privacy-policy-url 
to be set.]),
+,)
+
+libo_FUZZ_ARG_ENABLE(online-update-mar,
+AS_HELP_STRING([--enable-online-update-mar],
+[Enable the experimental Mozilla-like online update service that will
+ check for new versions of LibreOffice. Disabled by default. Requires
+ --with-update-config to be set.]),
 ,)
 
 AC_ARG_WITH(update-config,
@@ -2196,7 +2201,7 @@ AC_ARG_WITH(system-libs,
 
 AC_ARG_WITH(system-bzip2,
 AS_HELP_STRING([--with-system-bzip2],
-[Use bzip2 already on system. Used when --enable-online-update=mar
+[Use bzip2 already on system. Used when --enable-online-update-mar
 or --enable-python=internal]),,
 [with_system_bzip2="$with_system_libs"])
 
@@ -13586,19 +13591,11 @@ dnl Test whether to enable online update service
 dnl ===
 AC_MSG_CHECKING([whether to enable online update])
 ENABLE_ONLINE_UPDATE=
-ENABLE_ONLINE_UPDATE_MAR=
-UPDATE_CONFIG=
 if test "$enable_online_update" = ""; then
 AC_MSG_RESULT([no])
 else
 if test "$enable_online_update" = "mar"; then
-AC_MSG_RESULT([yes - MAR-based online update])
-ENABLE_ONLINE_UPDATE_MAR="TRUE"
-if test "$with_update_config" = ""; then
-AC_MSG_ERROR([mar based online updater needs an update config 
specified with "with-update-config])
-fi
-UPDATE_CONFIG="$with_update_config"
-AC_DEFINE(HAVE_FEATURE_UPDATE_MAR)
+AC_MSG_ERROR([--enable-online-update=mar is deprecated, use 
--enable-online-update-mar instead])
 elif test "$enable_online_update" = "yes"; then
 if test "$enable_curl" != "yes"; then
 AC_MSG_ERROR([--disable-online-update must be used when 
--disable-curl is used])
@@ -13610,6 +13607,25 @@ else
 fi
 fi
 AC_SUBST(ENABLE_ONLINE_UPDATE)
+
+
+dnl ===
+dnl Test whether to enable mar online update service
+dnl ===
+AC_MSG_CHECKING([whether to enable mar online update])
+ENABLE_ONLINE_UPDATE_MAR=
+UPDATE_CONFIG=
+if test "$enable_online_update_mar" = yes; then
+AC_MSG_RESULT([yes])
+ENABLE_ONLINE_UPDATE_MAR="TRUE"
+if test "$with_update_config" = ""; then
+AC_MSG_ERROR([mar based online updater needs an update config 
specified with "with-update-config])
+fi
+UPDATE_CONFIG="$with_update_config"
+AC_DEFINE(HAVE_FEATURE_UPDATE_MAR)
+else
+AC_MSG_RESULT([no])
+fi
 AC_SUBST(ENABLE_ONLINE_UPDATE_MAR)
 AC_SUBST(UPDATE_CONFIG)
 
diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf 
b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
index 29c6303a1448..e2c510f509f8 100644
--- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
+++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
@@ -28,7 +28,7 @@
 --enable-ext-nlpsolver
 --enable-epm
 --enable-python=internal
---enable-online-update=mar
+--enable-online-update-mar
 --disable-dconf
 --with-lang=de es fr ar zh-CN
 --with-package-format=archive

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

2023-12-07 Thread Stephan Bergmann (via logerrit)

 configure.ac |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0f32809a86630d9e8bbf46fef23e189896c8a497
Author: Stephan Bergmann 
AuthorDate: Wed Dec 6 21:49:38 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 7 09:05:18 2023 +0100

Adapt consteval failure check to recent GCC 14 trunk

...which happens to accept the original check from
af34108d90bbbce90cf00c4b23961787599c7fa5 "Use C++20 consteval for the
Color(sal_uInt32) ctor" now, but would still fail to compile the actual 
code at

> In file included from xmloff/source/chart/ColorPropertySet.hxx:23,
>  from xmloff/source/chart/ColorPropertySet.cxx:20:
> include/tools/color.hxx: In constructor 
‘xmloff::chart::ColorPropertySet::ColorPropertySet(Color)’:
> xmloff/source/chart/ColorPropertySet.cxx:81:9:   in ‘constexpr’ expansion 
of 
‘((xmloff::chart::ColorPropertySet*)this)->xmloff::chart::ColorPropertySet::m_nDefaultColor.Color::Color(10079487)’
> include/tools/color.hxx:82:11: error: modification of 
‘*(xmloff::chart::ColorPropertySet*)this’ is not a constant expression
>82 | : mValue(nColor)
>   |   ^~

(see the comment at 
"wrong "error: ‘this’ is not a constant expression" with consteval 
constructor")

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

diff --git a/configure.ac b/configure.ac
index e41223ff7ec1..1f3398fd5a0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14656,7 +14656,10 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
 };
 S const s;
 
-struct S1 { consteval S1(int) {} };
+struct S1 {
+ int a;
+ consteval S1(int n): a(n) {}
+};
 struct S2 {
 S1 x;
 S2(): x(0) {}

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

2023-11-23 Thread Xisco Fauli (via logerrit)

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

New commits:
commit 1f83730fb54ba68129048d0989bf6c957e0b933b
Author: Xisco Fauli 
AuthorDate: Thu Nov 23 13:18:48 2023 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 23 13:18:48 2023 +0100

bump product version to 24.2.0.0.alpha1+

Change-Id: Iabc985c1329d4c1ac31ddf93e8b8f4b6f3c48900

diff --git a/configure.ac b/configure.ac
index eb4dd017a406..e41223ff7ec1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[24.2.0.0.alpha0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.0.0.alpha1+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

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

2023-11-18 Thread Taichi Haradaguchi (via logerrit)

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

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

Latest VS 2022 Preview is 17.9.0 now

...while latest proper VS 2022 is 17.8.0

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

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

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

2023-11-13 Thread Mike Kaganski (via logerrit)

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

New commits:
commit 9520c38b0b1197a49499afb3276f999a530cf778
Author: Mike Kaganski 
AuthorDate: Mon Nov 13 14:40:13 2023 +0100
Commit: Mike Kaganski 
CommitDate: Mon Nov 13 19:51:44 2023 +0100

Fix a typo

Change-Id: I95404a278b53d7021adacd99ee7482592c0eb8e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159245
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 8310001dcb3f..5c78e2bd2f6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12681,7 +12681,7 @@ AC_MSG_CHECKING([whether to enable gpgmepp])
 if test "$enable_gpgmepp" = no; then
 AC_MSG_RESULT([no])
 elif test "$enable_mpl_subset" = "yes"; then
-AC_MSG_RESULT([no (MPL only])
+AC_MSG_RESULT([no (MPL only)])
 elif test "$enable_fuzzers" = "yes"; then
 AC_MSG_RESULT([no (oss-fuzz)])
 elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = 
TRUE \) -o "$_os" = "WINNT" ; then

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

2023-11-13 Thread Caolán McNamara (via logerrit)

 configure.ac   
  |2 
 download.lst   
  |4 
 external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch
  |   31 --
 
external/libcmis/0002-HttpSession-add-a-callback-that-can-be-used-to-confi.patch
 |  142 --
 
external/libcmis/0003-HttpSession-fix-regression-setting-wrong-type-of-CUR.patch
 |   81 -
 external/libcmis/UnpackedTarball_libcmis.mk
  |3 
 6 files changed, 3 insertions(+), 260 deletions(-)

New commits:
commit 3368447e826d4204086e4d8bfe59af4412c16233
Author: Caolán McNamara 
AuthorDate: Mon Nov 13 10:13:50 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Nov 13 13:02:52 2023 +0100

upgrade libcmis

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

diff --git a/configure.ac b/configure.ac
index 0234537eb02b..8310001dcb3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7615,7 +7615,7 @@ AC_SUBST(GPERF)
 dnl ===
 dnl Check for system libcmis
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.6 >= 0.6.0],enabled)
+libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.6 >= 0.6.1],enabled)
 
 dnl ===
 dnl C++11
diff --git a/download.lst b/download.lst
index d4c3eed3b9c6..60ac664205f9 100644
--- a/download.lst
+++ b/download.lst
@@ -60,8 +60,8 @@ DTOA_TARBALL := dtoa-20180411.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBCMIS_SHA256SUM := 
56df575f78dacc21b4cec7cec73d671fd235f7c2010a8bb7940ef1413dc899fd
-LIBCMIS_TARBALL := libcmis-0.6.0.tar.xz
+LIBCMIS_SHA256SUM := 
d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074
+LIBCMIS_TARBALL := libcmis-0.6.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch 
b/external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch
deleted file mode 100644
index 8480913cdf20..
--- a/external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5b9ed18e518a5214b4a1fb2766627c1d169b8d8c Mon Sep 17 00:00:00 2001
-From: Michael Stahl 
-Date: Mon, 6 Nov 2023 13:33:05 +0100
-Subject: [PATCH 1/2] fix regression in  HttpSession::initProtocols()
-
-(regression from commit 1b8a646b1d63bfa760d154dd7e51f6298d4a9899)

- src/libcmis/http-session.cxx | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libcmis/http-session.cxx b/src/libcmis/http-session.cxx
-index 3847a2c..9703427 100644
 a/src/libcmis/http-session.cxx
-+++ b/src/libcmis/http-session.cxx
-@@ -894,11 +894,12 @@ catch ( const libcmis::Exception& e )
- 
- void HttpSession::initProtocols( )
- {
--const unsigned long protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- #if (LIBCURL_VERSION_MAJOR > 7) || (LIBCURL_VERSION_MAJOR == 7 && 
LIBCURL_VERSION_MINOR >= 85)
-+auto const protocols = "https,http";
- curl_easy_setopt(m_curlHandle, CURLOPT_PROTOCOLS_STR, protocols);
- curl_easy_setopt(m_curlHandle, CURLOPT_REDIR_PROTOCOLS_STR, protocols);
- #else
-+const unsigned long protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- curl_easy_setopt(m_curlHandle, CURLOPT_PROTOCOLS, protocols);
- curl_easy_setopt(m_curlHandle, CURLOPT_REDIR_PROTOCOLS, protocols);
- #endif
--- 
-2.41.0
-
diff --git 
a/external/libcmis/0002-HttpSession-add-a-callback-that-can-be-used-to-confi.patch
 
b/external/libcmis/0002-HttpSession-add-a-callback-that-can-be-used-to-confi.patch
deleted file mode 100644
index b47ee4d195b2..
--- 
a/external/libcmis/0002-HttpSession-add-a-callback-that-can-be-used-to-confi.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 94012ca5b669e71ea35508159f63576364736dc2 Mon Sep 17 00:00:00 2001
-From: Michael Stahl 
-Date: Mon, 6 Nov 2023 14:18:59 +0100
-Subject: [PATCH 2/2] HttpSession: add a callback that can be used to configure
- libcurl
-

- inc/libcmis/session-factory.hxx | 7 +++
- src/libcmis/http-session.cxx| 8 +++-
- src/libcmis/http-session.hxx| 8 +++-
- src/libcmis/session-factory.cxx | 9 -
- 4 files changed, 29 insertions(+), 3 deletions(-)
-
-diff --git a/inc/libcmis/session-factory.hxx b/inc/libcmis/session-factory.hxx
-index 45abd8b..227ac4d 100644
 a/inc/libcmis/session-factory.hxx
-+++ b/inc/libcmis/session-factory.hxx
-@@ -38,6 +38,9 @@
- #include "libcmis/repository.hxx"
- #include "libcmis/session.hxx"
- 
-+// needed for a callback type
-+typedef void CURL;
-+
- namespace libcmis
- {
- /** This callback provides

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

2023-11-12 Thread Mike Kaganski (via logerrit)

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

New commits:
commit 09cebda51b9ea3b72c10e4470ac8840db70154b7
Author: Mike Kaganski 
AuthorDate: Sun Nov 12 12:54:04 2023 +0300
Commit: Mike Kaganski 
CommitDate: Sun Nov 12 13:52:42 2023 +0100

Fix some leading space inconsistencies

Change-Id: I548ec63d96a4d5e39fd29511c079b667915abb5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159345
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index ef52e39bc261..303f143df198 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5312,10 +5312,10 @@ linux-gnu*|linux-musl*)
 PLATFORMID=linux_x86_64
 ;;
 loongarch64)
-   CPUNAME=LOONGARCH64
-   RTL_ARCH=LOONGARCH64
-   PLATFORMID=linux_loongarch64
-   ;;
+CPUNAME=LOONGARCH64
+RTL_ARCH=LOONGARCH64
+PLATFORMID=linux_loongarch64
+;;
 *)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
@@ -12187,7 +12187,7 @@ if test "$ENABLE_PDFIUM" = "TRUE"; then
  [AC_MSG_ERROR([libabsl_bad_optional_access library not 
found.])])
 AC_CHECK_LIB([absl_bad_variant_access], [main], [],
  [AC_MSG_ERROR([libabsl_bad_variant_access library not 
found.])])
-   ABSEIL_LIBS="-labsl_bad_optional_access -labsl_bad_variant_access"
+ABSEIL_LIBS="-labsl_bad_optional_access -labsl_bad_variant_access"
 AC_LANG_POP([C++])
 ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${ABSEIL_LIBS}"
@@ -12268,9 +12268,9 @@ if test "$enable_skia" != "no" -a "$build_skia" = "yes" 
-a -z "$DISABLE_GUI"; th
 ENABLE_SKIA_DEBUG=
 fi
 ENABLE_SKIA=TRUE
-   if test "$ENDIANNESS" = "big" && test "$ENABLE_SKIA" = "TRUE"; then
-   AC_MSG_ERROR([skia doesn't work/isn't supported upstream on 
big-endian. Use --disable-skia])
-   fi
+if test "$ENDIANNESS" = "big" && test "$ENABLE_SKIA" = "TRUE"; then
+AC_MSG_ERROR([skia doesn't work/isn't supported upstream on 
big-endian. Use --disable-skia])
+fi
 
 AC_DEFINE(HAVE_FEATURE_SKIA)
 BUILD_TYPE="$BUILD_TYPE SKIA"
@@ -12682,7 +12682,7 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" 
\) -a "$ENABLE_NSS" = TRUE
 [AC_MSG_ERROR([gpgme headers not found, install gpgme development 
package])], [])
 AC_CHECK_LIB(gpgmepp, main, [],
 [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
-   GPGMEPP_LIBS=-lgpgmepp
+GPGMEPP_LIBS=-lgpgmepp
 else
 AC_MSG_RESULT([internal])
 BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"

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

2023-11-11 Thread Mike Kaganski (via logerrit)

 configure.ac |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 8d6209d92dedf46d6d7c084b54dd1ebcbe55f1c4
Author: Mike Kaganski 
AuthorDate: Sat Nov 11 16:26:55 2023 +0300
Commit: Mike Kaganski 
CommitDate: Sat Nov 11 16:40:47 2023 +0100

Finally remove superfluous --with-theme=default option

... as suggested in commit 7524f45e0a2b86dc418f0eb76df89dbdbecfafd3
(remove superfluous --with-theme=default option, 2014-08-22).

Change-Id: Iddd1e39846023c3a4e2ebd73b0010d70c706
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159320
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 15e7c781e993..ef52e39bc261 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13498,8 +13498,7 @@ fi
 
 WITH_THEMES=""
 if test "x$with_theme" != "xno"; then
-with_theme_sorted=`echo $with_theme|sed 's/\bdefault\b/colibre/g'|tr '\ ' 
'\n'|sort -u`
-for theme in $with_theme_sorted; do
+for theme in $with_theme; do
 case $theme in
 
breeze|breeze_dark|breeze_dark_svg|breeze_svg|colibre|colibre_svg|colibre_dark|colibre_dark_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg|sifr|sifr_svg|sifr_dark|sifr_dark_svg|sukapura|sukapura_dark|sukapura_dark_svg|sukapura_svg)
 WITH_THEMES="${WITH_THEMES:+$WITH_THEMES }$theme" ;;
 *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
@@ -13508,13 +13507,6 @@ if test "x$with_theme" != "xno"; then
 fi
 AC_MSG_RESULT([$WITH_THEMES])
 AC_SUBST([WITH_THEMES])
-# FIXME: remove this, and the convenience default->colibre remapping after a 
grace period
-for theme in $with_theme; do
-case $theme in
-default) AC_MSG_WARN([--with-theme=default is deprecated and will be 
removed, use --with-theme=colibre]) ;;
-*) ;;
-esac
-done
 
 ###
 # Extensions checking

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

2023-11-10 Thread Mike Kaganski (via logerrit)

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

New commits:
commit 9aa2eee9d88df6f68befd4758bc5af847d07c805
Author: Mike Kaganski 
AuthorDate: Fri Nov 10 18:17:18 2023 +0100
Commit: Mike Kaganski 
CommitDate: Fri Nov 10 21:37:10 2023 +0100

Fix the fix

Commit 87f0da8023081398d72372367db11d4a97d91833 put the check
into a wrong position

Change-Id: I459c11e00babfc604c5d35aac4f7cd0ce3701c3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159237
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 7ec877ed5a78..545c3de33303 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13581,9 +13581,6 @@ UPDATE_CONFIG=
 if test "$enable_online_update" = ""; then
 AC_MSG_RESULT([no])
 else
-if test "$enable_curl" != "yes"; then
-AC_MSG_ERROR([--disable-online-update must be used when --disable-curl 
is used])
-fi
 if test "$enable_online_update" = "mar"; then
 AC_MSG_RESULT([yes - MAR-based online update])
 ENABLE_ONLINE_UPDATE_MAR="TRUE"
@@ -13593,6 +13590,9 @@ else
 UPDATE_CONFIG="$with_update_config"
 AC_DEFINE(HAVE_FEATURE_UPDATE_MAR)
 elif test "$enable_online_update" = "yes"; then
+if test "$enable_curl" != "yes"; then
+AC_MSG_ERROR([--disable-online-update must be used when 
--disable-curl is used])
+fi
 AC_MSG_RESULT([yes])
 ENABLE_ONLINE_UPDATE="TRUE"
 else

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

2023-11-10 Thread Mike Kaganski (via logerrit)

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

New commits:
commit 87f0da8023081398d72372367db11d4a97d91833
Author: Mike Kaganski 
AuthorDate: Fri Nov 10 15:15:43 2023 +0100
Commit: Mike Kaganski 
CommitDate: Fri Nov 10 17:52:27 2023 +0100

Fix --disable-curl checks: --disable-online-update is needed

Change-Id: I63598815a2ed3c7300102180a8a8439e2ef1605d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159234
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 99fe7e311871..7ec877ed5a78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13581,6 +13581,9 @@ UPDATE_CONFIG=
 if test "$enable_online_update" = ""; then
 AC_MSG_RESULT([no])
 else
+if test "$enable_curl" != "yes"; then
+AC_MSG_ERROR([--disable-online-update must be used when --disable-curl 
is used])
+fi
 if test "$enable_online_update" = "mar"; then
 AC_MSG_RESULT([yes - MAR-based online update])
 ENABLE_ONLINE_UPDATE_MAR="TRUE"

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

2023-11-10 Thread Mike Kaganski (via logerrit)

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

New commits:
commit 7fc847a99c25590cdc8c0629448e4d3979af94b6
Author: Mike Kaganski 
AuthorDate: Fri Nov 10 14:41:52 2023 +0100
Commit: Mike Kaganski 
CommitDate: Fri Nov 10 17:34:32 2023 +0100

Improve MPL subset directions text a bit

Change-Id: Ibf91009a2dea5a728bf27388168199e87a1d05d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159233
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 39767d4e9da9..99fe7e311871 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14754,12 +14754,12 @@ if test "$enable_mpl_subset" = "yes"; then
 fi
 if test -n "$ENABLE_POPPLER"; then
 if test "x$SYSTEM_POPPLER" = "x"; then
-mpl_error_string="$mpl_error_string$newline Need to disable PDF 
import via poppler or use system library."
+mpl_error_string="$mpl_error_string$newline Need to disable PDF 
import via poppler (--disable-poppler) or use system library."
 fi
 fi
 # cf. m4/libo_check_extension.m4
 if test "x$WITH_EXTRA_EXTENSIONS" != "x"; then
-mpl_error_string="$mpl_error_string$newline Need to disable extra 
extensions '$WITH_EXTRA_EXTENSIONS'."
+mpl_error_string="$mpl_error_string$newline Need to disable extra 
extensions enabled using --enable-ext-."
 fi
 denied_themes=
 for theme in $WITH_THEMES; do

[Libreoffice-commits] core.git: configure.ac instsetoo_native/util

2023-11-09 Thread Andras Timar (via logerrit)

 configure.ac|3 +++
 instsetoo_native/util/openoffice.lst.in |8 
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit d9ccfb162f211565ea8e98ae58ab4199eac22452
Author: Andras Timar 
AuthorDate: Tue May 23 15:16:26 2023 +0200
Commit: Caolán McNamara 
CommitDate: Thu Nov 9 17:13:34 2023 +0100

replace license in package header to MPL-2.0 in case of MPL subset

Change-Id: I0ba75ff7da69a3a45afde3252de272aa18f69932
(cherry picked from commit fb228423017d2fce4491232f66299be6aa78b3d9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158672
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 65cedd785904..39767d4e9da9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14732,6 +14732,7 @@ dnl 
===
 
 AC_MSG_CHECKING([MPL subset])
 MPL_SUBSET=
+LICENSE="LGPL"
 
 if test "$enable_mpl_subset" = "yes"; then
 mpl_error_string=
@@ -14783,12 +14784,14 @@ if test "$enable_mpl_subset" = "yes"; then
 fi
 
 MPL_SUBSET="TRUE"
+LICENSE="MPL-2.0"
 AC_DEFINE(MPL_HAVE_SUBSET)
 AC_MSG_RESULT([only])
 else
 AC_MSG_RESULT([no restrictions])
 fi
 AC_SUBST(MPL_SUBSET)
+AC_SUBST(LICENSE)
 
 dnl ===
 
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index fb0ff9c81f9d..b5da0bfb6697 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -57,7 +57,7 @@ LibreOffice
 ADDSYSTEMINTEGRATION 1
 PACKAGEVERSION 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
 PACKAGEREVISION {buildid}
-LICENSENAME LGPL
+LICENSENAME @LICENSE@
 ROOTMODULEGID gid_Module_Root
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
@@ -100,7 +100,7 @@ LibreOfficeDev
 ADDSYSTEMINTEGRATION 1
 PACKAGEVERSION 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
 PACKAGEREVISION {buildid}
-LICENSENAME LGPL
+LICENSENAME @LICENSE@
 ROOTMODULEGID gid_Module_Root
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
@@ -138,7 +138,7 @@ LibreOffice_SDK
 DMG_VOLUMEEXTENSION SDK
 DATABASENAME libreoffice40sdk
 NO_README_IN_ROOTDIR 1
-LICENSENAME LGPL
+LICENSENAME @LICENSE@
 IGNOREDIRECTORYLAYER 1
 NOVERSIONINDIRNAME 0
 NOSPACEINDIRECTORYNAME 1
@@ -179,7 +179,7 @@ LibreOfficeDev_SDK
 DMG_VOLUMEEXTENSION SDK
 DATABASENAME libreoffice40devsdk
 NO_README_IN_ROOTDIR 1
-LICENSENAME LGPL
+LICENSENAME @LICENSE@
 IGNOREDIRECTORYLAYER 1
 NOVERSIONINDIRNAME 0
 NOSPACEINDIRECTORYNAME 1

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

2023-11-08 Thread Andrea Gelmini (via logerrit)

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

New commits:
commit a2171ef07fbfa97a23f82adb1e4aca459b827cb4
Author: Andrea Gelmini 
AuthorDate: Wed Nov 8 22:58:13 2023 +0100
Commit: Julien Nabet 
CommitDate: Thu Nov 9 08:19:18 2023 +0100

Fix typo

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

diff --git a/configure.ac b/configure.ac
index c3a43716c6b9..5a610aacba13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11212,7 +11212,7 @@ if test "$with_system_zxcvbn" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_ZXCVBN=TRUE
 AC_CHECK_HEADER(zxcvbn.h, [],
-   [ AC_MSG_ERROR(zxcvbn headers not foundd.)], [])
+   [ AC_MSG_ERROR(zxcvbn headers not found.)], [])
 AC_CHECK_LIB(zxcvbn, ZxcvbnMatch, [],
 [ AC_MSG_ERROR(zxcvbn library not found.)], [])
 else

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

2023-11-05 Thread Thorsten Behrens (via logerrit)

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

New commits:
commit d2b0c48ca0f0ba8ef3049ebcd5f93ae420c22c46
Author: Thorsten Behrens 
AuthorDate: Fri Nov 3 02:57:53 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Sun Nov 5 21:24:11 2023 +0100

reprobuild: don't use any build-time dependent values

Even taking the current year from the build system makes a build
non-reproducible (if you run it again the next year).

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

diff --git a/configure.ac b/configure.ac
index f6ea33f4cfc7..cb2f975bdd97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,7 +519,8 @@ AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
 
-LIBO_THIS_YEAR=`date +%Y`
+git_date=`git log -1 --pretty=format:"%cd" --date=format:'%Y' 2>&/dev/null`
+LIBO_THIS_YEAR=${git_date:-2023}
 AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
 
 # replace backslashes, to get a valid c++ string

[Libreoffice-commits] core.git: configure.ac hardened_runtime.xcent.in lo.xcent.in sysui/desktop

2023-11-05 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 2486803ee26c10751ff92e46c53cc03ad0a1218d
Author: Christian Lohmaier 
AuthorDate: Thu Nov 2 10:44:10 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Sun Nov 5 12:18:59 2023 +0100

move macOS specific entitlements file templates to sysui/desktop/macosx

generated location is kept to not have further changes in existing
scripts using those files.

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

diff --git a/configure.ac b/configure.ac
index c8466ae65e01..f6ea33f4cfc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5697,14 +5697,14 @@ if test "$cross_compiling" = "yes"; then
 config_host.mk.in \
 config_host_lang.mk.in \
 Makefile.in \
-lo.xcent.in \
 bin/bffvalidator.sh.in \
 bin/odfvalidator.sh.in \
 bin/officeotron.sh.in \
-hardened_runtime.xcent.in \
 instsetoo_native/util/openoffice.lst.in \
 config_host/*.in \
 sysui/desktop/macosx/Info.plist.in \
+sysui/desktop/macosx/hardened_runtime.xcent.in \
+sysui/desktop/macosx/lo.xcent.in \
 .vscode/vs-code-template.code-workspace.in \
 solenv/lockfile/autoconf.h.in \
 ) \
@@ -15034,13 +15034,13 @@ AC_CONFIG_LINKS([include:include])
 AC_CONFIG_FILES([config_host.mk
  config_host_lang.mk
  Makefile
- lo.xcent
  bin/bffvalidator.sh
  bin/odfvalidator.sh
  bin/officeotron.sh
- hardened_runtime.xcent
  instsetoo_native/util/openoffice.lst
  sysui/desktop/macosx/Info.plist
+ 
hardened_runtime.xcent:sysui/desktop/macosx/hardened_runtime.xcent.in
+ lo.xcent:sysui/desktop/macosx/lo.xcent.in
  
vs-code.code-workspace.template:.vscode/vs-code-template.code-workspace.in])
 
 AC_CONFIG_HEADERS([config_host/config_atspi.h])
diff --git a/hardened_runtime.xcent.in 
b/sysui/desktop/macosx/hardened_runtime.xcent.in
similarity index 100%
rename from hardened_runtime.xcent.in
rename to sysui/desktop/macosx/hardened_runtime.xcent.in
diff --git a/lo.xcent.in b/sysui/desktop/macosx/lo.xcent.in
similarity index 100%
rename from lo.xcent.in
rename to sysui/desktop/macosx/lo.xcent.in

[Libreoffice-commits] core.git: configure.ac filter/Configuration_filter.mk filter/source sc/inc sc/source

2023-10-24 Thread Kohei Yoshida (via logerrit)

 configure.ac|2 
 filter/Configuration_filter.mk  |2 
 filter/source/config/cache/typedetection.cxx|1 
 filter/source/config/fragments/filters/calc_Parquet.xcu |   19 
 filter/source/config/fragments/types/calc_Parquet.xcu   |   17 +++
 sc/inc/orcusfilters.hxx |   18 ++--
 sc/source/filter/inc/orcusfiltersimpl.hxx   |7 -
 sc/source/filter/orcus/filterdetect.cxx |2 
 sc/source/filter/orcus/orcusfiltersimpl.cxx |   70 +---
 sc/source/ui/docshell/docsh.cxx |   63 +-
 10 files changed, 102 insertions(+), 99 deletions(-)

New commits:
commit b14583ba37a6d7ce398ccd3cf339f954785b03d8
Author: Kohei Yoshida 
AuthorDate: Wed May 31 21:33:56 2023 -0400
Commit: Kohei Yoshida 
CommitDate: Wed Oct 25 03:59:57 2023 +0200

Support conditional loading of Apache Parquet files into Calc

Also, use orcus::create_filter() and simplify the logic a bit.  This
requires orcus 0.19.1 or newer.

Note that this change makes it possible to load Apache Parquet files
if and only if orcus has been built with the parquet import filter
enabled.  Using orcus without the parquet import filter enabled will
not break the build or run-time behavior; you just can't load parquet
files.

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

diff --git a/configure.ac b/configure.ac
index 999ab64289e8..c8466ae65e01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10878,7 +10878,7 @@ fi
 dnl ===
 dnl Orcus
 dnl ===
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.18 >= 0.18.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.18 >= 0.19.1])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 dnl Link with Boost.System
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index bd3d3486234e..8a323e83fd54 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -477,6 +477,7 @@ $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,f
generic_Text \
calc_Gnumeric \
calc_Lotus \
+   calc_Parquet \
calc_QPro \
calc_MS_Excel_40 \
calc_MS_Excel_40_VorlageTemplate \
@@ -535,6 +536,7 @@ $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.x
calc_HTML_WebQuery \
calc_StarOffice_XML_Calc_Template \
calc_pdf_Export \
+   calc_Parquet \
dBase \
calc8 \
calc8_template \
diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index 18d13a8f7796..a83a1406d0c1 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -211,6 +211,7 @@ int getFlatTypeRank(std::u16string_view rType)
 "calc_SYLK",
 "calc_DIF",
 "calc_dBase",
+"Apache Parquet",
 
 // Binary (raster and vector image files)
 "emf_MS_Windows_Metafile",
diff --git a/filter/source/config/fragments/filters/calc_Parquet.xcu 
b/filter/source/config/fragments/filters/calc_Parquet.xcu
new file mode 100644
index ..5b0fea8257bb
--- /dev/null
+++ b/filter/source/config/fragments/filters/calc_Parquet.xcu
@@ -0,0 +1,19 @@
+
+
+IMPORT ALIEN PREFERRED
+
+
+
+Apache Parquet
+
+com.sun.star.sheet.SpreadsheetDocument
+
+Apache Parquet Spreadsheet
+
+
diff --git a/filter/source/config/fragments/types/calc_Parquet.xcu 
b/filter/source/config/fragments/types/calc_Parquet.xcu
new file mode 100644
index ..6c29d886c92f
--- /dev/null
+++ b/filter/source/config/fragments/types/calc_Parquet.xcu
@@ -0,0 +1,17 @@
+
+
+com.sun.star.comp.sc.OrcusFilterDetect
+
+parquet
+
+true
+Apache Parquet 
Spreadsheet
+Apache 
Parquet
+
+
diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx
index 6d17f3741ebb..f13f5cc630d2 100644
--- a/sc/inc/orcusfilters.hxx
+++ b/sc/inc/orcusfilters.hxx
@@ -25,17 +25,17 @@ namespace weld { class TreeView; }
 class ScOrcusFilters
 {
 public:
-virtual ~ScOrcusFilters() {}
-
-virtual bool importCSV(ScDocument& rDoc, SfxMedium& rMedium) const = 0;
-
-virtual bool importGnumeric(ScDocument& rDoc, SfxMedium& rMedium) const = 
0;
+enum class ImportResult
+{
+NotSupported,
+Success,
+Failure
+};
 
-virtual bool importExcel2003XML(ScDocument& rDoc, SfxMedium& rMedium) 
const = 0;
-
-virtual bool importXLSX(ScDocument& rDoc, SfxMedium&

[Libreoffice-commits] core.git: configure.ac vcl/qt5

2023-10-18 Thread Michael Weghorn (via logerrit)

 configure.ac   |2 +-
 vcl/qt5/QtAccessibleWidget.cxx |4 
 vcl/qt5/QtFrame.cxx|   28 +---
 vcl/qt5/QtGraphics_GDI.cxx |7 ---
 vcl/qt5/QtSvpGraphics.cxx  |7 ---
 vcl/qt5/QtWidget.cxx   |4 
 6 files changed, 2 insertions(+), 50 deletions(-)

New commits:
commit afb4c96d271958ced3175dfc2cf8bb9e8b0a9d3b
Author: Michael Weghorn 
AuthorDate: Thu Aug 3 21:30:22 2023 +0200
Commit: Michael Weghorn 
CommitDate: Wed Oct 18 08:04:32 2023 +0200

qt: Drop code for Qt < 5.15

Our new AlmaLinux 8 baseline provides Qt 5.15.3,
so require 5.15 and drop the code for older, now
unsupported Qt versions.

Change-Id: I512ade1ba503fc7a86527a45142f37f043db6784
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155325
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/configure.ac b/configure.ac
index 189ef4a55222..39857bb25f6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13039,7 +13039,7 @@ then
 AC_MSG_ERROR([Wrong qmake for Qt5 found. Please specify the root 
of your Qt5 installation by exporting QT5DIR before running "configure".])
 fi
 qmake5_minor_version="`echo $qmake5_test_ver | cut -d. -f2`"
-qt5_minimal_minor="6"
+qt5_minimal_minor="15"
 if test "$qmake5_minor_version" -lt "$qt5_minimal_minor"; then
 AC_MSG_ERROR([The minimal supported Qt5 version is 
5.${qt5_minimal_minor}, but your 'qmake -v' reports Qt5 version 
$qmake5_test_ver.])
 else
diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx
index d6112bdf8223..cd50af4aed9f 100644
--- a/vcl/qt5/QtAccessibleWidget.cxx
+++ b/vcl/qt5/QtAccessibleWidget.cxx
@@ -452,11 +452,7 @@ QAccessible::Role QtAccessibleWidget::role() const
 case AccessibleRole::MENU_ITEM:
 return QAccessible::MenuItem;
 case AccessibleRole::NOTIFICATION:
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 5)
 return QAccessible::Notification;
-#else
-return QAccessible::StaticText;
-#endif
 case AccessibleRole::OPTION_PANE:
 return QAccessible::Pane;
 case AccessibleRole::PAGE_TAB:
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index f3cc0facfe8a..7a9b5f3861f8 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -50,9 +50,6 @@
 #include 
 #include 
 #include 
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-#include 
-#endif
 #include 
 #include 
 #if CHECK_QT5_USING_X11
@@ -341,18 +338,7 @@ QWindow* QtFrame::windowHandle() const
 return pChild->windowHandle();
 }
 
-QScreen* QtFrame::screen() const
-{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-return asChild()->screen();
-#else
-// QWidget::screen only available from Qt 5.14 on, call windowHandle(),
-// with the indirect result that mouse move events on Wayland will not be
-// emitted reliably, s. QTBUG-75766
-QWindow* const pWindow = windowHandle();
-return pWindow ? pWindow->screen() : nullptr;
-#endif
-}
+QScreen* QtFrame::screen() const { return asChild()->screen(); }
 
 bool QtFrame::GetUseDarkMode() const
 {
@@ -515,13 +501,7 @@ Size QtFrame::CalcDefaultSize()
 }
 else
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 QScreen* pScreen = QGuiApplication::screenAt(QPoint(0, 0));
-#else
-// QGuiApplication::screenAt was added in Qt 5.10, use deprecated 
QDesktopWidget
-int nLeftScreen = QApplication::desktop()->screenNumber(QPoint(0, 
0));
-QScreen* pScreen = QGuiApplication::screens()[nLeftScreen];
-#endif
 aSize = toSize(pScreen->availableVirtualGeometry().size());
 }
 }
@@ -1321,13 +1301,7 @@ void QtFrame::SetScreenNumber(unsigned int nScreen)
 {
 assert(m_bFullScreen);
 // left-most screen
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 QScreen* pScreen = QGuiApplication::screenAt(QPoint(0, 0));
-#else
-// QGuiApplication::screenAt was added in Qt 5.10, use deprecated 
QDesktopWidget
-int nLeftScreen = QApplication::desktop()->screenNumber(QPoint(0, 
0));
-QScreen* pScreen = QGuiApplication::screens()[nLeftScreen];
-#endif
 // entire virtual desktop
 screenGeo = pScreen->availableVirtualGeometry();
 pWindow->setScreen(pScreen);
diff --git a/vcl/qt5/QtGraphics_GDI.cxx b/vcl/qt5/QtGraphics_GDI.cxx
index a8ec20f60080..2005de80f7ba 100644
--- a/vcl/qt5/QtGraphics_GDI.cxx
+++ b/vcl/qt5/QtGraphics_GDI.cxx
@@ -702,14 +702,7 @@ void QtGraphics::GetResolution(sal_Int32& rDPIX, 
sal_Int32& rDPIY)
 if (!m_pFrame)
 return;
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 QScreen* pScreen = m_pFrame->GetQWidget()->screen();
-#else
-if (!m_pFrame->GetQWidget()->window()->windowHandle())
-return;
-
-QScreen* pScreen =

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

2023-10-17 Thread Michael Weghorn (via logerrit)

 README.md|4 +---
 configure.ac |   10 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit d6d4cae126cf8e8fc73b54b852d75c8b0a0db65e
Author: Michael Weghorn 
AuthorDate: Fri Aug 18 09:58:09 2023 +0200
Commit: Michael Weghorn 
CommitDate: Tue Oct 17 13:45:59 2023 +0200

Bump Java build baseline from JDK 9 to 17

As discussed in the ESC call on 2023-08-10 [1],
bump the Java build baseline to 17.
This should not affect the Java runtime requirement,
since the target version is explicitly specified
already.

[1] 
https://lists.freedesktop.org/archives/libreoffice/2023-August/090759.html

Change-Id: I18251151392ca5edec8ca3d5cffd192d5f9f38b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155827
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/README.md b/README.md
index 6afb8000b0e1..f529e48d4714 100644
--- a/README.md
+++ b/README.md
@@ -57,9 +57,7 @@ Java is required for building many parts of LibreOffice. In 
TDF Wiki article
 [Development/Java](https://wiki.documentfoundation.org/Development/Java), the
 exact modules that depend on Java are listed.
 
-The baseline for Java is Java Development Kit (JDK) Version 17 or later. It is
-possible to build LibreOffice with JDK version 9, but it is no longer supported
-by the JDK vendors, thus it should be avoided.
+The baseline for Java is Java Development Kit (JDK) Version 17 or later.
 
 If you want to use Clang with the LibreOffice compiler plugins, the minimal
 version of Clang is 12.0.1. Since Xcode doesn't provide the compiler plugin
diff --git a/configure.ac b/configure.ac
index 32c2eecfbc7a..189ef4a55222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2548,7 +2548,7 @@ AC_ARG_WITH(linker-hash-style,
 
 AC_ARG_WITH(jdk-home,
 AS_HELP_STRING([--with-jdk-home=],
-[If you have installed JDK 9 or later on your system please supply the
+[If you have installed JDK 17 or later on your system please supply the
  path here. Note that this is not the location of the java command but 
the
  location of the entire distribution. In case of cross-compiling, this
  is the JDK of the host os. Use --with-build-platform-configure-options
@@ -8580,7 +8580,7 @@ if test "$ENABLE_JAVA" != ""; then
 fi
 
 if ! test -f "$with_jdk_home/lib/jvm.lib" -a -f 
"$with_jdk_home/bin/java.exe"; then
-AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option (or 
fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 9])
+AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option (or 
fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 17])
 fi
 fi
 
@@ -8665,8 +8665,8 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != 
"yes"; then
 _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' 
| $SED '/^$/d' | $SED s/[[-A-Za-z]]*//`
 _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 
+ $3;}'`
 
-if test "$_jdk_ver" -lt 9; then
-AC_MSG_ERROR([JDK is too old, you need at least 9 ($_jdk_ver < 
9)])
+if test "$_jdk_ver" -lt 17; then
+AC_MSG_ERROR([JDK is too old, you need at least 17 ($_jdk_ver 
< 17)])
 fi
 dnl TODO: Presumably, the Security Manager will not merely be 
disallowed, but be
 dnl completely removed in some Java version > 18 (see
@@ -8687,7 +8687,7 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != 
"yes"; then
 JAVACFLAGS=-J-Xmx128M
 fi
 else
-AC_MSG_ERROR([Java not found. You need at least JDK 9])
+AC_MSG_ERROR([Java not found. You need at least JDK 17])
 fi
 else
 if test -z "$ENABLE_JAVA"; then

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

2023-10-14 Thread Taichi Haradaguchi (via logerrit)

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

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

tdf#116412 include bz2 module in internal python

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

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

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

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

[Libreoffice-commits] core.git: configure.ac odk/settings solenv/gbuild

2023-10-04 Thread Christian Lohmaier (via logerrit)

 configure.ac |4 ++--
 odk/settings/settings.mk |2 +-
 solenv/gbuild/platform/macosx.mk |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a3935f1a09405a56f13f661797f64ecd31e095f7
Author: Christian Lohmaier 
AuthorDate: Fri Sep 29 14:10:42 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Oct 4 15:00:31 2023 +0200

remove obsolete -single_module linker flag (is the default)

has already been unnecessary since over 15 years/was the default since
OS X 10.4 (2005) along with ignoring the corresponding altenative
(-multi_module) switch, from man ld:
-single_module
This is now the default so does not need to be specified.

-multi_module
Multi-modules in dynamic libraries have been ignored at runtime
since Mac OS X 10.4.0.  This option is obsolete.

Xcode 15 now warns about it being obsolete, so remove it.

Change-Id: I4d4aab452a330c3c4ec97da4232c3af6350c0ff4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157407
Tested-by: Jenkins
Reviewed-by: Patrick Luby 
Reviewed-by: Christian Lohmaier 

diff --git a/configure.ac b/configure.ac
index 3fe42df3978c..e9c6ba7561b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1002,7 +1002,7 @@ darwin*) # macOS
 INSTROOTCONTENTSUFFIX=/Contents
 SDKDIRNAME=${PRODUCTNAME_WITHOUT_SPACES}${PRODUCTVERSION}_SDK
 # See "Default values, as such probably valid just for Linux" comment 
above the case "$host_os"
-LINKFLAGSSHL="-dynamiclib -single_module"
+LINKFLAGSSHL="-dynamiclib"
 
 # -fPIC is default
 PICSWITCH=""
@@ -1043,7 +1043,7 @@ ios*) # iOS
 host=x86_64-apple-darwin
 fi
 # See "Default values, as such probably valid just for Linux" comment 
above the case "$host_os"
-LINKFLAGSSHL="-dynamiclib -single_module"
+LINKFLAGSSHL="-dynamiclib"
 
 # -fPIC is default
 PICSWITCH=""
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 25e5cb4af4b4..13289c96db6e 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -469,7 +469,7 @@ CC_OUTPUT_SWITCH=-o
 
 LIBO_SDK_LDFLAGS_STDLIBS =
 
-LIBRARY_LINK_FLAGS=-dynamiclib -single_module -Wl,-multiply_defined,suppress 
$(GCC_ARCH_OPTION)
+LIBRARY_LINK_FLAGS=-dynamiclib -Wl,-multiply_defined,suppress 
$(GCC_ARCH_OPTION)
 
 # install_name '@executable_path$/(@:f)'
 COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f1491b1117cf..be25f6563cd0 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -177,7 +177,7 @@ endef
 # Library class
 
 gb_Library_DEFS :=
-gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
+gb_Library_TARGETTYPEFLAGS := -dynamiclib
 gb_Bundle_TARGETTYPEFLAGS := -bundle
 gb_Library_UDK_MAJORVER := 3
 gb_Library_SYSPRE := lib

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

2023-10-04 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 809733714b7501490c5a6fa690d254ec7f9bc8f9
Author: Christian Lohmaier 
AuthorDate: Wed Sep 27 17:17:14 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Oct 4 14:59:18 2023 +0200

macOS /w Xcode 15: force the old linker when targeting macOS 11 or lower

the new linker has problems with weak symbols and causes runtime crashes 
when
trying to run those builds on older versions of macOS


https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Linking

they write the classic linker will be removed in a future release, so have 
it
error out for Xcode 16 for now just in case. The brave soul who tries it out
first will have to disable that AC_MSG_ERROR… (or expliticly set macOS 12 as
min target)

Change-Id: I653e5bce70b3eae0f512be11dc7e07ffc98e9812
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157336
Tested-by: Jenkins
Reviewed-by: Patrick Luby 
Reviewed-by: Christian Lohmaier 

diff --git a/configure.ac b/configure.ac
index 858984f7f946..3fe42df3978c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3518,6 +3518,21 @@ if test $_os = Darwin; then
 my_xcode_ver3=$(printf %s "$my_xcode_ver2" | $AWK -F. '{ print 
$1*100+($2<100?$2:99) }')
 if test "$my_xcode_ver3" -ge 1205; then
 AC_MSG_RESULT([yes ($my_xcode_ver2)])
+if test $MAC_OS_X_VERSION_MIN_REQUIRED -lt 12; then
+if test "$my_xcode_ver3" -ge 1600; then
+dnl the Xcode 15 relnotes state that the classic linker will 
disappear in the next version, but nothing about
+dnl fixing the problem with weak symbols/macOS 11 
compatibility, so assume for now that Xcode 16 will break it...
+AC_MSG_ERROR([Check that Xcode 16 still supports the old 
linker/that it doesn't break macOS 11 compatibility, then remove this check]);
+fi
+if test "$my_xcode_ver3" -ge 1500; then
+AC_MSG_WARN([Xcode 15 has a new linker that causes runtime 
crashes on macOS 11])
+add_warning "Xcode 15 has a new linker that causes runtime 
crashes on macOS 11, forcing the old linker."
+add_warning "see 
https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Linking;
+LDFLAGS="$LDFLAGS -Wl,-ld_classic"
+# if LDFLAGS weren't set already, a check above sets 
x_LDFLAGS=[#] to comment-out the export LDFLAGS line in config_host.mk
+x_LDFLAGS=
+fi
+fi
 else
 AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at 
least Xcode 12.5])
 fi

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

2023-09-27 Thread Caolán McNamara (via logerrit)

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

New commits:
commit 5484007fceb8099f771a544472ba66f49631fe4f
Author: Caolán McNamara 
AuthorDate: Wed Sep 27 09:22:31 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 27 11:18:11 2023 +0200

java_websocket needs ant

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

diff --git a/configure.ac b/configure.ac
index 4931ad5bf4bc..858984f7f946 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12714,6 +12714,7 @@ if test "$with_java" != "no"; then
 AC_MSG_RESULT([yes])
 ENABLE_JAVA_WEBSOCKET=TRUE
 BUILD_TYPE="$BUILD_TYPE JAVA_WEBSOCKET"
+NEED_ANT=TRUE
 else
 AC_MSG_RESULT([no])
 ENABLE_JAVA_WEBSOCKET=

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

2023-09-25 Thread Taichi Haradaguchi (via logerrit)

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

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

upload libwps 0.4.14

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

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

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

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

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

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

New commits:
commit 6ef2d358ac053ce0f6de9cf0f8f25e8bae66d441
Author: Stephan Bergmann 
AuthorDate: Sat Sep 23 08:44:52 2023 +0300
Commit: Stephan Bergmann 
CommitDate: Sat Sep 23 23:43:08 2023 +0200

Adapt Clang and GCC minimum version checks

...that were missing from 02f48a32400f81413329d81203c417521882cab6 "Adjust 
for
new linux baseline"

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

diff --git a/configure.ac b/configure.ac
index 6595593d3d1b..93e6bd11bfca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -,10 +,10 @@ if test "$COM_IS_CLANG" = TRUE; then
 CLANG_FULL_VERSION=`echo __clang_version__ | $CC $my_args -`
 CLANGVER=`echo $clang_version \
 | $AWK -F. '{ print 
\$1*1+(\$2<100?\$2:99)*100+(\$3<100?\$3:99) }'`
-if test "$CLANGVER" -ge 80001; then
+if test "$CLANGVER" -ge 12; then
 AC_MSG_RESULT([yes ($clang_version)])
 else
-AC_MSG_ERROR(["$CLANG_FULL_VERSION" is too old or unrecognized, 
must be at least Clang 8.0.1])
+AC_MSG_ERROR(["$CLANG_FULL_VERSION" is too old or unrecognized, 
must be at least Clang 12])
 fi
 AC_DEFINE_UNQUOTED(CLANG_VERSION,$CLANGVER)
 AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
@@ -4547,8 +4547,8 @@ if test "$GCC" = "yes" -a -z "$COM_IS_CLANG"; then
 
 AC_MSG_RESULT([gcc $_gcc_version ($gcc_full_version)])
 
-if test "$gcc_full_version" -lt 7; then
-AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 
7.0.0])
+if test "$gcc_full_version" -lt 12; then
+AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 12])
 fi
 else
 # Explicitly force GCC_VERSION to be empty, even for Clang, to check 
incorrect uses.

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

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

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

New commits:
commit 1eef07805021b7ca26a1a8894809b6d995747ba1
Author: Stephan Bergmann 
AuthorDate: Tue Aug 1 08:49:44 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 22 09:19:58 2023 +0200

Bump baseline to C++20

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

diff --git a/configure.ac b/configure.ac
index 0cebc8b88925..6595593d3d1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7550,18 +7550,18 @@ dnl C++11
 dnl ===
 
 if test -z "${CXXFLAGS_CXX11+x}"; then
-AC_MSG_CHECKING([whether $CXX_BASE supports C++17])
+AC_MSG_CHECKING([whether $CXX_BASE supports C++20])
 if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
 if test "$with_latest_c__" = yes; then
 CXXFLAGS_CXX11=-std:c++latest
 else
-CXXFLAGS_CXX11=-std:c++17
+CXXFLAGS_CXX11=-std:c++20
 fi
 CXXFLAGS_CXX11="$CXXFLAGS_CXX11 -permissive- 
-Zc:__cplusplus,preprocessor"
 elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
-my_flags='-std=c++17 -std=c++1z'
+my_flags='-std=c++20 -std=c++2a'
 if test "$with_latest_c__" = yes; then
-my_flags="-std=c++26 -std=c++2c -std=c++23 -std=c++2b -std=c++20 
-std=c++2a $my_flags"
+my_flags="-std=c++26 -std=c++2c -std=c++23 -std=c++2b $my_flags"
 fi
 for flag in $my_flags; do
 if test "$COM" = MSC; then

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

2023-09-14 Thread Taichi Haradaguchi (via logerrit)

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

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

Latest VS 2022 Preview is 17.8.0 now

...while latest proper VS 2022 is 17.7.4

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

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

[Libreoffice-commits] core.git: configure.ac desktop/qa desktop/source download.lst external/java_websocket external/Module_external.mk include/LibreOfficeKit include/sal Makefile.fetch readlicense_oo

2023-09-01 Thread Skyler Grey (via logerrit)

 Makefile.fetch   |
1 
 RepositoryExternal.mk|   
11 
 configure.ac |   
11 
 desktop/qa/desktop_lib/test_desktop_lib.cxx  |
4 
 desktop/source/lib/init.cxx  |  
227 +++
 download.lst |
5 
 external/Module_external.mk  |
1 
 external/java_websocket/ExternalPackage_java_websocket.mk|   
16 
 external/java_websocket/ExternalProject_java_websocket.mk|   
31 
 external/java_websocket/Makefile |
7 
 external/java_websocket/Module_java_websocket.mk |   
18 
 external/java_websocket/README   |
3 
 external/java_websocket/UnpackedTarball_java_websocket.mk|   
21 
 external/java_websocket/patches/ant-build.patch  |   
26 
 external/java_websocket/patches/no-slf4j.patch   |  
748 ++
 include/LibreOfficeKit/LibreOfficeKit.h  |
9 
 include/LibreOfficeKit/LibreOfficeKit.hxx|   
26 
 include/sal/log-areas.dox|
1 
 readlicense_oo/license/license.xml   |   
18 
 ridljar/Jar_libreoffice.mk   |
8 
 ridljar/com/sun/star/comp/helper/Bootstrap.java  |   
63 
 ridljar/com/sun/star/lib/connections/websocket/ConnectionDescriptor.java |   
60 
 ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java  |  
335 
 ridljar/com/sun/star/lib/connections/websocket/websocketConnector.java   |  
137 +
 ridljar/source/libreoffice/module-info.java  |
1 
 ridljar/util/manifest|
3 
 ure/source/README|
2 
 27 files changed, 1792 insertions(+), 1 deletion(-)

New commits:
commit 8e246331f6f71320cfcc8defdd04e756a75f71cf
Author: Skyler Grey 
AuthorDate: Fri Aug 18 13:30:35 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Sep 1 16:55:37 2023 +0200

Add a FunctionBasedURPConnection and a websocket URP connector

- FunctionBasedURPConnection is used to enable a client to open a URP
  connection to a fresh Kit instance in COOL.
- This URP connector can be used with that and
  https://github.com/CollaboraOnline/online/pull/6992 to use a Java Uno
  Remote Protocol client over websockets
- For interoperability with existing Collabora Online websockets a
  prefix (urp ) is added to each message sent and a similar prefix
  (urp: ) is expected on each message recieved. This allows sending over
  the same websocket as other data is being transmitted through. If you
  are writing a bridge to work with this, you will need to add/strip the
  prefixes accordingly
- This commit uses Java WebSocket
  (https://github.com/TooTallNate/Java-WebSocket) to send data over
  websockets.

Change-Id: I2bda3d0b988bef7883f9b6829eeb5b7ae8075f27
Signed-off-by: Skyler Grey 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151171
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/Makefile.fetch b/Makefile.fetch
index 625e781dc36a..6640b0ade985 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -136,6 +136,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,HYPHEN,HYPHEN_TARBALL) \
$(call fetch_Optional,ICU,ICU_TARBALL) \
$(call fetch_Optional,ICU,ICU_DATA_TARBALL) \
+   $(call fetch_Optional,JAVA_WEBSOCKET,JAVA_WEBSOCKET_TARBALL) \
$(call 
fetch_Optional,JFREEREPORT,JFREEREPORT_FLOW_ENGINE_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_FLUTE_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBBASE_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0d70c7e966fb..a7f6dc3897ec 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3915,6 +3915,17 @@ endef
 
 endif # SYSTEM_JFREEREPORT
 
+# no known distro packaged Java-Websocket at present
+
+ifeq ($(ENABLE_JAVA),TRUE)
+$(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
+   java_websocket \
+))
+endif
+
+define gb_Jar__use_java_websocket
+$(call gb_Jar_use_jar,$(1),java_websocket)
+endef
 
 # Executables
 
diff --git a/configure.ac b/configure.ac
index 5ce8454546c4..5a682dde4d61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12690,6

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

2023-08-29 Thread Noel Grandin (via logerrit)

 configure.ac |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 73af6241e9448af2dcbd0352e472e4d3153d0e1b
Author: Noel Grandin 
AuthorDate: Tue Aug 29 14:54:59 2023 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 29 20:57:58 2023 +0200

Revert "remove warning about qt and icccm"

This reverts commit 1ccd236d8dc833ab9de639cf903684d1ecebf5e1.

As pointed as by mikekaganski, "Isn't 5.6 older than 5.12?", so I cannot 
remove this yet

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

diff --git a/configure.ac b/configure.ac
index 60bf5493a432..5ce8454546c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13073,7 +13073,10 @@ then
 PKG_CHECK_MODULES(QT5_XCB_ICCCM,[xcb-icccm],[
 QT5_HAVE_XCB_ICCCM=1
 AC_DEFINE(QT5_HAVE_XCB_ICCCM)
-],[:])
+],[
+AC_MSG_WARN([XCB ICCCM not found, which is needed for old Qt 
versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)])
+add_warning "XCB ICCCM not found, which is needed for Qt versions 
(< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)"
+])
 QT5_CFLAGS="$QT5_CFLAGS $QT5_XCB_CFLAGS $QT5_XCB_ICCCM_CFLAGS"
 QT5_LIBS="$QT5_LIBS $QT5_XCB_LIBS $QT5_XCB_ICCCM_LIBS -lQt5X11Extras"
 QT5_USING_X11=1

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

2023-08-28 Thread Noel Grandin (via logerrit)

 configure.ac |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 1ccd236d8dc833ab9de639cf903684d1ecebf5e1
Author: Noel Grandin 
AuthorDate: Mon Aug 28 08:53:03 2023 +0200
Commit: Noel Grandin 
CommitDate: Mon Aug 28 15:48:20 2023 +0200

remove warning about qt and icccm

since the minimum qt5 version we requre is qt5.6

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

diff --git a/configure.ac b/configure.ac
index 5ce8454546c4..60bf5493a432 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13073,10 +13073,7 @@ then
 PKG_CHECK_MODULES(QT5_XCB_ICCCM,[xcb-icccm],[
 QT5_HAVE_XCB_ICCCM=1
 AC_DEFINE(QT5_HAVE_XCB_ICCCM)
-],[
-AC_MSG_WARN([XCB ICCCM not found, which is needed for old Qt 
versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)])
-add_warning "XCB ICCCM not found, which is needed for Qt versions 
(< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)"
-])
+],[:])
 QT5_CFLAGS="$QT5_CFLAGS $QT5_XCB_CFLAGS $QT5_XCB_ICCCM_CFLAGS"
 QT5_LIBS="$QT5_LIBS $QT5_XCB_LIBS $QT5_XCB_ICCCM_LIBS -lQt5X11Extras"
 QT5_USING_X11=1

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

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

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c1586ef57b5770f80ef200ab38ff4538c2dfb145
Author: Michael Stahl 
AuthorDate: Mon Aug 28 10:13:28 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon Aug 28 13:47:44 2023 +0200

python3: upgrade to release 3.8.18

Fixes CVE-2023-40217

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

diff --git a/configure.ac b/configure.ac
index 9249c73ef1d2..5ce8454546c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9972,7 +9972,7 @@ if test \( "$cross_compiling" = yes -a -z 
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.17
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.18
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 4e3f1f3798be..02adb7a75fd4 100644
--- a/download.lst
+++ b/download.lst
@@ -470,8 +470,8 @@ POSTGRESQL_TARBALL := postgresql-13.11.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PYTHON_SHA256SUM := 
2e54b0c68191f16552f6de2e97a2396540572a219f6bbb28591a137cecc490a9
-PYTHON_TARBALL := Python-3.8.17.tar.xz
+PYTHON_SHA256SUM := 
3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f
+PYTHON_TARBALL := Python-3.8.18.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

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

2023-08-22 Thread Mike Kaganski (via logerrit)

 configure.ac |   24 +---
 1 file changed, 17 insertions(+), 7 deletions(-)

New commits:
commit 1530584a7214ca92b457b24ebf5f0e444d805dca
Author: Mike Kaganski 
AuthorDate: Wed Aug 23 00:24:47 2023 +0300
Commit: Mike Kaganski 
CommitDate: Wed Aug 23 06:43:02 2023 +0200

MPL subset: don't stop on first error - collect it all

Otherwise, I have to disable items one by one, only to get to the
next error.

Change-Id: I21b915ccc2ebca32d185c8b68697fcb2991e005c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155959
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 77d916ac8b5a..9249c73ef1d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14668,6 +14668,8 @@ AC_MSG_CHECKING([MPL subset])
 MPL_SUBSET=
 
 if test "$enable_mpl_subset" = "yes"; then
+mpl_error_string=
+newline=$'\n*'
 warn_report=false
 if test "$enable_report_builder" != "no" -a "$with_java" != "no"; then
 warn_report=true
@@ -14675,35 +14677,43 @@ if test "$enable_mpl_subset" = "yes"; then
 warn_report=true
 fi
 if test "$warn_report" = "true"; then
-AC_MSG_ERROR([need to --disable-report-builder - extended database 
report builder.])
+mpl_error_string="$mpl_error_string$newline Need to 
--disable-report-builder - extended database report builder."
 fi
 if test "x$enable_postgresql_sdbc" != "xno"; then
-AC_MSG_ERROR([need to --disable-postgresql-sdbc - the PostgreSQL 
database backend.])
+mpl_error_string="$mpl_error_string$newline Need to 
--disable-postgresql-sdbc - the PostgreSQL database backend."
 fi
 if test "$enable_lotuswordpro" = "yes"; then
-AC_MSG_ERROR([need to --disable-lotuswordpro - a Lotus Word Pro file 
format import filter.])
+mpl_error_string="$mpl_error_string$newline Need to 
--disable-lotuswordpro - a Lotus Word Pro file format import filter."
 fi
 if test -n "$ENABLE_POPPLER"; then
 if test "x$SYSTEM_POPPLER" = "x"; then
-AC_MSG_ERROR([need to disable PDF import via poppler or use system 
library])
+mpl_error_string="$mpl_error_string$newline Need to disable PDF 
import via poppler or use system library."
 fi
 fi
 # cf. m4/libo_check_extension.m4
 if test "x$WITH_EXTRA_EXTENSIONS" != "x"; then
-AC_MSG_ERROR([need to disable extra extensions 
'$WITH_EXTRA_EXTENSIONS'])
+mpl_error_string="$mpl_error_string$newline Need to disable extra 
extensions '$WITH_EXTRA_EXTENSIONS'."
 fi
+denied_themes=
 for theme in $WITH_THEMES; do
 case $theme in
 
breeze|breeze_dark|breeze_dark_svg|breeze_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg)
 #denylist of icon themes under GPL or LGPL
-AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': 
$theme present, use --with-theme=colibre]) ;;
+denied_themes="$denied_themes $theme" ;;
 *) : ;;
 esac
 done
+if test "x$denied_themes" != "x"; then
+mpl_error_string="$mpl_error_string$newline Need to disable icon 
themes from '$WITH_THEMES': $denied_themes present, use --with-theme=colibre."
+fi
 
 ENABLE_OPENGL_TRANSITIONS=
 
 if test "$enable_lpsolve" != "no" -o "x$ENABLE_LPSOLVE" = "xTRUE"; then
-AC_MSG_ERROR([need to --disable-lpsolve - calc linear programming 
solver.])
+mpl_error_string="$mpl_error_string$newline Need to --disable-lpsolve 
- calc linear programming solver."
+fi
+
+if test "x$mpl_error_string" != "x"; then
+AC_MSG_ERROR([$mpl_error_string])
 fi
 
 MPL_SUBSET="TRUE"

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

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

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

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

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

This reverts commit 5e3510dbb62229cfb01da371d39ecc27b0d44880.

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

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

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

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

2023-08-04 Thread Colomban Wendling (via logerrit)

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

New commits:
commit 0f0a4c68bec8bf7e995142961925f74b83e1ed90
Author: Colomban Wendling 
AuthorDate: Thu Aug 3 15:49:43 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 4 13:42:29 2023 +0200

Fix --disable-atspi-tests when requirement are found

Drop `test_atspi_tests` altogether which only adds complexity, and fix
the case where using `--disable-atspi-tests` was not disabling
anything.

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

diff --git a/configure.ac b/configure.ac
index 667e3748cc7c..9596d04b117f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1199,8 +1199,6 @@ test "${test_gtk3_kde5+set}" != set -a "$test_kf5" = yes 
-a "$test_gtk3" = yes &
 test "${test_system_fontconfig+set}" != set -a "${test_system_freetype+set}" = 
set && test_system_fontconfig="$test_system_freetype"
 test "${test_system_freetype+set}" != set -a "${test_system_fontconfig+set}" = 
set && test_system_freetype="$test_system_fontconfig"
 
-test "${test_atspi_tests+set}" = set || test_atspi_tests="$test_gtk3"
-
 # convenience / platform overriding "fixes"
 # Don't sort!
 test "$test_kf5" = yes -a "$test_qt5" = no && test_kf5=no
@@ -11784,14 +11782,13 @@ if test "$enable_introspection" = yes; then
 fi
 
 # AT-SPI2 tests require gtk3, xvfb-run, dbus-launch and atspi-2
-test enable_atspi_tests = yes && test_atspi_tests=yes
-if test "$test_atspi_tests" = yes && ! test "$ENABLE_GTK3" = TRUE; then
+if ! test "$ENABLE_GTK3" = TRUE; then
 if test "$enable_atspi_tests" = yes; then
 AC_MSG_ERROR([--enable-atspi-tests requires --enable-gtk3])
 fi
-test_atspi_tests=no
+enable_atspi_tests=no
 fi
-if test "$test_atspi_tests" = yes; then
+if ! test "$enable_atspi_tests" = no; then
 AC_PATH_PROGS([XVFB_RUN], [xvfb-run], no)
 if ! test "$XVFB_RUN" = no; then
 dnl make sure the found xvfb-run actually works
@@ -11807,27 +11804,27 @@ if test "$test_atspi_tests" = yes; then
 if test "$enable_atspi_tests" = yes; then
 AC_MSG_ERROR([xvfb-run required by --enable-atspi-tests not found])
 fi
-test_atspi_tests=no
+enable_atspi_tests=no
 fi
 fi
-if test "$test_atspi_tests" = yes; then
+if ! test "$enable_atspi_tests" = no; then
 AC_PATH_PROGS([DBUS_LAUNCH], [dbus-launch], no)
 if test "$DBUS_LAUNCH" = no; then
 if test "$enable_atspi_tests" = yes; then
 AC_MSG_ERROR([dbus-launch required by --enable-atspi-tests not 
found])
 fi
-test_atspi_tests=no
+enable_atspi_tests=no
 fi
 fi
-if test "$test_atspi_tests" = yes; then
+if ! test "$enable_atspi_tests" = no; then
 PKG_CHECK_MODULES([ATSPI2], [atspi-2 gobject-2.0],,
   [if test "$enable_atspi_tests" = yes; then
AC_MSG_ERROR([$ATSPI2_PKG_ERRORS])
else
-   test_atspi_tests=no
+   enable_atspi_tests=no
fi])
 fi
-if test "x$test_atspi_tests" = xyes; then
+if ! test "x$enable_atspi_tests" = xno; then
 PKG_CHECK_MODULES([ATSPI2_2_32], [atspi-2 >= 2.32],
   [have_atspi_scroll_to=1],
   [have_atspi_scroll_to=0])
@@ -11835,7 +11832,7 @@ if test "x$test_atspi_tests" = xyes; then
[Whether AT-SPI2 has the scrollTo API])
 fi
 ENABLE_ATSPI_TESTS=
-test "$test_atspi_tests" = yes && ENABLE_ATSPI_TESTS=TRUE
+test "$enable_atspi_tests" = no || ENABLE_ATSPI_TESTS=TRUE
 AC_SUBST([ENABLE_ATSPI_TESTS])
 
 dnl ===

[Libreoffice-commits] core.git: configure.ac vcl/unx

2023-08-03 Thread Khaled Hosny (via logerrit)

 configure.ac   |2 +-
 vcl/unx/generic/fontmanager/fontconfig.cxx |   13 -
 2 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 803747fa9cb9a47e2f392d55b72033185c905e22
Author: Khaled Hosny 
AuthorDate: Thu Aug 3 14:39:37 2023 +
Commit: خالد حسني 
CommitDate: Thu Aug 3 19:55:43 2023 +0200

Raise minimum FontConfig version to 2.12.0

I want to use FC_SYMBOL and this the first stable version to have it,
and our baseline has 2.13.x already.

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

diff --git a/configure.ac b/configure.ac
index e7beaf945fb7..667e3748cc7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6091,7 +6091,7 @@ fi
 
 AC_SUBST(ENABLE_CUPS)
 
-libo_CHECK_SYSTEM_MODULE([fontconfig],[FONTCONFIG],[fontconfig >= 
2.4.1],,system,TRUE)
+libo_CHECK_SYSTEM_MODULE([fontconfig],[FONTCONFIG],[fontconfig >= 
2.12.0],,system,TRUE)
 
 dnl whether to find & fetch external tarballs?
 dnl ===
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index ad9bf6c268ab..7ceb42226d55 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -859,11 +859,12 @@ static void addtopattern(FcPattern *pPattern,
 
 namespace
 {
-//Someday fontconfig will hopefully use bcp47, see fdo#19869
-//In the meantime try something that will fit to workaround fdo#35118
+//Someday fontconfig will hopefully use bcp47, see:
+//https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/50
+//In the meantime try something that will fit to workaround, see:
+//https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/30
 OString mapToFontConfigLangTag(const LanguageTag )
 {
-#if defined(FC_VERSION) && (FC_VERSION >= 20492)
 std::shared_ptr xLangSet(FcGetLangs(), FcStrSetDestroy);
 OString sLangAttrib;
 
@@ -897,12 +898,6 @@ namespace
 }
 
 return OString();
-#else
-OString sLangAttrib = 
OUStringToOString(rLangTag.getLanguageAndScript(), 
RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
-if (sLangAttrib.equalsIgnoreAsciiCase("pa-in"))
-sLangAttrib = "pa";
-return sLangAttrib;
-#endif
 }
 
 bool isEmoji(sal_uInt32 nCurrentChar)

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

2023-07-30 Thread Taichi Haradaguchi (via logerrit)

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

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

tdf#116412: include bz2 in internal python

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

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

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

2023-06-29 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit fdfc6eb3fd37f87d51d1836d01259a14a4346a45
Author: Christian Lohmaier 
AuthorDate: Thu Jun 29 14:59:38 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jun 29 17:39:11 2023 +0200

fix cross-compilation with frozen headers

FROZEN wasn't part of the PERMITTED_BUILD_TARGETS in configure.ac, that
in turn means it is not part of BUILD_TYPE when building the crossbuild
build-tools.
That in turn means gb_Helper_optional in external/Module_external.mk
doesn't add it to the external module dirs, and that means the makefiles
from external/frozen aren't read, more specifically there won't be any
gb_UnpackedTarball_UnpackedTarball,frozen definition.

The UnpackedTarball definitions don't error out in this case, and the
gb_Library_use_extenals,module,frozen then doesn't work as expected. It
happily depends on the UnpackedTarball_get_final_target for frozen, but
since there is nothing to unpack (since the makefiles with the
definitions are skipped) that is a noop/it goes straight to just touch
workdir_for_build/UnpackedTarball/frozen.update to fulfill the
dependency without actually extracting any files.

This patch deals with the first problem only, adding it to the
PERMITTED_BUILD_TARGETS will allow the mechanism to work as intended.

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

diff --git a/configure.ac b/configure.ac
index eca7a5ad5cad..59703a6932e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5789,6 +5789,7 @@ if test "$cross_compiling" = "yes"; then
 DYNLOADING
 EPOXY
 EXPAT
+FROZEN
 GLM
 GRAPHITE
 HARFBUZZ

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

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

 configure.ac|4 +--
 download.lst|8 +++
 external/icu/README |2 -
 external/icu/UnpackedTarball_icu.mk |1 
 external/icu/icu4c-khmerbreakengine.patch.1 |   23 ++--
 external/icu/ubsan.patch.1  |   31 
 6 files changed, 19 insertions(+), 50 deletions(-)

New commits:
commit 05c6cdb144d1732ca51d463845fa6ddef7c08265
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jun 26 01:57:09 2023 +0900
Commit: Eike Rathke 
CommitDate: Tue Jun 27 13:08:34 2023 +0200

Update ICU to 73.2

Remove external/icu/ubsan.patch.1 that was applied upstream.

See https://icu.unicode.org/download/73

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

diff --git a/configure.ac b/configure.ac
index ece7c7d40db8..eca7a5ad5cad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10769,8 +10769,8 @@ fi
 dnl ===
 dnl Check for system icu
 dnl ===
-ICU_MAJOR=72
-ICU_MINOR=1
+ICU_MAJOR=73
+ICU_MINOR=2
 ICU_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/icu/source/i18n 
-I${WORKDIR}/UnpackedTarball/icu/source/common"
 ICU_LIBS_internal="-L${WORKDIR}/UnpackedTarball/icu/source/lib"
 libo_CHECK_SYSTEM_MODULE([icu],[ICU],[icu-i18n >= 66])
diff --git a/download.lst b/download.lst
index fce7592c6370..d38c37f48cf3 100644
--- a/download.lst
+++ b/download.lst
@@ -242,10 +242,10 @@ HYPHEN_TARBALL := 
5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ICU_SHA256SUM := 
a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68
-ICU_TARBALL := icu4c-72_1-src.tgz
-ICU_DATA_SHA256SUM := 
ee19f876507d6c23d9e0a2b631096f6b0eaa6fa61728c33a89efdb55e3385dea
-ICU_DATA_TARBALL := icu4c-72_1-data.zip
+ICU_SHA256SUM := 
818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1
+ICU_TARBALL := icu4c-73_2-src.tgz
+ICU_DATA_SHA256SUM := 
ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701
+ICU_DATA_TARBALL := icu4c-73_2-data.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/icu/README b/external/icu/README
index 484de1f41536..23cf5f0524ae 100644
--- a/external/icu/README
+++ b/external/icu/README
@@ -1 +1 @@
-Library providing Unicode support, from [http://site.icu-project.org/].
+Library providing Unicode support, from [https://icu.unicode.org/].
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index b5b072b1e1e6..655614447d53 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-clang-cl.patch.1 \
external/icu/gcc9.patch \
external/icu/c++20-comparison.patch.1 \
-   external/icu/ubsan.patch.1 \
external/icu/Wdeprecated-copy-dtor.patch \
external/icu/icu4c-windows-cygwin-cross.patch.1 \
external/icu/icu4c-emscripten-cross.patch.1 \
diff --git a/external/icu/icu4c-khmerbreakengine.patch.1 
b/external/icu/icu4c-khmerbreakengine.patch.1
index ea8f20f443ff..605914014e96 100644
--- a/external/icu/icu4c-khmerbreakengine.patch.1
+++ b/external/icu/icu4c-khmerbreakengine.patch.1
@@ -1,6 +1,6 @@
 diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp
 icu.org/source/common/dictbe.cpp   2022-04-08 00:41:55.0 +0200
-+++ icu/source/common/dictbe.cpp   2022-05-16 13:56:43.426870900 +0200
+--- icu.org/source/common/dictbe.cpp   2023-06-14 06:23:55.0 +0900
 icu/source/common/dictbe.cpp   2023-06-26 17:43:53.034173100 +0900
 @@ -35,7 +35,19 @@
   **
   */
@@ -211,8 +211,8 @@ diff -ur icu.org/source/common/dictbe.cpp 
icu/source/common/dictbe.cpp
  int32_t start = (int32_t)utext_getNativeIndex(text);
  if (start != offset) {
  offset = start;
--count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), 
cuLengths, cpLengths, NULL, );
-+count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), 
cuLengths, cpLengths, NULL, , ignoreSet, minLength);
+-count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), 
cuLengths, cpLengths, nullptr, );
++count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), 
cuLengths, cpLengths, nullptr, , ignoreSet, minLength);
  // Dictionary leaves text after longest prefix, not longest word. 
Back up.
  if (count <= 0) {
  utext_setNativeIndex(text, start);
@@ -748,8 +748,8 @@ diff -ur

[Libreoffice-commits] core.git: configure.ac connectivity/Library_postgresql-sdbc-impl.mk download.lst extensions/Library_ldapbe2.mk external/openldap external/postgresql

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

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

New commits:
commit 299ea597d154e1dc3d0f09adf67e05747cca54cf
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Dec 5 01:47:35 2022 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Wed Jun 21 12:52:52 2023 +0200

openldap: upgrade to release 2.6.4

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

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

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

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

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

2023-06-14 Thread Christian Lohmaier (via logerrit)

 configure.ac |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 7b31137fee6b9c81bd88944f9dd08c9ad4620103
Author: Christian Lohmaier 
AuthorDate: Wed Aug 17 13:55:04 2022 +0200
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Wed Jun 14 16:46:59 2023 +0200

fix ant related test for paths with non-ascii characters

autoconf forces LC_ALL=C and that in turn sets java's I/O encoding
without a way to override separately
(https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4163515)
and that breaks if the build/source path contains non-ascii characters:

java.lang.ExceptionInInitializerError
  […]
Caused by: java.nio.file.InvalidPathException: Malformed input or input 
contains unmappable characters
  […]

so set LC_ALL to $LANG for the ant/java tests to unbreak that part of
the tests.

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

diff --git a/configure.ac b/configure.ac
index ed6475647a28..4c1efff0799e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13649,6 +13649,9 @@ dnl 
===
 dnl Test for the presence of Ant and that it works
 dnl ===
 
+# java takes the encoding from LC_ALL, and since autoconf forces it to C it
+# breaks filename decoding, so for the ant section, set it to LANG
+LC_ALL=$LANG
 if test "$ENABLE_JAVA" != "" -a "$NEED_ANT" = "TRUE" -a "$cross_compiling" != 
"yes"; then
 ANT_HOME=; export ANT_HOME
 WITH_ANT_HOME=; export WITH_ANT_HOME
@@ -13867,7 +13870,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" 
-a "$cross_compiling" != "
 fi
 AC_SUBST(OOO_JUNIT_JAR)
 AC_SUBST(HAMCREST_JAR)
-
+# set back LC_ALL to C after the java related tests...
+LC_ALL=C
 
 AC_SUBST(SCPDEFS)

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

2023-06-09 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit ce72faa0519c2daba848a80915184b20ffb2c124
Author: Christian Lohmaier 
AuthorDate: Wed Jun 7 19:44:27 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Jun 9 12:26:51 2023 +0200

bump version to 24.2.0.0.alpha0+

calendar based naming - 24.2 is the February release, 24.8 would be the
one in August

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

diff --git a/configure.ac b/configure.ac
index d281d48ba8f0..ed6475647a28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.7.0.0.alpha0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.0.0.alpha0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

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

2023-06-07 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 1c60f18de581d42c200e119aa5efc72fc7ee0bcd
Author: Christian Lohmaier 
AuthorDate: Wed Jun 7 19:02:25 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Jun 7 19:02:25 2023 +0200

temporarily bump product version to 7.7.0.0.alpha0+

next version will use different version scheme, but in order to not
break scripts, that actual change will go through gerrit

Change-Id: I9e4ed4ef8c7bfbba0ed0f91944c46501504447d1

diff --git a/configure.ac b/configure.ac
index 8b256fbbb0a4..9d70be6200b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.6.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.7.0.0.alpha0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

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

2023-06-07 Thread Michael Stahl (via logerrit)

 configure.ac |2 +-
 download.lst |4 ++--
 external/python3/python-3.3.0-darwin.patch.1 |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 734d53534a6ca023e9c2eb819cde889b01818f1b
Author: Michael Stahl 
AuthorDate: Wed Jun 7 11:16:03 2023 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 7 15:18:15 2023 +0200

python3: upgrade to release 3.8.17

Fixes CVE-2023-24329 and a few more obscure security issues.

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

diff --git a/configure.ac b/configure.ac
index 58c785f6f5d5..8b256fbbb0a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9951,7 +9951,7 @@ if test \( "$cross_compiling" = yes -a -z 
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.17
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 9a0ac67b1bff..5366f5e1bbbd 100644
--- a/download.lst
+++ b/download.lst
@@ -465,8 +465,8 @@ POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PYTHON_SHA256SUM := 
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
-PYTHON_TARBALL := Python-3.8.16.tar.xz
+PYTHON_SHA256SUM := 
2e54b0c68191f16552f6de2e97a2396540572a219f6bbb28591a137cecc490a9
+PYTHON_TARBALL := Python-3.8.17.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/python3/python-3.3.0-darwin.patch.1 
b/external/python3/python-3.3.0-darwin.patch.1
index 39d3c9180a19..d262d55cd5b3 100644
--- a/external/python3/python-3.3.0-darwin.patch.1
+++ b/external/python3/python-3.3.0-darwin.patch.1
@@ -49,7 +49,7 @@ diff -ru python3.orig/Mac/Resources/app/Info.plist.in 
python3/Mac/Resources/app/
 -  Python
 +  LibreOfficePython
CFBundleGetInfoString
-   %version%, (c) 2001-2020 Python Software Foundation.
+   %version%, (c) 2001-2023 Python Software Foundation.
CFBundleHelpBookFolder
 diff -ru python3.orig/Mac/Resources/framework/Info.plist.in 
python3/Mac/Resources/framework/Info.plist.in
 --- python3.orig/Mac/Resources/framework/Info.plist.in 2015-07-05 
18:50:07.0 +0200

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

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

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

New commits:
commit c2c1e6a27293bba770b07efb0a4d64ba4b6150fb
Author: Stephan Bergmann 
AuthorDate: Mon Jun 5 15:30:48 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Jun 5 19:46:32 2023 +0200

Latest VS 2022 Preview is 17.7.0 now

...while latest proper VS 2022 is 17.6.2

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

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

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

2023-06-04 Thread Khaled Hosny (via logerrit)

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

New commits:
commit 45f6b03349b2626c5e75008bccd4e094f96e2769
Author: Khaled Hosny 
AuthorDate: Sun Jun 4 21:47:32 2023 +0300
Commit: خالد حسني 
CommitDate: Sun Jun 4 21:41:52 2023 +0200

Fix ccache cache size detection

I have ccache 4.8.1 and it reports:

(/home/khaled/.config/ccache/ccache.conf) max_size = 30.0 GB

With a space between the number and the unit and the configure check
with then see a unit-less 30 and will warn:

ccache's cache size is less than 1GB using it is counter-productive: 
Disabling auto-ccache detection

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

diff --git a/configure.ac b/configure.ac
index e86e3c30141d..bb2e3bcd6999 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3317,8 +3317,9 @@ AC_SUBST(CCACHE_DEPEND_MODE)
 # sccache defaults are good enough
 if test "$CCACHE" != "" -a -z "$SCCACHE"; then
 # e.g. (/home/rene/.config/ccache/ccache.conf) max_size = 20.0G
+# or (...) max_size = 20.0 G
 # -p works with both 4.2 and 4.4
-ccache_size_msg=$([$CCACHE -p | $AWK /max_size/'{ print $4 }' | sed -e 
's/\.[0-9]*//'])
+ccache_size_msg=$([$CCACHE -p | $AWK /max_size/'{ print $4 $5 }' | sed -e 
's/\.[0-9]*//'])
 ccache_size=$(echo "$ccache_size_msg" | grep "G" | sed -e 's/G.*$//')
 if test "$ccache_size" = ""; then
 ccache_size=$(echo "$ccache_size_msg" | grep "M" | sed -e 's/\ M.*$//')

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

2023-06-04 Thread خالد حسني (via logerrit)

 configure.ac |   34 +-
 1 file changed, 25 insertions(+), 9 deletions(-)

New commits:
commit f2b270e79016097077bd49c0ae4ac2b8762dc91b
Author: خالد حسني 
AuthorDate: Sun Jun 4 15:09:15 2023 +0200
Commit: Khaled Hosny (خالد حسني) 
CommitDate: Sun Jun 4 17:26:12 2023 +0200

Revert "Fix ccache cache size detection"

This reverts commit 70fd835b4cf75e386ee115c705241a4059fb68a8.

Reason for revert: cache_size_kibibyte is the current cache size not the 
maximum size

Change-Id: Idca3f7f3af9d2d6f20a50cb8360754dc63729726
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152542
Tested-by: Jenkins
Reviewed-by: Khaled Hosny (خالد حسني) 

diff --git a/configure.ac b/configure.ac
index 06a60ebf8d8d..e86e3c30141d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3316,15 +3316,31 @@ AC_SUBST(CCACHE_DEPEND_MODE)
 
 # sccache defaults are good enough
 if test "$CCACHE" != "" -a -z "$SCCACHE"; then
-ccache_size=$($CCACHE --print-stats | $AWK /cache_size_kibibyte/'{ print 
$2 }')
-if test $ccache_size -lt 976563; then
-CCACHE=""
-AC_MSG_WARN([ccache's cache size is less than 1GB using it is 
counter-productive: Disabling auto-ccache detection])
-add_warning "ccache's cache size is less than 1GB using it is 
counter-productive: auto-ccache detection disabled"
-elif test $ccache_size -lt 4883000; then
-# warn that ccache may be too small for debug build
-AC_MSG_WARN([ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build])
-add_warning "ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build"
+# e.g. (/home/rene/.config/ccache/ccache.conf) max_size = 20.0G
+# -p works with both 4.2 and 4.4
+ccache_size_msg=$([$CCACHE -p | $AWK /max_size/'{ print $4 }' | sed -e 
's/\.[0-9]*//'])
+ccache_size=$(echo "$ccache_size_msg" | grep "G" | sed -e 's/G.*$//')
+if test "$ccache_size" = ""; then
+ccache_size=$(echo "$ccache_size_msg" | grep "M" | sed -e 's/\ M.*$//')
+if test "$ccache_size" = ""; then
+ccache_size=0
+fi
+# we could not determine the size or it was less than 1GB -> disable 
auto-ccache
+if test $ccache_size -lt 1024; then
+CCACHE=""
+AC_MSG_WARN([ccache's cache size is less than 1GB using it is 
counter-productive: Disabling auto-ccache detection])
+add_warning "ccache's cache size is less than 1GB using it is 
counter-productive: auto-ccache detection disabled"
+else
+# warn that ccache may be too small for debug build
+AC_MSG_WARN([ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build])
+add_warning "ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build"
+fi
+else
+if test $ccache_size -lt 5; then
+#warn that ccache may be too small for debug build
+AC_MSG_WARN([ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build])
+add_warning "ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build"
+fi
 fi
 fi

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

2023-05-31 Thread Khaled Hosny (via logerrit)

 configure.ac |   34 +-
 1 file changed, 9 insertions(+), 25 deletions(-)

New commits:
commit 70fd835b4cf75e386ee115c705241a4059fb68a8
Author: Khaled Hosny 
AuthorDate: Tue May 30 12:25:22 2023 +0300
Commit: خالد حسني 
CommitDate: Thu Jun 1 01:57:07 2023 +0200

Fix ccache cache size detection

I have ccache 4.8.1 and it reports:

(/home/khaled/.config/ccache/ccache.conf) max_size = 30.0 GB

With a space between the number and the unit and the configure check
with then see a unit-less 30 and will warn:

ccache's cache size is less than 1GB using it is counter-productive: 
Disabling auto-ccache detection

Instead of relying on the human readable output, use --print-stats
which prints machine-readable output and is available since 3.7 (thanks
to Cloph for the suggestion).

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

diff --git a/configure.ac b/configure.ac
index e86e3c30141d..06a60ebf8d8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3316,31 +3316,15 @@ AC_SUBST(CCACHE_DEPEND_MODE)
 
 # sccache defaults are good enough
 if test "$CCACHE" != "" -a -z "$SCCACHE"; then
-# e.g. (/home/rene/.config/ccache/ccache.conf) max_size = 20.0G
-# -p works with both 4.2 and 4.4
-ccache_size_msg=$([$CCACHE -p | $AWK /max_size/'{ print $4 }' | sed -e 
's/\.[0-9]*//'])
-ccache_size=$(echo "$ccache_size_msg" | grep "G" | sed -e 's/G.*$//')
-if test "$ccache_size" = ""; then
-ccache_size=$(echo "$ccache_size_msg" | grep "M" | sed -e 's/\ M.*$//')
-if test "$ccache_size" = ""; then
-ccache_size=0
-fi
-# we could not determine the size or it was less than 1GB -> disable 
auto-ccache
-if test $ccache_size -lt 1024; then
-CCACHE=""
-AC_MSG_WARN([ccache's cache size is less than 1GB using it is 
counter-productive: Disabling auto-ccache detection])
-add_warning "ccache's cache size is less than 1GB using it is 
counter-productive: auto-ccache detection disabled"
-else
-# warn that ccache may be too small for debug build
-AC_MSG_WARN([ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build])
-add_warning "ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build"
-fi
-else
-if test $ccache_size -lt 5; then
-#warn that ccache may be too small for debug build
-AC_MSG_WARN([ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build])
-add_warning "ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build"
-fi
+ccache_size=$($CCACHE --print-stats | $AWK /cache_size_kibibyte/'{ print 
$2 }')
+if test $ccache_size -lt 976563; then
+CCACHE=""
+AC_MSG_WARN([ccache's cache size is less than 1GB using it is 
counter-productive: Disabling auto-ccache detection])
+add_warning "ccache's cache size is less than 1GB using it is 
counter-productive: auto-ccache detection disabled"
+elif test $ccache_size -lt 4883000; then
+# warn that ccache may be too small for debug build
+AC_MSG_WARN([ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build])
+add_warning "ccache's cache size is less than 5GB using it may be 
counter-productive for debug or symbol-enabled build"
 fi
 fi

[Libreoffice-commits] core.git: configure.ac instsetoo_native/CustomTarget_install.mk

2023-05-23 Thread Jussi Pakkanen (via logerrit)

 configure.ac |   20 
 instsetoo_native/CustomTarget_install.mk |1 +
 2 files changed, 21 insertions(+)

New commits:
commit 0f6bf89b1f3fb7e089d928d3ac27bed59fd7d364
Author: Jussi Pakkanen 
AuthorDate: Sun May 14 18:28:44 2023 +0300
Commit: Christian Lohmaier 
CommitDate: Tue May 23 11:47:19 2023 +0200

Add configure switch to enable building the installer with WiX.

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

diff --git a/configure.ac b/configure.ac
index e7ad75620e59..e86e3c30141d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1893,6 +1893,11 @@ AC_ARG_ENABLE(silent-msi,
 [Enable MSI with LIMITUI=1 (silent install).]),
 ,)
 
+AC_ARG_ENABLE(wix,
+AS_HELP_STRING([--enable-wix],
+[Build Windows installer using WiX.]),
+,)
+
 AC_ARG_ENABLE(macosx-code-signing,
 AS_HELP_STRING([--enable-macosx-code-signing=],
 [Sign executables, dylibs, frameworks and the app bundle. If you
@@ -13427,6 +13432,21 @@ else
 fi
 AC_SUBST(ENABLE_SILENT_MSI)
 
+dnl ===
+dnl Check for WiX tools.
+dnl ===
+if test "$enable_wix" = "" -o "enable_wix" = "no"; then
+AC_MSG_RESULT([no])
+ENABLE_WIX=
+else
+AC_MSG_RESULT([yes])
+if ! which candle  >/dev/null 2>&1; then
+  AC_MSG_ERROR([WiX requested but WiX toolset not found.])
+fi
+ENABLE_WIX=TRUE
+fi
+AC_SUBST(ENABLE_SILENT_MSI)
+
 AC_MSG_CHECKING([whether and how to use Xinerama])
 if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
 if test "$x_libraries" = "default_x_libraries"; then
diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index ee69d07ebd8f..f05b771fa107 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -116,6 +116,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: $(in
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
 ifeq (TRUE,$(LIBO_TEST_INSTALL))
+   $(if $(ENABLE_WIX),$(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/msicreator/create_installer.py $(BUILDDIR) $(SRCDIR) $(LIBO_VERSION) 
$(PRODUCTNAME_WITHOUT_SPACES))
unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME_WITHOUT_SPACES)/archive/install/en-US/LibreOffice*_archive.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* 
$(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*

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

2023-05-16 Thread Stephan Bergmann (via logerrit)

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

New commits:
commit 511f4f785e6137dda2589e660dc2f1953c914dfd
Author: Stephan Bergmann 
AuthorDate: Tue May 16 12:16:00 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 16 14:47:12 2023 +0200

Make --with-latest-c++ support future C++26

...as already supported by


"Add C++26 compile flags."

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

diff --git a/configure.ac b/configure.ac
index e5110cf1e8d7..e7ad75620e59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7529,7 +7529,7 @@ if test -z "${CXXFLAGS_CXX11+x}"; then
 elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 my_flags='-std=c++17 -std=c++1z'
 if test "$with_latest_c__" = yes; then
-my_flags="-std=c++23 -std=c++2b -std=c++20 -std=c++2a $my_flags"
+my_flags="-std=c++26 -std=c++2c -std=c++23 -std=c++2b -std=c++20 
-std=c++2a $my_flags"
 fi
 for flag in $my_flags; do
 if test "$COM" = MSC; then

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

2023-05-11 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 6337348e9f51c6cf299ce0b9dc3eb221d8e07edb
Author: Christian Lohmaier 
AuthorDate: Thu May 11 22:19:57 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Thu May 11 22:19:57 2023 +0200

bump product version to 7.6.0.0.alpha1+

Change-Id: I4215440ecfc7509004837e436c2f947eba3f8148

diff --git a/configure.ac b/configure.ac
index 1958191469a6..e5110cf1e8d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.6.0.0.alpha0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.6.0.0.alpha1+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: configure.ac .vscode/vs-code-template.code-workspace.in

2023-04-18 Thread Christian Lohmaier (via logerrit)

 .vscode/vs-code-template.code-workspace.in |   93 +
 configure.ac   |3 
 2 files changed, 59 insertions(+), 37 deletions(-)

New commits:
commit e39d4921bcd06836d5b28dc23628da41bcf463f7
Author: Christian Lohmaier 
AuthorDate: Wed Apr 5 12:32:58 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Apr 18 14:30:11 2023 +0200

vscode: add Cygwin terminal profile and config for VS debugger for Windows

and also fix the gdb helper path for linux in one of the launch
configurations, it used instdir for both the solenv as well as instdir
paths.

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

diff --git a/.vscode/vs-code-template.code-workspace.in 
b/.vscode/vs-code-template.code-workspace.in
index 87a6a27ac865..52f83afc15cc 100644
--- a/.vscode/vs-code-template.code-workspace.in
+++ b/.vscode/vs-code-template.code-workspace.in
@@ -59,7 +59,20 @@
"prefix": "tdf#",
"url": 
"https://bugs.documentfoundation.org/show_bug.cgi?id="
}
-   ]
+   ],
+   "terminal.integrated.profiles.windows": {
+   "Cygwin": {
+   "path": "@CYGWIN_BASH@",
+   "args": [
+   "--login"
+   ],
+   // prevent changing to $(HOME)
+   "env": {
+   "CHERE_INVOKING": "1"
+   }
+   }
+   },
+   "terminal.integrated.defaultProfile.windows": "Cygwin"
},
"tasks": {
"version": "2.0.0",
@@ -137,26 +150,26 @@
}
],
"externalConsole": false,
-   "MIMode": "gdb",
-   "setupCommands": [
-   {
-   "description": "Enable 
pretty-printing for gdb",
-   "text": 
"-enable-pretty-printing",
-   "ignoreFailures": true
-   },
-   {
-   "description": "Mark 
pretty-printers (in solenv/gdb) safe",
-   "text": 
"add-auto-load-safe-path @INSTROOT@",
-   "ignoreFailures": true
-   },
-   {
-   "description": "Mark 
pretty-printers bootstrap (in instdir/program) safe",
-   "text": 
"add-auto-load-safe-path @INSTROOT@",
-   "ignoreFailures": true
-   },
-   ],
"linux": {
+   "MIMode": "gdb",
"miDebuggerPath": "gdb"
+   "setupCommands": [
+   {
+   "description": "Enable 
pretty-printing for gdb",
+   "text": 
"-enable-pretty-printing",
+   "ignoreFailures": true
+   },
+   {
+   "description": "Mark 
pretty-printers (in solenv/gdb) safe",
+   "text": 
"add-auto-load-safe-path @SRC_ROOT@/solenv/gdb",
+   "ignoreFailures": true
+   },
+   {
+   "description": "Mark 
pretty-printers bootstrap (in instdir/program) safe",
+   "text": 
"add-auto-load-safe-path @INSTROOT@",
+   "ignoreFailures": true
+   },
+   ]
},
"osx": {
"program": "@INSTROOT@/MacOS/soffice",
@@ -169,6 +182,9 @@

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

2023-04-16 Thread Julien Nabet (via logerrit)

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

New commits:
commit e542aa8c3ac78fc0f36dd06d6fa8dc3d5b0ac588
Author: Julien Nabet 
AuthorDate: Sat Apr 15 10:36:42 2023 +0200
Commit: Julien Nabet 
CommitDate: Sun Apr 16 10:17:16 2023 +0200

configure.ac: add error message if NET SDK not found

+ rename find_dotnetsdk46 to find_dotnetsdk

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

diff --git a/configure.ac b/configure.ac
index a7d04b853365..87c42a10f5cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6523,7 +6523,7 @@ find_al()
 done
 }
 
-find_dotnetsdk46()
+find_dotnetsdk()
 {
 unset frametest
 
@@ -6534,6 +6534,7 @@ find_dotnetsdk46()
 return
 fi
 done
+AC_MSG_ERROR([The Windows NET SDK (minimum 4.6) not found, check the 
installation])
 }
 
 find_winsdk_version()
@@ -6887,7 +6888,7 @@ if test "$build_os" = "cygwin" -o "$build_os" = "wsl"; 
then
 
 dnl Check mscoree.lib / .NET Framework dir
 AC_MSG_CHECKING(.NET Framework)
-find_dotnetsdk46
+find_dotnetsdk
 PathFormat "$frametest"
 frametest="$formatted_path_unix"
 if test -f "$frametest/Lib/um/$WIN_BUILD_ARCH/mscoree.lib"; then

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

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

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

New commits:
commit 53ba2283c81ea7812538dc1c846a81fcb037fb10
Author: Stephan Bergmann 
AuthorDate: Fri Apr 14 08:30:19 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Apr 14 10:25:22 2023 +0200

Latest VS 2022 Preview is 17.6.0 now

...while latest proper VS 2022 is 17.5.4

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

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

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

2023-04-04 Thread Andrea Gelmini (via logerrit)

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

New commits:
commit fb8e9b3e8ec9b03399e6cd0d47a9d08976b71ed7
Author: Andrea Gelmini 
AuthorDate: Mon Apr 3 16:05:20 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Apr 4 08:08:33 2023 +0200

Fix typo in code

Change-Id: I9386ce811885e46ffedfc5bd8cc05007ddf75f10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149968
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index e5ff818fca0a..b4763c487c55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14593,7 +14593,7 @@ else
 AC_MSG_ERROR([jq not found])
 fi
 if test -z "$SYSTEMD_ESCAPE"; then
-AC_MSG_ERROR([syystemd-escape not found])
+AC_MSG_ERROR([systemd-escape not found])
 fi
 if test -z "$SYSTEMD_RUN"; then
 AC_MSG_ERROR([systemd-run not found])

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

2023-03-11 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 5f20f4ff21f597e55d899f5ea4dfe1c1fa5824bc
Author: Christian Lohmaier 
AuthorDate: Sat Mar 11 21:22:55 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Sun Mar 12 01:06:08 2023 +

cross-compiling on windows needs openssl to build internal python

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

partially reverts 4132bd5477c25a505f7bfbee1e7dcf6602c927d3

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

diff --git a/configure.ac b/configure.ac
index d8ec4664bd25..17fa8afac23a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5689,6 +5689,9 @@ if test "$cross_compiling" = "yes"; then
 sub_conf_opts="$sub_conf_opts --with-main-module=writer"
 fi
 fi
+# windows uses full-internal python and that in turn relies on openssl, so 
also enable openssl
+# when cross-compiling for aarch64, overriding the defaults below
+test "${PLATFORMID}" = "windows_aarch64" && sub_conf_opts="$sub_conf_opts 
--enable-openssl --with-tls=openssl"
 
 # Don't bother having configure look for stuff not needed for the build 
platform anyway
 # WARNING: any option with an argument containing spaces must be handled 
separately (see --with-theme)
@@ -5772,6 +5775,7 @@ if test "$cross_compiling" = "yes"; then
 LIBXSLT
 MDDS
 NATIVE
+OPENSSL
 ORCUS
 PYTHON
 SCRIPTING

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

2023-03-08 Thread Mike Kaganski (via logerrit)

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

New commits:
commit f5cceefde86bcc7d563469c7aba0009a5611adb0
Author: Mike Kaganski 
AuthorDate: Wed Mar 8 18:40:51 2023 +0300
Commit: Mike Kaganski 
CommitDate: Wed Mar 8 20:47:54 2023 +

MSVC: use the newer conformant preprocessor

As explained in the /Zc:preprocessor documentation [1], it enables "a 
token-based
preprocessor that conforms to C99 and C++11 and later standards", available 
since
Visual Studio 2019 version 16.5.

It helps to workaround an IntelliSense bug [2], which disables highlighting 
and
code completion in the IDE integration when certain Boost libraries are 
included;
but using a better preprocessor can't hurt in general, right?

[1] https://learn.microsoft.com/en-us/cpp/build/reference/zc-preprocessor
[2] 
https://developercommunity.visualstudio.com/t/IntelliSense-reports-many-errors-for-the/10287480#T-ND10303205

Change-Id: I5268f2dd4acf01cc1da23cfe76653c2f6c688c05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148484
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 403f81635f0b..d8ec4664bd25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7513,7 +7513,7 @@ if test -z "${CXXFLAGS_CXX11+x}"; then
 else
 CXXFLAGS_CXX11=-std:c++17
 fi
-CXXFLAGS_CXX11="$CXXFLAGS_CXX11 -permissive- -Zc:__cplusplus"
+CXXFLAGS_CXX11="$CXXFLAGS_CXX11 -permissive- 
-Zc:__cplusplus,preprocessor"
 elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 my_flags='-std=c++17 -std=c++1z'
 if test "$with_latest_c__" = yes; then

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

2023-02-27 Thread Stephan Bergmann (via logerrit)

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

New commits:
commit 788dd3e7fb24c681716608a8bf0339df8c78e4e5
Author: Stephan Bergmann 
AuthorDate: Mon Feb 27 13:12:01 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 27 18:38:13 2023 +

Note that Clang consteval bugs are meanwhile fixed

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

diff --git a/configure.ac b/configure.ac
index 4d523b097109..f2b95c279951 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14344,13 +14344,13 @@ dnl from consteval constructor initializing const 
variable",
 dnl  "wrong 'error: ‘this’ 
is not a constant
 dnl expression' with consteval constructor", 
 "code
 dnl using consteval: 'clang/lib/CodeGen/Address.h:38: llvm::Value*
-dnl clang::CodeGen::Address::getPointer() const: Assertion `isValid()' 
failed.'",
-dnl  "Bogus error C7595 
with consteval
-dnl constructor in ternary expression (/std:c++latest)", or
+dnl clang::CodeGen::Address::getPointer() const: Assertion `isValid()' 
failed.'" (which should be
+dnl fixed since Clang 14), 
 "Bogus error
+dnl C7595 with consteval constructor in ternary expression (/std:c++latest)", 
or
 dnl  "C++20, consteval, 
anonymous union:
 dnl llvm/lib/IR/Instructions.cpp:1491: void llvm::StoreInst::AssertOK(): 
Assertion
 dnl 
`cast(getOperand(1)->getType())->isOpaqueOrPointeeTypeMatches(getOperand(0)->getType())
-dnl && "Ptr must be a pointer to Val type!"' failed.":
+dnl && "Ptr must be a pointer to Val type!"' failed." (which should be fixed 
since Clang 17):
 AC_LANG_PUSH([C++])
 save_CXX=$CXX
 if test "$COM" = MSC && test "$COM_IS_CLANG" != TRUE; then

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1572 matches

Mail list logo