[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 20b5c7f7d3c65cf80e29fd2f4bc1e6d9d588c33e
Author: Andras Timar 
AuthorDate: Mon Dec 6 16:52:18 2021 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 6 16:52:18 2021 +0100

Bump version to 6.2-34

Change-Id: If492b3bcc55660dc24be24c537584f388d8a50da

diff --git a/configure.ac b/configure.ac
index f83483543137..0e062d2c12d8 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([Collabora Office],[6.2.10.33],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.34],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

 configure.ac |  120 ++-
 1 file changed, 78 insertions(+), 42 deletions(-)

New commits:
commit c377e40eacdf770ea0abb256217a6d659b3be2fb
Author: Andras Timar 
AuthorDate: Tue Oct 19 14:14:19 2021 +0200
Commit: Andras Timar 
CommitDate: Tue Oct 19 14:14:19 2021 +0200

Build with newer macOS SDK

Change-Id: I5181b2f08c297566a266b360c27ee9d21f6c67b2

diff --git a/configure.ac b/configure.ac
index f94fbac35304..f83483543137 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2736,7 +2736,7 @@ dnl ENABLE_JAVA="TRUE" if we want there to be *run-time* 
(and build-time) suppor
 dnl ENABLE_JAVA="" indicate no Java support at all
 
 dnl ===
-dnl Check OS X SDK and compiler
+dnl Check macOS SDK and compiler
 dnl ===
 
 if test $_os = Darwin; then
@@ -2749,8 +2749,8 @@ if test $_os = Darwin; then
 # For developers with a current Xcode, the lowest-numbered SDK
 # higher than or equal to the minimum required should be found.
 
-AC_MSG_CHECKING([what Mac OS X SDK to use])
-for _macosx_sdk in ${with_macosx_sdk-11.1 10.15 10.14 10.13 10.12}; do
+AC_MSG_CHECKING([what macOS SDK to use])
+for _macosx_sdk in ${with_macosx_sdk-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
 with_macosx_sdk="${_macosx_sdk}"
@@ -2764,24 +2764,12 @@ if test $_os = Darwin; then
 fi
 done
 if test ! -d "$MACOSX_SDK_PATH"; then
-AC_MSG_ERROR([Could not find an appropriate Mac OS X SDK])
+AC_MSG_ERROR([Could not find an appropriate macOS SDK])
 fi
 
-if test $_os = iOS; then
-if test "$enable_ios_simulator" = "yes"; then
-useos=iphonesimulator
-else
-useos=iphoneos
-fi
-MACOSX_SDK_PATH=`xcrun --sdk ${useos} --show-sdk-path 2> /dev/null`
-fi
 AC_MSG_RESULT([SDK $with_macosx_sdk at $MACOSX_SDK_PATH])
 
-
 case $with_macosx_sdk in
-10.12)
-MACOSX_SDK_VERSION=101200
-;;
 10.13)
 MACOSX_SDK_VERSION=101300
 ;;
@@ -2791,16 +2779,30 @@ if test $_os = Darwin; then
 10.15)
 MACOSX_SDK_VERSION=101500
 ;;
+11.0)
+MACOSX_SDK_VERSION=11
+;;
 11.1)
 MACOSX_SDK_VERSION=110100
 ;;
+11.3)
+MACOSX_SDK_VERSION=110300
+;;
 *)
-AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.12--11.1])
+AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.13--11.3])
 ;;
 esac
 
+if test "$host_cpu" = arm64 -a $MACOSX_SDK_VERSION -lt 11; then
+AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value for Apple Silicon])
+fi
+
 if test "$with_macosx_version_min_required" = "" ; then
-with_macosx_version_min_required="10.9";
+if test "$host_cpu" = x86_64; then
+with_macosx_version_min_required="10.10";
+else
+with_macosx_version_min_required="11.0";
+fi
 fi
 
 if test "$with_macosx_version_max_allowed" = "" ; then
@@ -2814,10 +2816,17 @@ if test $_os = Darwin; then
 FRAMEWORKSHOME="$MACOSX_SDK_PATH/System/Library/Frameworks"
 MACOSX_DEPLOYMENT_TARGET="$with_macosx_version_min_required"
 
+AC_MSG_CHECKING([whether Xcode is new enough])
+my_xcode_ver1=$(xcrun xcodebuild -version | head -n 1)
+my_xcode_ver2=${my_xcode_ver1#Xcode }
+my_xcode_ver3=$(printf %s "$my_xcode_ver2" | $AWK -F. '{ print 
$1*100+($2<100?$2:99) }')
+if test "$my_xcode_ver3" -ge 1103; then
+AC_MSG_RESULT([yes ($my_xcode_ver2)])
+else
+AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at 
least Xcode 11.3])
+fi
+
 case "$with_macosx_version_min_required" in
-10.9)
-MAC_OS_X_VERSION_MIN_REQUIRED="1090"
-;;
 10.10)
 MAC_OS_X_VERSION_MIN_REQUIRED="101000"
 ;;
@@ -2836,35 +2845,59 @@ if test $_os = Darwin; then
 10.15)
 MAC_OS_X_VERSION_MIN_REQUIRED="101500"
 ;;
+10.16)
+MAC_OS_X_VERSION_MIN_REQUIRED="101600"
+;;
+11.0)
+MAC_OS_X_VERSION_MIN_REQUIRED="11"
+;;
+11.1)
+MAC_OS_X_VERSION_MIN_REQUIRED="110100"
+;;
+11.3)
+MAC_OS_X_VERSION_MIN_REQUIRED="110300"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.9--15])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.10--11.3])
 ;;
 esac
-MAC_OS_X_VERSIO

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 41a9473f545394a7ca2e622a3b553471fd8cbd0c
Author: Andras Timar 
AuthorDate: Tue Jul 6 10:45:44 2021 +0200
Commit: Andras Timar 
CommitDate: Tue Jul 6 10:45:44 2021 +0200

Bump version to 6.2-32

Change-Id: I7ad32f1ec00bc81f81a17b9f7397a1e40a91bf87

diff --git a/configure.ac b/configure.ac
index 98a947a6cc02..c6375d63277b 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([Collabora Office],[6.2.10.31],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.32],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 32489994c35814a20481885d5845841cb292730e
Author: Andras Timar 
AuthorDate: Tue Jun 15 09:21:06 2021 +0200
Commit: Andras Timar 
CommitDate: Tue Jun 15 09:21:06 2021 +0200

Bump version to 6.2-31

Change-Id: Ia7a4feff6e45f6ce3d592672a3f2bbbce1c93058

diff --git a/configure.ac b/configure.ac
index 74fa63e31fe7..98a947a6cc02 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([Collabora Office],[6.2.10.30],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.31],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 2fb8a0c9e18801f9addb3513d6e7b4b16574bded
Author: Tor Lillqvist 
AuthorDate: Fri Apr 16 17:00:54 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Apr 16 16:35:58 2021 +0200

Accept macOS SDK 11.1

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

diff --git a/configure.ac b/configure.ac
index 0e5cd92e907c..74fa63e31fe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2750,7 +2750,7 @@ if test $_os = Darwin; then
 # higher than or equal to the minimum required should be found.
 
 AC_MSG_CHECKING([what Mac OS X SDK to use])
-for _macosx_sdk in ${with_macosx_sdk-10.15 10.14 10.13 10.12}; do
+for _macosx_sdk in ${with_macosx_sdk-11.1 10.15 10.14 10.13 10.12}; do
 MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> 
