[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac download.lst external/python3

2022-10-25 Thread Taichi Haradaguchi (via logerrit) 
 configure.ac   
|2 
 download.lst   
|4 
 
external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 |   59 --
 external/python3/i100492-freebsd.patch.1   
|6 -
 external/python3/internal-zlib.patch.0 
|6 -
 external/python3/macos-11.patch.0  
|6 -
 external/python3/python-3.3.0-darwin.patch.1   
|4 
 external/python3/python-3.3.3-disable-obmalloc.patch.0 
|4 
 external/python3/python-3.3.3-elf-rpath.patch.1
|4 
 external/python3/python-3.5.4-msvc-disable.patch.1 
|6 -
 external/python3/python-3.5.tweak.strip.soabi.patch
|2 
 external/python3/python-3.7.6-msvc-ssl.patch.1 
|2 
 external/python3/ubsan.patch.0 
|4 
 13 files changed, 25 insertions(+), 84 deletions(-)

New commits:
commit 418d0c88fc56c5e2ef1bfa774b89c440a024fda2
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Oct 24 00:52:04 2022 +0900
Commit: Christian Lohmaier 
CommitDate: Tue Oct 25 15:38:35 2022 +0200

Python3: update to 3.8.15

* Fixes CVE-2022-40674
* Removed 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 
as fixed upstream

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

diff --git a/configure.ac b/configure.ac
index 4258dd0225f6..53ddc45502f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9849,7 +9849,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.14
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.15
 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 71323519bac0..14bc39ac7316 100644
--- a/download.lst
+++ b/download.lst
@@ -220,8 +220,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 := 
5d77e278271ba803e9909a41a4f3baca006181c93ada682a5e5fe8dc4a24c5f3
-export PYTHON_TARBALL := Python-3.8.14.tar.xz
+export PYTHON_SHA256SUM := 
5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550
+export PYTHON_TARBALL := Python-3.8.15.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
diff --git 
a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 
b/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
deleted file mode 100644
index 489e5d0e89ee..
--- 
a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
+++ /dev/null
@@ -1,59 +0,0 @@
-From 582d188e6e3487180891f1fc457a80dec8be26a8 Mon Sep 17 00:00:00 2001
-From: Christian Heimes 
-Date: Mon, 24 Sep 2018 14:38:31 +0200
-Subject: [PATCH] [3.6] bpo-17239: Disable external entities in SAX parser
- (GH-9217) (GH-9512)
-
-The SAX parser no longer processes general external entities by default
-to increase security. Before, the parser created network connections
-to fetch remote files or loaded local files from the file system for DTD
-and entities.
-
-Signed-off-by: Christian Heimes 
-
-https://bugs.python.org/issue17239.
-(cherry picked from commit 17b1d5d4e36aa57a9b25a0e694affbd1ee637e45)
-
-Co-authored-by: Christian Heimes 
-
-
-
-https://bugs.python.org/issue17239

- Doc/library/xml.dom.pulldom.rst   | 14 +
- Doc/library/xml.rst   |  6 +-
- Doc/library/xml.sax.rst   |  8 +++
- Doc/whatsnew/3.6.rst  | 18 +-
- Lib/test/test_pulldom.py  |  7 +++
- Lib/test/test_sax.py  | 60 ++-
- Lib/test/test_xml_etree.py| 13 
- Lib/xml/sax/expatreader.py|  2 +-
- .../2018-09-11-18-30-55.bpo-17239.kOpwK2.rst  |  3 +
- 9 files changed, 125 insertions(+), 6 deletions(-)
-

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac sysui/desktop

2022-10-24 Thread Christian Lohmaier (via logerrit) 
 configure.ac   |7 ++-
 sysui/desktop/macosx/Info.plist.in |4 
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 9328e304c55684911b97f4e4fa3dab2fd1eb7f0f
Author: Christian Lohmaier 
AuthorDate: Tue Oct 18 12:51:52 2022 +0200
Commit: Caolán McNamara 
CommitDate: Mon Oct 24 09:56:58 2022 +0200

macOS: add XCode and SDK buildversions to Info.plist

without those submitting a build for external testing via testflight is
not possible because appstore thinks you were using a beta version of XCode

Change-Id: I6979a9d290c3e67dd9969d6e535625760b639c25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141496
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 3336cb1b3d12e9cd5c2f560c82129dc8ed7527da)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141698
Reviewed-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 4c0e343e3f66..4258dd0225f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3286,7 +3286,7 @@ if test $_os = Darwin; then
 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.13)
 MACOSX_SDK_VERSION=101300
@@ -3353,6 +3353,9 @@ if test $_os = Darwin; then
 AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at 
least Xcode 11.3])
 fi
 
+my_xcode_ver1=$(xcrun xcodebuild -version | tail -n 1)
+MACOSX_XCODE_BUILD_VERSION=${my_xcode_ver1#Build version }
+
 case "$with_macosx_version_min_required" in
 10.12)
 MAC_OS_X_VERSION_MIN_REQUIRED="101200"
@@ -3574,6 +3577,8 @@ AC_SUBST(ENABLE_MACOSX_SANDBOX)
 AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
 AC_SUBST(MACOSX_PROVISIONING_INFO)
 AC_SUBST(MACOSX_PROVISIONING_PROFILE)
+AC_SUBST(MACOSX_SDK_BUILD_VERSION)
+AC_SUBST(MACOSX_XCODE_BUILD_VERSION)
 
 dnl ===
 dnl Check iOS SDK and compiler
diff --git a/sysui/desktop/macosx/Info.plist.in 
b/sysui/desktop/macosx/Info.plist.in
index 6593139019fc..5401687027fa 100644
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1961,6 +1961,10 @@
 
 NSContactsUsageDescription
 You can add your contacts as a data source for mail merge or 
similar operations.
+DTXcodeBuild
+@MACOSX_XCODE_BUILD_VERSION@
+DTSDKBuild
+@MACOSX_SDK_BUILD_VERSION@

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

