subject:"\[Libreoffice\-commits\] core.git\: configure.ac"

[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

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

2023-02-23 Thread Rico Tzschichholz (via logerrit)

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

New commits:
commit 258f3412213954448e6af0fdc252b10ff76c7d50
Author: Rico Tzschichholz 
AuthorDate: Mon Feb 13 15:08:18 2023 +0100
Commit: خالد حسني 
CommitDate: Thu Feb 23 14:38:11 2023 +

Refer directly to static library files for Graphite2 and HarfBuzz on Linux

Just using "-L... -l..." will cause dynamic linking if a matching system
library is found.

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

diff --git a/configure.ac b/configure.ac
index c5afd41afeba..4d523b097109 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10827,9 +10827,17 @@ dnl 
===
 harfbuzz_required_version=5.1.0
 
 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include 
-DGRAPHITE2_STATIC"
-GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
 HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
-HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"
+case "$_os" in
+Linux)
+
GRAPHITE_LIBS_internal="${WORKDIR}/LinkTarget/StaticLibrary/libgraphite.a"
+
HARFBUZZ_LIBS_internal="${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a"
+;;
+*)
+GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary 
-lgraphite"
+
HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"
+;;
+esac
 libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
 libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
$harfbuzz_required_version])

[Libreoffice-commits] core.git: configure.ac distro-configs/LibreOfficeCoverity.conf external/harfbuzz vcl/inc vcl/unx

2023-02-22 Thread Khaled Hosny (via logerrit)

 configure.ac   |   12 ++--
 distro-configs/LibreOfficeCoverity.conf|2 --
 external/harfbuzz/UnpackedTarball_harfbuzz.mk  |3 ---
 external/harfbuzz/harfbuzz-fd-hack.patch.0 |   24 
 vcl/inc/unx/freetype_glyphcache.hxx|1 +
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |   25 +++--
 6 files changed, 26 insertions(+), 41 deletions(-)

New commits:
commit a881850d5828dba3a19f2d53c995e9610d6d87b1
Author: Khaled Hosny 
AuthorDate: Tue Feb 21 17:04:02 2023 +0200
Commit: Caolán McNamara 
CommitDate: Wed Feb 22 09:02:40 2023 +

vcl: Avoid the need to patch HarfBuzz

Reverts parts of d552b4a549d614a03aa9328e017dec27bd3ff41e and
97e2e73e87479a742b798f362eda4baafb89497c.

Instead of patching HarfBuzz, lets make use of the already mmap’ed file
we use with FreeType.

Change-Id: Ia81222118162a30cadb8c988bc477ad3ce36166d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147410
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index a346bde17e87..c5afd41afeba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10830,16 +10830,8 @@ 
GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHI
 GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
 HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
 HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"
-case "$_os" in
-Linux)
-libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 
0.9.3],,,TRUE)
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
$harfbuzz_required_version],,,TRUE)
-;;
-*)
-libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
$harfbuzz_required_version])
-;;
-esac
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
$harfbuzz_required_version])
 
 if test "$COM" = "MSC"; then # override the above
 GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
diff --git a/distro-configs/LibreOfficeCoverity.conf 
b/distro-configs/LibreOfficeCoverity.conf
index 25e5c5d1af87..5b301570b8fc 100644
--- a/distro-configs/LibreOfficeCoverity.conf
+++ b/distro-configs/LibreOfficeCoverity.conf
@@ -9,8 +9,6 @@
 --enable-gstreamer-1-0
 --enable-option-checking=fatal
 --with-system-libs
---with-system-graphite
---with-system-harfbuzz
 --with-system-headers
 --without-system-cppunit
 --without-system-libfixmath
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 37c5946a5ce4..9bc9e326b426 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -16,9 +16,6 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,harfbuzz))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-$(if $(filter LINUX,$(OS)), \
-external/harfbuzz/harfbuzz-fd-hack.patch.0 \
-) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/harfbuzz-fd-hack.patch.0 
b/external/harfbuzz/harfbuzz-fd-hack.patch.0
deleted file mode 100644
index 1cc5820fd49c..
--- a/external/harfbuzz/harfbuzz-fd-hack.patch.0
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- Mode: Diff -*-
 src/hb-blob.cc
-+++ src/hb-blob.cc
-@@ -737,7 +737,19 @@
-   char *data = (char *) hb_malloc (allocated);
-   if (unlikely (!data)) return nullptr;
- 
--  FILE *fp = fopen (file_name, "rb");
-+  FILE *fp;
-+  int nFD;
-+  int n;
-+  if (sscanf (file_name, "/:FD:/%d%n", , ) == 1 && file_name[n] == '\0')
-+  {
-+lseek (nFD, 0, SEEK_SET);
-+fp = fdopen (dup (nFD), "rb");
-+  }
-+  else
-+  {
-+fp = fopen (file_name, "rb");
-+  }
-+
-   if (unlikely (!fp)) goto fread_fail_without_close;
- 
-   while (!feof (fp))
diff --git a/vcl/inc/unx/freetype_glyphcache.hxx 
b/vcl/inc/unx/freetype_glyphcache.hxx
index c80642b6126c..7602ec0ba1d8 100644
--- a/vcl/inc/unx/freetype_glyphcache.hxx
+++ b/vcl/inc/unx/freetype_glyphcache.hxx
@@ -61,6 +61,7 @@ public:
 FT_FaceRec_*  GetFaceFT();
 void  ReleaseFaceFT();
 
+FreetypeFontFile* GetFontFile() const   { return mpFontFile; }
 const OString&GetFontFileName() const   { return 
mpFontFile->GetFileName(); }
 int   GetFontFaceIndex() const  { return mnFaceNum; }
 int   GetFontFaceVariation() const  { return 
mnFaceVariation; }
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx 
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index d3c507a28e98..af9f656b17d5 100644
---

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

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

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

New commits:
commit 44801e26e098cc1cf7f96e3b233c2b9e5084c9fd
Author: Michael Weghorn 
AuthorDate: Fri Feb 10 15:13:45 2023 +0100
Commit: Michael Weghorn 
CommitDate: Fri Feb 10 21:17:38 2023 +

qt6 configure: Search for Qt 6 moc in more locations

This e.g. makes this find the correct moc on Arch Linux,
where the Qt 6 moc is provided under `/usr/lib/qt6/moc`
by package `qt6-base`.

Change-Id: Iefca23e6391a952eb79108260ae1417fc75ad0ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146781
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Michael Weghorn 

diff --git a/configure.ac b/configure.ac
index 3dd1a3df366a..ad1caa71cd80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13116,7 +13116,7 @@ then
 qt6_libexec_dirs="$qt6_libexec_dirs:$lib_dir/libexec"
 fi
 done
-AC_PATH_PROGS( MOC6, [moc-qt6 moc], no, [`dirname 
$qt6_libdir`/libexec:$QT6DIR/libexec:$qt6_libexec_dirs:$PATH])
+AC_PATH_PROGS( MOC6, [moc-qt6 moc], no, [`dirname 
$qt6_libdir`/libexec:$QT6DIR/libexec:$qt6_libexec_dirs:`echo $qt6_libdirs | 
$SED -e 's/ /:/g'`:$PATH])
 if test "$MOC6" = "no"; then
 AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
 the root of your Qt installation by exporting QT6DIR before running 
"configure".])

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

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

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

New commits:
commit 9fbcf60c51f9bc553c6e6e0204fac975a87ebf13
Author: Michael Weghorn 
AuthorDate: Fri Feb 10 15:12:36 2023 +0100
Commit: Michael Weghorn 
CommitDate: Fri Feb 10 21:16:34 2023 +

qt6 configure: Add moc version check

This way, it is determined at configure time
if the moc meant to be used for Qt 6 is actually a Qt 5
one, as happened e.g. on Arch Linux without
upcoming Change-Id Iefca23e6391a952eb79108260ae1417fc75ad0ef
("qt6 configure: Search for Qt 6 moc in more locations").

Fail at configure rather than build time in such cases.

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

diff --git a/configure.ac b/configure.ac
index ed0e05d6a7b3..3dd1a3df366a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13120,6 +13120,12 @@ then
 if test "$MOC6" = "no"; then
 AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
 the root of your Qt installation by exporting QT6DIR before running 
"configure".])
+else
+moc6_test_ver="`$MOC6 -v 2>&1 | $SED -n -e 's/^moc \(6.*\)/\1/p'`"
+if test -z "$moc6_test_ver"; then
+AC_MSG_ERROR([Wrong moc for Qt6 found.])
+fi
+AC_MSG_NOTICE([Detected moc version: $moc_test_ver])
 fi
 fi
 AC_SUBST(QT6_CFLAGS)

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

2023-02-09 Thread Khaled Hosny (via logerrit)

 configure.ac|5 +++--
 vcl/inc/font/LogicalFontInstance.hxx|2 --
 vcl/source/font/LogicalFontInstance.cxx |   13 +
 vcl/source/gdi/CommonSalLayout.cxx  |9 ++---
 4 files changed, 6 insertions(+), 23 deletions(-)

New commits:
commit cbdcc18778f9736ca6f186e2bbb9f0db456b1cee
Author: Khaled Hosny 
AuthorDate: Wed Feb 8 21:27:50 2023 +0200
Commit: خالد حسني 
CommitDate: Thu Feb 9 16:42:46 2023 +

Require HarfBuzz 5.1.0

This is the minimal version to provide the functionality we currently
check for. Some important LO functionality currently depend on idfdef'd
HarfBuzz code, and some distributions build against old system HarfBuzz
leading to user bug reports that are tricky to track down, e.g:
tdf#153048 and tdf#153470.

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

diff --git a/configure.ac b/configure.ac
index c232686dc696..ed0e05d6a7b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10820,6 +10820,7 @@ AC_SUBST(SYSTEM_LIBORCUS)
 dnl ===
 dnl HarfBuzz
 dnl ===
+harfbuzz_required_version=5.1.0
 
 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include 
-DGRAPHITE2_STATIC"
 GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
@@ -10828,11 +10829,11 @@ 
HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbu
 case "$_os" in
 Linux)
 libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 
0.9.3],,,TRUE)
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.42],,,TRUE)
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
$harfbuzz_required_version],,,TRUE)
 ;;
 *)
 libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.42])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
$harfbuzz_required_version])
 ;;
 esac
 
diff --git a/vcl/inc/font/LogicalFontInstance.hxx 
b/vcl/inc/font/LogicalFontInstance.hxx
index 6f4645c82c0c..c9e837d540f1 100644
--- a/vcl/inc/font/LogicalFontInstance.hxx
+++ b/vcl/inc/font/LogicalFontInstance.hxx
@@ -156,10 +156,8 @@ private:
 // The value is initialized and used in NeedOffsetCorrection().
 std::optional m_xeFontFamilyEnum;
 
-#if HB_VERSION_ATLEAST(4, 0, 0)
 mutable hb_draw_funcs_t* m_pHbDrawFuncs = nullptr;
 basegfx::B2DPolygon m_aDrawPolygon;
-#endif
 };
 
 inline hb_font_t* LogicalFontInstance::GetHbFont()
diff --git a/vcl/source/font/LogicalFontInstance.cxx 
b/vcl/source/font/LogicalFontInstance.cxx
index 277edec2d96c..58b291d04bdf 100644
--- a/vcl/source/font/LogicalFontInstance.cxx
+++ b/vcl/source/font/LogicalFontInstance.cxx
@@ -54,10 +54,8 @@ LogicalFontInstance::~LogicalFontInstance()
 if (m_pHbFontUntransformed)
 hb_font_destroy(m_pHbFontUntransformed);
 
-#if HB_VERSION_ATLEAST(4, 0, 0)
 if (m_pHbDrawFuncs)
 hb_draw_funcs_destroy(m_pHbDrawFuncs);
-#endif
 }
 
 hb_font_t* LogicalFontInstance::InitHbFont()
@@ -75,12 +73,10 @@ hb_font_t* LogicalFontInstance::InitHbFont()
 if (!aVariations.empty())
 hb_font_set_variations(pHbFont, aVariations.data(), 
aVariations.size());
 
-#if HB_VERSION_ATLEAST(3, 3, 0)
 // If we are applying artificial italic, instruct HarfBuzz to do the same
 // so that mark positioning is also transformed.
 if (NeedsArtificialItalic())
 hb_font_set_synthetic_slant(pHbFont, ARTIFICIAL_ITALIC_SKEW);