/dev/null`
 if test -d "$MACOSX_SDK_PATH"; then
 with_macosx_sdk="${_macosx_sdk}"
@@ -2791,8 +2791,11 @@ if test $_os = Darwin; then
 10.15)
 MACOSX_SDK_VERSION=101500
 ;;
+11.1)
+MACOSX_SDK_VERSION=110100
+;;
 *)
-AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.12--15])
+AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.12--11.1])
 ;;
 esac
 
@@ -2880,8 +2883,11 @@ if test $_os = Darwin; then
 10.15)
 MAC_OS_X_VERSION_MAX_ALLOWED="101500"
 ;;
+11.1)
+MAC_OS_X_VERSION_MAX_ALLOWED="110100"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.9--15])
+AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.9--11.1])
 ;;
 esac
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 79d3cf78ea44929cb1ea723953be24a0a82dd9f9
Author: Andras Timar 
AuthorDate: Fri Apr 16 09:39:43 2021 +0200
Commit: Andras Timar 
CommitDate: Fri Apr 16 09:39:43 2021 +0200

Bump version to 6.2-30

Change-Id: I0d2a4d6b7d8fa311bd5bd4ebc86124caa77d5ccb

diff --git a/configure.ac b/configure.ac
index f0aeab1c3363..0e5cd92e907c 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([Collabora Office],[6.2.10.29],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.30],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit a682c9dd877a9056b787ecc73b3866334d3afa52
Author: Andras Timar 
AuthorDate: Wed Feb 10 08:48:18 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Feb 10 08:48:18 2021 +0100

Bump version to 6.2-29

Change-Id: Ic2348e378a469eb4a44d343ad50be8686bb09bce

diff --git a/configure.ac b/configure.ac
index a331039d7d0f..f0aeab1c3363 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([Collabora Office],[6.2.10.28],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.29],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 4ff25b8034bed9c9f4547a5ec709e6e43f9b
Author: Andras Timar 
AuthorDate: Thu Jan 14 12:11:40 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Jan 14 12:11:40 2021 +0100

Bump version to 6.2-28

Change-Id: Ifcaa6f8a130489bbc80ee9a80972f10cd7995874

diff --git a/configure.ac b/configure.ac
index 8976456ebe5b..a331039d7d0f 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([Collabora Office],[6.2.10.27],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.28],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Henry Castro (via logerrit)]

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

New commits:
commit d28e83bbf0f3dc1c7ddf63d04a2a9b65279bae45
Author: Henry Castro 
AuthorDate: Fri Nov 6 07:50:27 2020 -0400
Commit: Henry Castro 
CommitDate: Mon Nov 9 12:04:51 2020 +0100

lok:configure: replace obsolete configuration links

The "AC_LINK_FILES" is replaced by "AC_CONFIG_LINKS"

Change-Id: I9c82d3f54cf78f08489453389d4e5070529a4f69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105404
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/configure.ac b/configure.ac
index cd83fc5b111b..22b0905e9ca4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12980,7 +12980,7 @@ CFLAGS=$my_original_CFLAGS
 CXXFLAGS=$my_original_CXXFLAGS
 CPPFLAGS=$my_original_CPPFLAGS
 
-AC_LINK_FILES([include], [include])
+AC_CONFIG_LINKS([include:include])
 AC_CONFIG_FILES([config_host.mk
  config_host_lang.mk
  Makefile
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 79c270f6f19e86c02a88f78ea613b1445df46540
Author: Andras Timar 
AuthorDate: Wed Oct 28 14:32:44 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Oct 28 14:32:44 2020 +0100

Bump version to 6.2-26

Change-Id: Ic3f548cf7e482114c7dd328ae2031361a54b6dd7

diff --git a/configure.ac b/configure.ac
index 4963620e569e..cd83fc5b111b 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([Collabora Office],[6.2.10.25],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.26],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 845650b678df4af7ae99a258f17afcec139f6df5
Author: Andras Timar 
AuthorDate: Tue Oct 6 09:01:02 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Oct 6 09:01:02 2020 +0200

Bump version to 6.2-25

Change-Id: Id5ba7c81ec55042260c6d1f2c9dc00c56b68d252

diff --git a/configure.ac b/configure.ac
index 69fd79dd687b..4963620e569e 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([Collabora Office],[6.2.10.24],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.25],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 9f92ec593ea41c6a7469af4bfd4d2a64f5dca197
Author: Tor Lillqvist 
AuthorDate: Thu Sep 17 13:42:25 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Sep 17 13:42:25 2020 +0300

Accept iOS SDK 14.0

Change-Id: I63bac82f1c5bbc00d637041b1e428d00b4c9dff5

diff --git a/configure.ac b/configure.ac
index f2122b0ec2ee..a941f1d5d093 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2992,8 +2992,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.7
-older_sdk_vers="13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
+current_sdk_ver=14.0
+older_sdk_vers="13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit a14c389b42800d34bd9b91a811431532f9a3bb62
Author: Andras Timar 
AuthorDate: Mon Sep 14 17:25:54 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Sep 14 17:25:54 2020 +0200

Bump version to 6.2-24

Change-Id: I69e92c4f17cdfedfb753c9ed3348fda96e29b5e5

diff --git a/configure.ac b/configure.ac
index 9bf867051527..f2122b0ec2ee 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([Collabora Office],[6.2.10.23],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.24],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 4a3c4070d184c178d4869292e411aeebec5f1334
Author: Tor Lillqvist 
AuthorDate: Wed Sep 2 17:26:32 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 2 17:26:32 2020 +0300

Accept iOS SDK 13.7

Change-Id: I0e0e4f6d0fa19c8e8c001c9ba4c25205346a32a9

diff --git a/configure.ac b/configure.ac
index e379985dfd77..9bf867051527 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2992,8 +2992,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.6
-older_sdk_vers="13.5 13.4 13.2 13.1 13.0 12.4 12.2"
+current_sdk_ver=13.7
+older_sdk_vers="13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 27a52f8c106b30403701cf0058c8fc278bc04018
Author: Andras Timar 
AuthorDate: Wed Aug 26 08:33:01 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 26 08:33:01 2020 +0200

Bump version to 6.2-23

Change-Id: Ibda2faa09d88af123fca6a067c5055aa19f3ba16

diff --git a/configure.ac b/configure.ac
index 04717530e1e6..e379985dfd77 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([Collabora Office],[6.2.10.22],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.23],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 0183f78c5c2c52e2a3cab910fe2ab94a55886457
Author: Tor Lillqvist 
AuthorDate: Thu Aug 13 14:25:17 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Aug 13 14:25:17 2020 +0300

Accept iOS SDK 13.6

Change-Id: If78f63ef2450a5354d343fb4d8f9e7f8f3c2abaf

diff --git a/configure.ac b/configure.ac
index 2823a962747e..04717530e1e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2992,8 +2992,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.5
-older_sdk_vers="13.4 13.2 13.1 13.0 12.4 12.2"
+current_sdk_ver=13.6
+older_sdk_vers="13.5 13.4 13.2 13.1 13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 536cbf5e9fd8e65824dfbddb46fe28bad27f1485
Author: Andras Timar 
AuthorDate: Wed Aug 5 20:28:52 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Aug 5 20:28:52 2020 +0200

Bump version to 6.2-22

Change-Id: I658c792eeadf4dff4d7bc119edfa128b2eca6512

diff --git a/configure.ac b/configure.ac
index 10bf82f583f4..2823a962747e 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([Collabora Office],[6.2.10.21],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.22],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 2efab9d2961849fe7b9d9dbda057fb796928b885
Author: Andras Timar 
AuthorDate: Tue Jul 28 10:05:20 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Jul 28 10:05:20 2020 +0200

Bump version to 6.2-21

Change-Id: Ic03f11ab2818eda52e28b9753b97fec879c06d0d

diff --git a/configure.ac b/configure.ac
index 453c26a1c867..95ee51cbec11 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([Collabora Office],[6.2.10.20],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.21],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Aron Budea (via logerrit)]

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

New commits:
commit 9a937193f80ea914d25d939747e27bfc98ee6927
Author: Aron Budea 
AuthorDate: Thu Jul 16 03:23:19 2020 +0200
Commit: Aron Budea 
CommitDate: Thu Jul 16 03:23:19 2020 +0200

Bump version to 6.2-20

Change-Id: I40871c8c067f6217a0ef4b4678c253fd2e764ca4

diff --git a/configure.ac b/configure.ac
index bae4e3011aca..453c26a1c867 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([Collabora Office],[6.2.10.19],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.20],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 7d37f9a26fe4add0f53ba7b552088c370f076ed9
Author: Andras Timar 
AuthorDate: Thu Jul 2 09:10:52 2020 +0200
Commit: Andras Timar 
CommitDate: Thu Jul 2 09:10:52 2020 +0200

Bump version to 6.2-19

Change-Id: I077c07cb274d84b3505dc79329d00cf4772f11ec

diff --git a/configure.ac b/configure.ac
index 0a50a15b51fe..bae4e3011aca 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([Collabora Office],[6.2.10.18],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.19],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 1692732d0a831b05041c672eeec22ebc509aba69
Author: Andras Timar 
AuthorDate: Fri Jun 26 21:31:57 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 26 21:31:57 2020 +0200

Bump version to 6.2-18

Change-Id: I10a58da129f3fb1eaef27a9ebcbdd56cf10de4bb

diff --git a/configure.ac b/configure.ac
index 2e8e9b19c7da..0a50a15b51fe 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([Collabora Office],[6.2.10.17],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.18],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 207471efd99fe953f8d057691833f903ceb4b18a
Author: Andras Timar 
AuthorDate: Fri Jun 19 12:32:02 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 19 12:32:02 2020 +0200

Bump version to 6.2-17

Change-Id: I6a0d5f39e8a0876fe747974b73386d96547c6e11

diff --git a/configure.ac b/configure.ac
index be9851960312..2e8e9b19c7da 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([Collabora Office],[6.2.10.16],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.17],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Henry Castro (via logerrit)]

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

New commits:
commit d4e71e2d5088f61250748c92a10ec31fb40d6adf
Author: Henry Castro 
AuthorDate: Wed Jun 3 20:18:58 2020 -0400
Commit: Henry Castro 
CommitDate: Thu Jun 11 16:38:21 2020 +0200

lok: symbolic link to the "include" directory when builddir != srcdir

When compiling the android variant build in a different build output 
directory
of the "online" project, it fails due to the missing "include" files.

Change-Id: If9056788b3d043e4ae8ad3f799885995c0ab0cf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95603
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/configure.ac b/configure.ac
index 5bbb00efe8f4..be9851960312 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12973,6 +12973,7 @@ CFLAGS=$my_original_CFLAGS
 CXXFLAGS=$my_original_CXXFLAGS
 CPPFLAGS=$my_original_CPPFLAGS
 
+AC_LINK_FILES([include], [include])
 AC_CONFIG_FILES([config_host.mk
  config_host_lang.mk
  Makefile
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 7f122373e0c86499985655e67d4bf7270a34ade1
Author: Andras Timar 
AuthorDate: Thu Jun 11 11:01:49 2020 +0200
Commit: Andras Timar 
CommitDate: Thu Jun 11 11:01:53 2020 +0200

Bump version to 6.2-16

Change-Id: I18a7348c19fa9209dc24a43db508a3361fedb9d3

diff --git a/configure.ac b/configure.ac
index 05d22de09247..5bbb00efe8f4 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([Collabora Office],[6.2.10.15],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.16],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 142d613b6afe25eedd3cd557af48a73ad12f2d63
Author: Andras Timar 
AuthorDate: Mon Jun 8 16:49:14 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 16:49:14 2020 +0200

Bump version to 6.2-15

Change-Id: Ia008650801b8726c8598c8ef27ac40b4ab717af5

diff --git a/configure.ac b/configure.ac
index 315ae156bd42..05d22de09247 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([Collabora Office],[6.2.10.14],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.15],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 112063051a2887a552462786b5d8d1897efbe915
Author: Andras Timar 
AuthorDate: Thu May 28 15:49:20 2020 +0200
Commit: Andras Timar 
CommitDate: Thu May 28 15:49:20 2020 +0200

Bump version to 6.2-14

Change-Id: If2faf0cea56f4d9f3abc89265196db4ae453451a

diff --git a/configure.ac b/configure.ac
index 2092c50f132b..315ae156bd42 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([Collabora Office],[6.2.10.13],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.14],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 0211195b016543961ea6e1da860dadaa3a15aca4
Author: Tor Lillqvist 
AuthorDate: Thu May 21 10:59:41 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu May 21 17:24:31 2020 +0200

Accept iOS 13.5 SDK

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

diff --git a/configure.ac b/configure.ac
index fa25abb35057..2092c50f132b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2992,8 +2992,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.4
-older_sdk_vers="13.2 13.1 13.0 12.4 12.2"
+current_sdk_ver=13.5
+older_sdk_vers="13.4 13.2 13.1 13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit a8976709a467924dd308801e15b3ac46900c636b
Author: Andras Timar 
AuthorDate: Tue May 19 23:32:10 2020 +0200
Commit: Andras Timar 
CommitDate: Tue May 19 23:32:20 2020 +0200

Bump version to 6.2-13

Change-Id: Ia3d213cdf5d616e9dfef7fa41ffe16d577868073

diff --git a/configure.ac b/configure.ac
index 335f75de7a9f..fa25abb35057 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([Collabora Office],[6.2.10.12],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.13],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Yunusemre Şentürk (via logerrit)]

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

New commits:
commit 476241a599fb8a5ab1bbc2989c6c6a84eb7c9788
Author: Yunusemre Şentürk 
AuthorDate: Thu May 14 17:32:59 2020 +0300
Commit: Andras Timar 
CommitDate: Fri May 15 21:36:48 2020 +0200

Fix typo.

It was causing "./configure: line 9997: =no: command not found"
when autogen.sh is used.

Change-Id: Iee57fb43c7bfbe4ac64ea5f995af05ddc8a26ad4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94234
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index 919129b67173..335f75de7a9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2148,7 +2148,7 @@ 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.]),,
-[$with_latest_c__=no])
+[with_latest_c__=no])
 
 dnl ===
 dnl Branding
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 8dce0b1a703ee45efd952a652c10b7fefe246271
Author: Andras Timar 
AuthorDate: Thu May 14 09:02:15 2020 +0200
Commit: Andras Timar 
CommitDate: Thu May 14 09:02:15 2020 +0200

Bump version to 6.2-12

Change-Id: I6e91a29740fd51be157ff22b844c8a783266a28c

diff --git a/configure.ac b/configure.ac
index 15c468365172..919129b67173 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([Collabora Office],[6.2.10.11],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.12],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit ba552ebf17c44b6951f472cce0b2bb318fd8f952
Author: Andras Timar 
AuthorDate: Thu May 7 07:23:41 2020 +0200
Commit: Andras Timar 
CommitDate: Thu May 7 07:23:41 2020 +0200

Bump version to 6.2-11

Change-Id: I2064eef90fbf58055059ea60b33c5fe9cb2de0cb

diff --git a/configure.ac b/configure.ac
index c64fa51b7dbf..15c468365172 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([Collabora Office],[6.2.10.10],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.11],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Stephan Bergmann (via logerrit)]

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

New commits:
commit d996e8074ce122c887617c2c7fb20c4a67530aa3
Author: Stephan Bergmann 
AuthorDate: Mon Apr 20 11:40:24 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Fri May 1 21:39:39 2020 +0200

Add --with-latest-c++ to explicitly opt in for -std=c++20/-std:c++latest

cd472d1d8489f30797f47d3f6dafede28c1feb90 "Compile as C++2a, where 
available" had
started to unconditionally check for support of -std=c++2a (and later also
-std=c++20) for Clang and GCC, but that can cause occasional issues 
especially
for Linux distros, see e.g. 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 
"replace
boost::bimap in sdext pdfimport" or

"/usr/include/boost/format/alt_sstream_impl.hpp incompatible with -std=c++20
(std::allocator::allocate hint argument)" (where
677c8de4fa79cd9b278b142013ba7f1c9e4e41c3 "external/boost: Adapt to
std::allocator parts removed in C++20" is not picked up due to
--with-system-boost).

So better require an explicit opt-in via a new --with-latest-c++.  And 
while at
it, also make that enable -std:c++latest for MSVC.

Change-Id: I2d1f03144fad9a7884562e56b1b76cab5eb8f080
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92555
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93204
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 76cc8f5f3ca8..c64fa51b7dbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2144,6 +2144,12 @@ libo_FUZZ_ARG_WITH(lxml,
  report widget classes and ids.]),
 ,)
 
+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.]),,
+[$with_latest_c__=no])
+
 dnl ===
 dnl Branding
 dnl ===
@@ -6248,14 +6254,21 @@ libo_FUZZ_ARG_ENABLE(c++17,
 AC_MSG_CHECKING([whether $CXX supports C++17, C++14, or C++11])
 CXXFLAGS_CXX11=
 if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
-CXXFLAGS_CXX11=-std:c++17
+if test "$with_latest_c__" = yes; then
+CXXFLAGS_CXX11=-std:c++latest
+else
+CXXFLAGS_CXX11=-std:c++17
+fi
 elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 dnl But only use C++17 if the gperf that is being used knows not to emit
 dnl "register" in C++ output:
 printf 'foo\n' | $GPERF -L C++ > conftest.inc
 my_flags='-std=gnu++14 -std=gnu++1y -std=c++14 -std=c++1y -std=gnu++11 
-std=gnu++0x -std=c++11 -std=c++0x'
 if test "$enable_c__17" != no; then
-my_flags="-std=gnu++2a -std=c++2a -std=gnu++17 -std=gnu++1z -std=c++17 
-std=c++1z $my_flags"
+my_flags="-std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z $my_flags"
+if test "$with_latest_c__" = yes; then
+my_flags="-std=gnu++2a -std=c++2a $my_flags"
+fi
 fi
 for flag in $my_flags; do
 if test "$COM" = MSC; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac .gitignore instsetoo_native/util setup_native/source solenv/bin

[Andras Timar (via logerrit)]

 .gitignore   |1 +
 configure.ac |3 +++
 instsetoo_native/util/openoffice.lst.in  |2 +-
 setup_native/source/packinfo/finals_instsetoo.txt.in |1 +
 solenv/bin/modules/installer/globals.pm  |2 +-
 solenv/bin/modules/installer/windows/admin.pm|3 ++-
 solenv/bin/modules/installer/windows/msp.pm  |2 +-
 7 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 70e34e275af01341c049ac3b7fc333621adcaf82
Author: Andras Timar 
AuthorDate: Mon Oct 10 13:56:31 2016 -0700
Commit: Andras Timar 
CommitDate: Fri Apr 24 19:45:49 2020 +0200

[cp] Enable MSP patching

(cherry picked from commit ae8938f8848bcce96e21ee207c0226ff0a3cb4a2)

Change-Id: I1de9776e161161daf7349be304e05d5bb959f891
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92847
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/.gitignore b/.gitignore
index 45d7859318e5..46ff6df9b846 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,7 @@
 /README
 /AUTHORS
 /MAINTAINERS
+/setup_native/source/packinfo/finals_instsetoo.txt
 
 # make id
 /ID
diff --git a/configure.ac b/configure.ac
index 658a72b7e783..76cc8f5f3ca8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3183,6 +3183,7 @@ if test "$_os" = "WINNT"; then
 BITNESS_OVERRIDE=64
 fi
 fi
+AC_SUBST(WINDOWS_SDK_ARCH)
 if test "$_os" = "iOS"; then
 cross_compiling="yes"
 fi
@@ -4568,6 +4569,7 @@ if test "$cross_compiling" = "yes"; then
 bin/odfvalidator.sh.in \
 bin/officeotron.sh.in \
 instsetoo_native/util/openoffice.lst.in \
+setup_native/source/packinfo/finals_instsetoo.txt.in \
 config_host/*.in \
 sysui/desktop/macosx/Info.plist.in) \
 | (cd CONF-FOR-BUILD && tar xf -)
@@ -12966,6 +12968,7 @@ AC_CONFIG_FILES([config_host.mk
  bin/odfvalidator.sh
  bin/officeotron.sh
  instsetoo_native/util/openoffice.lst
+ setup_native/source/packinfo/finals_instsetoo.txt
  sysui/desktop/macosx/Info.plist])
 AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 2616587940c9..485c328dbaa6 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -27,7 +27,7 @@ Globals
 REGISTRYLAYERNAME Layers
 SERVICEPACK 1
 UPDATE_DATABASE 1
-CREATE_MSP_INSTALLSET 0
+CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
 WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt 
b/setup_native/source/packinfo/finals_instsetoo.txt.in
similarity index 82%
rename from setup_native/source/packinfo/finals_instsetoo.txt
rename to setup_native/source/packinfo/finals_instsetoo.txt.in
index d5a68d369f7b..52abc3729fe3 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt
+++ b/setup_native/source/packinfo/finals_instsetoo.txt.in
@@ -30,3 +30,4 @@
 # OpenOffice   pro de  
msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
 # OpenOfficeLanguagePack   pro es  
msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
 # URE  pro en-US   
msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
+CollaboraOfficepro 
en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW
   
c:\lo\src\cp-6.2-9-@WINDOWS_SDK_ARCH@\Collabora_Office_6.2-9_Win_@WINDOWS_SDK_ARCH@.msi
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index a7ec5e50b209..a5bd3b93d5df 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -220,7 +220,7 @@ BEGIN
 $fix_number_of_cab_files = 1;
 $cabfilecompressionlevel = 21; # Using LZX compression, possible values 
are: 15 | 16 | ... | 21 (best compression)
 $number_of_cabfiles = 1;# only for $fix_number_of_cab_files = 1
-$include_cab_in_msi = 1;
+$include_cab_in_msi = 0;
 $msidatabasename = "";
 $prepare_winpatch = 0;
 $previous_idt_dir = "";
diff --git a/solenv/bin/modules/installer/windows/admin.pm 
b/solenv/bin/modules/installer/windows/admin.pm
index f822afe7eaec..3dfba9e7a8de 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -287,8 +287,9 @@ sub create_directory_structure
 {

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

Rebased ref, commits from common ancestor:
commit 0f626e17710d7d9da9fc1b4c0592a6907dd0cb96
Author: Andras Timar 
AuthorDate: Wed Apr 15 17:41:59 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 15 17:42:19 2020 +0200

Bump version to 6.2-10

Change-Id: Icc37cafb66db8cb8a8eb1713cb330db15c3cf42b

diff --git a/configure.ac b/configure.ac
index 6ee3a993d14d..658a72b7e783 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([Collabora Office],[6.2.10.9],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.10],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit fbc378a5d83086cc98c5dd2caf91659e775b06cb
Author: Andras Timar 
AuthorDate: Wed Apr 15 17:41:59 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 15 17:41:59 2020 +0200

Bumpr version to 6.2-10

Change-Id: Icc37cafb66db8cb8a8eb1713cb330db15c3cf42b

diff --git a/configure.ac b/configure.ac
index 6ee3a993d14d..658a72b7e783 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([Collabora Office],[6.2.10.9],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.10],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 09c3017758e074fcb9e37a4a22c7f66c9ae38586
Author: Andras Timar 
AuthorDate: Tue Apr 7 11:00:19 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Apr 7 11:00:19 2020 +0200

Bump version to 6.2-9

Change-Id: I8b696127e871781204cfb7c62fa461002b81271a

diff --git a/configure.ac b/configure.ac
index c901cad09e8c..6ee3a993d14d 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([Collabora Office],[6.2.10.8],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.9],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 5ebb43f59dff06d95841f35177055fe73e62cb62
Author: Andras Timar 
AuthorDate: Thu Mar 26 18:16:12 2020 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 26 18:16:12 2020 +0100

Bump version to 6.2-8

Change-Id: Ia693ec6cab5b5d3f5b3614907933ac2e69f17fcf

diff --git a/configure.ac b/configure.ac
index 8f75b097b3d0..c901cad09e8c 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([Collabora Office],[6.2.10.7],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.8],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Tor Lillqvist (via logerrit)]

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

New commits:
commit c6f7199f9d2a67920948352571698bd32e280d76
Author: Tor Lillqvist 
AuthorDate: Tue Mar 24 21:45:18 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Mar 25 00:24:47 2020 +0200

Accept iOS SDK 13.4

Change-Id: I7ef4acfd009c9e7fa0adf31a2f50f507b957bac9

diff --git a/configure.ac b/configure.ac
index c3d3b87e9464..8f75b097b3d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2986,8 +2986,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.2
-older_sdk_vers="13.1 13.0 12.4 12.2"
+current_sdk_ver=13.4
+older_sdk_vers="13.2 13.1 13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit a7004eb475ad8836d2e5c783805e32323b86cbe6
Author: Andras Timar 
AuthorDate: Thu Mar 19 14:15:40 2020 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 19 14:15:40 2020 +0100

Bump version to 6.2-7

Change-Id: I5685d8ddc789d4852404ea6a40664dc5d91befd9

diff --git a/configure.ac b/configure.ac
index 69429c40e669..c3d3b87e9464 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([Collabora Office],[6.2.10.6],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.7],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 4f84c8a53f8425ccf687d12bde7e592ab8ebabad
Author: Andras Timar 
AuthorDate: Wed Mar 4 11:29:29 2020 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 19 13:35:07 2020 +0100

Bump version to 6.2-6

Change-Id: Ib8f6d50001207d5c0f5e7350c45f778b8f5a9c2c

diff --git a/configure.ac b/configure.ac
index b945eb65bff5..69429c40e669 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([Collabora Office],[6.2.10.5],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.6],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Jan Holesovsky (via logerrit)]

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

New commits:
commit 1b8fddee057901dc02480ac8dcb9cbabb0f80ba7
Author: Jan Holesovsky 
AuthorDate: Mon Mar 9 10:03:05 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Mar 10 14:22:13 2020 +0100

Disable gtk in the build-config when cross-compiling.

Not needed at all and gtk3 is already disabled there.

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

diff --git a/configure.ac b/configure.ac
index 7ed5afefdb8f..b945eb65bff5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4594,6 +4594,7 @@ if test "$cross_compiling" = "yes"; then
 # Don't bother having configure look for stuff not needed for the build 
platform anyway
 ./configure \
 --disable-cups \
+--disable-gtk \
 --disable-gtk3 \
 --disable-pdfimport \
 --disable-postgresql-sdbc \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit db593a614cc22d81d66b0783a08e64377011ad4a
Author: Andras Timar 
AuthorDate: Wed Feb 26 13:30:46 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Feb 26 13:32:26 2020 +0100

Bump version to 6.2-5

Change-Id: Ied558fdd2f9dbc07423df7d77385b7c4bd3f2814
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89543
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index e0a3bca717fe..7ed5afefdb8f 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([Collabora Office],[6.2.10.4],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.5],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Jan Holesovsky (via logerrit)]

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

New commits:
commit 302ddf9f9ccca2e1583d09e2588e9c9c9d30b976
Author: Jan Holesovsky 
AuthorDate: Tue Feb 11 23:55:52 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Feb 13 06:53:00 2020 +0100

If asked to do so, enable icecream even in the 'build' part of configure.

Otherwise it is used only in the 'host' part of the cross-compile build.

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

diff --git a/configure.ac b/configure.ac
index 0d00032d3210..e0a3bca717fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4597,6 +4597,7 @@ if test "$cross_compiling" = "yes"; then
 --disable-gtk3 \
 --disable-pdfimport \
 --disable-postgresql-sdbc \
+--enable-icecream="$enable_icecream" \
 --with-parallelism="$with_parallelism" \
 --without-doxygen \
 --without-java \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Jan Holesovsky (via logerrit)]

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

New commits:
commit 697f277fef62ad9944e2f4be6ccbace1376b3384
Author: Jan Holesovsky 
AuthorDate: Fri Feb 7 14:18:40 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Feb 10 11:24:44 2020 +0100

android hunspell: Don't explicitly disable extensions on Android.

We need the bundled extensions for hunspell.

Change-Id: I423d71376652b7d54dfdcc81462a19db9dc785bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88218
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 

diff --git a/configure.ac b/configure.ac
index 438b89e2fd0c..0d00032d3210 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2520,7 +2520,7 @@ fi
 
 if test -z "$enable_extensions"; then
 # For iOS and Android disable extensions unless specifically overridden 
with --enable-extensions.
-if test $_os != iOS -a $_os != Android; then
+if test $_os != iOS; then
 enable_extensions=yes
 fi
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 60e11c22ad886404653a6c7cc32f8fe441ab3f6e
Author: Andras Timar 
AuthorDate: Tue Jan 28 10:36:25 2020 +0100
Commit: Andras Timar 
CommitDate: Tue Jan 28 10:36:25 2020 +0100

Bump version to 6.2-4

Change-Id: I76f298a009ce712c7ef23f136a1deccd29264bdc

diff --git a/configure.ac b/configure.ac
index a3fa7f7798da..438b89e2fd0c 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([Collabora Office],[6.2.10.3],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.4],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 02b9ea64850f33df7b3c89c24a2cafbaeab0f85b
Author: Andras Timar 
AuthorDate: Thu Jan 9 22:19:30 2020 +0100
Commit: Andras Timar 
CommitDate: Thu Jan 9 22:19:30 2020 +0100

Bump version to 6.2-3

Change-Id: Iab6ee2f21a0d13230faa2b510ad3af9d6ba3c519

diff --git a/configure.ac b/configure.ac
index c24547c7e283..a3fa7f7798da 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([Collabora Office],[6.2.10.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.3],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac lingucomponent/Library_MacOSXSpell.mk lingucomponent/Module_lingucomponent.mk postprocess/Rdb_services.mk Repository.mk

[Tor Lillqvist (via logerrit)]

 Repository.mk   |4 ++--
 configure.ac|8 ++--
 lingucomponent/Library_MacOSXSpell.mk   |1 -
 lingucomponent/Module_lingucomponent.mk |4 ++--
 postprocess/Rdb_services.mk |6 --
 solenv/bin/native-code.py   |4 ++--
 6 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 1e01adf9d46524569c0c4461b78e5c06143db761
Author: Tor Lillqvist 
AuthorDate: Fri Jan 3 13:55:24 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Jan 3 14:23:29 2020 +0100

Use only the 'MacOSXSpell' component on iOS, not the 'spell' one

Using only the system spell checker (through MacOSXSpell) is what we
have been doing anyway.

Do not build the hunspell or mythes externals for iOS. Do not build
the lnth or spell components for iOS.

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

diff --git a/Repository.mk b/Repository.mk
index cd7f47ffbb24..6d1458238231 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -394,7 +394,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
localebe1 \
log \
lng \
-   lnth \
+   $(if $(filter-out iOS,$(OS)),lnth) \
$(if $(filter $(OS),MACOSX),macbe1) \
$(if $(MERGELIBS),merged) \
migrationoo2 \
@@ -428,7 +428,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
simplecanvas \
slideshow \
sot \
-   spell \
+   $(if $(filter-out iOS,$(OS)),spell) \
$(if $(DISABLE_GUI),,spl) \
storagefd \
$(call gb_Helper_optional,SCRIPTING,stringresource) \
diff --git a/configure.ac b/configure.ac
index 568a99baf59f..c24547c7e283 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9648,7 +9648,9 @@ dnl 
===
 dnl Check for system hunspell
 dnl ===
 AC_MSG_CHECKING([which libhunspell to use])
-if test "$with_system_hunspell" = "yes"; then
+if test "$_os" = iOS; then
+   AC_MSG_RESULT([none])
+elif test "$with_system_hunspell" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_HUNSPELL=TRUE
 AC_LANG_PUSH([C++])
@@ -9721,7 +9723,9 @@ dnl 
===
 dnl Checking for mythes
 dnl ===
 AC_MSG_CHECKING([which mythes to use])
-if test "$with_system_mythes" = "yes"; then
+if test "$_os" = iOS; then
+   AC_MSG_RESULT([none])
+elif test "$with_system_mythes" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_MYTHES=TRUE
 AC_LANG_PUSH([C++])
diff --git a/lingucomponent/Library_MacOSXSpell.mk 
b/lingucomponent/Library_MacOSXSpell.mk
index f244673a1c4c..d49ee47a73bd 100644
--- a/lingucomponent/Library_MacOSXSpell.mk
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -38,7 +38,6 @@ $(eval $(call 
gb_Library_use_system_darwin_frameworks,MacOSXSpell,\
 
 $(eval $(call gb_Library_use_externals,MacOSXSpell,\
boost_headers \
-   hunspell \
 ))
 
 $(eval $(call gb_Library_add_objcxxobjects,MacOSXSpell,\
diff --git a/lingucomponent/Module_lingucomponent.mk 
b/lingucomponent/Module_lingucomponent.mk
index 2bde5d5391e5..9dabeb155673 100644
--- a/lingucomponent/Module_lingucomponent.mk
+++ b/lingucomponent/Module_lingucomponent.mk
@@ -13,9 +13,9 @@ $(eval $(call gb_Module_Module,lingucomponent))
 $(eval $(call gb_Module_add_targets,lingucomponent,\
Library_guesslang \
Library_hyphen \
-   Library_lnth \
+   $(if $(filter-out iOS,$(OS)),Library_lnth) \
$(if $(filter iOS MACOSX,$(OS)),Library_MacOSXSpell) \
-   Library_spell \
+   $(if $(filter-out iOS,$(OS)),Library_spell) \
StaticLibrary_ulingu \
Library_numbertext \
 ))
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 406382b9fd16..bcfd9fd8a18d 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -50,8 +50,10 @@ $(eval $(call gb_Rdb_add_components,services,\
i18npool/util/i18npool \
lingucomponent/source/hyphenator/hyphen/hyphen \
lingucomponent/source/languageguessing/guesslang \
-   lingucomponent/source/spellcheck/spell/spell \
-   lingucomponent/source/thesaurus/libnth/lnth \
+   $(if $(filter-out iOS,$(OS)), \
+   lingucomponent/source/spellcheck/spell/spell \
+   lingucomponent/source/thesaurus/libnth/lnth \
+   ) \
lingucomponent/source/numbertext/numbertext \
linguistic/source/lng \
$(if $(ENABLE_LWP), \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d000d106c337..9a688a3b470d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -34,7 +34,7 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 1487436c4cc282f159c68cbf0cc35ba6ebe3b56f
Author: Andras Timar 
AuthorDate: Wed Dec 18 11:27:09 2019 +0100
Commit: Andras Timar 
CommitDate: Wed Dec 18 11:27:09 2019 +0100

Bump version to 6.2-2

Change-Id: I1cc1e749e43aa6fcdd07a89b327aa77096d53efa

diff --git a/configure.ac b/configure.ac
index 7f86fa5b321a..568a99baf59f 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([Collabora Office],[6.2.10.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.2],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Jan Holesovsky (via logerrit)]

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

New commits:
commit 94eb59078731b2e4093d983bc618d051f4e31740
Author: Jan Holesovsky 
AuthorDate: Wed Nov 27 15:29:50 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Dec 2 09:04:47 2019 +0100

android: Fix location of the built freetype library.

Otherwise it is not found when the the fontconfig's ./configure is
running, which leads to linking failure during the fontconfig's
./configure time, which leads to an undefined HAVE_FT_GET_NEXT_CHAR
which leads to not using the actual FT_Get_Next_Char, but instead some
dummy code that leads to an infinite loop on the app startup; huh.

Change-Id: I40b7a403fbe75582bb98f15f1afe7a4050fd13aa
Reviewed-on: https://gerrit.libreoffice.org/83922
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/configure.ac b/configure.ac
index 1d848685cfef..7f86fa5b321a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8108,7 +8108,11 @@ if test  "$test_freetype" = "yes"; then
 SYSTEM_FREETYPE=TRUE
 else
 FREETYPE_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"
-FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib 
-lfreetype"
+if test "x$ac_config_site_64bit_host" = xYES; then
+FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib64 
-lfreetype"
+else
+FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib 
-lfreetype"
+fi
 fi
 AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac jvmfwk/distributions

[Stephan Bergmann (via logerrit)]

 configure.ac   |   18 +++--
 jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml |   10 +++
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml   |   16 +--
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml  |   10 +++
 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml |6 ++--
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |   10 +++
 6 files changed, 36 insertions(+), 34 deletions(-)

New commits:
commit e69896aff0ed221a94b16b9ede385b307945a473
Author: Stephan Bergmann 
AuthorDate: Fri Jul 26 10:19:39 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Nov 19 12:56:13 2019 +0100

Bump Java baseline to Java 8

...as discussed at

"Minutes of ESC call: 2019-07-25".

3d27b2fa9c5a03f78e5145377402f8a88e3da1be "tdf#124503: Support JRE 
installations
with unknown java.vendor property" had added support for JREs with unknown
vendor strings without checking that those JREs have a matching version 
(Java 6
back then, Java 8 now).  That check has still not be implemented, assuming 
that
Java 8 is old enough in practice so that any such JRE encountered in the 
wild
will at least be Java 8 anyway.

Change-Id: I0205a34955368067c698bcabd24de84205a382bd
Reviewed-on: https://gerrit.libreoffice.org/76365
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 77d709caf7f8..6048434da877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1962,7 +1962,7 @@ AC_ARG_WITH(linker-hash-style,
 
 AC_ARG_WITH(jdk-home,
 AS_HELP_STRING([--with-jdk-home=],
-[If you have installed JDK 1.6 or later on your system please supply 
the
+[If you have installed JDK 8 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.]),
 ,)
@@ -6895,7 +6895,7 @@ if test "$ENABLE_JAVA" != ""; then
 _jdk_home=$regvalue
 fi
 if test -z "$with_jdk_home"; then
-for ver in 1.8 1.7 1.6; do
+for ver in 1.8; do
 reg_get_value "$bitness" 
"HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome"
 if test -n "$regvalue"; then
 _jdk_home=$regvalue
@@ -6996,8 +6996,8 @@ if test "$ENABLE_JAVA" != ""; then
 _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' 
| $SED s/[[-A-Za-z]]*//`
 _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 
