core.git: Branch 'libreoffice-24-2' - configure.ac

2024-06-21 Thread Chris Mayo (via logerrit) 
 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f194fc58594ce7ddb4e3152b59800220070a0403
Author: Chris Mayo 
AuthorDate: Sat May 18 17:13:31 2024 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Fri Jun 21 10:38:15 2024 +0200

Fix bashism in configure tests for curl and libcmis

When /bin/sh is dash:

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

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

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

Introduced in:

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

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

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

core.git: Branch 'libreoffice-24-2' - configure.ac

2024-05-21 Thread Christian Lohmaier (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bbf052d967d2c7e920a58e47d3351dc7d3a61121
Author: Christian Lohmaier 
AuthorDate: Tue May 21 21:30:01 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 21 21:30:01 2024 +0200

bump product version to 24.2.5.0.0+

Change-Id: I5885efdf31ee6b8121e098b2fb7024f1c0b9dee4

diff --git a/configure.ac b/configure.ac
index a435fdc89a1e..79373cd08b8d 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.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.5.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'libreoffice-24-2' - configure.ac

2024-04-22 Thread Vasily Melenchuk (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bed3fa30f442c9045264f34fd6abf940215c637b
Author: Vasily Melenchuk 
AuthorDate: Fri Apr 19 13:14:13 2024 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Apr 22 22:13:07 2024 +0200

configure: cygwin issue with date fixed

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

Change-Id: Ic8762a98f11ef2fee669478b5694ae1c5fb0b8ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166294
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 5d3e3790e15cd05bea463bc4ff14d523163832fc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166431

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

core.git: Branch 'libreoffice-24-2' - configure.ac

2024-04-11 Thread Christian Lohmaier (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bdb455b6c62a1cfeb7e759fa7314d8653c453f84
Author: Christian Lohmaier 
AuthorDate: Thu Apr 11 19:30:14 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Apr 11 19:30:14 2024 +0200

bump product version to 24.2.4.0.0+

Change-Id: Ie305c2fa2e92e34e5d8c450428a169fa014817f3

diff --git a/configure.ac b/configure.ac
index b78d73420d81..5505bfed8b5b 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.3.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.4.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'libreoffice-24-2' - configure.ac download.lst

2024-03-21 Thread Michael Stahl (via logerrit) 
 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fc26519a0b11e470ace3651a0cad8ea82d3b03d4
Author: Michael Stahl 
AuthorDate: Wed Mar 20 10:52:09 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 21 16:09:01 2024 +0100

python3: upgrade to release 3.8.19

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

Change-Id: Iebca2608e16a966356736201c63f1be5185430d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165053
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0633e4b4205334dd65ec64d7f3e306ee125e31be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165008
Reviewed-by: Xisco Fauli 

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

core.git: Branch 'libreoffice-24-2' - configure.ac

2024-03-13 Thread Fridrich Strba (via logerrit) 
 configure.ac |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 01d39c444a62d69dedcaa1d9f6b2bed47a5dadee
Author: Fridrich Strba 
AuthorDate: Tue Mar 12 11:34:52 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Mar 13 07:58:58 2024 +0100

Fix build with autoconf 2.72

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

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

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

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

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

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

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

core.git: Branch 'libreoffice-24-2' - configure.ac filter/qa

2024-03-11 Thread Mike Kaganski (via logerrit) 
 configure.ac   |   14 --
 filter/qa/unit/svg.cxx |3 ++-
 2 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 6bc66a08b8fef03772979f67a34df4e9cc3ff33d
Author: Mike Kaganski 
AuthorDate: Sat Mar 9 08:03:08 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 11 11:36:28 2024 +0100

Enable CVE tests on Windows by default

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

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

Change-Id: I3816e97cfb4559f7647167ed291b75468b03dc4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164612
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 4c65ab909598766e5859a5f0ce4bf55b23c9551b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164621
Reviewed-by: Xisco Fauli 

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

core.git: Branch 'libreoffice-24-2' - configure.ac

2024-03-07 Thread Christian Lohmaier (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b0c2f78a9d398b92e24a0b9f91c7773ecd743d6f
Author: Christian Lohmaier 
AuthorDate: Thu Mar 7 12:26:19 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Mar 7 12:26:19 2024 +0100

bump product version to 24.2.3.0.0+

Change-Id: I984e5fcd6f5367fb284912d9d6bb3c8f53125c43

diff --git a/configure.ac b/configure.ac
index 650fe6896be7..901392b32fcf 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.2.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.3.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'libreoffice-24-2' - configure.ac

2024-02-13 Thread Michael Weghorn (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9de87f990e6d9e48495bd6970a25eb1823d5b2ef
Author: Michael Weghorn 
AuthorDate: Mon Feb 12 10:38:03 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Feb 13 23:09:01 2024 +0100

kf6: Add missing include path to fix build

Many thanks to Andreas Sturmlechner for pointing
this out on #libreoffice-dev on 2024-02-12:

> [10:27]  michaelweghorn: I also had to apply a trivial
>  openmandriva patch to get it to build in the first place,
>  
https://github.com/gentoo/gentoo/blob/master/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch

Change-Id: If86220e258336d84ffc30fd5da0f5d99dda59aff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163237
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 30ec42fad4c0c61de93bea23e9f7d98acc6db0e6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163272
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/configure.ac b/configure.ac
index a5d9287e0808..b7042e9ee312 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13493,7 +13493,7 @@ then
 AC_MSG_ERROR([KF6 libraries not found.  Please specify the root of 
your KF6 installation by exporting KF6DIR before running "configure".])
 fi
 
-KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n 
-I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO 
-I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets 
-I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets 
-I$qt6_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT 
-DQT_NO_VERSION_TAGGING"
+KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n 
-I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem 
-I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets 
-I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore 
-I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork 
-DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
 KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore 
-lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets 
-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network"
 KF6_CFLAGS=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")

core.git: Branch 'libreoffice-24-2' - configure.ac

2024-02-09 Thread Christian Lohmaier (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46169670ef4031888e143823b263577296d7867f
Author: Christian Lohmaier 
AuthorDate: Fri Feb 9 15:59:12 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Fri Feb 9 15:59:12 2024 +0100

bump product version to 24.2.2.0.0+

Change-Id: Ie3111656db10fd1237fafbf96d7cdd46385811b0

diff --git a/configure.ac b/configure.ac
index 18f2900fbd39..a5d9287e0808 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.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.2.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'libreoffice-24-2' - configure.ac

2024-01-11 Thread Christian Lohmaier (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6cc31ef3fe6335d9e997ad6897f4c8f1a23cb07c
Author: Christian Lohmaier 
AuthorDate: Thu Jan 11 19:25:35 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Jan 11 19:25:35 2024 +0100

bump product version to 24.2.1.0.0+

Change-Id: Ia5f3014edabb54205d1b3c4f5f32cb7cfbb70ed5

diff --git a/configure.ac b/configure.ac
index 77781df743ed..665f954adfc0 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.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.1.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'libreoffice-24-2' - configure.ac

2024-01-03 Thread Stephan Bergmann (via logerrit) 
 configure.ac |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 7b47ee0b6ca78ed51544b8177b810cd353814068
Author: Stephan Bergmann 
AuthorDate: Wed Jan 3 15:16:31 2024 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 3 17:13:07 2024 +0100

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

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

Change-Id: I2dc9e500cfd9ffb1962c3fe3aa0bc9d6ba49c3d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161585
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit fa49dadaf5161708c79f5311cc317ccbc5eb02cd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161564

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

core.git: Branch 'libreoffice-24-2' - configure.ac

2024-01-01 Thread Rene Engelhard (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

update LIBO_THIS_YEAR

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

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

core.git: Branch 'libreoffice-24-2' - configure.ac external/argon2

2023-12-26 Thread Thorsten Behrens (via logerrit) 
 configure.ac   |1 
 external/argon2/0002-Add-WinARM64-vcxproj-config.patch |  185 +
 external/argon2/UnpackedTarball_argon2.mk  |1 
 3 files changed, 187 insertions(+)

New commits:
commit 2e8b59608471ab6c62a2e9c851dbe2b28fbd9804
Author: Thorsten Behrens 
AuthorDate: Sat Dec 23 01:08:09 2023 +0100
Commit: Xisco Fauli 
CommitDate: Tue Dec 26 09:35:23 2023 +0100

tdf#105844 argon2: add vcxproj files for WinARM64 builds

Also add argon2 to crossbuild tools side.

Change-Id: I8704b2d8362a051c2d634b9db7416cdc2cf9add4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161206
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit ed1965b60840056da1eed9fd5ba5c21fdea95d56)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161220

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

core.git: Branch 'libreoffice-24-2' - configure.ac

2023-12-21 Thread Xisco Fauli (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b49ba07a60776b65fd0084c9a812fa60619e25aa
Author: Xisco Fauli 
AuthorDate: Thu Dec 21 17:44:38 2023 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 21 17:44:38 2023 +0100

bump product version to 24.2.0.1.0+

Change-Id: Ia556c2be1b2c3896a72cf89cd9ad9087b1df4010

diff --git a/configure.ac b/configure.ac
index fce08fb0cac3..62cd9343f82a 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.beta1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.0.1.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'libreoffice-24-2' - configure.ac

2023-12-11 Thread Michael Weghorn (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a9a882929bd7ed2d1c5a1bc68a912d0f6de301af
Author: Michael Weghorn 
AuthorDate: Fri Dec 8 15:20:04 2023 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 11 20:51:34 2023 +0100

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

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

See the commit message of

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

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

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

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

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

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

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

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

Change-Id: Ie7ba6ec58ea44e5cf8a52d18f0359d3c2335a4ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160466
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 5829cf7e96d3b2fcbc91b9c5c15438202629bc03)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160579
Reviewed-by: Xisco Fauli 

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

core.git: Branch 'libreoffice-24-2' - configure.ac

2023-12-08 Thread Christian Lohmaier (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a891585acd2dce722c2688d7738a3569859e0164
Author: Christian Lohmaier 
AuthorDate: Fri Dec 8 16:12:31 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Fri Dec 8 16:12:31 2023 +0100

bump product version to 24.2.0.0.beta1+

Change-Id: I0e516ede7ba4b78ce887aff1cfb1115a86b7c678

diff --git a/configure.ac b/configure.ac
index d77e27499230..e7886b44507a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[24.2.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.0.0.beta1+],[],[],[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