-#endif
 
 ImplInitHbFont(pHbFont);
 
@@ -91,7 +87,6 @@ hb_font_t* LogicalFontInstance::GetHbFontUntransformed() const
 {
 auto* pHbFont = const_cast(this)->GetHbFont();
 
-#if HB_VERSION_ATLEAST(3, 3, 0)
 if (NeedsArtificialItalic()) // || NeedsArtificialBold()
 {
 if (!m_pHbFontUntransformed)
@@ -103,7 +98,7 @@ hb_font_t* LogicalFontInstance::GetHbFontUntransformed() 
const
 }
 return m_pHbFontUntransformed;
 }
-#endif
+
 return pHbFont;
 }
 
@@ -259,7 +254,6 @@ bool LogicalFontInstance::NeedsArtificialItalic() const
 return m_aFontSelData.GetItalic() != ITALIC_NONE && 
m_pFontFace->GetItalic() == ITALIC_NONE;
 }
 
-#if HB_VERSION_ATLEAST(4, 0, 0)
 namespace
 {
 void move_to_func(hb_draw_funcs_t*, void* /*pDrawData*/, hb_draw_state_t*, 
float to_x, float to_y,
@@ -294,12 +288,10 @@ void close_path_func(hb_draw_funcs_t*, void* pDrawData, 
hb_draw_state_t*, void*
 pPoly->clear();
 }
 }
-#endif
 
 bool LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph,

basegfx::B2DPolyPolygon& rPolyPoly) const
 {
-#if HB_VERSION_ATLEAST(4, 0, 0)
 if

[Libreoffice-commits] core.git: configure.ac desktop/source external/cairo external/fontconfig external/freetype external/harfbuzz vcl/source vcl/unx

2023-02-09 Thread Tor Lillqvist (via logerrit)

 configure.ac |   13 +-
 desktop/source/lib/init.cxx  |   20 +++
 external/cairo/ExternalPackage_cairo.mk  |3 
 external/cairo/UnpackedTarball_cairo.mk  |2 
 external/cairo/cairo/cairo-fd-hack.patch.0   |   15 ++
 external/cairo/cairo/libcairo-bundled-soname.patch.0 |   12 ++
 external/fontconfig/ExternalPackage_fontconfig.mk|   16 ++
 external/fontconfig/ExternalProject_fontconfig.mk|   15 ++
 external/fontconfig/Module_fontconfig.mk |1 
 external/fontconfig/UnpackedTarball_fontconfig.mk|1 
 external/fontconfig/libfontconfig-bundled-soname.patch.0 |   11 +
 external/freetype/ExternalProject_freetype.mk|2 
 external/freetype/UnpackedTarball_freetype.mk|1 
 external/freetype/freetype-fd-hack.patch.0   |   53 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk|3 
 external/harfbuzz/harfbuzz-fd-hack.patch.0   |   24 
 vcl/source/fontsubset/sft.cxx|   23 +++
 vcl/unx/generic/fontmanager/fontmanager.cxx  |   90 ---
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx   |   13 ++
 19 files changed, 270 insertions(+), 48 deletions(-)

New commits:
commit d552b4a549d614a03aa9328e017dec27bd3ff41e
Author: Tor Lillqvist 
AuthorDate: Tue Sep 20 16:07:14 2022 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Feb 9 13:47:02 2023 +

Enable opening of downloaded fonts only in ForKit in Online

We want that only the ForKit process needs to have access to new font
files added to a Collabora Online instance dynamically by downloading
from a server. There are however many locations in the Kit process, in
core and in external libraries like harfbuzz, where the code wants to
open a font file.

Handle this so that the ForKit process opens such a downloaded font
file and doesn't close it. The file descriptor is thus inherited by
Kit processes.  The font file pathname passed on to other code is a
fake on in the format "/:FD:/%d" where the %d is the file descriptor
of the opened font file. Add checks in all places where font files are
opened, look for this special pathname format, and modify the code to
just dup() the already open file descriptor in that case.

All this is relevant for Linux only, as Collabora Online runs on
Linux.

Do the above for harfbuzz, cairo, fontconfig, and freetype.

In addition make sure that these libraries (except harfbuzz which
needs to be a static library and freetype) when bundled, on Linux, are
built as shared libraries, and won't be confused with the
corresponding system libraries by making sure their sonames are
different.

Change-Id: Ib059cb27e1637d07bb709249abd0d984f948caa9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140714
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146341
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 86896f3c4c80..c232686dc696 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10823,11 +10823,18 @@ dnl 
===
 
 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include 
-DGRAPHITE2_STATIC"
 GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
-libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
-
 HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
 HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.8])
+case "$_os" in
+Linux)
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 
0.9.3],,,TRUE)
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.42],,,TRUE)
+;;
+*)
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.42])
+;;
+esac
 
 if test "$COM" = "MSC"; then # override the above
 GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d0eda23e0eb8..d0c67bda098f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -26,6 +26,10 @@
 #include 
 #endif
 
+#ifdef LINUX
+#include 
+#endif
+
 #ifdef ANDROID
 #include 
 #endif
@@ -4554,13 +4558,27 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/, 
const char *pOption, const c
 else
 sal_detail_set_log_selector(pCurrentSalLogOverride);
 }
+#ifdef LINUX
 else if (strcmp(pOption, "addfont") == 0)
 {
+if (memcmp(pValue, "file://", 7) == 0)

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

2023-02-08 Thread Hossein (via logerrit)

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

New commits:
commit b1f0c23720cbb7a30128c066d54f7dcf1fdc6178
Author: Hossein 
AuthorDate: Wed Feb 8 23:06:29 2023 +
Commit: Mike Kaganski 
CommitDate: Thu Feb 9 07:06:57 2023 +

tdf#153476 Disable MS telemetry in VsDevCmd.bat

MS telemetry inside VsDevCmd.bat causes problems for the autogen.sh
script which uses it to find the Visual Studio C/C++ standard library
via the environment variables that show the UCRT path and version.

VsDevCmd.bat is the "Developer Command Prompt for Visual Studio".

The telemtry is disabled by:

  set VSCMD_SKIP_SENDTELEMETRY=1

This change resolves the problems described in tdf#153476.

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

diff --git a/configure.ac b/configure.ac
index d6291f7f4fc5..86896f3c4c80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3995,7 +3995,8 @@ vs_versions_to_check()
 win_get_env_from_vsdevcmdbat()
 {
 local WRAPPERBATCHFILEPATH="`mktemp -t wrpXX.bat`"
-printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo\r\n' "$(cygpath 
-w $VC_PRODUCT_DIR)" > $WRAPPERBATCHFILEPATH
+printf '@set VSCMD_SKIP_SENDTELEMETRY=1\r\n' > $WRAPPERBATCHFILEPATH
+printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo\r\n' "$(cygpath 
-w $VC_PRODUCT_DIR)" >> $WRAPPERBATCHFILEPATH
 # use 'echo.%ENV%' syntax (instead of 'echo %ENV%') to avoid outputting 
"ECHO is off." in case when ENV is empty or a space
 printf '@setlocal\r\n@echo.%%%s%%\r\n@endlocal\r\n' "$1" >> 
$WRAPPERBATCHFILEPATH
 local result

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

2023-01-26 Thread Ling Yang (via logerrit)

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

New commits:
commit a03dbcf786481d7b9294354399c83b46972ac85a
Author: Ling Yang 
AuthorDate: Wed Sep 7 02:18:30 2022 +
Commit: Michael Stahl 
CommitDate: Thu Jan 26 16:45:19 2023 +

add "LOONGARCH64" to the JAVAINTERPRETER 64bit check

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

diff --git a/configure.ac b/configure.ac
index 321cc06acbdb..5f6e4b454ce1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8587,7 +8587,7 @@ if test "$ENABLE_JAVA" != ""; then
 JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"`
 elif test "$cross_compiling" != "yes"; then
 case $CPUNAME in
-AARCH64|AXP|X86_64|IA64|POWERPC64|S390X|SPARC64|MIPS64|RISCV64)
+
AARCH64|AXP|X86_64|IA64|POWERPC64|S390X|SPARC64|MIPS64|RISCV64|LOONGARCH64)
 if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 
2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then
 AC_MSG_WARN([You are building 64-bit binaries but the JDK 
$JAVAINTERPRETER is 32-bit])
 AC_MSG_ERROR([You should pass the --with-jdk-home option 
pointing to a 64-bit JDK])

[Libreoffice-commits] core.git: configure.ac cui/source download.lst external/liborcus external/mdds RepositoryExternal.mk sc/inc sc/qa sc/source svl/source

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

 RepositoryExternal.mk   |4 
 configure.ac|4 
 cui/source/dialogs/AdditionsDialog.cxx  |2 
 download.lst|8 
 external/liborcus/ExternalPackage_liborcus.mk   |8 
 external/liborcus/ExternalProject_liborcus.mk   |4 
 external/liborcus/Library_orcus.mk  |   21 
 external/liborcus/UnpackedTarball_liborcus.mk   |   21 
 external/liborcus/bugfix-0.18.0-unset-border-colors.patch.1 |  236 +++
 external/liborcus/forcepoint-83.patch.1 |   38 
 external/liborcus/forcepoint-84.patch.1 |   38 
 external/liborcus/forcepoint-87.patch.1 |   27 
 external/liborcus/forcepoint-88.patch.1 |   42 
 external/liborcus/forcepoint-95.patch.1 |   11 
 external/liborcus/gcc9.patch.0  |   17 
 external/liborcus/inc/pch/precompiled_orcus-parser.hxx  |8 
 external/liborcus/inc/pch/precompiled_orcus.hxx |9 
 external/liborcus/include.patch.0   |   20 
 external/liborcus/liborcus-no-benchmark.patch.1 |8 
 external/liborcus/overrun.patch.0   |   63 
 external/liborcus/std-get-busted.patch.1|   88 -
 external/mdds/UnpackedTarball_mdds.mk   |2 
 external/mdds/speedup-erase-2.patch |   18 
 external/mdds/speedup-erase-begin.patch |  140 -
 sc/inc/mtvelements.hxx  |   43 
 sc/qa/unit/helper/csv_handler.hxx   |   27 
 sc/qa/unit/helper/qahelper.cxx  |8 
 sc/source/core/tool/scmatrix.cxx|   13 
 sc/source/filter/html/htmlpars.cxx  |   74 
 sc/source/filter/inc/orcusinterface.hxx |  431 +++--
 sc/source/filter/orcus/filterdetect.cxx |3 
 sc/source/filter/orcus/interface.cxx|  893 +++-
 sc/source/filter/orcus/xmlcontext.cxx   |   37 
 sc/source/ui/dataprovider/csvdataprovider.cxx   |8 
 sc/source/ui/docshell/datastream.cxx|   10 
 svl/source/misc/gridprinter.cxx |7 
 36 files changed, 1242 insertions(+), 1149 deletions(-)

New commits:
commit 516bc904e94971b61e4b13af632bf321b0a4a640
Author: Kohei Yoshida 
AuthorDate: Tue Jan 17 17:10:07 2023 -0500
Commit: Kohei Yoshida 
CommitDate: Thu Jan 26 02:27:57 2023 +

Upgrade mdds and orcus to 2.1.0 and 0.18.0, respectively

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 92ea4ba17670..0f7c77f443d6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3306,7 +3306,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.17 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.18 \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3325,7 +3325,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.17 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.18 \
 )
 
 endef
diff --git a/configure.ac b/configure.ac
index 41518fdc533c..321cc06acbdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10532,7 +10532,7 @@ dnl 
===
 dnl Check for system mdds
 dnl ===
 MDDS_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/mdds/include"
-libo_CHECK_SYSTEM_MODULE([mdds],[MDDS],[mdds-2.0 >= 2.0.0])
+libo_CHECK_SYSTEM_MODULE([mdds],[MDDS],[mdds-2.1 >= 2.1.0])
 
 dnl ===
 dnl Check for system dragonbox
@@ -10839,7 +10839,7 @@ AC_SUBST(DEFAULT_CRASHDUMP_VALUE)
 dnl ===
 dnl Orcus
 dnl ===
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.17 >= 0.17.2])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.18 >= 0.18.0])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 dnl Link with Boost.System
diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index ffbe02a344e2..7c76f9c9872a

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

2023-01-25 Thread Michael Weghorn (via logerrit)

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