+ $3;}'`
 
-if test "$_jdk_ver" -lt 10600; then
-AC_MSG_ERROR([IBM JDK is too old, you need at least 1.6])
+if test "$_jdk_ver" -lt 10800; then
+AC_MSG_ERROR([IBM JDK is too old, you need at least 8])
 fi
 
 AC_MSG_RESULT([checked (IBM JDK $_jdk)])
@@ -7015,10 +7015,10 @@ you must use the "--with-jdk-home" configure option 
explicitly])
 _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 10600; then
-AC_MSG_ERROR([JDK is too old, you need at least 1.6])
+if test "$_jdk_ver" -lt 10800; then
+AC_MSG_ERROR([JDK is too old, you need at least 8])
 fi
-if test "$_jdk_ver" -gt 10600; then
+if test "$_jdk_ver" -gt 10800; then
 JAVA_CLASSPATH_NOT_SET=TRUE
 fi
 if test "$_jdk_ver" -ge 10900; then
@@ -7037,7 +7037,7 @@ you must use the "--with-jdk-home" configure option 
explicitly])
 JAVAFLAGS=-J-Xmx128M
 fi
 else
-AC_MSG_ERROR([Java not found. You need at least jdk-1.6])
+AC_MSG_ERROR([Java not found. You need at least JDK 8])
 fi
 else
 dnl Java disabled