2022-10-13 Thread Christian Lohmaier (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f7fb0a2decec3f8869098ae5e47ee6055545486
Author: Christian Lohmaier 
AuthorDate: Thu Oct 13 12:51:29 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Oct 13 12:51:29 2022 +0200

bump product version to 7.3.8.0.0+

Change-Id: Ia7cc93f51a23cb65ce10dfc0bcbb3e1573130e42

diff --git a/configure.ac b/configure.ac
index 3a39b672a033..4c0e343e3f66 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.3.7.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.8.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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac external/libxml2 external/redland

2022-09-15 Thread Jan-Marek Glogowski (via logerrit) 
 configure.ac  |2 -
 external/libxml2/UnpackedTarball_libxml2.mk   |3 +
 external/libxml2/libxml2-config.patch.1   |   43 --
 external/libxml2/xml2-config.in   |   28 
 external/redland/UnpackedTarball_raptor.mk|1 
 external/redland/raptor/libxml-override.patch |   13 ---
 6 files changed, 31 insertions(+), 59 deletions(-)

New commits:
commit 5c044ae7a3246bddbd0513bd5ed3efef10cb1503
Author: Jan-Marek Glogowski 
AuthorDate: Sun May 30 13:23:16 2021 +0200
Commit: Michael Stahl 
CommitDate: Thu Sep 15 10:56:29 2022 +0200

libxml2: use xml2-config dummy for internal build

When building a static LO with --disable-dynloading on Linux,
--without-system-libs failed for me. And it left me really puzzled:
raptor configure failed and claimed it couldn't link libxml2.

raptor's config.log showed missing math functions. xml2-config of
LO's build is patched and it includes a -lm. The xml2-config in my
chroot doesn't. But we explicitly pass the xml2-config for
non-system-libxml2 build. Reading the configure from raptor didn't
reveal a way, that it could somehow pick up the xml2-config from
the chroot, but that code is autoconf-complex...

When running "sh -x configure", it turned out the configure script
actually picks up the LIBXML_* flags from the environment, which
are set by LO's config_host.mk. These just add -lm for Android.

So this adds a xml2-config.in "dummy", which overwrites the one
from the libxml2 source and just echos LO's LIBXML_* values and
it adds -lm for all DISABLE_DYNLOADING targets.

Change-Id: Ia713cf80c8e7dc989cf23c224e7a0f7ea1210a87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116409
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 8b9f8f0f9d38cc64f742fe5358fce88d0f82391a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139965
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 8ef428589d79..3a39b672a033 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9614,7 +9614,7 @@ else
 
LIBXML_LIBS="${WORKDIR}/UnpackedTarball/libxml2/win32/bin.msvc/libxml2.lib"
 else
 LIBXML_LIBS="-L${WORKDIR}/UnpackedTarball/libxml2/.libs -lxml2"
-if test "$_os" = Android; then
+if test "$DISABLE_DYNLOADING" = TRUE; then
 LIBXML_LIBS="$LIBXML_LIBS -lm"
 fi
 fi
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk 
b/external/libxml2/UnpackedTarball_libxml2.mk
index 83df02849cb3..8c81c3d26e4c 100644
--- a/external/libxml2/UnpackedTarball_libxml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -14,7 +14,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libxml2,$(LIBXML_TARBALL),,libxml2)
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libxml2))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
-   external/libxml2/libxml2-config.patch.1 \
external/libxml2/libxml2-global-symbols.patch \
external/libxml2/libxml2-vc10.patch \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
@@ -23,4 +22,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
external/libxml2/libxml2-icu.patch.0) \
 ))
 
+$(eval $(call 
gb_UnpackedTarball_add_file,libxml2,xml2-config.in,external/libxml2/xml2-config.in))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/libxml2-config.patch.1 
b/external/libxml2/libxml2-config.patch.1
deleted file mode 100644
index 5a2ef1485e92..
--- a/external/libxml2/libxml2-config.patch.1
+++ /dev/null
@@ -1,43 +0,0 @@
-Hack the xml2-config to return paths into WORKDIR.
-
 a/xml2-config.in   2009-12-17 11:45:20.0 +
-+++ b/xml2-config.in   2009-12-17 11:45:36.0 +
-@@ -1,9 +1,14 @@
- #! /bin/sh
- 
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--includedir=@includedir@
--libdir=@libdir@
-+#prefix=@prefix@
-+#exec_prefix=@exec_prefix@
-+#includedir=@includedir@
-+#libdir=@libdir@
-+
-+prefix=${WORKDIR}/UnpackedTarball/libxml2
-+exec_prefix=${WORKDIR}/UnpackedTarball/libxml2
-+includedir=${WORKDIR}/UnpackedTarball/libxml2/include
-+libdir=${WORKDIR}/UnpackedTarball/libxml2/.libs
- cflags=
- libs=
- 
-@@ -67,7 +72,8 @@
-   ;;
- 
- --cflags)
--cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
-+#cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
-+cflags="-I${includedir}"
-   ;;
- 
- --libtool-libs)
-@@ -91,7 +96,8 @@
- libs="@XML_LIBDIR@ $libs"
- fi
- 
--libs="$libs @WIN32_EXTRA_LIBADD@"
-+#libs="$libs @WIN32_EXTRA_LIBADD@"
-+libs="-L${libdir} -lxml2 -lm"
- ;;
- 
- *)
diff --git a/external/libxml2/xml2-config.in b/external/libxml2/xml2-config.in
new file mode 100644
index ..164508e47e67
--- /dev/null
+++ b/external/libxml2/xml2-config.in
@@

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac download.lst

2022-09-14 Thread Taichi Haradaguchi (via logerrit) 
 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 27500239d711ce6e2dfe16acaa74c2dae6660809
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Sep 10 17:20:58 2022 +0900
Commit: Caolán McNamara 
CommitDate: Wed Sep 14 11:42:55 2022 +0200

Python3: upgrade to release 3.8.14

Fixes CVE-2020-10735.

Change-Id: I028bb1fe6154beffdd80c0190c9de40ab8a80c4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139747
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 849601bdec341eaee3cafc46fbe3cf223f06fb7d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139840

diff --git a/configure.ac b/configure.ac
index a62c288ab803..8ef428589d79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9844,7 +9844,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.13
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.14
 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 9569035fc250..26d413585101 100644
--- a/download.lst
+++ b/download.lst
@@ -220,8 +220,8 @@ export POPPLER_DATA_SHA256SUM := 
6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69
 export POPPLER_DATA_TARBALL := poppler-data-0.4.10.tar.gz
 export POSTGRESQL_SHA256SUM := 
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
 export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