New commits:
commit 9e10d4cc278805738a0816b60fd076529f85e1a3
Author: Michael Weghorn 
AuthorDate: Mon Jan 23 17:01:51 2023 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jan 25 10:35:19 2023 +

android: Don't warn about NDK 21 and 22

At least for these 2 configurations, building the app with
NDK 22.1.7171670 worked fine:

x86 dbgutil build:

--build=x86_64-unknown-linux-gnu
--with-android-ndk=/home/michi/Android/Sdk/ndk/22.1.7171670/
--with-android-sdk=/home/michi/Android/Sdk
--with-distro=LibreOfficeAndroidX86
--enable-sal-log
--with-external-tar=/home/michi/development/libreoffice-external
--enable-ccache
--enable-dbgutil
--with-jdk-home=/usr/lib/jvm/java-17-openjdk-amd64/

32-bit ARM release build:

--build=x86_64-unknown-linux-gnu
--with-android-ndk=/home/michi/Android/Sdk/ndk/22.1.7171670/
--with-android-sdk=/home/michi/Android/Sdk
--with-distro=LibreOfficeAndroid
--with-external-tar=/home/michi/development/libreoffice-external
--enable-ccache
--with-jdk-home=/usr/lib/jvm/java-11-openjdk-amd64/
--enable-release-build

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

diff --git a/configure.ac b/configure.ac
index 921853e2f8b3..41518fdc533c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -706,11 +706,11 @@ if test -n "$with_android_ndk"; then
 11.1.*|12.1.*|13.1.*|14.1.*)
 AC_MSG_ERROR([Building for Android is only supported with NDK versions 
above 16.x.*])
 ;;
-16.*|17.*|18.*|19.*|20.*)
+16.*|17.*|18.*|19.*|20.*|21.*|22.*)
 ;;
 *)
-AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 16.* til 20.* have been used successfully. Proceed at your own risk.])
-add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 16.* til 20.* have been used successfully. Proceed at your own risk."
+AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 16.* to 22.* have been used successfully. Proceed at your own risk.])
+add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only 
versions 16.* to 22.* have been used successfully. Proceed at your own risk."
 ;;
 esac

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

2023-01-24 Thread Jan Holesovsky (via logerrit)

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

New commits:
commit 4132bd5477c25a505f7bfbee1e7dcf6602c927d3
Author: Jan Holesovsky 
AuthorDate: Mon Jan 23 17:56:31 2023 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Jan 24 11:28:53 2023 +

No need for openssl in the cross build's instdir_for_build

So disable it from the configure & make sure it is not brought in by the
non-iOS check.

Change-Id: I9bbf1c593d1d48197951002e04e7f925d35ecba9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146034
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/configure.ac b/configure.ac
index 8bad8873443d..921853e2f8b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5734,6 +5734,7 @@ if test "$cross_compiling" = "yes"; then
 --disable-nss \
 --disable-online-update \
 --disable-opencl \
+--disable-openssl \
 --disable-pdfimport \
 --disable-postgresql-sdbc \
 --disable-skia \
@@ -5741,9 +5742,9 @@ if test "$cross_compiling" = "yes"; then
 --enable-dynamic-loading \
 --enable-icecream="$enable_icecream" \
 --without-doxygen \
+--without-tls \
 --without-webdav \
 --without-x \
---with-tls=openssl \
 "
 # single quotes added for better readability in case of spaces
 echo "Running CONF-FOR-BUILD/configure" \
@@ -5798,7 +5799,6 @@ if test "$cross_compiling" = "yes"; then
 LIBXSLT
 MDDS
 NATIVE
-OPENSSL
 ORCUS
 PYTHON
 SCRIPTING
@@ -10632,7 +10632,7 @@ if test "$enable_fuzzers" != "yes" -a "$enable_nss" = 
"yes"; then
 libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 
4.8],,system-if-linux)
 AC_DEFINE(HAVE_FEATURE_NSS)
 ENABLE_NSS=TRUE
-elif test $_os != iOS ; then
+elif test $_os != iOS -a "$enable_openssl" != "no"; then
 with_tls=openssl
 fi
 AC_SUBST(ENABLE_NSS)

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

2023-01-23 Thread Rene Engelhard (via logerrit)

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

New commits:
commit f8604f08ed5e07e50a65b5d35f3c0c18bf19044a
Author: Rene Engelhard 
AuthorDate: Sun Jan 22 20:53:35 2023 +0100
Commit: René Engelhard 
CommitDate: Mon Jan 23 18:22:08 2023 +

update hardcoded dragonbox include to 1.1.3

since dragonbox now installs to that one, and 1.1.3 is default for the
internal case anyway since dd1610146528cba8642caad3bf72e27b9ca6c153.

Change-Id: Ibd0449b1bd1191a1872c233bfe9810af1d1215cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145985
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Tested-by: René Engelhard 
Reviewed-by: René Engelhard 

diff --git a/configure.ac b/configure.ac
index d981eba2bab8..8bad8873443d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10544,7 +10544,7 @@ if test "$with_system_dragonbox" = "yes"; then
 AC_LANG_PUSH([C++])
 save_CPPFLAGS=$CPPFLAGS
 # This is where upstream installs to, unfortunately no .pc or so...
-DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1.0.0
+DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1.1.3
 CPPFLAGS="$CPPFLAGS $DRAGONBOX_CFLAGS"
 AC_CHECK_HEADER([dragonbox/dragonbox.h], [],
[AC_MSG_ERROR([dragonbox/dragonbox.h not found. install dragonbox])], 
[])

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

2023-01-22 Thread Rene Engelhard (via logerrit)

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

New commits:
commit a180a99e2d53a2ca04e8fe31a38f6994e42bf69b
Author: Rene Engelhard 
AuthorDate: Sun Jan 22 11:58:41 2023 +0100
Commit: René Engelhard 
CommitDate: Sun Jan 22 11:12:01 2023 +

check for harfbuzz >= 2.6.8

because of hb_ot_layout_lookup_get_glyph_alternates() usage, see

https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice/commit/?h=wip/lunar-7.5=97d1a9d48f30394d86db0ce948c4fb8986afc701
and

https://harfbuzz.github.io/harfbuzz-hb-ot-layout.html#hb-ot-layout-lookup-get-glyph-alternates:
"Since: 2.6.8"

Change-Id: I755c42745f3bdd647fcd7c101ea7e5fde24c5a6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145965
Reviewed-by: خالد حسني 
Tested-by: René Engelhard 

diff --git a/configure.ac b/configure.ac
index 47b6702df669..d981eba2bab8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10864,7 +10864,7 @@ 
libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
 
 HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
 HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.0])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.8])
 
 if test "$COM" = "MSC"; then # override the above
 GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"

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

2023-01-14 Thread Sam James (via logerrit)

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

New commits:
commit d532040f3e9f11e4f364e0313e426cdb708e6568
Author: Sam James 
AuthorDate: Fri Jan 13 15:09:59 2023 +
Commit: Stephan Bergmann 
CommitDate: Sat Jan 14 11:55:29 2023 +

configure.ac: Fix build with --with-system-zxing and < Clang 16

Clang 15 and older default to -std=c++14, not -std=c++17 (unlike Clang 16 
onwards).

This doesn't show up with GCC because GCC 11 onwards defaults to -std=c++17.

The new version of libzxing requires C++ 17, per its release notes. Adapt
the configure check accordingly to pass -std=c++17 when checking for its
headers and save accordingly if successful.

(Do this via ${CXXFLAGS_CXX11} which has the appropriate switch
for our compiler, despite its name.)

Bug: https://bugs.gentoo.org/890324
Change-Id: Iaaa8fdc05eea0e26416b605bfda8f2d831f8729c
Signed-off-by: Sam James 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145479
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 56119241c743..47b6702df669 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11187,7 +11187,7 @@ else
 continue
 fi
 dnl TODO: White space in $i would cause problems:
-CXXFLAGS="$save_CXXFLAGS -I$i/ZXing"
+CXXFLAGS="$save_CXXFLAGS ${CXXFLAGS_CXX11} -I$i/ZXing"
 AC_CHECK_HEADER(MultiFormatWriter.h, [ZXING_CFLAGS=-I$i/ZXing; 
break],
 [unset ac_cv_header_MultiFormatWriter_h], [#include 
])
 done

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

2023-01-13 Thread Tor Lillqvist (via logerrit)

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

New commits:
commit 22cb88b25ba9a52ca0e0eaa3fd116f5fbcc9422f
Author: Tor Lillqvist 
AuthorDate: Thu Jan 12 21:47:24 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Jan 13 10:11:44 2023 +

Fix Emscripten version check to still work with older SDK versions

Change-Id: I051b5edd5936bcb94521f88ec7a7a762c66c9283
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145419
Tested-by: Jenkins
Tested-by: Michael Stahl 
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 93a1c89e3569..56119241c743 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1413,11 +1413,17 @@ if test "$_os" = "Emscripten"; 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
-AS_IF([test ! -f "$EMSCRIPTEN_VERSION_H"],
-  [AC_MSG_ERROR([Could not find the  in the 
Emscripten SDK.])])
-EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_major__ "$EMSCRIPTEN_VERSION_H" | 
$SED -ne 's/.*__EMSCRIPTEN_major__ //p')
-EMSCRIPTEN_MINOR=$($GREP __EMSCRIPTEN_minor__ "$EMSCRIPTEN_VERSION_H" | 
$SED -ne 's/.*__EMSCRIPTEN_minor__ //p')
-EMSCRIPTEN_TINY=$($GREP __EMSCRIPTEN_tiny__ "$EMSCRIPTEN_VERSION_H" | $SED 
-ne 's/.*__EMSCRIPTEN_tiny__ //p')
+if test -f "$EMSCRIPTEN_VERSION_H"; then
+EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_major__ "$EMSCRIPTEN_VERSION_H" 
| $SED -ne 's/.*__EMSCRIPTEN_major__ //p')
+EMSCRIPTEN_MINOR=$($GREP __EMSCRIPTEN_minor__ "$EMSCRIPTEN_VERSION_H" 
| $SED -ne 's/.*__EMSCRIPTEN_minor__ //p')
+EMSCRIPTEN_TINY=$($GREP __EMSCRIPTEN_tiny__ "$EMSCRIPTEN_VERSION_H" | 
$SED -ne 's/.*__EMSCRIPTEN_tiny__ //p')
+else
+EMSCRIPTEN_DEFINES=$(echo | emcc -dM -E - | $GREP __EMSCRIPTEN_)
+EMSCRIPTEN_MAJOR=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 
's/.*__EMSCRIPTEN_major__ //p')
+EMSCRIPTEN_MINOR=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 
's/.*__EMSCRIPTEN_minor__ //p')
+EMSCRIPTEN_TINY=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 
's/.*__EMSCRIPTEN_tiny__ //p')
+fi
+
 
EMSCRIPTEN_VERSION="${EMSCRIPTEN_MAJOR}.${EMSCRIPTEN_MINOR}.${EMSCRIPTEN_TINY}"
 
 check_semantic_version_three_prefixed EMSCRIPTEN MIN

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

2023-01-12 Thread Tor Lillqvist (via logerrit)

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

New commits:
commit 57eae105cdd6faeb7640f06cf4706fde9bf73fbf
Author: Tor Lillqvist 
AuthorDate: Thu Jan 12 15:45:11 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Jan 12 17:45:03 2023 +

Adapt to newer Emscripten SDK

The __EMSCRIPTEN_major__, minor, and tiny macros are no longer
predefined but only defined in . So grep that
instead of running emcc -dM -E.

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

diff --git a/configure.ac b/configure.ac
index 01219ec033be..93a1c89e3569 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1410,10 +1410,14 @@ 
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])
-EMSCRIPTEN_DEFINES=$(echo | emcc -dM -E - | $GREP __EMSCRIPTEN_)
-EMSCRIPTEN_MAJOR=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 
's/.*__EMSCRIPTEN_major__ //p')
-EMSCRIPTEN_MINOR=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 
's/.*__EMSCRIPTEN_minor__ //p')
-EMSCRIPTEN_TINY=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 
's/.*__EMSCRIPTEN_tiny__ //p')
+AS_IF([test -z "$EMSDK"],
+  [AC_MSG_ERROR([No \$EMSDK environment variable.])])
+
EMSCRIPTEN_VERSION_H=$EMSDK/upstream/emscripten/cache/sysroot/include/emscripten/version.h
+AS_IF([test ! -f "$EMSCRIPTEN_VERSION_H"],
+  [AC_MSG_ERROR([Could not find the  in the 
Emscripten SDK.])])
+EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_major__ "$EMSCRIPTEN_VERSION_H" | 
$SED -ne 's/.*__EMSCRIPTEN_major__ //p')
+EMSCRIPTEN_MINOR=$($GREP __EMSCRIPTEN_minor__ "$EMSCRIPTEN_VERSION_H" | 
$SED -ne 's/.*__EMSCRIPTEN_minor__ //p')
+EMSCRIPTEN_TINY=$($GREP __EMSCRIPTEN_tiny__ "$EMSCRIPTEN_VERSION_H" | $SED 
-ne 's/.*__EMSCRIPTEN_tiny__ //p')
 