@@ -7063,6 +7063,8 @@ dnl Checks for javac
 dnl ===
 if test "$ENABLE_JAVA" != ""; then
 javacompiler="javac"
+: ${JAVA_SOURCE_VER=8}
+: ${JAVA_TARGET_VER=8}
 if test -z "$with_jdk_home"; then
 AC_PATH_PROG(JAVACOMPILER, $javacompiler)
 else
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index b05b6c797ea8..89ffc08ffc8d 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -17,19 +17,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 http://openoffice.org/2004/java/framework/1.0";>
-  2019-01-19
+  2019-07-26
   
 
-  1.7.0
+

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 8efc7715ddab32a00324d6f56424416d4bca7e51
Author: Stephan Bergmann 
AuthorDate: Fri Sep 27 14:04:39 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Nov 19 12:30:16 2019 +0100

Revert "tdf#121925 test for URLClassPath.ClassPathURLCheck"

This reverts commit 905c107cde4a0a7059b1e11b5f23a0a59188cb0c.
Conflicts:
configure.ac

As discussed at 

"Fix Java Jar dependency classpath to pass the ClassPathURLCheck":  "At 
least
with java-latest-openjdk-headless-13.0.0.33-1.rolling.fc31.x86_64, the
testurlcheck program in configure.ac reports 'false', but (when you convert 
the
corresponding AC_MSG_ERROR into a AC_MSG_RESULT to not make configure fail) 
a
full `make check screenshot` works fine for me."