-export PYTHON_SHA256SUM := 
6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57
-export PYTHON_TARBALL := Python-3.8.13.tar.xz
+export PYTHON_SHA256SUM := 
5d77e278271ba803e9909a41a4f3baca006181c93ada682a5e5fe8dc4a24c5f3
+export PYTHON_TARBALL := Python-3.8.14.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac download.lst external/python3

2022-09-08 Thread Taichi Haradaguchi (via logerrit) 
 configure.ac|2 +-
 download.lst|4 ++--
 external/python3/darwin.patch.0 |   12 
 3 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit 78fdc2b31860f7ac9fe153d49b9eef25adc28530
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Sep 6 21:10:53 2022 +0900
Commit: Xisco Fauli 
CommitDate: Thu Sep 8 12:32:42 2022 +0200

python3: upgrade to release 3.8.13

Remove some code in external/python3/darwin.patch.0 as it was fixed 
upstream(https://bugs.python.org/issue45405).

Change-Id: Ie6bfb2456f96a63adbf0dbcb9c902dc56f1151ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139493
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit c8fd50f9ec02a131fd4c99e80f7252b49015653a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139564
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index cfcb455e6f92..a62c288ab803 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9844,7 +9844,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.10
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.13
 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 58b285b83eca..9569035fc250 100644
--- a/download.lst
+++ b/download.lst
@@ -220,8 +220,8 @@ export POPPLER_DATA_SHA256SUM := 
6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69
 export POPPLER_DATA_TARBALL := poppler-data-0.4.10.tar.gz
 export POSTGRESQL_SHA256SUM := 
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
 export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
-export PYTHON_SHA256SUM := 
6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9
-export PYTHON_TARBALL := Python-3.8.10.tar.xz
+export PYTHON_SHA256SUM := 
6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57
+export PYTHON_TARBALL := Python-3.8.13.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
diff --git a/external/python3/darwin.patch.0 b/external/python3/darwin.patch.0
index 30d20ed57578..139cdc9780bb 100644
--- a/external/python3/darwin.patch.0
+++ b/external/python3/darwin.patch.0
@@ -8,15 +8,3 @@
  .text
  
  /* ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags,
 configure
-+++ configure
-@@ -5167,7 +5167,9 @@
- fi
- 
- 
-+if test "$(uname -s)" = Darwin; then MULTIARCH=; else
- MULTIARCH=$($CC --print-multiarch 2>/dev/null)
-+fi
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet 
based on compiler characteristics" >&5

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

2022-07-14 Thread Christian Lohmaier (via logerrit) 
 configure.ac |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9a2a837ae6ac35ec098359aa1c09590c7ccda69f
Author: Christian Lohmaier 
AuthorDate: Wed Jul 13 14:10:55 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jul 14 15:34:46 2022 +0200

fix bluetooth entitlement, was added to the flipped condition

of course it should only be added when the bluetooth part of the
sdremote is enabled, not the other way round...
fixes c78b49ec132eb5126445ebee7d259d3df7fcaa68

Change-Id: I0085c61a4bafece80be92c56928095c2726e11b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137025
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit bdd97cb83e09225905a6272caf91579a0a77d3c2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137054
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Christian Lohmaier 

diff --git a/configure.ac b/configure.ac
index 9073fb68858f..85521710e9a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11870,14 +11870,14 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" 
!= "no"; then
 AC_MSG_RESULT([yes])
 ENABLE_SDREMOTE_BLUETOOTH=TRUE
 SYSTEM_BLUEZ=
+SDREMOTE_ENTITLEMENT="$SDREMOTE_ENTITLEMENT
+   com.apple.security.device.bluetooth
+   "
 fi
 else
 AC_MSG_RESULT([no])
 ENABLE_SDREMOTE_BLUETOOTH=
 SYSTEM_BLUEZ=
-SDREMOTE_ENTITLEMENT="$SDREMOTE_ENTITLEMENT
-   com.apple.security.device.bluetooth
-   "
 fi
 else
 ENABLE_SDREMOTE=

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

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

New commits:
commit 9e34b51f347a00257a50e7526bb7e3437f7f3b1a
Author: Christian Lohmaier 
AuthorDate: Fri Jul 1 21:39:45 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Jul 1 21:39:45 2022 +0200

bump product version to 7.3.6.0.0+

Change-Id: I6eeea91eee285da5381fbd4a44bb6736c699db3c

diff --git a/configure.ac b/configure.ac
index 55099b401f32..9073fb68858f 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.3.5.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.6.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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

2022-06-30 Thread Christian Lohmaier (via logerrit) 
 configure.ac |   48 
 1 file changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 1709c90e4d5bdf5a7b5201baac49249e22e11588
Author: Christian Lohmaier 
AuthorDate: Tue Jun 21 13:45:00 2022 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 30 15:48:36 2022 +0200

allow pretty names in --enable-macosx-code/package-signing

also reorder the logic to avoid duplicating the matches for default
value and manually provided one.

Change-Id: I4466cbeaf5abd7168f21e22cd910f63568c14e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136224
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 2f5b54ba51157a2346e10dfb82e3d434d6030aaa)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136551
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index 557c5da4a766..db33c873cd83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3481,16 +3481,22 @@ if test $_os = Darwin; then
 
 AC_MSG_CHECKING([whether to do code signing])
 
-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
-# 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
-# "Developer ID Application" one.
+if test -z "$enable_macosx_code_signing" -o "$enable_macosx_code_signing" 
== "no" ; then
+AC_MSG_RESULT([no])
+else
+if test "$enable_macosx_code_signing" = yes; then
+# By default use the first suitable certificate (?).
 
-identity=`security find-identity -p codesigning -v 2>/dev/null | grep 
'Developer ID Application:' | $AWK '{print $2}' |head -1`
+# 
http://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
+# "Developer ID Application" one.
+identity="Developer ID Application:"
+else
+identity=$enable_macosx_code_signing
+fi
+identity=`security find-identity -p codesigning -v 2>/dev/null | $AWK 
"/$identity/{print \\$2; exit}"`
 if test -n "$identity"; then
 MACOSX_CODESIGNING_IDENTITY=$identity
 pretty_name=`security find-identity -p codesigning -v | grep 
"$MACOSX_CODESIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'`
@@ -3498,12 +3504,6 @@ if test $_os = Darwin; then
 else
 AC_MSG_ERROR([cannot determine identity to use])
 fi
-elif test -n "$enable_macosx_code_signing" -a 
"$enable_macosx_code_signing" != no ; then
-MACOSX_CODESIGNING_IDENTITY=$enable_macosx_code_signing
-pretty_name=`security find-identity -p codesigning -v | grep 
"$MACOSX_CODESIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'`
-AC_MSG_RESULT([yes, using the identity $MACOSX_CODESIGNING_IDENTITY 
for $pretty_name])
-else
-AC_MSG_RESULT([no])
 fi
 
 AC_MSG_CHECKING([whether to create a Mac App Store package])
@@ -3512,11 +3512,15 @@ if test $_os = Darwin; then
 AC_MSG_RESULT([no])
 elif test -z "$MACOSX_CODESIGNING_IDENTITY"; then
 AC_MSG_ERROR([You forgot --enable-macosx-code-signing])
-elif test "$enable_macosx_package_signing" = yes; then
-# By default use the first suitable certificate.
-# It should be a "3rd Party Mac Developer Installer" one
-
-identity=`security find-identity -v 2>/dev/null | grep '3rd Party Mac 
Developer Installer:' | awk '{print $2}' |head -1`
+else
+if test "$enable_macosx_package_signing" = yes; then
+# By default use the first suitable certificate.
+# It should be a "3rd Party Mac Developer Installer" one
+identity="3rd Party Mac Developer Installer:"
+else
+identity=$enable_macosx_package_signing
+fi
+identity=`security find-identity -v 2>/dev/null | $AWK "/$identity/ 
{print \\$2; exit}"`
 if test -n "$identity"; then
 MACOSX_PACKAGE_SIGNING_IDENTITY=$identity
 pretty_name=`security find-identity -v | grep 
"$MACOSX_PACKAGE_SIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'`
@@ -3524,10 +3528,6 @@ if test $_os = Darwin; then
 else
 AC_MSG_ERROR([Could not find any suitable '3rd Party

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac lo.xcent lo.xcent.in Makefile.in

2022-06-30 Thread Christian Lohmaier (via logerrit) 
 Makefile.in  |1 +
 configure.ac |9 +
 lo.xcent.in  |   11 ---
 3 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 23b81098bd580eada788986682ab3bb4e1f53c83
Author: Christian Lohmaier 
AuthorDate: Wed Jun 29 13:17:14 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Jun 30 09:01:06 2022 +0200

don't specify entitlements that are not used (sdremote w/o bluetooth)

the network.server entitlement is only needed when the sdremote is
enabled, and the bluetooth one only when the bluetooth part is built.
Also warn about bluetooth not being built because of obsoleted/removed
API. It was "silently" dropped before (lost in the flood of configure
output).

Change-Id: I38d83aa1132307b5b4b5d6dceba8f9020ffb2373
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136617
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136626
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/Makefile.in b/Makefile.in
index d74dba59344c..d3f1047be4ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -225,6 +225,7 @@ distclean : clean compilerplugins-clean
 $(BUILDDIR)/configure \
 $(BUILDDIR)/hardened_runtime.xcent \
 $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
+$(BUILDDIR)/lo.xcent \
 $(BUILDDIR)/sysui/desktop/macosx/Info.plist \
 $(BUILDDIR)/vs-code-template.code-workspace
$(if $(filter WNT,$(OS)),env -i PATH="$$PATH") $(FIND) 
$(SRCDIR)/solenv/gdb -name \*.pyc -exec rm {} \;
diff --git a/configure.ac b/configure.ac
index 1bce50885f53..557c5da4a766 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5490,6 +5490,7 @@ 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 \
@@ -11796,6 +11797,8 @@ AC_MSG_CHECKING([whether to enable Impress remote 
control])
 if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
 AC_MSG_RESULT([yes])
 ENABLE_SDREMOTE=TRUE
+SDREMOTE_ENTITLEMENT=" com.apple.security.network.server
+   "
 AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote 
control])
 
 if test $OS = MACOSX && test "$MACOSX_SDK_VERSION" -ge 101500; then
@@ -11803,6 +11806,7 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != 
"no"; then
 if test "$enable_sdremote_bluetooth" = yes; then
 AC_MSG_ERROR([macOS SDK $macosx_sdk does not currently support 
--enable-sdremote-bluetooth])
 fi
+add_warning "not building the bluetooth part of the sdremote - used 
api was removed from macOS SDK 10.15"
 enable_sdremote_bluetooth=no
 fi
 # If not explicitly enabled or disabled, default
@@ -11852,6 +11856,9 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != 
"no"; then
 AC_MSG_RESULT([no])
 ENABLE_SDREMOTE_BLUETOOTH=
 SYSTEM_BLUEZ=
+SDREMOTE_ENTITLEMENT="$SDREMOTE_ENTITLEMENT
+   com.apple.security.device.bluetooth
+   "
 fi
 else
 ENABLE_SDREMOTE=
@@ -11860,6 +11867,7 @@ else
 fi
 AC_SUBST(ENABLE_SDREMOTE)
 AC_SUBST(ENABLE_SDREMOTE_BLUETOOTH)
+AC_SUBST(SDREMOTE_ENTITLEMENT)
 AC_SUBST(SYSTEM_BLUEZ)
 
 dnl ===
@@ -14667,6 +14675,7 @@ 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
diff --git a/lo.xcent b/lo.xcent.in
similarity index 74%
rename from lo.xcent
rename to lo.xcent.in
index 56bb981916fe..9a0838fbc388 100644
--- a/lo.xcent
+++ b/lo.xcent.in
@@ -14,16 +14,13 @@

com.apple.security.network.client

-   com.apple.security.network.server
-   
-   com.apple.security.device.bluetooth
-   
com.apple.security.print

 com.apple.security.cs.disable-executable-page-protection
 
-
-com.apple.security.personal-information.addressbook
-
+
+com.apple.security.personal-information.addressbook
+
+@SDREMOTE_ENTITLEMENT@

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

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

New commits:
commit ecf9b8609ee45ef49a230a005d06658748f47c2b
Author: Christian Lohmaier 
AuthorDate: Wed May 18 19:50:54 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Wed May 18 19:50:54 2022 +0200

bump product version to 7.3.5.0.0+

Change-Id: I7d01d3f4b475ea6d55199e4babccac2b9338b180

diff --git a/configure.ac b/configure.ac
index 4d30f78d7747..1bce50885f53 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.3.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

2022-04-29 Thread Stephan Bergmann (via logerrit) 
 configure.ac |   28 +---
 1 file changed, 25 insertions(+), 3 deletions(-)

New commits:
commit 320b5de4f005ce317ab5873625be55c19f32b807
Author: Stephan Bergmann 
AuthorDate: Tue Apr 19 22:03:37 2022 +0200
Commit: Michael Stahl 
CommitDate: Fri Apr 29 13:02:53 2022 +0200

Fix determining ZXING_CFLAGS for --with-system-zxing

While at least Linux distros typically provide the zxing include files in a
dedicated ZXing sub-directory (i.e., /usr/include/ZXing/), the bundled
external/zxing does not (it rather provides them in
workdir/UnpackedTarball/zxing/core/src/, cf. RepositoryExternal.mk).  
Therefore,
source files like cui/source/dialogs/QrCodeGenDialog.cxx

  #include 

etc. rather than

  #include 

etc., and for --with-system-zxing ad92c7dfa64c9e08aa2bcf612a9a4a68e9deae22 
"fix
system zxing build" simply hardcoded ZXING_CFLAGS=-I/usr/include/ZXing 
(i.e.,
the typical location for these include files).

However, for e.g. a Fedora Flatpak-from-RPM build of --with-system-zxing
LibreOffice, the include files will be in /app/include/ZXing/ rather than in
/usr/include/ZXing/.  (And which AC_CHECK_HEADER would find via
CPLUS_INCLUDE_PATH containing /app/include for such a build.  But the 
hardcoded
ZXING_CFLAGS then caused compiling e.g. 
cui/source/dialogs/QrCodeGenDialog.cxx
to fail because it didn't find BarcodeFormat.h etc. in the hardcoded
/usr/include/ZXing/.)

So when checking for the sample zxing include file (MultiFormatWriter.h), 
try
any $CPLUS_INCLUDE_PATH paths one by one (and with a fallback to 
/usr/include).
(The explicit unset ac_cv_header_MultiFormatWriter_h is needed so that the
second and later iterations of the for loop don't erroneously reuse a cached
"no" result.)

Change-Id: Id85f9960ffd3759c7960ef3a81982b85bc3c04c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133189
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 27c850b2ea3d004b380921de6664c50e6d54d4f5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133484
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index dab4326616b0..0be3513046e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11131,10 +11131,32 @@ else
 if test "$with_system_zxing" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_ZXING=TRUE
+ZXING_CFLAGS=
 AC_LANG_PUSH([C++])
-AC_CHECK_HEADER(ZXing/MultiFormatWriter.h, [],
-[AC_MSG_ERROR(zxing headers not found.)], [#include ])
-ZXING_CFLAGS=-I/usr/include/ZXing
+save_CXXFLAGS=$CXXFLAGS
+save_IFS=$IFS
+IFS=$P_SEP
+for i in $CPLUS_INCLUDE_PATH /usr/include; do
+dnl Reset IFS as soon as possible, to avoid unexpected side 
effects (and the
+dnl "/usr/include" fallback makes sure we get here at least once; 
resetting rather than
+dnl unsetting follows the advice at 
 "Add 
recommendation on (not)
+dnl unsetting IFS."):
+IFS=$save_IFS
+dnl TODO: GCC and Clang treat empty paths in CPLUS_INCLUDE_PATH 
like ".", but we simply
+dnl ignore them here:
+if test -z "$i"; then
+continue
+fi
+dnl TODO: White space in $i would cause problems:
+CXXFLAGS="$save_CXXFLAGS -I$i/ZXing"
+AC_CHECK_HEADER(MultiFormatWriter.h, [ZXING_CFLAGS=-I$i/ZXing; 
break],
+[unset ac_cv_header_MultiFormatWriter_h], [#include 
])
+done
+CXXFLAGS=$save_CXXFLAGS
+if test -z "$ZXING_CFLAGS"; then
+AC_MSG_ERROR(zxing headers not found.)
+fi
 AC_CHECK_LIB([ZXing], [main], [ZXING_LIBS=-lZXing],
 [ AC_CHECK_LIB([ZXingCore], [main], [ZXING_LIBS=-lZXingCore],
 [ AC_MSG_ERROR(zxing C++ library not found.) ])], [])

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

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

New commits:
commit 36024e89023fe7be1510867790d5976459483330
Author: Christian Lohmaier 
AuthorDate: Tue Apr 12 21:16:37 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Apr 12 21:16:37 2022 +0200

bump product version to 7.3.4.0.0+

Change-Id: Iea02bb7e76ef5f6b0c7df0e2340785e48698a122

diff --git a/configure.ac b/configure.ac
index a1fe4c65b291..dab4326616b0 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.3.3.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac external/nss

2022-04-01 Thread Michael Stahl (via logerrit) 
 configure.ac|6 +-
 external/nss/ExternalProject_nss.mk |3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 33e2408600781553d86237cfb599eead5ed0bc3c
Author: Michael Stahl 
AuthorDate: Thu Mar 31 20:33:02 2022 +0200
Commit: Caolán McNamara 
CommitDate: Fri Apr 1 15:58:49 2022 +0200

nss: build with zlib module on WNT

Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132419
Reviewed-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index f04806fc935f..a1fe4c65b291 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9123,7 +9123,11 @@ else
 SYSTEM_ZLIB=
 BUILD_TYPE="$BUILD_TYPE ZLIB"
 ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib"
-ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib"
+if test "$COM" = "MSC"; then
+ZLIB_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/zlib.lib"
+else
+ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib"
+fi
 fi
 AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LIBS)
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index b0c4ae9f7c97..592ea70741b9 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -27,10 +27,11 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
MOZ_DEBUG_FLAGS=" " \
OPT_CODE_SIZE=0) \
OS_TARGET=WIN95 \
+   USE_SYSTEM_ZLIB=1 \
$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
$(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \
LIB="$(ILIB)" \
-   XCFLAGS="$(SOLARINC)" \
+   XCFLAGS="$(SOLARINC) $(ZLIB_CFLAGS)" \
$(if $(CROSS_COMPILING),\
CROSS_COMPILE=1 \
$(if $(filter AARCH64,$(CPUNAME)),CPU_ARCH=aarch64) \

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

2022-03-25 Thread Xisco Fauli (via logerrit) 
 configure.ac |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a137a43f18803406a2cdecd2b715ed8f459bb972
Author: Xisco Fauli 
AuthorDate: Fri Mar 25 11:29:19 2022 +0100
Commit: Xisco Fauli 
CommitDate: Fri Mar 25 13:05:08 2022 +0100

configure.ac: add missing MAC_OS_X_VERSION_MAX_ALLOWED for macOS SDK 12.3

Support for macOS SDK 12.3 was backported to libreoffice-7-3 in
1d875592eb4a2ca78b94c959f1acbc3552db608f "Accept macOS SDK 12.3"
but MAC_OS_X_VERSION_MAX_ALLOWED was missing in the commit
because it was removed in master after

b0ab07ba89c88006932c68e0ca08dffcd0a4621e
"Always set MAC_OS_X_VERSION_MAX_ALLOWED =
MAC_OS_X_VERSION_MIN_REQUIRED"

Change-Id: Ic7d8581bebad12bfe7f23b06c24d3b8ea2fdde43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132104
Reviewed-by: Stephan Bergmann 
Tested-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index d5c7cb76c917..f04806fc935f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3455,8 +3455,11 @@ if test $_os = Darwin; then
 12.1)
 MAC_OS_X_VERSION_MAX_ALLOWED="120100"
 ;;
+12.3)
+MAC_OS_X_VERSION_MAX_ALLOWED="120300"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.12--12.1])
+AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.12--12.3])
 ;;
 esac

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

2022-03-23 Thread Tor Lillqvist (via logerrit) 
 configure.ac |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 1d875592eb4a2ca78b94c959f1acbc3552db608f
Author: Tor Lillqvist 
AuthorDate: Mon Mar 14 23:43:35 2022 +0200
Commit: Xisco Fauli 
CommitDate: Wed Mar 23 15:48:16 2022 +0100

Accept macOS SDK 12.3

Change-Id: Ice469236dd79675b6fad6f7c5a244888200fea8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131565
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131975
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index adc7c2800488..d5c7cb76c917 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3270,7 +3270,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.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
+for macosx_sdk in 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
@@ -3312,6 +3312,9 @@ if test $_os = Darwin; then
 12.1)
 MACOSX_SDK_VERSION=120100
 ;;
+12.3)
+MACOSX_SDK_VERSION=120300
+;;
 *)
 AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
 ;;
@@ -3381,8 +3384,11 @@ if test $_os = Darwin; then
 12.1)
 MAC_OS_X_VERSION_MIN_REQUIRED="120100"
 ;;
+12.3)
+MAC_OS_X_VERSION_MIN_REQUIRED="120300"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.12--12.1])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.13--12.3])
 ;;
 esac

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

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

New commits:
commit d39751115137632040a05d29b5131a3e4d6a867a
Author: Christian Lohmaier 
AuthorDate: Wed Mar 9 19:54:25 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Mar 9 19:54:25 2022 +0100

bump product version to 7.3.3.0.0+

Change-Id: Ib9e8a24d5c7f74bbc6870875dfe6dd414be5fdfa

diff --git a/configure.ac b/configure.ac
index 2e773f127069..adc7c2800488 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.3.2.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

2022-02-17 Thread Michael Weghorn (via logerrit) 
 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a1d08b478a4f55c5e8fc08eb3cf963c2a8107221
Author: Michael Weghorn 
AuthorDate: Wed Feb 16 13:38:47 2022 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 17 11:33:42 2022 +0100

configure.ac: Update kf5 include/lib check to work with KF5 >= 5.91

The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
subdirectory in kcoreaddons commit

commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
Author: Ahmad Samir 
Date:   Sat Jan 15 14:14:13 2022 +0200

Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/

Instead of /usr/include/KF5/kcoreaddons_version.h.

For more details see:
https://invent.kde.org/frameworks/kservice/-/merge_requests/79

GIT_SILENT

Adapt the KF5 check to check for the 'KFileWidget' header and
the 'libKF5KIOFileWidgets.so' library instead.
This is more exact anyway, since we require KIOFileWidgets,
and the previous check didn't ensure that.
(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
configure would previously pass, but the build fail.)

[1] 
https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244

Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 5fd5e42bf28a7910321c6b6d76257e7386839fbc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130007
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index c3748100ce7b..2e773f127069 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13077,8 +13077,8 @@ then
 kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 
/usr/lib64/kf5/devel"
 fi
 
-kf5_test_include="KF5/kcoreaddons_version.h"
-kf5_test_library="libKF5CoreAddons.so"
+kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
+kf5_test_library="libKF5KIOFileWidgets.so"
 kf5_libdirs="$qt5_libdir $kf5_libdirs"
 
 dnl kf5 KDE4 support compatibility installed

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

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

New commits:
commit 7715103aa6920b1b57113fd1377544292c1ad04e
Author: Christian Lohmaier 
AuthorDate: Fri Feb 11 12:03:14 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Fri Feb 11 12:03:14 2022 +0100

bump product version to 7.3.2.0.0+

Change-Id: Icbb8b54a43d6377e616b7d15bbd46eefcd7d49c6

diff --git a/configure.ac b/configure.ac
index b37328188e38..c3748100ce7b 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.3.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac include/tools

2022-02-10 Thread Luboš Luňák (via logerrit) 
 configure.ac  |   31 ++-
 include/tools/simdsupport.hxx |   31 +--
 2 files changed, 27 insertions(+), 35 deletions(-)

New commits:
commit 00acb0d7479770f7828c60e22dbc9186ba7f85fe
Author: Luboš Luňák 
AuthorDate: Wed Jan 26 13:34:08 2022 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 11 08:29:36 2022 +0100

MSVC -arch is independent from the ability to use CPU intrinsics

It's possible to write AVX512 intrinsics in code compile only with
-arch:AVX . So do not require -arch for being able to do so,
especially since there is no -arch option for only AVX512F without
other AVX512 subsets (the option enables also CD, BW, DQ and VL
https://docs.microsoft.com/en-us/cpp/build/reference/arch-x64).


https://crashreport.libreoffice.org/stats/crash_details/55ef825d-c323-4df9-95e2-76672c674e60
is presumably caused by this, I can see use of registers XMM0-15
in arraysumAVX512.cxx built with -arch:AVX2 but when built
with -arch:AVX512 registers XMM16-31 are used too (I'm not sure
if that's AVX512DQ or something else, I can't find info on it).

Change-Id: I7447a17e618327d43b920b8929d1b0e733b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129724
Reviewed-by: Mike Kaganski 
Reviewed-by: Luboš Luňák 
Tested-by: Jenkins
(cherry picked from commit 807a15bd64c1f2a57371d12e7684541293cd9791)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129765
Reviewed-by: Miklos Vajna 

diff --git a/configure.ac b/configure.ac
index 8a922cdcee4d..b37328188e38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7692,22 +7692,27 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 flag_f16c=-mf16c
 flag_fma=-mfma
 else
-# https://docs.microsoft.com/en-us/cpp/build/reference/arch-x86
-# MSVC seems to differentiate only between SSE and SSE2, where in fact
-# SSE2 seems to be SSE2+.
-# Even if -arch:SSE2 is the default, set it explicitly, so that the 
variable
-# is not empty (and can be tested in gbuild).
-flag_sse2=-arch:SSE2
-flag_ssse3=-arch:SSE2
-flag_sse41=-arch:SSE2
-flag_sse42=-arch:SSE2
+# With MSVC using -arch is in fact not necessary for being able
+# to use CPU intrinsics, code using AVX512F intrinsics will compile
+# even if compiled with -arch:AVX, the -arch option really only affects
+# instructions generated for C/C++ code.
+# So use the matching same (or lower) -arch options, but only in order
+# to generate the best matching instructions for the C++ code surrounding
+# the intrinsics.
+# SSE2 is the default for x86/x64, so no need to specify the option.
+flag_sse2=
+# No specific options for these, use the next lower.
+flag_ssse3="$flag_sse2"
+flag_sse41="$flag_sse2"
+flag_sse42="$flag_sse2"
 flag_avx=-arch:AVX
 flag_avx2=-arch:AVX2
 flag_avx512=-arch:AVX512
-flag_avx512f=-arch:AVX512
-# These are part of -arch:AVX2
-flag_f16c=-arch:AVX2
-flag_fma=-arch:AVX2
+# Using -arch:AVX512 would enable more than just AVX512F, so use only AVX2.
+flag_avx512f=-arch:AVX2
+# No MSVC options for these.
+flag_f16c="$flag_sse2"
+flag_fma="$flag_sse2"
 fi
 
 AC_MSG_CHECKING([whether $CXX can compile SSE2 intrinsics])
diff --git a/include/tools/simdsupport.hxx b/include/tools/simdsupport.hxx
index 738b34e072db..fa8923bb095f 100644
--- a/include/tools/simdsupport.hxx
+++ b/include/tools/simdsupport.hxx
@@ -34,34 +34,21 @@
 
 #if defined(_MSC_VER) // VISUAL STUDIO COMPILER
 
-// SSE2 is required for X64
-#if (defined(_M_X64) || defined(_M_IX86_FP) && _M_IX86_FP >= 2)
+// With MSVC using -arch is in fact not necessary for being able
+// to use CPU intrinsics, code using AVX512F intrinsics will compile
+// even if compiled with -arch:AVX, the -arch option really only affects
+// instructions generated for C/C++ code.
+#if defined(_M_X64) || defined(_M_X86)
+// As such, if we're building for X86 or X64, support for these is always 
available
+// with MSVC2019+.
 #define LO_SSE2_AVAILABLE
-#include 
-#endif // end SSE2
-
-// compiled with /arch:AVX
-#if defined(__AVX__)
-#ifndef LO_SSE2_AVAILABLE
-#define LO_SSE2_AVAILABLE
-#include 
-#endif
 #define LO_SSSE3_AVAILABLE
 #define LO_AVX_AVAILABLE
-#include 
-#endif // end defined(__AVX__)
-
-// compiled with /arch:AVX2
-#if defined(__AVX2__)
 #define LO_AVX2_AVAILABLE
-#include 
-#endif // defined(__AVX2__)
-
-// compiled with /arch:AVX512F
-#if defined(__AVX512F__)
 #define LO_AVX512F_AVAILABLE
+#include 
 #include 
-#endif // defined(__AVX512F__)
+#endif
 
 #else // compiler Clang and GCC

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

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

New commits:
commit fc8b90c3d750684b506989d1456f31c2f76e51fc
Author: Christian Lohmaier 
AuthorDate: Wed Jan 12 20:06:13 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Jan 12 20:06:13 2022 +0100

bump product version to 7.3.1.0.0+

Change-Id: If592010b0b2c64b8a1999c1a6b4744e1d477491b

diff --git a/configure.ac b/configure.ac
index ce82177fa691..5e3a1fc72071 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.3.0.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

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

New commits:
commit be5e8e00ce08a7386b0c2ad223e4df16195313fe
Author: Rene Engelhard 
AuthorDate: Mon Dec 20 11:32:34 2021 +0100
Commit: René Engelhard 
CommitDate: Sun Dec 26 22:03:20 2021 +0100

bump liborcus dependency in pkg-config check to >= 0.17.2

since that is what is needed now since 
aadbac5467bb6ab768f87ed6ec003c55159d54aa
to make the tests pass.
(One could do a version-check like done with libmwaw etc, too, but
didn't follow that route)

Change-Id: Id70871104b5c12462db12f14b637c6884a98954c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127144
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 
(cherry picked from commit e31191d45c27965bb1a73577b9fcc99b5d88795a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127374

diff --git a/configure.ac b/configure.ac
index ace149ccfc88..e1b75d2c10ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10696,7 +10696,7 @@ AC_SUBST(ENABLE_FUZZERS)
 dnl ===
 dnl Orcus
 dnl ===
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.17 >= 0.17.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.17 >= 0.17.2])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 dnl Link with Boost.System

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

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

New commits:
commit b644b8c3b63cca1ae63bfae9ad7608924ead9ca5
Author: Christian Lohmaier 
AuthorDate: Tue Dec 21 20:08:08 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Dec 21 20:08:08 2021 +0100

bump product version to 7.3.0.1.0+

Change-Id: Ia15c20c3cb42181081842be825012614e4bb03a1

diff --git a/configure.ac b/configure.ac
index 79d73bdd8fc5..ace149ccfc88 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.3.0.0.beta1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

2021-12-16 Thread Noel Grandin (via logerrit) 
 configure.ac |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit e047e8fa96f67202a8cee399ffafccab787ba9eb
Author: Noel Grandin 
AuthorDate: Wed Dec 15 19:18:58 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Dec 16 11:57:49 2021 +0100

add support for macOS SDK 12.1

Change-Id: I30d816d5926e5b1771901c697b67eb275d122636
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126890
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit d023a95526b825927c6ef3bf39925c77f76b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126927
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index 96cb249fb7d1..79d73bdd8fc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3256,7 +3256,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.0 11.3 11.1 11.0 10.15 10.14 10.13; do
+for macosx_sdk in 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
@@ -3295,6 +3295,9 @@ if test $_os = Darwin; then
 12.0)
 MACOSX_SDK_VERSION=12
 ;;
+12.1)
+MACOSX_SDK_VERSION=120100
+;;
 *)
 AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
 ;;
@@ -3361,8 +3364,11 @@ if test $_os = Darwin; then
 12.0)
 MAC_OS_X_VERSION_MIN_REQUIRED="12"
 ;;
+12.1)
+MAC_OS_X_VERSION_MIN_REQUIRED="120100"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.12--12.0])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.12--12.1])
 ;;
 esac
 
@@ -3426,8 +3432,11 @@ if test $_os = Darwin; then
 12.0)
 MAC_OS_X_VERSION_MAX_ALLOWED="12"
 ;;
+12.1)
+MAC_OS_X_VERSION_MAX_ALLOWED="120100"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.12--12.0])
+AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.12--12.1])
 ;;
 esac

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac download.lst external/libmwaw writerperfect/qa

2021-12-14 Thread David Tardon (via logerrit) 
 configure.ac  |2 +-
 download.lst  |4 ++--
 external/libmwaw/Library_mwaw.mk  |3 +++
 writerperfect/qa/unit/WpftDrawFilterTest.cxx  |2 ++
 writerperfect/qa/unit/WpftWriterFilterTest.cxx|1 +
 writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1 |binary
 writerperfect/qa/unit/data/draw/libmwaw/pass/Scoop_1  |binary
 writerperfect/qa/unit/data/writer/libmwaw/pass/ScriptWriter_1 |binary
 8 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 85ef4efeb27546b252ed59c80efe8352adcc2cc3
Author: David Tardon 
AuthorDate: Mon Dec 13 21:39:46 2021 +0100
Commit: Xisco Fauli 
CommitDate: Tue Dec 14 15:45:50 2021 +0100

upload libmwaw 0.3.21

Change-Id: Id28cd361237ce67b76a865ad4291ccece521af85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126768
Tested-by: Jenkins
Reviewed-by: David Tardon 
(cherry picked from commit c74d59a8b47bb8228c297a60e6b5b0cc5e08aa53)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126809
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index bbd326b84321..96cb249fb7d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9361,7 +9361,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.20])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.21])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
diff --git a/download.lst b/download.lst
index 1a70e6a44ba0..8ec9ac8c3082 100644
--- a/download.lst
+++ b/download.lst
@@ -184,8 +184,8 @@ export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39
 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
 export MSPUB_SHA256SUM := 
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
 export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM := 
14c38b06214f277ccd1450e22e6e32648955018d7695896bc560165748c8cd21
-export MWAW_VERSION_MICRO := 20
+export MWAW_SHA256SUM := 
e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c
+export MWAW_VERSION_MICRO := 21
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 2f27a6113485..58d433f9d093 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -201,6 +201,9 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTimeStruct \
UnpackedTarball/libmwaw/src/lib/RagTimeText \
+   UnpackedTarball/libmwaw/src/lib/ReadySetGoParser \
+   UnpackedTarball/libmwaw/src/lib/ScoopParser \
+   UnpackedTarball/libmwaw/src/lib/ScriptWriterParser \
UnpackedTarball/libmwaw/src/lib/StudentWritingCParser \
UnpackedTarball/libmwaw/src/lib/StyleParser \
UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx 
b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
index 3786315c4620..78168cdb9ce0 100644
--- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
@@ -46,6 +46,8 @@ void WpftDrawFilterTest::test()
 { "MacDraw_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
 { "MacDraw_II.hqx", REQUIRE_MWAW_VERSION(0, 3, 3) },
 { "MacDraw_Pro_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 4) },
+{ "ReadySetGo_1", REQUIRE_MWAW_VERSION(0, 3, 21) },
+{ "Scoop_1", REQUIRE_MWAW_VERSION(0, 3, 21) },
 };
 const writerperfect::test::WpftOptionalMap_t aStarOfficeOptional{
 { "Draw_3.1.sda", REQUIRE_STAROFFICE_VERSION(0, 0, 1) },
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx 
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 543146169253..78d24dc99b17 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -44,6 +44,7 @@ void WpftWriterFilterTest::test()
 { "RagTime_2.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
 { "RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
 { "RagTime_5.5.rag", REQUIRE_MWAW_VERSION(0, 3, 6) },
+{ "ScriptWriter", REQUIRE_MWAW_VERSION(0, 3, 21) },
 { "StudentWritingCenter", REQUIRE_MWAW_VERSION(0, 3, 20) },
 { "WordMaker", REQUIRE_MWAW_VERSION(0, 3, 20) },
 };
diff --git a/writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac

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

New commits:
commit 3a52a86a7e61814aa682445f6dd3499f2987eb44
Author: Christian Lohmaier 
AuthorDate: Thu Nov 25 20:10:43 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Nov 25 20:10:43 2021 +0100

bump product version to 7.3.0.0.beta1+

Change-Id: Iaa2e28159921541843c029d66f138fe732148583

diff --git a/configure.ac b/configure.ac
index b573c6934310..dcc0501b0add 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.3.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.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