EMSCRIPTEN_VERSION="${EMSCRIPTEN_MAJOR}.${EMSCRIPTEN_MINOR}.${EMSCRIPTEN_TINY}"
 
 check_semantic_version_three_prefixed EMSCRIPTEN MIN

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

2022-12-22 Thread Stephan Bergmann (via logerrit)

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

New commits:
commit 482d86c493fd01b4c559436030738480792f6d47
Author: Stephan Bergmann 
AuthorDate: Thu Dec 22 09:29:25 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 22 09:42:45 2022 +

Latest VS 2022 Preview is 17.5.0 now

...while latest proper VS 2022 is 17.4.3, so my Windows
--with-visual-studio=2022preview build inconsistently picked up non-preview
standard library headers, and failed

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

diff --git a/configure.ac b/configure.ac
index 858e2cb3fb12..01219ec033be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3976,7 +3976,7 @@ map_vs_year_to_version()
 2022)
 vsversion=17;;
 2022preview)
-vsversion=17.4;;
+vsversion=17.5;;
 *)
 AC_MSG_ERROR([Assertion failure - invalid argument "$1" to 
map_vs_year_to_version()]);;
 esac
@@ -4095,7 +4095,7 @@ find_msvc()
 vcyear=2019
 vctoolset=v142
 ;;
-17.0 | 17.4)
+17.0 | 17.5)
 vcyear=2022
 vctoolset=v143
 ;;
@@ -4267,7 +4267,7 @@ if test "$_os" = "WINNT"; then
 # are always "better", we list them in reverse chronological order.
 
 case "$vcnumwithdot" in
-16.0 | 17.0 | 17.4)
+16.0 | 17.0 | 17.5)
 WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0"
 ;;
 esac
@@ -6620,7 +6620,7 @@ find_msms()
 
 msmdir=
 case "$VCVER" in
-16.0 | 17.0 | 17.4)
+16.0 | 17.0 | 17.5)
 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
@@ -6656,7 +6656,7 @@ find_msvc_x64_dlls()
 
 msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
 case "$VCVER" in
-16.0 | 17.0 | 17.4)
+16.0 | 17.0 | 17.5)
 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

2022-12-20 Thread Aurimas Fišeras (via logerrit)

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

New commits:
commit a207cbfb0606f9c487c10fedbfe0a4b3e6fd2933
Author: Aurimas Fišeras 
AuthorDate: Thu Dec 8 23:34:29 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Dec 20 15:23:20 2022 +

Rename function to match what it does and remove obsolete comment

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

diff --git a/configure.ac b/configure.ac
index e0728bde7a89..65eb0373a285 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3997,11 +3997,9 @@ vs_versions_to_check()
 fi
 }
 
-win_get_env_from_vsvars32bat()
+win_get_env_from_vsdevcmdbat()
 {
 local WRAPPERBATCHFILEPATH="`mktemp -t wrpXX.bat`"
-# Also seems to be located in another directory under the same name: 
vsvars32.bat
-# 
https://github.com/bazelbuild/bazel/blob/master/src/main/native/build_windows_jni.sh#L56-L57
 printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo\r\n' "$(cygpath 
-w $VC_PRODUCT_DIR)" > $WRAPPERBATCHFILEPATH
 # use 'echo.%ENV%' syntax (instead of 'echo %ENV%') to avoid outputting 
"ECHO is off." in case when ENV is empty or a space
 printf '@setlocal\r\n@echo.%%%s%%\r\n@endlocal\r\n' "$1" >> 
$WRAPPERBATCHFILEPATH
@@ -4033,9 +4031,9 @@ find_ucrt()
 ide_env_dir="$VC_PRODUCT_DIR/../Common7/Tools/"
 ide_env_file="${ide_env_dir}VsDevCmd.bat"
 if test -f "$ide_env_file"; then
-PathFormat "$(win_get_env_from_vsvars32bat UniversalCRTSdkDir)"
+PathFormat "$(win_get_env_from_vsdevcmdbat UniversalCRTSdkDir)"
 UCRTSDKDIR=$formatted_path
-UCRTVERSION=$(win_get_env_from_vsvars32bat UCRTVersion)
+UCRTVERSION=$(win_get_env_from_vsdevcmdbat UCRTVersion)
 dnl Hack needed at least by tml:
 if test "$UCRTVERSION" = 10.0.15063.0 \
 -a ! -f "${UCRTSDKDIR}Include/10.0.15063.0/um/sqlext.h" \

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

2022-12-15 Thread Tor Lillqvist (via logerrit)

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

New commits:
commit c526b4a58ea6eabf7454566d5e399dbaa3d5d261
Author: Tor Lillqvist 
AuthorDate: Thu Dec 15 01:47:37 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 15 11:45:30 2022 +

Simplify selection of iOS SDK, like we now do for macOS

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

diff --git a/configure.ac b/configure.ac
index f90c0c47c97c..cc803db75779 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3634,27 +3634,19 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=16.1
-older_sdk_vers="16.0 15.6"
+
 if test "$enable_ios_simulator" = "yes"; then
-platform=iPhoneSimulator
+platformlc=iphonesimulator
 versionmin=-mios-simulator-version-min=14.5
 else
-platform=iPhoneOS
+platformlc=iphoneos
 versionmin=-miphoneos-version-min=14.5
 fi
-xcode_developer=`xcode-select -print-path`
 
-for sdkver in $current_sdk_ver $older_sdk_vers; do
-
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
-if test -d $t; then
-sysroot=$t
-break
-fi
-done
+sysroot=`xcrun --sdk $platformlc --show-sdk-path`
 
-if test -z "$sysroot"; then
-AC_MSG_ERROR([Could not find iOS SDK, expected something like 
$xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}${current_sdk_ver}.sdk])
+if ! test -d "$sysroot"; then
+AC_MSG_ERROR([Could not find iOS SDK $sysroot])
 fi
 
 AC_MSG_RESULT($sysroot)

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

2022-12-14 Thread Michael Stahl (via logerrit)

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

New commits:
commit c6a8af20c82e3be1c1cc48ef16fb8c323e2fda95
Author: Michael Stahl 
AuthorDate: Wed Dec 14 17:09:01 2022 +
Commit: Thorsten Behrens 
CommitDate: Wed Dec 14 20:44:39 2022 +

Revert "Add oox to build side, for cross compilation"

This reverts commit 599f9836a674ec525e56fa787a800d7ed4be3383.

Reason for revert: It doesn't do anything, see 144170 for next attempt.

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

diff --git a/configure.ac b/configure.ac
index 44c984df8440..f90c0c47c97c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5797,7 +5797,6 @@ if test "$cross_compiling" = "yes"; then
 LIBXSLT
 MDDS
 NATIVE
-OOX
 OPENSSL
 ORCUS
 PYTHON

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

2022-12-14 Thread Ilmari Lauhakangas (via logerrit)

 README.md|2 +-
 configure.ac |   12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c7b93e2687af1bf26b0843e3d815effd129752f6
Author: Ilmari Lauhakangas 
AuthorDate: Wed Dec 14 11:46:55 2022 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Wed Dec 14 15:22:52 2022 +

Bump minimum macOS to 10.15

This gives us support for filesystem library
(after GCC is bumped to >7)

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

diff --git a/README.md b/README.md
index bd1528f321ee..1dda3212ea13 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: Windows 7
 * Build: Cygwin + Visual Studio 2019 version 16.10
 * macOS:
-* Runtime: 10.14
+* Runtime: 10.15
 * Build: 11.0 + Xcode 12.5
 * Linux:
 * Runtime: RHEL 7 or CentOS 7
diff --git a/configure.ac b/configure.ac
index c5a7ee205090..44c984df8440 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2882,7 +2882,7 @@ AC_ARG_WITH(macosx-version-min-required,
 AS_HELP_STRING([--with-macosx-version-min-required=],
 [set the minimum OS version needed to run the built LibreOffice])
 [
-  e. g.: --with-macosx-version-min-required=10.14
+  e. g.: --with-macosx-version-min-required=10.15
 ],
 ,)
 
@@ -3446,8 +3446,8 @@ if test $_os = Darwin; then
 # we don't target the lower versions anymore, so it doesn't matter that we 
don't generate the
 # correct version in case such an old SDK is specified, it will be 
rejected later anyway
 MACOSX_SDK_VERSION=$(echo $macosx_sdk | $AWK -F. '{ print 
$1*1+$2*100+$3 }')
-if test $MACOSX_SDK_VERSION -lt 101400; then
-AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported, lowest supported 
version is 10.14])
+if test $MACOSX_SDK_VERSION -lt 101500; then
+AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported, lowest supported 
version is 10.15])
 fi
 if test "$host_cpu" = arm64 -a $MACOSX_SDK_VERSION -lt 11; then
 AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported for Apple Silicon 
(need at least 11.0)])
@@ -3457,15 +3457,15 @@ if test $_os = Darwin; then
 AC_MSG_CHECKING([what minimum version of macOS to require])
 if test "$with_macosx_version_min_required" = "" ; then
 if test "$host_cpu" = x86_64; then
-with_macosx_version_min_required="10.14";
+with_macosx_version_min_required="10.15";
 else
 with_macosx_version_min_required="11.0";
 fi
 fi
 # see same notes about MACOSX_SDK_VERSION above
 MAC_OS_X_VERSION_MIN_REQUIRED=$(echo $with_macosx_version_min_required | 
$AWK -F. '{ print $1*1+$2*100+$3 }')
-if test $MAC_OS_X_VERSION_MIN_REQUIRED -lt 101400; then
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, minimum supported 
version is 10.14])
+if test $MAC_OS_X_VERSION_MIN_REQUIRED -lt 101500; then
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, minimum supported 
version is 10.15])
 fi
 AC_MSG_RESULT([$with_macosx_version_min_required])

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

2022-12-12 Thread Thorsten Behrens (via logerrit)

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

New commits:
commit 599f9836a674ec525e56fa787a800d7ed4be3383
Author: Thorsten Behrens 
AuthorDate: Sun Dec 11 23:06:34 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Dec 12 09:55:28 2022 +

Add oox to build side, for cross compilation

With ce4c154e8b254f3bcd59ea46b3db4bd3d5a26058, cui now depends on oox
generated headers, so we need to build oox too, for cross builds.

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

diff --git a/configure.ac b/configure.ac
index ccce0a06b770..6325d8c50075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5797,6 +5797,7 @@ if test "$cross_compiling" = "yes"; then
 LIBXSLT
 MDDS
 NATIVE
+OOX
 OPENSSL
 ORCUS
 PYTHON

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

2022-12-10 Thread Thorsten Behrens (via logerrit)

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

New commits:
commit b60dfc2928ef9763452c57f06073185456310609
Author: Thorsten Behrens 
AuthorDate: Sun Dec 11 00:19:53 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Sun Dec 11 01:30:50 2022 +

Replace backslashes in config params before usage in cxx files

With cbfac11330882c7d0a817b6c37a08b2ace2b66f4, LOKit tries to pass
full configure line on via JSON - which, on Windows, might contain
backslashes and other nasties, so we better try to clean that up here.

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

diff --git a/configure.ac b/configure.ac
index 6b5f50c2490e..ccce0a06b770 100644
--- a/configure.ac
+++ b/configure.ac
@@ -522,7 +522,9 @@ AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
 LIBO_THIS_YEAR=`date +%Y`
 AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
 
-AC_DEFINE_UNQUOTED([BUILDCONFIG],[["$ac_configure_args"]],[Options passed to 
configure script])
+# replace backslashes, to get a valid c++ string
+config_args=$(echo $ac_configure_args | tr '\\' '/')
+AC_DEFINE_UNQUOTED([BUILDCONFIG],[["$config_args"]],[Options passed to 
configure script])
 
 dnl ===
 dnl Product version

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