Change-Id: I205bada5e8eeede7b33cdbc3f87a629edb8b9872
Reviewed-on: https://gerrit.libreoffice.org/79687
Reviewed-by: Jan-Marek Glogowski 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index c817647540b8..77d709caf7f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7344,58 +7344,6 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
 fi
 SOLARINC="$SOLARINC $JAVAINC"
 
-if test "$ENABLE_JAVA" != "" -a "x" != "x$JAVACOMPILER"; then
-url_check_unknown=0
-java_base="testurlcheck"
-java_src="${java_base}.java"
-java_cls="${java_base}.class"
-cat > "${java_src}" <<_ACEOF
-[import jdk.internal.loader.URLClassPath;
-import java.lang.reflect.Field;
-import java.net.URL;
-
-class ${java_base}
-{
-public static void main(String args[])
-{
-try {
-URLClassPath cp = new URLClassPath(new URL[0], null);
-Field field = 
cp.getClass().getDeclaredField("DISABLE_CP_URL_CHECK");
-field.setAccessible(true);
-System.out.println(field.get(cp).toString());
-} catch(Exception e) {
-System.out.println("unknown");
-}
-}
-}]
-_ACEOF
-AC_MSG_CHECKING([if jdk.net.URLClassPath.ClassPathURLCheck is disabled])
-java_cmd="$JAVACOMPILER --add-exports 
java.base/jdk.internal.loader=ALL-UNNAMED ${java_src} 1>&2"
-AC_TRY_EVAL(java_cmd)
-if test $? = 0 -a -f "./${java_cls}"; then
-java_res=`$JAVAINTERPRETER --add-opens 
java.base/jdk.internal.loader=ALL-UNNAMED ${java_base} 2>/dev/null`
-if test $? = 0; then
-case "${java_res}" in
-true) AC_MSG_RESULT([yes]) ;;
-false)
-rm -f "./${java_src}" "./${java_cls}"
-AC_MSG_ERROR([no - Java unit tests will break!])
-;;
-*) url_check_unknown=1 ;;
-esac
-else
-url_check_unknown=1
-fi
-else
-url_check_unknown=1
-fi
-if test $url_check_unknown -eq 1; then
-AC_MSG_RESULT([unknown - assuming yes])
-add_warning "Unable to find the default value for 
jdk.net.URLClassPath.ClassPathURLCheck - java tests might fail!"
-fi
-rm -f "./${java_src}" "./${java_cls}"
-fi
-
 AC_SUBST(JAVACOMPILER)
 AC_SUBST(JAVADOC)
 AC_SUBST(JAVAINTERPRETER)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Jan Holesovsky (via logerrit)]

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