2022-12-09 Thread Aurimas Fišeras (via logerrit)

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

New commits:
commit 53f117492db82285b190a40dd432e2bb10899457
Author: Aurimas Fišeras 
AuthorDate: Fri Dec 9 20:21:28 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Dec 9 23:11:47 2022 +

configure.ac: update links to avoid redirects, fix broken links.

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

diff --git a/configure.ac b/configure.ac
index 613604558eb8..6b5f50c2490e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1879,7 +1879,7 @@ libo_FUZZ_ARG_ENABLE(release-build,
 [Enable release build. Note that the "release build" choice is 
orthogonal to
  whether symbols are present, debug info is generated, or optimization
  is done.
- See http://wiki.documentfoundation.org/Development/DevBuild]),
+ See https://wiki.documentfoundation.org/Development/DevBuild]),
 ,)
 
 AC_ARG_ENABLE(windows-build-signing,
@@ -2587,7 +2587,7 @@ AC_ARG_WITH(bffvalidator,
 [Enables export validation for Microsoft Binary formats (doc, xls, 
ppt).
  Requires installed Microsoft Office Binary File Format Validator.
  Note: export-validation (--with-export-validation) is required to be 
turned on.
- See https://www.microsoft.com/en-us/download/details.aspx?id=26794]),
+ See 
https://web.archive.org/web/20200804155745/https://www.microsoft.com/en-us/download/details.aspx?id=26794]),
 ,with_bffvalidator=no)
 
 libo_FUZZ_ARG_WITH(junit,
@@ -3537,7 +3537,7 @@ if test $_os = Darwin; then
 if test "$enable_macosx_code_signing" = yes; then
 # By default use the first suitable certificate (?).
 
-# 
http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application
+# 
https://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application
 # says that the "Mac Developer" certificate is useful just for 
self-testing. For distribution
 # outside the Mac App Store, use the "Developer ID Application" 
one, and for distribution in
 # the App Store, the "3rd Party Mac Developer" one. I think it 
works best to the
@@ -6980,7 +6980,7 @@ if test "$GXX" = "yes" -a -z "$COM_IS_CLANG"; then
 AC_MSG_RESULT([ok (g++ $_gpp_version)])
 fi
 
-dnl see https://code.google.com/p/android/issues/detail?id=41770
+dnl see https://issuetracker.google.com/issues/36962819
 glibcxx_threads=no
 AC_LANG_PUSH([C++])
 AC_REQUIRE_CPP
@@ -9134,7 +9134,7 @@ if test "$enable_epm" = "yes"; then
 if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
 AC_MSG_RESULT([yes])
 else
-AC_MSG_ERROR([no. Install ESP Package Manager 
(http://www.msweet.org/projects.php?Z2) and/or specify the path to the right 
epm])
+AC_MSG_ERROR([no. Install ESP Package Manager 
(https://jimjag.github.io/epm/) and/or specify the path to the right epm])
 fi
 AC_MSG_CHECKING([epm version])
 EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | 
$SED -e s/v//`
@@ -9143,7 +9143,7 @@ if test "$enable_epm" = "yes"; then
 AC_MSG_RESULT([OK, >= 3.7])
 else
 AC_MSG_RESULT([too old. epm >= 3.7 is required.])
-AC_MSG_ERROR([Install ESP Package Manager 
(http://www.msweet.org/projects.php?Z2) and/or specify the path to the right 
epm])
+AC_MSG_ERROR([Install ESP Package Manager 
(https://jimjag.github.io/epm/) and/or specify the path to the right epm])
 fi
 fi
 fi
@@ -9508,7 +9508,7 @@ cd /opt/lo/bin
 wget https://dev-www.libreoffice.org/bin/cygwin/nasm.exe
 chmod +x nasm
 
-or get and install one from http://www.nasm.us/
+or get and install one from https://www.nasm.us/
 
 Then re-run autogen.sh
 
@@ -9518,7 +9518,7 @@ Alternatively, you can install the 'new' nasm where ever 
you want and make sure
 _EOS
 else
 cat << _EOS
-consult https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/BUILDING.md
+consult https://github.com/libjpeg-turbo/libjpeg-turbo/blob/main/BUILDING.md
 
 _EOS
 fi
@@ -9545,7 +9545,7 @@ if test "$SYSTEM_CLUCENE" = TRUE; then
 save_CPPFLAGS=$CPPFLAGS
 CXXFLAGS="$CXXFLAGS $CLUCENE_CFLAGS"
 CPPFLAGS="$CPPFLAGS $CLUCENE_CFLAGS"
-dnl 
http://sourceforge.net/tracker/index.php?func=detail=3392466_id=80013=558446
+dnl https://sourceforge.net/p/clucene/bugs/200/
 dnl https://bugzilla.redhat.com/show_bug.cgi?id=794795
 AC_CHECK_HEADER([CLucene/analysis/cjk/CJKAnalyzer.h], [],
  [AC_MSG_ERROR([Your version of libclucene has contribs-lib

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

2022-12-09 Thread Michael Stahl (via logerrit)

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

New commits:
commit 05f55b3898407828bb24347be56247f58803f7bb
Author: Michael Stahl 
AuthorDate: Fri Dec 9 11:51:22 2022 +0100
Commit: Michael Stahl 
CommitDate: Fri Dec 9 12:09:22 2022 +

python3: upgrade to release 3.8.16

Fixes CVE-2022-37454 and a few other ones that look less relevant
including CVE-2022-45061 and CVE-2015-20107.

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

diff --git a/configure.ac b/configure.ac
index 5fc489a7e8c0..613604558eb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9987,7 +9987,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}.15
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
 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 814bbf7e744e..60af75d77aca 100644
--- a/download.lst
+++ b/download.lst
@@ -208,8 +208,8 @@ export POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
 export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
 export POSTGRESQL_SHA256SUM := 
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
 export POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
-export PYTHON_SHA256SUM := 
5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550
-export PYTHON_TARBALL := Python-3.8.15.tar.xz
+export PYTHON_SHA256SUM := 
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
+export PYTHON_TARBALL := Python-3.8.16.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed

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

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

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

New commits:
commit af6f87e66bc7f6257524df68ca9d90e6072558f6
Author: Christian Lohmaier 
AuthorDate: Thu Dec 8 20:26:44 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 8 20:26:44 2022 +0100

bump product version to 7.6.0.0.alpha0+

Change-Id: I4cc88c54d42dd141f03c46377cd5c2f2fa56ad7b

diff --git a/configure.ac b/configure.ac
index 1e850637f55e..5fc489a7e8c0 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.5.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.6.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

2022-11-30 Thread Tor Lillqvist (via logerrit)

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

New commits:
commit 85b9961c93446e7088d3be97b5977f1deaa16daf
Author: Tor Lillqvist 
AuthorDate: Tue Nov 29 13:59:06 2022 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Nov 30 14:59:54 2022 +0100

Make it possible build for WASM with --disable-gui, without Qt5

The various configury options here are a bit confusing, but this works
at least for me.

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

diff --git a/configure.ac b/configure.ac
index 22589f700099..c954d6221b77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1156,7 +1156,7 @@ emscripten)
 # API currently just exists in headers, not code
 usable_dlapi=no
 using_freetype_fontconfig=yes
-using_x11=no
+using_x11=yes
 test_openldap=no
 test_qt5=yes
 test_split_debug=yes
@@ -5429,7 +5429,7 @@ if test "$with_x" = "no"; then
 USING_X11=
 fi
 
-if test -z "$USING_X11" -a "$DISABLE_DYNLOADING" = TRUE -a "$enable_gen" = 
"yes"; then
+if test -z "$USING_X11" -a "$enable_qt5" = "yes" -a "$enable_gen" = "yes"; then
 AC_MSG_ERROR([Can't select gen VCL plugin, if --without-x is used!])
 fi

[Libreoffice-commits] core.git: configure.ac distro-configs/LibreOfficeWASM32.conf

2022-11-30 Thread Tor Lillqvist (via logerrit)

 configure.ac  |2 --
 distro-configs/LibreOfficeWASM32.conf |2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 11e72e61b64bcabf5c599bc24e0b2f6b62c91b5c
Author: Tor Lillqvist 
AuthorDate: Tue Nov 22 11:30:06 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Nov 30 12:27:24 2022 +0100

Move Qt5 and scripting options for Emscripten to the distro-configs file

The resulting config_host.mk from running autogen.sh with just
--with-distro=LibreOfficeWASM32 is identical, so this should be safe.

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

diff --git a/configure.ac b/configure.ac
index d6c1ac9fa3fe..22589f700099 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1163,8 +1163,6 @@ emscripten)
 test_system_freetype=no
 enable_compiler_plugins=no
 enable_customtarget_components=yes
-enable_qt5=yes
-enable_scripting=no
 enable_split_debug=yes
 enable_wasm_strip=yes
 with_system_zlib=no
diff --git a/distro-configs/LibreOfficeWASM32.conf 
b/distro-configs/LibreOfficeWASM32.conf
index b4a3f1dc6ae7..d7fc849b3cfa 100644
--- a/distro-configs/LibreOfficeWASM32.conf
+++ b/distro-configs/LibreOfficeWASM32.conf
@@ -1 +1,3 @@
 --host=wasm32-local-emscripten
+--enable-qt5
+--disable-scripting

[Libreoffice-commits] core.git: configure.ac external/cppunit

2022-11-29 Thread Christian Lohmaier (via logerrit)

 configure.ac  |7 ++-
 external/cppunit/enable-win32-debug.patch |4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit ce31e09a6d40295cec4be9da8f4cec886d6c92c1
Author: Christian Lohmaier 
AuthorDate: Tue Nov 29 12:28:20 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Nov 29 14:14:22 2022 +0100

accept Apple's patch utility - pickier than GNU patch, but should be OK

macOS Ventura replaced the patch utility by Apple's version:
patch 2.0-12u11-Apple (as of macOS 13.0.1)

It is picker/less robust when it comes to locating matches, and absolutely
refuses to apply when the hunks are out of order. Only one patch needed
rework in the current codebase (master an 7-4 branch), and being more 
correct
about the locations in the files to be patched is not a bad thing either, so
accept Apple's version of patch (with a warning for now)

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

diff --git a/configure.ac b/configure.ac
index bea2bd98a22e..d6c1ac9fa3fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11542,7 +11542,12 @@ if test "$_os" = "SunOS" -o "$_os" = "Darwin"; then
 if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 
2>/dev/null; then
 AC_MSG_RESULT([yes])
 else
-AC_MSG_ERROR([no, GNU patch needed. install or specify with 
--with-gnu-patch=/path/to/it])
+if $GNUPATCH --version | grep "2\.0-.*-Apple" >/dev/null 2>/dev/null; 
then
+AC_MSG_RESULT([no, but accepted (Apple patch)])
+add_warning "patch utility is not GNU patch. Apple's patch should 
work OK, but it might experience issues where GNU patch doesn't."
+else
+AC_MSG_ERROR([no, GNU patch needed. install or specify with 
--with-gnu-patch=/path/to/it])
+fi
 fi
 else
 GNUPATCH=$PATCH
diff --git a/external/cppunit/enable-win32-debug.patch 
b/external/cppunit/enable-win32-debug.patch
index dc159ecc51ad..2c7f4f956d2f 100644
--- a/external/cppunit/enable-win32-debug.patch
+++ b/external/cppunit/enable-win32-debug.patch
@@ -1,6 +1,6 @@
 --- misc/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
 +++ misc/build/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
-@@ -107,7 +107,6 @@
+@@ -190,7 +190,6 @@
true
Level3
true
@@ -8,7 +8,7 @@

..\..\include;%(AdditionalIncludeDirectories)

WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)
.\ReleaseDll\
-@@ -138,6 +137,7 @@
+@@ -222,6 +221,7 @@
  
true
true

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

2022-11-25 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 75eb99cec153e720407b44c376285a0c543018b2
Author: Christian Lohmaier 
AuthorDate: Fri Nov 25 16:41:07 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Fri Nov 25 16:41:07 2022 +0100

bump product verion to 7.5.0.0.alpha1+

Change-Id: I565f3fc512b39af5c3b2e65a5cc3109794ca25ba

diff --git a/configure.ac b/configure.ac
index 6284f5f0c05a..40094c4801c7 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.5.0.0.alpha0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.5.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

2022-11-22 Thread Andrea Gelmini (via logerrit)

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

New commits:
commit 9f1b157122b0c0dfd2e8f97f4a98d342a8a1d423
Author: Andrea Gelmini 
AuthorDate: Tue Nov 22 08:39:39 2022 +0100
Commit: Julien Nabet 
CommitDate: Tue Nov 22 19:48:55 2022 +0100

Fix typo

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

diff --git a/configure.ac b/configure.ac
index 26641bbc23ce..6284f5f0c05a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3433,7 +3433,7 @@ if test $_os = Darwin; then
 # XCode only ships with a single SDK for a while now, and using older SDKs 
alongside is not
 # really supported anymore, instead you'd use different copies of Xcode, 
each with their own
 # SDK, and thus xcrun will pick the SDK that matches the currently 
selected Xcode version
-# also restricting the SDK version to "known good" versions doesn't seem 
necessary anyomre, the
+# also restricting the SDK version to "known good" versions doesn't seem 
necessary anymore, the
 # problems that existed in the PPC days with target versions not being 
respected or random
 # failures seems to be a thing of the past or rather: limiting either the 
Xcode version or the
 # SDK version is enough, no need to do both...

[Libreoffice-commits] core.git: configure.ac external/firebird external/libpng external/python3

2022-11-21 Thread Christian Lohmaier (via logerrit)

 configure.ac  |5 -
 external/firebird/ExternalProject_firebird.mk |5 -
 external/libpng/UnpackedTarball_libpng.mk |4 
 external/libpng/libpng-osx.patch.1|   16 
 external/python3/ExternalProject_python3.mk   |1 -
 5 files changed, 31 deletions(-)

New commits:
commit a7a766aa4119bf9616223d0de6587a3f30549eac
Author: Christian Lohmaier 
AuthorDate: Mon Nov 21 16:16:29 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Nov 21 22:35:33 2022 +0100

macOS (janitor): remove workarounds for no longer supported SDKs

since we won't accept anything lower than 10.14 on master (and 10.13 on
libreoffice-7-4 branch), we don't need those quirks anymore.

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

diff --git a/configure.ac b/configure.ac
index 5e2fe435a222..26641bbc23ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12172,11 +12172,6 @@ if test "$enable_skia" != "no" -a "$build_skia" = 
"yes" -a -z "$DISABLE_GUI"; th
 SKIA_GPU=VULKAN
 AC_SUBST(SKIA_GPU)
 fi
-
-if test -n "$MAC_OS_X_VERSION_MIN_REQUIRED" && test 
"$MAC_OS_X_VERSION_MIN_REQUIRED" -lt "101200"; then
-SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX=1
-AC_SUBST(SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX)
-fi
 else
 AC_MSG_RESULT([no (freetype too old)])
 add_warning "freetype version is too old for Skia library, at least 
2.8.1 required, Skia support disabled"
diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 0419109e7156..29a71763600f 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -84,11 +84,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
, \
--enable-shared --disable-static \
) \
-   $(if $(filter MACOSX,$(OS)), \
-   $(if $(filter 1, \
-   $(shell expr 
'$(MAC_OS_X_VERSION_MIN_REQUIRED)' \
-   '<' 101200)), \
-   ac_cv_func_clock_gettime=no)) \
$(if $(HAVE_LIBCPP),CXX='$(CXX) 
-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR') \
&& LC_ALL=C $(MAKE) \
$(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if 
$(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
diff --git a/external/libpng/UnpackedTarball_libpng.mk 
b/external/libpng/UnpackedTarball_libpng.mk
index 2a8ad3f84406..dca4e4b5cfe9 100644
--- a/external/libpng/UnpackedTarball_libpng.mk
+++ b/external/libpng/UnpackedTarball_libpng.mk
@@ -15,8 +15,4 @@ $(eval $(call gb_UnpackedTarball_add_files,libpng,.,\
external/libpng/configs/pnglibconf.h \
 ))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libpng,\
-   external/libpng/libpng-osx.patch.1 \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libpng/libpng-osx.patch.1 
b/external/libpng/libpng-osx.patch.1
deleted file mode 100644
index 387b3a8cc613..
--- a/external/libpng/libpng-osx.patch.1
+++ /dev/null
@@ -1,16 +0,0 @@
--*- Mode: Diff -*-
-
-Avoid warning: 'inflateValidate' is only available on macOS 10.13 or newer 
[-Wunguarded-availability-new]
-
 a/pngrutil.c
-+++ b/pngrutil.c
-@@ -422,7 +422,8 @@
-   }
- 
- #if ZLIB_VERNUM >= 0x1290 && \
--   defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32)
-+   defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32) && \
-+   !(defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED 
< 101300)
-   if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON)
-  /* Turn off validation of the ADLER32 checksum in IDAT chunks */
-  ret = inflateValidate(_ptr->zstream, 0);
diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index f1b71a037b4a..faa8e97387d4 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -100,7 +100,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 ) \

--enable-framework=/@__OOO 
--with-framework-name=LibreOfficePython, \
--enable-shared \
-   $(if $(filter 1090 101000 101100 
101200,$(MAC_OS_X_VERSION_MIN_REQUIRED)),ac_cv_func_utimensat=no) \
) \
$(if $(ENABLE_OPENSSL),$(if $(SYSTEM_OPENSSL),,\
--with-openssl=$(call 
gb_UnpackedTarball_get_dir,openssl) \

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

2022-11-21 Thread Christian Lohmaier (via logerrit)

 configure.ac |  127 ---
 1 file changed, 35 insertions(+), 92 deletions(-)

New commits:
commit 97d6185ef18b97ce30206720567fab2994ef2b3d
Author: Christian Lohmaier 
AuthorDate: Mon Nov 21 14:51:32 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Nov 21 22:27:19 2022 +0100

macOS: simplify SDK handling, remove the upper limit of SDK

…both for building as well as for min-required version
The newer versions of XCode/the corresponding SDK it comes with didn't cause
any problems in the last years, and checking for a max-sdk version just 
causes
more work when working on a newer system, either forcing to have multiple
versions of Xcode around and switching between those for no reason, or 
always
patching configure to accept the currently used version when bisecting 
stuff.

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

diff --git a/configure.ac b/configure.ac
index 52476b46d14a..5e2fe435a222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3430,60 +3430,34 @@ if test $_os = Darwin; then
 # The SDK in the currently selected Xcode should be found.
 
 AC_MSG_CHECKING([what macOS SDK to use])
-for macosx_sdk in 13.0 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14; do
-MACOSX_SDK_PATH=`xcrun --sdk macosx${macosx_sdk} --show-sdk-path 2> 
/dev/null`
-if test -d "$MACOSX_SDK_PATH"; then
-break
-else
-MACOSX_SDK_PATH="`xcode-select 
-print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${macosx_sdk}.sdk"
-if test -d "$MACOSX_SDK_PATH"; then
-break
-fi
-fi
-done
+# XCode only ships with a single SDK for a while now, and using older SDKs 
alongside is not
+# really supported anymore, instead you'd use different copies of Xcode, 
each with their own
+# SDK, and thus xcrun will pick the SDK that matches the currently 
selected Xcode version
+# also restricting the SDK version to "known good" versions doesn't seem 
necessary anyomre, the
+# problems that existed in the PPC days with target versions not being 
respected or random
+# failures seems to be a thing of the past or rather: limiting either the 
Xcode version or the
+# SDK version is enough, no need to do both...
+MACOSX_SDK_PATH=`xcrun --sdk macosx --show-sdk-path 2> /dev/null`
 if test ! -d "$MACOSX_SDK_PATH"; then
 AC_MSG_ERROR([Could not find an appropriate macOS SDK])
 fi
-
-AC_MSG_RESULT([macOS SDK $macosx_sdk at $MACOSX_SDK_PATH])
-MACOSX_SDK_BUILD_VERSION=$(xcodebuild -version -sdk "$MACOSX_SDK_PATH" 
ProductBuildVersion) 
-case $macosx_sdk in
-10.14)
-MACOSX_SDK_VERSION=101400
-;;
-10.15)
-MACOSX_SDK_VERSION=101500
-;;
-11.0)
-MACOSX_SDK_VERSION=11
-;;
-11.1)
-MACOSX_SDK_VERSION=110100
-;;
-11.3)
-MACOSX_SDK_VERSION=110300
-;;
-12.0)
-MACOSX_SDK_VERSION=12
-;;
-12.1)
-MACOSX_SDK_VERSION=120100
-;;
-12.3)
-MACOSX_SDK_VERSION=120300
-;;
-13.0)
-MACOSX_SDK_VERSION=13
-;;
-*)
-AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
-;;
-esac
-
+macosx_sdk=`xcodebuild -version -sdk "$MACOSX_SDK_PATH" SDKVersion`
+MACOSX_SDK_BUILD_VERSION=$(xcodebuild -version -sdk "$MACOSX_SDK_PATH" 
ProductBuildVersion)
+# format changed between 10.9 and 10.10 - up to 10.9 it was just four 
digits (1090), starting
+# with macOS 10.10 it was switched to account for x.y.z with six digits, 
10.10 is 101000,
+# 10.10.2 is 101002
+# we don't target the lower versions anymore, so it doesn't matter that we 
don't generate the
+# correct version in case such an old SDK is specified, it will be 
rejected later anyway
+MACOSX_SDK_VERSION=$(echo $macosx_sdk | $AWK -F. '{ print 
$1*1+$2*100+$3 }')
+if test $MACOSX_SDK_VERSION -lt 101400; then
+AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported, lowest supported 
version is 10.14])
+fi
 if test "$host_cpu" = arm64 -a $MACOSX_SDK_VERSION -lt 11; then
-AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported for Apple 
Silicon])
+AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported for Apple Silicon 
(need at least 11.0)])
 fi
+AC_MSG_RESULT([macOS SDK $macosx_sdk at $MACOSX_SDK_PATH])
 
+AC_MSG_CHECKING([what minimum version of macOS to require])
 if test "$with_macosx_version_min_required" = "" ; then
 if test "$host_cpu" = x86_64; then
 with_macosx_version_min_required="10.14";
@@ -3491,6 +3465,19 @@ if test $_os = Darwin; then
 with_macosx_version_min_required="11.0";
 fi
 fi
+# see same

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

2022-11-21 Thread Balázs Varga (allotropia) (via logerrit)

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

New commits:
commit 6edd93671c491938e52fce75a64f48f8a63d08a1
Author: Balázs Varga (allotropia) 
AuthorDate: Thu Nov 10 13:52:21 2022 +0100
Commit: Balazs Varga 
CommitDate: Mon Nov 21 11:18:35 2022 +0100

Revert "use uname for detecting WSL"

Since this patch breaks WSL2 builds on windows.

This reverts commit 5a8a1c4a86938b65c5ea7807f60e721946d7d8de.

Change-Id: Idd68a2609b81881af87ae777b5c4bf9cc2d8ef88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142580
Tested-by: Jenkins
Reviewed-by: Balazs Varga 

diff --git a/configure.ac b/configure.ac
index cef05a5893d9..52476b46d14a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,9 +302,9 @@ dnl checks build and host OSes
 dnl do this before argument processing to allow for platform dependent defaults
 dnl ===
 
-# Check for WSL. But if --host is explicitly specified (to really do build for
+# Check for WSL (version 2, at least). But if --host is explicitly specified 
(to really do build for
 # Linux on WSL) trust that.
-if test -z "$host" -a -z "$build" -a "$(uname -r | grep -i Microsoft 
2>/dev/null)" != ""; then
+if test -z "$host" -a -z "$build" -a "`wslsys -v 2>/dev/null`" != ""; then
 ac_cv_host="x86_64-pc-wsl"
 ac_cv_host_cpu="x86_64"
 ac_cv_host_os="wsl"

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

2022-11-15 Thread Stephan Bergmann (via logerrit)

 configure.ac |  113 +--
 1 file changed, 57 insertions(+), 56 deletions(-)

New commits:
commit d0a8c957be6dbc91cc05939468ce99947656481c
Author: Stephan Bergmann 
AuthorDate: Tue Nov 15 22:18:08 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 16 08:53:58 2022 +0100

configure: Allow to override CXXFLAGS_CXX11

(My Clang --with-latest-c++ build against GCC 13 trunk libstdc++ needs to 
use
-std=c++20 instead of -std=c++2b to work around
 for now.)

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