New commits:
commit 59eee888bf7174114e5749855d95e8ff7dd15013
Author: Jan Holesovsky 
AuthorDate: Thu Jul 4 09:06:49 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Oct 22 14:18:10 2019 +0200

android: Allow specification of the API level.

Change-Id: Icf33e2703f42a7866ce895437cf5f276066eeebe
Reviewed-on: https://gerrit.libreoffice.org/81227
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/configure.ac b/configure.ac
index be8a5be03ed4..80ca6532ceea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,6 +370,11 @@ AC_ARG_WITH(android-sdk,
 [Specify location of the Android SDK. Mandatory when building for 
Android.]),
 ,)
 
+AC_ARG_WITH(android-api-level,
+AS_HELP_STRING([--with-android-api-level],
+[Specify the API level when building for Android. Defaults to 16 for 
ARM and x86 and to 21 for ARM64 and x86-64]),
+,)
+
 ANDROID_NDK_HOME=
 if test -z "$with_android_ndk" -a -e "$SRC_ROOT/external/android-ndk" -a 
"$build" != "$host"; then
 with_android_ndk="$SRC_ROOT/external/android-ndk"
@@ -406,6 +411,10 @@ if test -n "$with_android_ndk"; then
 esac
 
 ANDROID_API_LEVEL=16