diff --git a/configure.ac b/configure.ac
index 51d5508ad248..cef05a5893d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2691,7 +2691,7 @@ libo_FUZZ_ARG_WITH(lxml,
 libo_FUZZ_ARG_WITH(latest-c++,
 AS_HELP_STRING([--with-latest-c++],
 [Try to enable the latest features of the C++ compiler, even if they 
are not yet part of a
- published standard.]),,
+ published standard.  This option is ignored when CXXFLAGS_CXX11 is 
set explicitly.]),,
 [with_latest_c__=no])
 
 AC_ARG_WITH(gtk3-build,
@@ -7615,63 +7615,64 @@ dnl 
===
 dnl C++11
 dnl ===
 
-AC_MSG_CHECKING([whether $CXX_BASE supports C++17])
-CXXFLAGS_CXX11=
-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
-fi
-CXXFLAGS_CXX11="$CXXFLAGS_CXX11 -permissive- -Zc:__cplusplus"
-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"
-fi
-for flag in $my_flags; do
-if test "$COM" = MSC; then
-flag="-Xclang $flag"
+if test -z "${CXXFLAGS_CXX11+x}"; then
+AC_MSG_CHECKING([whether $CXX_BASE supports C++17])
+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
 fi
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS $flag -Werror"
-if test "$SYSTEM_LIBCMIS" = TRUE; then
-CXXFLAGS="$CXXFLAGS -DSYSTEM_LIBCMIS $LIBCMIS_CFLAGS"
+CXXFLAGS_CXX11="$CXXFLAGS_CXX11 -permissive- -Zc:__cplusplus"
+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"
 fi
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include 
-#include 
-#include 
-
-#if defined SYSTEM_LIBCMIS
-// See ucb/source/ucp/cmis/auth_provider.hxx:
-#if !defined __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated"
-#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
-#endif
-#include 
-#if !defined __clang__
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-void f(std::vector & v, std::function fn) {
-std::sort(v.begin(), v.end(), fn);
-}
-]])],[CXXFLAGS_CXX11=$flag])
-AC_LANG_POP([C++])
-CXXFLAGS=$save_CXXFLAGS
-if test -n "$CXXFLAGS_CXX11"; then
-break
-fi
-done
-fi
-if test -n "$CXXFLAGS_CXX11"; then
-AC_MSG_RESULT([yes ($CXXFLAGS_CXX11)])
-else
-AC_MSG_ERROR(no)
+for flag in $my_flags; do
+if test "$COM" = MSC; then
+flag="-Xclang $flag"
+fi
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $flag -Werror"
+if test "$SYSTEM_LIBCMIS" = TRUE; then
+CXXFLAGS="$CXXFLAGS -DSYSTEM_LIBCMIS $LIBCMIS_CFLAGS"
+fi
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include 
+#include 
+#include 
+
+#if defined SYSTEM_LIBCMIS
+// See ucb/source/ucp/cmis/auth_provider.hxx:
+#if !defined __clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#endif
+#include 
+#if !defined __clang__
+#pragma GCC diagnostic pop
+

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

2022-11-14 Thread Noel Grandin (via logerrit)

 configure.ac|2 -
 vcl/headless/CairoCommon.cxx|   53 ++--
 vcl/headless/SvpGraphicsBackend.cxx |4 --
 vcl/source/bitmap/BitmapTools.cxx   |4 --
 4 files changed, 11 insertions(+), 52 deletions(-)

New commits:
commit bb943222e6592402c4ca35bbf50094c7491330c9
Author: Noel Grandin 
AuthorDate: Mon Nov 14 15:30:35 2022 +0200
Commit: Noel Grandin 
CommitDate: Mon Nov 14 20:49:21 2022 +0100

bump required cairo version to 1.12.0

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

diff --git a/configure.ac b/configure.ac
index f6937648fe2d..51d5508ad248 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13593,7 +13593,7 @@ if test "$test_cairo" = "yes"; then
 SYSTEM_CAIRO=TRUE
 AC_MSG_RESULT([yes])
 
-PKG_CHECK_MODULES( CAIRO, cairo >= 1.8.0 )
+PKG_CHECK_MODULES( CAIRO, cairo >= 1.12.0 )
 CAIRO_CFLAGS=$(printf '%s' "$CAIRO_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${CAIRO_LIBS}"
 CAIRO_LIBS="${filteredlibs}"
diff --git a/vcl/headless/CairoCommon.cxx b/vcl/headless/CairoCommon.cxx
index ee4234c3c79f..be0e6919f99e 100644
--- a/vcl/headless/CairoCommon.cxx
+++ b/vcl/headless/CairoCommon.cxx
@@ -30,6 +30,10 @@
 #include 
 #include 
 
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 12, 0)
+#error "require at least cairo 1.12.0"
+#endif
+
 void dl_cairo_surface_set_device_scale(cairo_surface_t* surface, double 
x_scale, double y_scale)
 {
 #if !HAVE_DLAPI
@@ -472,19 +476,9 @@ void CairoCommon::doXorOnRelease(sal_Int32 nExtentsLeft, 
sal_Int32 nExtentsTop,
 cairo_surface_t* target_surface = m_pSurface;
 if (cairo_surface_get_type(target_surface) != CAIRO_SURFACE_TYPE_IMAGE)
 {
-//in the unlikely case we can't use m_pSurface directly, copy contents
-//to another temp image surface
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
+//in the unlikely case we can't use m_pSurface directly, copy contents
+//to another temp image surface
 target_surface = cairo_surface_map_to_image(target_surface, nullptr);
-#else
-cairo_t* copycr = createTmpCompatibleCairoContext();
-cairo_rectangle(copycr, nExtentsLeft, nExtentsTop, nExtentsRight - 
nExtentsLeft,
-nExtentsBottom - nExtentsTop);
-cairo_set_source_surface(copycr, m_pSurface, 0, 0);
-cairo_fill(copycr);
-target_surface = cairo_get_target(copycr);
-cairo_destroy(copycr);
-#endif
 }
 
 cairo_surface_flush(target_surface);
@@ -554,19 +548,7 @@ void CairoCommon::doXorOnRelease(sal_Int32 nExtentsLeft, 
sal_Int32 nExtentsTop,
 
 if (target_surface != m_pSurface)
 {
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
 cairo_surface_unmap_image(m_pSurface, target_surface);
-#else
-cairo_t* copycr = cairo_create(m_pSurface);
-//unlikely case we couldn't use m_pSurface directly, copy contents
-//back from image surface
-cairo_rectangle(copycr, nExtentsLeft, nExtentsTop, nExtentsRight - 
nExtentsLeft,
-nExtentsBottom - nExtentsTop);
-cairo_set_source_surface(copycr, target_surface, 0, 0);
-cairo_fill(copycr);
-cairo_destroy(copycr);
-cairo_surface_destroy(target_surface);
-#endif
 }
 
 cairo_surface_destroy(surface);
@@ -574,13 +556,9 @@ void CairoCommon::doXorOnRelease(sal_Int32 nExtentsLeft, 
sal_Int32 nExtentsTop,
 
 cairo_t* CairoCommon::createTmpCompatibleCairoContext() const
 {
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
-cairo_surface_t* target = cairo_surface_create_similar_image(
-m_pSurface,
-#else
-cairo_surface_t* target = cairo_image_surface_create(
-#endif
-CAIRO_FORMAT_ARGB32, m_aFrameSize.getX() * m_fScale, 
m_aFrameSize.getY() * m_fScale);
+cairo_surface_t* target = cairo_surface_create_similar_image(m_pSurface, 
CAIRO_FORMAT_ARGB32,
+ 
m_aFrameSize.getX() * m_fScale,
+ 
m_aFrameSize.getY() * m_fScale);
 
 dl_cairo_surface_set_device_scale(target, m_fScale, m_fScale);
 
@@ -1002,10 +980,6 @@ cairo_pattern_t* create_stipple()
 }
 } // end anonymous ns
 
-#if defined CAIRO_VERSION && CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
-#define CAIRO_OPERATOR_DIFFERENCE (static_cast(23))
-#endif
-
 void CairoCommon::invert(const basegfx::B2DPolygon& rPoly, SalInvert nFlags, 
bool bAntiAlias)
 {
 cairo_t* cr = getCairoContext(false, bAntiAlias);
@@ -1018,14 +992,7 @@ void CairoCommon::invert(const basegfx::B2DPolygon& 
rPoly, SalInvert nFlags, boo
 
 cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
 
-if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 10, 0))
-{
-cairo_set_operator(cr,

[Libreoffice-commits] core.git: configure.ac scp2/source

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

 configure.ac  |   60 --
 scp2/source/ooo/vc_redist.scp |   15 +-
 2 files changed, 37 insertions(+), 38 deletions(-)

New commits:
commit ab4e40941e9ebae83f98ba918440b03eac5bdcaa
Author: Mike Kaganski 
AuthorDate: Fri Nov 11 16:59:31 2022 +0300
Commit: Mike Kaganski 
CommitDate: Fri Nov 11 21:31:35 2022 +0100

Fix VS2022 MSMs detection

After commits 42da199753515584e615cdcdd8601d2ffc27245b (more VS2022 
integration,
Oct 14 10:58:25 2021 +0200) and 9ea17a6331ca9491e7012dca837d3815cd4309ac 
(Adapt
to latest VS 2022 MSM versions, Apr 08 09:15:19 2022 +0200), the new 143 
version
of MSMs gets detected and passed to SCP, but not used there, so MSIs lack 
CRT.

Additionally, it may happen that a redist is configured that does not match 
the
actual CRT used in the build, because it picked a latest available version, 
and
then an error happens when building MSI, because it expects MSMs in wrong 
source
directory.

This simplifies the checks, makes sure to look for the correct MSM version, 
and
adds an error message in SCP in case when the passed version is not 
handled, to
detect the incomplete support early.

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

diff --git a/configure.ac b/configure.ac
index a3f00fddd585..f6937648fe2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6703,35 +6703,23 @@ find_winsdk()
 find_msms()
 {
 # Return value: $msmdir
+local version="$1"
 
-AC_MSG_CHECKING([for MSVC merge modules directory])
-local my_msm_files
+AC_MSG_CHECKING([for MSVC $version merge modules directory])
+local my_msm_file="Microsoft_VC${version}_CRT_x86.msm"
 local my_msm_dir
 
-dnl Order my_msm_files in increasing order. Then check the directories 
returned
-dnl by ls in an inner loop; assuming they are also ordered in increasing 
order,
-dnl the result will be the highest MSM version found in the highest 
directory.
-
-case "$VCVER" in
-16.0 | 17.0 | 17.4)
-my_msm_files="Microsoft_VC141_CRT_x86.msm Microsoft_VC142_CRT_x86.msm 
Microsoft_VC143_CRT_x86.msm ${my_msm_files}"
-;;
-esac
-for f in $my_msm_files; do
-echo "$as_me:$LINENO: searching for $f" >&5
-done
+echo "$as_me:$LINENO: searching for $my_msm_file" >&5
 
 msmdir=
 case "$VCVER" in
 16.0 | 17.0 | 17.4)
-for f in ${my_msm_files}; do
-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${f}])" >&5
-if test -e "$my_msm_dir${f}"; then
-msmdir=$my_msm_dir
-fi
-done
+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
+if test -e "$my_msm_dir${my_msm_file}"; then
+msmdir=$my_msm_dir
+fi
 done
 ;;
 esac
@@ -6744,7 +6732,7 @@ find_msms()
 AC_MSG_FAILURE([not found])
 else
 AC_MSG_WARN([not found (check config.log)])
-add_warning "MSM none of ${my_msm_files} found"
+add_warning "MSM ${my_msm_file} not found"
 fi
 fi
 }
@@ -8565,25 +8553,25 @@ AC_ARG_WITH(ucrt-dir,
 UCRT_REDISTDIR="$with_ucrt_dir"
 if test $_os = "WINNT"; then
 find_msvc_x64_dlls
-for i in $PKGFORMAT; do
-if test "$i" = msi; then
-find_msms
-break
-fi
-done
 MSVC_DLL_PATH=`win_short_path_for_make "$msvcdllpath"`
 MSVC_DLLS="$msvcdlls"
-test -n "$msmdir" && MSM_PATH=`win_short_path_for_make "$msmdir"`
-# MSVC 15.3 changed it to VC141
 if echo "$msvcdllpath" | grep -q "VC143.CRT$"; then
-SCPDEFS="$SCPDEFS -DWITH_VC143_REDIST"
+with_redist=143
 elif echo "$msvcdllpath" | grep -q "VC142.CRT$"; then
-SCPDEFS="$SCPDEFS -DWITH_VC142_REDIST"
+with_redist=142
 elif echo "$msvcdllpath" | grep -q "VC141.CRT$"; then
-SCPDEFS="$SCPDEFS -DWITH_VC141_REDIST"
-else
-SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST"
+with_redist=141
 fi
+for i in $PKGFORMAT; do
+if test "$i" = msi; then
+find_msms "$with_redist"
+if test -n "$msmdir"; then
+MSM_PATH=`win_short_path_for_make "$msmdir"`
+SCPDEFS="$SCPDEFS -DWITH_VC_REDIST=$with_redist"
+fi
+break
+fi
+done
 
 if test "$UCRT_REDISTDIR" = "no"; then
 dnl explicitly disabled
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index

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

2022-11-09 Thread Jan Holesovsky (via logerrit)

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

New commits:
commit e50cffea75456551382445c28fdd4cabd9c2e81b
Author: Jan Holesovsky 
AuthorDate: Wed Nov 9 12:23:25 2022 +0100
Commit: Jan Holesovsky 
CommitDate: Wed Nov 9 13:17:52 2022 +0100

Clarify the cairo warning in ./configure

To know what to expect.

Change-Id: Ia660a1ebdbb76c04aa96934cabc16e1cbfc4cfd1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142478
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/configure.ac b/configure.ac
index 0fa69d60a292..08c2ac634b71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11774,7 +11774,7 @@ GTK3_LIBS=""
 ENABLE_GTKTILEDVIEWER=""
 if test "$test_gtk3" = yes -a "x$enable_gtk3" = "xyes" -o "x$enable_gtk3_kde5" 
= "xyes"; then
 if test "$with_system_cairo" = no; then
-add_warning 'Non-system cairo combined with gtk3 is assumed to cause 
trouble; proceed at your own risk.'
+add_warning 'Non-system cairo combined with gtk3 is known to cause 
trouble (eg. broken image in the splashscreen). Use --with-system-cairo unless 
you know what you are doing.'
 fi
 : ${with_system_cairo:=yes}
 PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 
gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo)

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

2022-11-09 Thread xuenhua (via logerrit)

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

New commits:
commit a5f5846fcfe6c9b1f39e753a9d3bad49f34c22a9
Author: xuenhua 
AuthorDate: Wed Nov 9 11:09:21 2022 +0800
Commit: Tor Lillqvist 
CommitDate: Wed Nov 9 10:48:51 2022 +0100

Keep support for iOS SDK version 15.6

Change-Id: Ia58c9525a3e00cf9dab53b90128e72026a17679e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142469
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 0bc58a7c3259..0fa69d60a292 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3695,7 +3695,7 @@ dnl 
===
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
 current_sdk_ver=16.1
-older_sdk_vers="16.0"
+older_sdk_vers="16.0 15.6"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=14.5

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

2022-11-08 Thread xuenhua (via logerrit)

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

New commits:
commit 363d45244b2ba3f666e50255f77900d3849e51d2
Author: xuenhua 
AuthorDate: Sat Nov 5 15:40:27 2022 +0800
Commit: Tor Lillqvist 
CommitDate: Tue Nov 8 15:35:54 2022 +0100

Update iOS SDK Current Version to 16.1

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

diff --git a/configure.ac b/configure.ac
index 9a445fefabc1..0bc58a7c3259 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3694,8 +3694,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=16.0
-older_sdk_vers="15.6"
+current_sdk_ver=16.1
+older_sdk_vers="16.0"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=14.5

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

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

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

New commits:
commit 08bb758b150d6d52258b2a4f783e37298bb42373
Author: Stephan Bergmann 
AuthorDate: Sun Nov 6 21:51:40 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Nov 7 08:15:36 2022 +0100

Adapt to llvm-config --src-root dropped from LLVM 16 trunk

...with


"[llvm-config] Remove --src-root option", causing

> checking for llvm-config... .../llvm-config
> usage: llvm-config ... [...]
[...]
> dirname: missing operand
> Try 'dirname --help' for more information.

noise during configure

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

diff --git a/configure.ac b/configure.ac
index e079b251b108..b4b9a7a24eb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8403,9 +8403,11 @@ if test "$COM_IS_CLANG" = "TRUE"; then
 fi
 # Try if clang is built from source (in which case its includes 
are not together with llvm includes).
 # src-root is [llvm-toplevel-src-dir]/llvm, clang is 
[llvm-toplevel-src-dir]/clang
-clangsrcdir=$(dirname $($LLVM_CONFIG --src-root))
-if test -n "$clangsrcdir" -a -d "$clangsrcdir" -a -d 
"$clangsrcdir/clang/include"; then
-COMPILER_PLUGINS_CXXFLAGS="$COMPILER_PLUGINS_CXXFLAGS 
-I$clangsrcdir/clang/include"
+if $LLVM_CONFIG --src-root >/dev/null 2>&1; then
+clangsrcdir=$(dirname $($LLVM_CONFIG --src-root))
+if test -n "$clangsrcdir" -a -d "$clangsrcdir" -a -d 
"$clangsrcdir/clang/include"; then
+COMPILER_PLUGINS_CXXFLAGS="$COMPILER_PLUGINS_CXXFLAGS 
-I$clangsrcdir/clang/include"
+fi
 fi
 # obj-root is [llvm-toplevel-obj-dir]/, clang is 
[llvm-toplevel-obj-dir]/tools/clang
 clangobjdir=$($LLVM_CONFIG --obj-root)

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

2022-11-04 Thread Tor Lillqvist (via logerrit)

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

New commits:
commit 10e81ff3e3aa0f0b6b6cf392e62606ef4629ebec
Author: Tor Lillqvist 
AuthorDate: Thu Nov 3 15:21:12 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 4 08:26:19 2022 +0100

No need to accept macOS SDK 10.13 surely

We require at least 10.14 at run-time anyway.

Change-Id: Iaffdb403696733583ac66e31139c3b427aae0b69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142233
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 7116a768c1fd..e079b251b108 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3428,7 +3428,7 @@ if test $_os = Darwin; then
 # The SDK in the currently selected Xcode should be found.
 
 AC_MSG_CHECKING([what macOS SDK to use])
-for macosx_sdk in 13.0 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
+for macosx_sdk in 13.0 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14; do
 MACOSX_SDK_PATH=`xcrun --sdk macosx${macosx_sdk} --show-sdk-path 2> 
/dev/null`
 if test -d "$MACOSX_SDK_PATH"; then
 break
@@ -3446,9 +3446,6 @@ if test $_os = Darwin; then
 AC_MSG_RESULT([macOS SDK $macosx_sdk at $MACOSX_SDK_PATH])
 MACOSX_SDK_BUILD_VERSION=$(xcodebuild -version -sdk "$MACOSX_SDK_PATH" 
ProductBuildVersion) 
 case $macosx_sdk in
-10.13)
-MACOSX_SDK_VERSION=101300
-;;
 10.14)
 MACOSX_SDK_VERSION=101400
 ;;

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