+if test -n "$with_android_api_level" ; then
+ANDROID_API_LEVEL="$with_android_api_level"
+fi
+
 android_cpu=$host_cpu
 if test $host_cpu = arm; then
 android_platform_prefix=arm-linux-androideabi
@@ -418,7 +427,9 @@ if test -n "$with_android_ndk"; then
 android_gnu_prefix=$android_platform_prefix
 LLVM_TRIPLE=$android_platform_prefix
 # minimum android version that supports aarch64
-ANDROID_API_LEVEL=21
+if test "$ANDROID_API_LEVEL" -lt "21" ; then
+ANDROID_API_LEVEL=21
+fi
 ANDROID_APP_ABI=arm64-v8a
 elif test $host_cpu = x86_64; then
 android_platform_prefix=x86_64-linux-android
@@ -445,6 +456,8 @@ if test -n "$with_android_ndk"; then
 AC_MSG_ERROR([Unrecognized value for the 
--with-android-ndk-toolchain-version option. Building for Android is only 
supported with Clang 5.*])
 esac
 
+AC_MSG_NOTICE([using the Android API level... $ANDROID_API_LEVEL])
+
 # NDK 15 or later toolchain is 64bit-only, except for Windows that we 
don't support. Using a 64-bit
 # linker is required if you compile large parts of the code with -g. A 
32-bit linker just won't
 # manage to link the (app-specific) single huge .so that is built for the 
app in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Tor Lillqvist (via logerrit)]

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

New commits:
commit b8fe0a7d3306870eebf7cdeef8a4730a22a9c76b
Author: Tor Lillqvist 
AuthorDate: Thu Oct 10 15:58:15 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Oct 10 16:09:51 2019 +0300

Set RTL_OS to "iOS" for iOS

We accidentally had left it as "MacOSX". Affects at least the
"generator" metadata stored in documents.

Change-Id: I72eeefdbe192409084f7ab7a24adbc39dcafb624
(cherry picked from commit 1fb87997031d6318ddf8ddf9714d2585a92f7667)

diff --git a/configure.ac b/configure.ac
index 67c2a5801b8e..8d03a0cb7729 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4066,6 +4066,7 @@ darwin*)
 ;;
 arm64)
 OS=iOS
+RTL_OS=iOS
 if test "$enable_ios_simulator" = "yes"; then
 AC_MSG_ERROR([iOS simulator is only available in OSX not iOS])
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 2a3b9af83b3ab2891d8d2257bf11e34f8f62e32b
Author: Tor Lillqvist 
AuthorDate: Wed Oct 9 09:01:27 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 9 09:17:11 2019 +0300

Accept iOS SDK 13.1

Change-Id: I02870b35f67dd9ca47061311186d74dfec823aa7

diff --git a/configure.ac b/configure.ac
index 0ecaa54ff976..f30b5e5712d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2967,8 +2967,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.0
-older_sdk_vers="12.4 12.2 12.1 12.0 11.4"
+current_sdk_ver=13.1
+older_sdk_vers="13.0 12.4 12.2 12.1 12.0 11.4"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=11.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Deve (via logerrit)]

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

New commits:
commit c2d39ea4288f14c0f9cc16320bd34b3199e907ff
Author: Deve 
AuthorDate: Wed Jan 9 00:10:27 2019 +0100
Commit: Andras Timar 
CommitDate: Sun Sep 22 09:53:24 2019 +0200

Don't build dconf on Android and iOS.

Without that modification, it finds dconf in linux system and then 
compilation fails when it tries to build configmgr/source/dconf.cxx because 
dconf headers are not found in Android NDK.

Change-Id: I25ab7f1ce66ed491f08a526e462e00957135b0c2
Reviewed-on: https://gerrit.libreoffice.org/65987
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit b534c1ef4ba439cc1b0f566ed9e3a3275a2e8e5e)
Reviewed-on: https://gerrit.libreoffice.org/79342
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index 189f0e36a6b0..0ecaa54ff976 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10512,7 +10512,7 @@ dnl =
 dnl Check whether to build with dconf support.
 dnl =
 
-if test "$enable_dconf" != no; then
+if test $_os != Android -a $_os != iOS -a "$enable_dconf" != no; then
 PKG_CHECK_MODULES([DCONF], [dconf >= 0.15.2], [], [
 if test "$enable_dconf" = yes; then
 AC_MSG_ERROR([dconf not found])
@@ -10521,7 +10521,7 @@ if test "$enable_dconf" != no; then
 fi])
 fi
 AC_MSG_CHECKING([whether to enable dconf])
-if test "$enable_dconf" = no; then
+if test $_os = Android -o $_os = iOS -o "$enable_dconf" = no; then
 DCONF_CFLAGS=
 DCONF_LIBS=
 ENABLE_DCONF=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |   23 ---
 1 file changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 59e86c2de4125e45f045fa621b458ddfb6b5e2aa
Author: Tor Lillqvist 
AuthorDate: Sat Sep 21 12:06:33 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Sat Sep 21 12:18:40 2019 +0300

Accept also macOS SDK 10.15 and iOS SDK 13.0

Change-Id: I1032f1d25d90c29d83f3d164d4fc0392a7fc58c7

diff --git a/configure.ac b/configure.ac
index 8025a650167e..189f0e36a6b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2714,7 +2714,7 @@ dnl 
===
 dnl Check OS X SDK and compiler
 dnl ===
 
-if test $_os = Darwin -o $_os = iOS; then
+if test $_os = Darwin; then
 
 # If no --with-macosx-sdk option is given, look for one
 
@@ -2725,7 +2725,7 @@ if test $_os = Darwin -o $_os = iOS; then
 # higher than or equal to the minimum required should be found.
 
 AC_MSG_CHECKING([what Mac OS X SDK to use])
-for _macosx_sdk in ${with_macosx_sdk-10.14 10.13 10.12}; do
+for _macosx_sdk in ${with_macosx_sdk-10.15 10.14 10.13 10.12}; do
 MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> 
/dev/null`
 if test -d "$MACOSX_SDK_PATH"; then
 with_macosx_sdk="${_macosx_sdk}"
@@ -2763,8 +2763,11 @@ if test $_os = Darwin -o $_os = iOS; then
 10.14)
 MACOSX_SDK_VERSION=101400
 ;;
+10.15)
+MACOSX_SDK_VERSION=101500
+;;
 *)
-AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.12--14])
+AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.12--15])
 ;;
 esac
 
@@ -2802,8 +2805,11 @@ if test $_os = Darwin -o $_os = iOS; then
 10.14)
 MAC_OS_X_VERSION_MIN_REQUIRED="101400"
 ;;
+10.15)
+MAC_OS_X_VERSION_MIN_REQUIRED="101500"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.9--14])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.9--15])
 ;;
 esac
 MAC_OS_X_VERSION_MIN_REQUIRED_DOTS=$with_macosx_version_min_required
@@ -2846,8 +2852,11 @@ if test $_os = Darwin -o $_os = iOS; then
 10.14)
 MAC_OS_X_VERSION_MAX_ALLOWED="101400"
 ;;
+10.15)
+MAC_OS_X_VERSION_MAX_ALLOWED="101500"
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.9--14])
+AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.9--15])
 ;;
 esac
 
@@ -2958,8 +2967,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=12.4
-older_sdk_vers="12.2 12.1 12.0 11.4"
+current_sdk_ver=13.0
+older_sdk_vers="12.4 12.2 12.1 12.0 11.4"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=11.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 2f57a6bbe319e44a9fd27f0f19b8fccb826951ec
Author: Tor Lillqvist 
AuthorDate: Thu Jul 25 13:44:18 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Jul 25 13:41:44 2019 +0200

Accept also iOS SDK 12.4 and 12.2

Change-Id: Id7c17c6c2668a1d9fca5335f83a12229071cec9b
Reviewed-on: https://gerrit.libreoffice.org/76297
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index ec9ba8726c1f..537d5d00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2958,8 +2958,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=12.1
-older_sdk_vers="12.0 11.4"
+current_sdk_ver=12.4
+older_sdk_vers="12.2 12.1 12.0 11.4"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=11.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac Repository.mk shell/Library_spsupp.mk shell/Library_spsupp_x64.mk shell/Library_spsupp_x86.mk shell/Module_shell.mk sole

[Mike Kaganski (via logerrit)]

 Repository.mk   |   12 +++-
 configure.ac|2 ++
 shell/Library_spsupp_x64.mk |5 -
 shell/Library_spsupp_x86.mk |   21 +
 shell/Module_shell.mk   |   12 +++-
 solenv/gbuild/Library.mk|1 +
 6 files changed, 34 insertions(+), 19 deletions(-)

New commits:
commit 733db098ddce73d951b64fff4b98daddbc0a5979
Author: Mike Kaganski 
AuthorDate: Tue May 7 21:22:08 2019 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 20 17:45:00 2019 +0200

Make spsupp*.dll usable on 64-bit Windows

Build spsupp for both x64 and x86, regardless of target platform.
This allows to install the ActiveX component to be used by both
64-bit and 32-bit applications on 64-bit systems (especially IE,
which runs both 64-bit and 32-bit processes simultaneously at
least on Win10), no matter which LO (32/64) was installed.

Move the DLLs from activex feature to ooo, to copy unconditionally.
Registration of LO-specific component will be also unconditional;
registration of replacement of MSO component will need own feature.

This doesn't yet register the component in system: TODO later.

Change-Id: Iccf5e73dfae306cb777f844d40611e23c4520a13
Reviewed-on: https://gerrit.libreoffice.org/71925
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/74410

diff --git a/Repository.mk b/Repository.mk
index 9c1b992c425e..268af2df6fd5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -664,16 +664,26 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbina
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activex, \
so_activex \
-   spsupp \
 ))
 
 ifneq ($(BUILD_X64),)
 $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin64, \
so_activex_x64 \
+))
+endif
+
+ifneq ($(CXX_X64_BINARY),)
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
spsupp_x64 \
 ))
 endif
 
+ifneq ($(CXX_X86_BINARY),)
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+   spsupp_x86 \
+))
+endif
+
 $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinarytable, \
$(if $(WINDOWS_SDK_HOME),\
instooofiltmsi \
diff --git a/configure.ac b/configure.ac
index 3eaab42340ec..ec9ba8726c1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3602,6 +3602,8 @@ if test "$_os" = "WINNT"; then
 AC_MSG_RESULT([not found])
 AC_MSG_WARN([Installation set will not contain 64-bit Explorer 
extensions])
 fi
+else
+CXX_X64_BINARY=$MSVC_CXX
 fi
 AC_SUBST(BUILD_X64)
 
diff --git a/shell/Library_spsupp_x64.mk b/shell/Library_spsupp_x64.mk
index 4b36a6c8d105..1988b2745539 100644
--- a/shell/Library_spsupp_x64.mk
+++ b/shell/Library_spsupp_x64.mk
@@ -20,11 +20,6 @@ $(eval $(call gb_Library_set_include,spsupp_x64,\
$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_defs,spsupp_x64,\
-   -DUNICODE \
-   -D_UNICODE \
-))
-
 $(eval $(call gb_Library_use_system_win32_libs,spsupp_x64,\
advapi32 \
kernel32 \
diff --git a/shell/Library_spsupp.mk b/shell/Library_spsupp_x86.mk
similarity index 63%
rename from shell/Library_spsupp.mk
rename to shell/Library_spsupp_x86.mk
index fd9bdba84351..ba101b7bb4ec 100644
--- a/shell/Library_spsupp.mk
+++ b/shell/Library_spsupp_x86.mk
@@ -7,23 +7,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Library_Library,spsupp))
+$(eval $(call gb_Library_Library,spsupp_x86))
 
-$(eval $(call gb_Library_use_custom_headers,spsupp,\
+$(eval $(call gb_Library_set_x86,spsupp_x86,YES))
+
+$(eval $(call gb_Library_use_custom_headers,spsupp_x86,\
shell/source/win32/spsupp/idl \
 ))
 
-$(eval $(call gb_Library_set_include,spsupp,\
+$(eval $(call gb_Library_set_include,spsupp_x86,\
-I$(SRCDIR)/shell/inc/spsupp \
$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_defs,spsupp,\
-   -DUNICODE \
-   -D_UNICODE \
-))
-
-$(eval $(call gb_Library_use_system_win32_libs,spsupp,\
+$(eval $(call gb_Library_use_system_win32_libs,spsupp_x86,\
advapi32 \
kernel32 \
ole32 \
@@ -31,13 +28,13 @@ $(eval $(call gb_Library_use_system_win32_libs,spsupp,\
user32 \
 ))
 
-$(eval $(call gb_Library_add_nativeres,spsupp,spsupp))
+$(eval $(call gb_Library_add_nativeres,spsupp_x86,spsupp))
 
-$(eval $(call gb_Library_add_ldflags,spsupp,\
+$(eval $(call gb_Library_add_ldflags,spsupp_x86,\
/DEF:$(SRCDIR)/shell/source/win32/spsupp/spsupp.def \
 ))
 
-$(eval $(call gb_Library_add_exception_objects,spsupp,\
+$(eval $(call gb_Library_add_exception_objects,spsupp_x86,\
 shell/source/win32/spsupp/COMOpenDocuments \
 shell/source/win32/spsupp/registrar \
 shell/source/win32/spsupp/spsuppClassFactory \
diff --git a/shell/Module_shell.m