2022-11-03 Thread Tor Lillqvist (via logerrit)

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

New commits:
commit 029e4e8a614a86f22bcafc0e2db55449d2b07a52
Author: Tor Lillqvist 
AuthorDate: Thu Nov 3 11:11:29 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 3 14:07:01 2022 +0100

Accept macOS SDK 13.0

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

diff --git a/configure.ac b/configure.ac
index f2314d4144e2..7116a768c1fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3428,7 +3428,7 @@ if test $_os = Darwin; then
 # The SDK in the currently selected Xcode should be found.
 
 AC_MSG_CHECKING([what macOS SDK to use])
-for macosx_sdk in 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
+for macosx_sdk in 13.0 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
 MACOSX_SDK_PATH=`xcrun --sdk macosx${macosx_sdk} --show-sdk-path 2> 
/dev/null`
 if test -d "$MACOSX_SDK_PATH"; then
 break
@@ -3473,6 +3473,9 @@ if test $_os = Darwin; then
 12.3)
 MACOSX_SDK_VERSION=120300
 ;;
+13.0)
+MACOSX_SDK_VERSION=13
+;;
 *)
 AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
 ;;
@@ -3538,8 +3541,11 @@ if test $_os = Darwin; then
 12.3)
 MAC_OS_X_VERSION_MIN_REQUIRED="120300"
 ;;
+13.0)
+MAC_OS_X_VERSION_MIN_REQUIRED="13"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.14--12.3])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.14--13.0])
 ;;
 esac

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

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

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

New commits:
commit 296a8ef5cab17e576de7aa0d89bf5f7c7de3070f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Nov 1 21:47:24 2022 +0900
Commit: Ilmari Lauhakangas 
CommitDate: Tue Nov 1 19:16:20 2022 +0100

Add support for .NET Framework 4.8.1

Change-Id: I9d719c1c5ad36579638882cf09dabaee812c015e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142113
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/configure.ac b/configure.ac
index e98a71342a46..f2314d4144e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6591,7 +6591,7 @@ find_al()
 unset altest
 
 # We need this check to detect 4.6.1 or above.
-for ver in 4.8 4.7.2 4.7.1 4.7 4.6.2 4.6.1; do
+for ver in 4.8.1 4.8 4.7.2 4.7.1 4.7 4.6.2 4.6.1; do
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/NETFXSDK/$ver/WinSDK-NetFx40Tools/InstallationFolder"
 PathFormat "$regvalue"
 if test -n "$regvalue" -a \( -f "$formatted_path_unix/al.exe" -o -f 
"$formatted_path_unix/bin/al.exe" \); then
@@ -6615,7 +6615,7 @@ find_dotnetsdk46()
 {
 unset frametest
 
-for ver in 4.8 4.7.2 4.7.1 4.7 4.6.2 4.6.1 4.6; do
+for ver in 4.8.1 4.8 4.7.2 4.7.1 4.7 4.6.2 4.6.1 4.6; do
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/NETFXSDK/$ver/KitsInstallationFolder"
 if test -n "$regvalue"; then
 frametest=$regvalue

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

2022-10-29 Thread Rene Engelhard (via logerrit)

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

New commits:
commit 75e16fdc9d111aad9663b7de1b229fbd2a61b51e
Author: Rene Engelhard 
AuthorDate: Sat Oct 29 15:23:20 2022 +0200
Commit: Miklos Vajna 
CommitDate: Sat Oct 29 16:49:44 2022 +0200

require xmlsec1-nss >= 1.2.35

1.2.34 apparently doesn't have xmlSecBase64Decode_ex (needed since
19e998aa98d966cffca98bed9408d5758d91d9be):

[build CXX] xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx

/home/rene/LibreOffice/git/master/xmlsecurity/source/gpg/SecurityEnvironment.cxx:
 In member function 'virtual 
com::sun::star::uno::Reference 
SecurityEnvironmentGpg::getCertificate(const rtl::OUString&, const 
com::sun::star::uno::Sequence&)':

/home/rene/LibreOffice/git/master/xmlsecurity/source/gpg/SecurityEnvironment.cxx:166:16:
 error: 'xmlSecBase64Decode_ex' was not declared in this scope; did you mean 
'xmlSecBase64Decode'?
  166 | int nRet = xmlSecBase64Decode_ex(strKeyId, 
const_cast(strKeyId), xmlStrlen(strKeyId), );
  |^
  |xmlSecBase64Decode
make[3]: *** 
[/home/rene/LibreOffice/git/master/solenv/gbuild/LinkTarget.mk:337: 
/home/rene/LibreOffice/git/master/workdir/CxxObject/xmlsecurity/source/gpg/SecurityEnvironment.o]
 Error 1

and is neither in a grep -r on the header directory

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

diff --git a/configure.ac b/configure.ac
index 8446105fceac..e98a71342a46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9623,7 +9623,7 @@ libo_CHECK_SYSTEM_MODULE([expat], [EXPAT], [expat])
 dnl ===
 dnl Check for system xmlsec
 dnl ===
-libo_CHECK_SYSTEM_MODULE([xmlsec], [XMLSEC], [xmlsec1-nss >= 1.2.28])
+libo_CHECK_SYSTEM_MODULE([xmlsec], [XMLSEC], [xmlsec1-nss >= 1.2.35])
 
 AC_MSG_CHECKING([whether to enable Embedded OpenType support])
 if test "$enable_eot" = "yes"; then

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1527 matches

Mail list logo