[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ccbe835d2391087d67a41c0baf67b309d852a17d Author: Andras Timar AuthorDate: Sat Nov 25 20:35:33 2023 +0100 Commit: Andras Timar CommitDate: Sat Nov 25 20:35:33 2023 +0100 Bump version to 22.05.21.1 Change-Id: Ib37d550643dbac62fa6fde15b69d327a5e52291a diff --git a/configure.ac b/configure.ac index 1c75c940e349..ac14c5440705 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],[22.05.20.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.21.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 889f81dd0ae41aba3eb5a07fdc42ab591a074813 Author: Andras Timar AuthorDate: Fri Oct 27 16:26:57 2023 +0200 Commit: Andras Timar CommitDate: Fri Oct 27 16:26:57 2023 +0200 Bump version to 22.05.20.1 Change-Id: I5bf4cf9b14f2b54cd61f8de20d350973b5f483dc diff --git a/configure.ac b/configure.ac index 57026f568ef8..1c75c940e349 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],[22.05.19.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.20.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 57e9c6309c52b194ff9350818ff2b3724255ed4a Author: Andras Timar AuthorDate: Sun Sep 17 20:23:29 2023 +0200 Commit: Andras Timar CommitDate: Sun Sep 17 20:23:29 2023 +0200 Bump version to 22.05.19.1 Change-Id: I14db135059e397878556a7214c21a439ac175078 diff --git a/configure.ac b/configure.ac index aeb48dbd15f4..57026f568ef8 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],[22.05.18.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.19.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 99be3fb17a4039f495fbe614b184d555fed558e5 Author: Aron Budea AuthorDate: Sun Aug 13 04:09:03 2023 +0200 Commit: Aron Budea CommitDate: Sun Aug 13 04:09:03 2023 +0200 Bump version to 22.05.18.1 Change-Id: Ibf1268c93fb83561e3e87ef5899c908ef8a9f59e diff --git a/configure.ac b/configure.ac index c42502675378..aeb48dbd15f4 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],[22.05.17.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.18.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a1c2341b0397dcc2575c05f143fdf7eac9aabe53 Author: Aron Budea AuthorDate: Wed Jul 12 15:04:32 2023 +0200 Commit: Aron Budea CommitDate: Wed Jul 12 15:04:32 2023 +0200 Bump version to 22.05.17.1 Change-Id: I3e7103abfd2f54bc6be120d64a37e521fa876f39 diff --git a/configure.ac b/configure.ac index 72cbed9fe25f..c42502675378 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],[22.05.16.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.17.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 26451099702871030eb9ce6d1b502f529c124dd0 Author: Aron Budea AuthorDate: Wed Jun 28 20:53:25 2023 +0200 Commit: Aron Budea CommitDate: Wed Jun 28 20:53:25 2023 +0200 Bump version to 22.05.16.1 Change-Id: Ib1b7b82830a8d99056c6044557555c306976aeb4 diff --git a/configure.ac b/configure.ac index 9802aa37a0f8..72cbed9fe25f 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],[22.05.15.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.16.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9543e7a2366ac3ce101009ae5d20b9d4ed0e06ef Author: Aron Budea AuthorDate: Tue Jun 20 01:09:29 2023 +0200 Commit: Aron Budea CommitDate: Tue Jun 20 01:28:37 2023 +0200 Accept iOS SDK 16.5 Change-Id: Idf53c90cc3ef5c59cc9ad6151c13cc2125daf546 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153304 Tested-by: Aron Budea Reviewed-by: Aron Budea diff --git a/configure.ac b/configure.ac index f83a3c7f8f6b..9802aa37a0f8 100644 --- a/configure.ac +++ b/configure.ac @@ -3501,8 +3501,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=16.2 -older_sdk_vers="16.1 16.0 15.6 15.5 15.4 15.2 15.0" +current_sdk_ver=16.5 +older_sdk_vers="16.4 16.3 16.2 16.1 16.0 15.6 15.5 15.4 15.2 15.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=14.5
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac external/cppunit
configure.ac |7 ++- external/cppunit/enable-win32-debug.patch |4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) New commits: commit 8263cac3fb78fa1a43ef4db314696d4a44dcf26e Author: Christian Lohmaier AuthorDate: Tue Nov 29 12:28:20 2022 +0100 Commit: Andras Timar CommitDate: Mon Jun 19 20:06:07 2023 +0200 accept Apple's patch utility - pickier than GNU patch, but should be OK macOS Ventura replaced the patch utility by Apple's version: patch 2.0-12u11-Apple (as of macOS 13.0.1) It is picker/less robust when it comes to locating matches, and absolutely refuses to apply when the hunks are out of order. Only one patch needed rework in the current codebase (master an 7-4 branch), and being more correct about the locations in the files to be patched is not a bad thing either, so accept Apple's version of patch (with a warning for now) Change-Id: I707d00958b814307b13caf9923f1de7f3919442c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143461 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/configure.ac b/configure.ac index 40987b268ba6..f83a3c7f8f6b 100644 --- a/configure.ac +++ b/configure.ac @@ -11423,7 +11423,12 @@ if test "$_os" = "SunOS" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then AC_MSG_RESULT([yes]) else -AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it]) +if $GNUPATCH --version | grep "2\.0-.*-Apple" >/dev/null 2>/dev/null; then +AC_MSG_RESULT([no, but accepted (Apple patch)]) +add_warning "patch utility is not GNU patch. Apple's patch should work OK, but it might experience issues where GNU patch doesn't." +else +AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it]) +fi fi else GNUPATCH=$PATCH diff --git a/external/cppunit/enable-win32-debug.patch b/external/cppunit/enable-win32-debug.patch index dc159ecc51ad..2c7f4f956d2f 100644 --- a/external/cppunit/enable-win32-debug.patch +++ b/external/cppunit/enable-win32-debug.patch @@ -1,6 +1,6 @@ --- misc/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj +++ misc/build/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj -@@ -107,7 +107,6 @@ +@@ -190,7 +190,6 @@ true Level3 true @@ -8,7 +8,7 @@ ..\..\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions) .\ReleaseDll\ -@@ -138,6 +137,7 @@ +@@ -222,6 +221,7 @@ true true
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a3908f47f58f0eeb1bb788f7501ee8d6bac11ae3 Author: Andras Timar AuthorDate: Wed May 24 18:24:22 2023 +0200 Commit: Andras Timar CommitDate: Wed May 24 18:24:22 2023 +0200 Bump version to 22.05.15.2 Change-Id: I89ba521234c721e2278b32dafc5899afa4c32ecf diff --git a/configure.ac b/configure.ac index ebf1c706cb7b..40987b268ba6 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],[22.05.15.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.15.2],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f48bce6451f919fbffe171e7affef9870efdbbad Author: Andras Timar AuthorDate: Tue May 23 21:45:31 2023 +0200 Commit: Andras Timar CommitDate: Tue May 23 21:45:31 2023 +0200 Bump version to 22.05.15.1 Change-Id: Id64bbf7aa778079f0888d2e89870f52a965a001c diff --git a/configure.ac b/configure.ac index 9267b271e57a..ebf1c706cb7b 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],[22.05.14.3],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.15.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8e4f947ca6a2dc5a3c05347af7dfde2146352abe Author: Andras Timar AuthorDate: Fri May 5 19:12:32 2023 +0200 Commit: Andras Timar CommitDate: Fri May 5 19:12:32 2023 +0200 Bump version to 22.05.14.3 Change-Id: I39e6e2bdd9386579c19096900a1b5391386c79ca diff --git a/configure.ac b/configure.ac index 4b08cb209e99..9267b271e57a 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],[22.05.14.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.14.3],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bf3a9678c7f14a22fc90e72e9980c4747f750b3e Author: Andras Timar AuthorDate: Thu May 4 10:01:22 2023 +0200 Commit: Andras Timar CommitDate: Thu May 4 10:01:22 2023 +0200 Bump version to 22.05.14.2 Change-Id: I93c1f6cbafcac4dff98dd9b82e8330bc1ea4e5ea diff --git a/configure.ac b/configure.ac index b44e2eee5241..4b08cb209e99 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],[22.05.14.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.14.2],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit db0b72abfba97d0ab17265741e15a22c7fd31102 Author: Andras Timar AuthorDate: Wed May 3 17:45:25 2023 +0200 Commit: Andras Timar CommitDate: Wed May 3 17:45:25 2023 +0200 Bump version to 22.05.14.1 Change-Id: I9d3116913cc0b69a0f324b25aa6bd17e1130f4fc diff --git a/configure.ac b/configure.ac index 89f1710abd16..b44e2eee5241 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],[22.05.13.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.14.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 416b47096203b13365953eff93eb800860f7a4cf Author: Andras Timar AuthorDate: Thu Mar 23 09:26:13 2023 +0100 Commit: Andras Timar CommitDate: Thu Mar 23 09:26:13 2023 +0100 Bump version to 22.05.12.3 Change-Id: I75efe25ce6562677d5078666d28846423619c727 diff --git a/configure.ac b/configure.ac index 6370dd88cd91..ebc592b173bb 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],[22.05.11.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.12.3],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 70be8b47f27949eda87214c7e43103ab066edfa4 Author: Andras Timar AuthorDate: Mon Feb 27 22:03:45 2023 +0100 Commit: Andras Timar CommitDate: Mon Feb 27 22:03:45 2023 +0100 Bump version to 22.05.11.1 Change-Id: Icfc98142071805433d0fe74a024567579279f7da diff --git a/configure.ac b/configure.ac index 6250a9618591..6370dd88cd91 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],[22.05.10.5],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.11.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 99bb89a2629d3bd68c64e1ecf460ccb37741f6ae Author: Andras Timar AuthorDate: Sun Feb 19 20:36:10 2023 +0100 Commit: Andras Timar CommitDate: Sun Feb 19 20:36:10 2023 +0100 Bump version to 22.05.10.5 Change-Id: I4ad6616536d89d9bacc091e5b54e2b6b083dd7c6 diff --git a/configure.ac b/configure.ac index 94d735220e6c..6250a9618591 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],[22.05.10.4],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.10.5],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6be73d231ce40f52780ea8fa4be088ceed998463 Author: Andras Timar AuthorDate: Thu Feb 16 21:44:24 2023 +0100 Commit: Andras Timar CommitDate: Thu Feb 16 21:44:24 2023 +0100 Bump version to 22.05.10.4 Change-Id: I3a7998664b046195a2111dd56bb2945a1929dd37 diff --git a/configure.ac b/configure.ac index 50cd9b6a06e9..94d735220e6c 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],[22.05.10.3],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.10.4],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a248ab4d27cf8ab8ad5d7b7cf84b01783a5f3b36 Author: Andras Timar AuthorDate: Thu Feb 16 16:41:06 2023 +0100 Commit: Andras Timar CommitDate: Thu Feb 16 16:41:06 2023 +0100 Bump version to 22.05.10.3 Change-Id: Ica8d6a3b13f3bcc383f962aeb36593b902d01142 diff --git a/configure.ac b/configure.ac index 87fe374be6b2..50cd9b6a06e9 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],[22.05.10.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.10.3],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac vcl/unx
configure.ac |2 +-
vcl/unx/generic/gdi/freetypetextrender.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dadcf15b93ea7a20024f551327fed2744887a52f
Author: Andras Timar
AuthorDate: Tue Jan 31 20:18:41 2023 +0100
Commit: Andras Timar
CommitDate: Tue Jan 31 20:20:00 2023 +0100
Bump version to 22.05.10.1
Change-Id: I27a9ff61800178a2d1cdea300abb6d1cf704f81d
diff --git a/configure.ac b/configure.ac
index 046d9199e452..41095d2aed24 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],[22.05.9.3],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.10.1],[],[],[https://collaboraoffice.com/])
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
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx
b/vcl/unx/generic/gdi/freetypetextrender.cxx
index ea8474e69fee..1a63f9d63076 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -149,7 +149,7 @@ void FreeTypeTextRenderImpl::GetFontMetric(
ImplFontMetricDataRef& rxFontMetric,
std::unique_ptr FreeTypeTextRenderImpl::GetTextLayout(int
nFallbackLevel)
{
-assert(mpFreetypeFont[nFallbackLevel]);
+//assert(mpFreetypeFont[nFallbackLevel]);
if (!mpFreetypeFont[nFallbackLevel])
return nullptr;
return std::make_unique(*mpFreetypeFont[nFallbackLevel]);
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0a6a0d78c881c967d52d8fd976eef3c2c79cf609 Author: Andras Timar AuthorDate: Mon Jan 16 21:24:05 2023 +0100 Commit: Andras Timar CommitDate: Mon Jan 16 21:24:05 2023 +0100 Bump version to 22.05.9.3 Change-Id: I0ebd0d6bababb254a7dd8a5906e7634908be7b60 diff --git a/configure.ac b/configure.ac index f0f60015a33f..046d9199e452 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],[22.05.9.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.9.3],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a2ec3af0a5b2fd168021f29e607775d2811e8193 Author: Andras Timar AuthorDate: Fri Dec 16 21:17:30 2022 +0100 Commit: Andras Timar CommitDate: Fri Dec 16 21:17:30 2022 +0100 Bump version to 22.05.9.1 Change-Id: I82b945edf12d9cd22cb433ba0059076ba5b5e9eb diff --git a/configure.ac b/configure.ac index 4585a22fc362..f0f60015a33f 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],[22.05.8.4],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.9.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac | 134 ++-
1 file changed, 34 insertions(+), 100 deletions(-)
New commits:
commit 92f8b5ac2e699ed3fbd6e086dd40007b22c3838f
Author: Christian Lohmaier
AuthorDate: Mon Nov 21 14:51:32 2022 +0100
Commit: Tor Lillqvist
CommitDate: Fri Dec 16 15:32:28 2022 +
macOS: simplify SDK handling, remove the upper limit of SDK
…both for building as well as for min-required version
The newer versions of XCode/the corresponding SDK it comes with didn't cause
any problems in the last years, and checking for a max-sdk version just
causes
more work when working on a newer system, either forcing to have multiple
versions of Xcode around and switching between those for no reason, or
always
patching configure to accept the currently used version when bisecting
stuff.
Addition by tml: We still want to default to
--with-macosx-version-min-required=10.12 in this branch.
Change-Id: I0dac9f90afe7d4490d44a1036fa8d358d29da57f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144206
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index 9793ed40bdd9..4585a22fc362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3294,63 +3294,34 @@ if test $_os = Darwin; then
# The SDK in the currently selected Xcode should be found.
AC_MSG_CHECKING([what macOS SDK to use])
-for macosx_sdk in 13.0 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 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
-else
-MACOSX_SDK_PATH="`xcode-select
-print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${macosx_sdk}.sdk"
-if test -d "$MACOSX_SDK_PATH"; then
-break
-fi
-fi
-done
+# XCode only ships with a single SDK for a while now, and using older SDKs
alongside is not
+# really supported anymore, instead you'd use different copies of Xcode,
each with their own
+# SDK, and thus xcrun will pick the SDK that matches the currently
selected Xcode version
+# also restricting the SDK version to "known good" versions doesn't seem
necessary anyomre, the
+# problems that existed in the PPC days with target versions not being
respected or random
+# failures seems to be a thing of the past or rather: limiting either the
Xcode version or the
+# SDK version is enough, no need to do both...
+MACOSX_SDK_PATH=`xcrun --sdk macosx --show-sdk-path 2> /dev/null`
if test ! -d "$MACOSX_SDK_PATH"; then
AC_MSG_ERROR([Could not find an appropriate macOS SDK])
fi
-
-AC_MSG_RESULT([macOS SDK $macosx_sdk at $MACOSX_SDK_PATH])
+macosx_sdk=`xcodebuild -version -sdk "$MACOSX_SDK_PATH" SDKVersion`
MACOSX_SDK_BUILD_VERSION=$(xcodebuild -version -sdk "$MACOSX_SDK_PATH"
ProductBuildVersion)
-case $macosx_sdk in
-10.13)
-MACOSX_SDK_VERSION=101300
-;;
-10.14)
-MACOSX_SDK_VERSION=101400
-;;
-10.15)
-MACOSX_SDK_VERSION=101500
-;;
-11.0)
-MACOSX_SDK_VERSION=11
-;;
-11.1)
-MACOSX_SDK_VERSION=110100
-;;
-11.3)
-MACOSX_SDK_VERSION=110300
-;;
-12.0)
-MACOSX_SDK_VERSION=12
-;;
-12.1)
-MACOSX_SDK_VERSION=120100
-;;
-12.3)
-MACOSX_SDK_VERSION=120300
-;;
-13.0)
-MACOSX_SDK_VERSION=13
-;;
-*)
-AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
-;;
-esac
-
+# format changed between 10.9 and 10.10 - up to 10.9 it was just four
digits (1090), starting
+# with macOS 10.10 it was switched to account for x.y.z with six digits,
10.10 is 101000,
+# 10.10.2 is 101002
+# we don't target the lower versions anymore, so it doesn't matter that we
don't generate the
+# correct version in case such an old SDK is specified, it will be
rejected later anyway
+MACOSX_SDK_VERSION=$(echo $macosx_sdk | $AWK -F. '{ print
$1*1+$2*100+$3 }')
+if test $MACOSX_SDK_VERSION -lt 101400; then
+AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported, lowest supported
version is 10.14])
+fi
if test "$host_cpu" = arm64 -a $MACOSX_SDK_VERSION -lt 11; then
-AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported for Apple
Silicon])
+AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported for Apple Silicon
(need at least 11.0)])
fi
+AC_MSG_RESULT([macOS SDK $macosx_sdk at $MACOSX_SDK_PATH])
+AC_MSG_CHECKING([what minimum version of macOS to require])
if test "$with_macosx_version_min_required" = "" ; then
if test "$host_cpu" = x86_64; then
with_macosx_version_min_required="10.12";
@@ -3358,6 +3329,19 @@ if test $_os = Darwin; then
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 403051783e14edbe0781fdefd40e286aacbd03b5 Author: Tor Lillqvist AuthorDate: Thu Dec 15 01:47:37 2022 +0200 Commit: Tor Lillqvist CommitDate: Thu Dec 15 09:53:36 2022 + Accept iOS SDK 16.2 Change-Id: I850a0214d12ef6b5b9a289b34a1467dfe9d35d17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144204 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index dc14d3f46d71..e2d259980c92 100644 --- a/configure.ac +++ b/configure.ac @@ -3627,8 +3627,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=16.1 -older_sdk_vers="16.0 15.6 15.5 15.4 15.2 15.0" +current_sdk_ver=16.2 +older_sdk_vers="16.1 16.0 15.6 15.5 15.4 15.2 15.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=14.5
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1b0fff73f64e926806f011c78f0b6ca8976a3967 Author: Andras Timar AuthorDate: Tue Nov 22 14:56:54 2022 +0100 Commit: Andras Timar CommitDate: Tue Nov 22 14:56:54 2022 +0100 Bump version to 22.05.8.3 Change-Id: I39bec732957b3382500390ea770d2790934c577c diff --git a/configure.ac b/configure.ac index dcb8847a3ceb..ac276c04d952 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],[22.05.8.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.8.3],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dc73229172f8d6540767c9ab724be338a891719c Author: Andras Timar AuthorDate: Tue Nov 8 11:14:13 2022 +0100 Commit: Andras Timar CommitDate: Tue Nov 8 11:14:13 2022 +0100 Bump version to 22.05.8.2 Change-Id: I996ec4afa589a39810e03fc14b48af39cb057e5a diff --git a/configure.ac b/configure.ac index ab716311dc6c..dcb8847a3ceb 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],[22.05.8.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.8.2],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 807888b849187eaf5d1c0e4a064f66702180a8e9
Author: Tor Lillqvist
AuthorDate: Thu Nov 3 12:02:08 2022 +0200
Commit: Tor Lillqvist
CommitDate: Thu Nov 3 13:36:49 2022 +0100
Accept macOS SDK 13.0
Change-Id: I2207f39583626c55900f3c027bd4a783d2dd36f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142231
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index e3e52c26e8f5..ab716311dc6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3302,7 +3302,7 @@ if test $_os = Darwin; then
# The SDK in the currently selected Xcode should be found.
AC_MSG_CHECKING([what macOS SDK to use])
-for macosx_sdk in 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
+for macosx_sdk in 13.0 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${macosx_sdk} --show-sdk-path 2>
/dev/null`
if test -d "$MACOSX_SDK_PATH"; then
break
@@ -3347,6 +3347,9 @@ if test $_os = Darwin; then
12.3)
MACOSX_SDK_VERSION=120300
;;
+13.0)
+MACOSX_SDK_VERSION=13
+;;
*)
AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
;;
@@ -3422,8 +3425,11 @@ if test $_os = Darwin; then
12.3)
MAC_OS_X_VERSION_MIN_REQUIRED="120300"
;;
+13.0)
+MAC_OS_X_VERSION_MIN_REQUIRED="13"
+;;
*)
-AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.12--12.3])
+AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.12--13.0])
;;
esac
@@ -3493,8 +3499,11 @@ if test $_os = Darwin; then
12.3)
MAC_OS_X_VERSION_MAX_ALLOWED="120300"
;;
+13.0)
+MAC_OS_X_VERSION_MAX_ALLOWED="13"
+;;
*)
-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])
+AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.12--13.0])
;;
esac
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1bfe827fdf2445b1478aab58079068a5611f686d Author: Tor Lillqvist AuthorDate: Thu Nov 3 11:30:07 2022 +0200 Commit: Tor Lillqvist CommitDate: Thu Nov 3 11:29:57 2022 +0100 Accept iOS SDK 16.1 Change-Id: Ibb1cfde3e604396dc0f943a573df6aa04be5201d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142220 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index ebe537d0d035..e3e52c26e8f5 100644 --- a/configure.ac +++ b/configure.ac @@ -3618,8 +3618,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=16.0 -older_sdk_vers="15.6 15.5 15.4 15.2 15.0" +current_sdk_ver=16.1 +older_sdk_vers="16.0 15.6 15.5 15.4 15.2 15.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=14.5
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8ccd8918fa0da0522816fa6a4a2e525f081b9818 Author: Andras Timar AuthorDate: Thu Oct 27 22:05:03 2022 +0200 Commit: Andras Timar CommitDate: Thu Oct 27 22:05:03 2022 +0200 Bump version to 22.05.7.3 Change-Id: I03608c35a6de874d434b4d4485cb1476ca72ff0d diff --git a/configure.ac b/configure.ac index b2b33d85383c..49e7fa162ae4 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],[22.05.7.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.7.3],[],[],[https://collaboraoffice.com/]) 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 @@ -3318,7 +3318,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) +MACOSX_SDK_BUILD_VERSION=$(xcodebuild -version -sdk "$MACOSX_SDK_PATH" ProductBuildVersion) case $macosx_sdk in 10.13) MACOSX_SDK_VERSION=101300
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8f42f09a5e5c863fa1d43250289dc4405b8e Author: Andras Timar AuthorDate: Thu Oct 20 11:28:11 2022 +0200 Commit: Andras Timar CommitDate: Thu Oct 20 11:28:11 2022 +0200 Bump version to 22.05.7.2 Change-Id: I4527eb403e037023fd08ea6fe1dae886c9c4626d diff --git a/configure.ac b/configure.ac index 79d2e463d624..d6eb9393626a 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],[22.05.7.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.7.2],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d918501c7a5abf12827d7fe0b61375633158c2d5 Author: Andras Timar AuthorDate: Tue Oct 18 21:52:29 2022 +0200 Commit: Andras Timar CommitDate: Tue Oct 18 21:52:29 2022 +0200 Bump version to 22.05.7.1 Change-Id: I5f743c8f5bc77556598826f60d20f9b4d5d78e03 diff --git a/configure.ac b/configure.ac index 27248dde59ce..79d2e463d624 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],[22.05.6.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.7.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac | 19 --- 1 file changed, 19 deletions(-) New commits: commit 240ecad069ac4d38d7491c4b405b9c5065335f58 Author: Tor Lillqvist AuthorDate: Fri Oct 14 14:42:51 2022 +0300 Commit: Tor Lillqvist CommitDate: Fri Oct 14 14:48:59 2022 +0200 Don't bother with sanity check for fd hack in all or none of the related libs Get rid of the check that produces the error "cairo, fontconfig, freetype, graphite, and harfbuzz must all be either used from the system or bundled". It should be enough that in CPLinux-LOKit.conf we bundle all the libraries that need a "fd hack" for downloaded fonts in COOL. If somebody combines these libraries in a different way and then attempts to use the result for COOL and use the font downloading feature, it won't work, but it's their own fault. Change-Id: I7c6f6bc3ee2209cb4d7a167bd3ce80a9cfb74e17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141367 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index 5d650956063d..5c514dedb5a1 100644 --- a/configure.ac +++ b/configure.ac @@ -13541,25 +13541,6 @@ AC_SUBST(CAIRO_LIBS) AC_SUBST(ENABLE_CAIRO_CANVAS) AC_SUBST(SYSTEM_CAIRO) -if test -z "$with_system_cairo"; then -with_system_cairo=yes -fi - -case "$_os" in -Linux) -AC_MSG_CHECKING([for compatibility of system/bundled font-related libraries]) -if test "$with_system_harfbuzz" != "$with_system_fontconfig" || - test "$with_system_fontconfig" != "$with_system_freetype" || - test "$with_system_freetype" != "$with_system_cairo" || - test "$with_system_cairo" != "$with_system_graphite"; then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([cairo, fontconfig, freetype, graphite, and harfbuzz must all be either used from the system or bundled]) -else - AC_MSG_RESULT([yes]) -fi -;; -esac - dnl === dnl Test whether to use avahi dnl ===
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac desktop/source distro-configs/CPLinux-LOKit.conf external/cairo external/fontconfig external/freetype external/harfbuz
configure.ac | 53
desktop/source/lib/init.cxx | 20 +++
distro-configs/CPLinux-LOKit.conf|4
external/cairo/ExternalPackage_cairo.mk |3
external/cairo/UnpackedTarball_cairo.mk |2
external/cairo/cairo/cairo-fd-hack.patch.0 | 15 ++
external/cairo/cairo/libcairo-bundled-soname.patch.0 | 12 ++
external/fontconfig/ExternalPackage_fontconfig.mk| 16 ++
external/fontconfig/ExternalProject_fontconfig.mk| 15 ++
external/fontconfig/Module_fontconfig.mk |1
external/fontconfig/UnpackedTarball_fontconfig.mk|1
external/fontconfig/libfontconfig-bundled-soname.patch.0 | 11 +
external/freetype/ExternalPackage_freetype.mk| 16 ++
external/freetype/ExternalProject_freetype.mk|5
external/freetype/Module_freetype.mk |1
external/freetype/UnpackedTarball_freetype.mk|2
external/freetype/freetype-fd-hack.patch.0 | 53
external/freetype/libfreetype-bundled-soname.patch.0 | 11 +
external/harfbuzz/UnpackedTarball_harfbuzz.mk|3
external/harfbuzz/harfbuzz-fd-hack.patch.0 | 24
vcl/source/fontsubset/sft.cxx| 23 +++
vcl/unx/generic/fontmanager/fontmanager.cxx | 90 ---
vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 13 ++
23 files changed, 345 insertions(+), 49 deletions(-)
New commits:
commit 2def5485aa57d7c407a84ecc73b22083579e9a98
Author: Tor Lillqvist
AuthorDate: Tue Sep 20 16:07:14 2022 +0300
Commit: Tor Lillqvist
CommitDate: Wed Oct 12 14:21:18 2022 +0200
Enable opening of downloaded fonts only in ForKit in Online
(This is the second attempt at this, I had to revert the first one as
it broke desktop Collabora Office.)
We want that only the ForKit process needs to have access to new font
files added to a Collabora Online instance dynamically by downloading
from a server. There are however many locations in the Kit process, in
core and in external libraries like harfbuzz, where the code wants to
open a font file.
Handle this so that the ForKit process opens such a downloaded font
file and doesn't close it. The file descriptor is thus inherited by
Kit processes. The font file pathname passed on to other code is a
fake on in the format "/:FD:/%d" where the %d is the file descriptor
of the opened font file. Add checks in all places where font files are
opened, look for this special pathname format, and modify the code to
just dup() the already open file descriptor in that case.
All this is relevant for Linux only, as Collabora Online runs on
Linux.
Do the above for harfbuzz, cairo, fontconfig, and freetype.
In addition make sure that these libraries (except harfbuzz which
needs to be a static library) when bundled, on Linux, are built as
shared libraries, and won't be confused with the corresponding system
libraries by making sure their sonames are different.
Change-Id: Ib059cb27e1637d07bb709249abd0d984f948caa9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140714
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index 65126c1caee5..5d650956063d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4478,6 +4478,18 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" !=
"no"; then
AC_MSG_ERROR([--with-system-graphite conflicts with --enable-dbgutil])
else
with_system_graphite=no
+if test -z "$with_system_harfbuzz"; then
+with_system_harfbuzz=no
+fi
+if test -z "$with_system_cairo"; then
+with_system_cairo=no
+fi
+if test -z "$with_system_fontconfig"; then
+with_system_fontconfig=no
+fi
+if test -z "$with_system_freetype"; then
+with_system_freetype=no
+fi
fi
if test "$with_system_orcus" = "yes"; then
AC_MSG_ERROR([--with-system-orcus conflicts with --enable-dbgutil])
@@ -10775,13 +10787,27 @@ AC_SUBST(SYSTEM_LIBORCUS)
dnl ===
dnl HarfBuzz
dnl ===
-libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3],
+case "$_os" in
+Linux)
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3],
+ ["-I${WORKDIR}/UnpackedTarball/graphite/include
-DGRAPHITE2_STATIC"],
+ ["-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"],
+ TRUE)
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 2076ae6168a76c534262a191442448186692ea74 Author: Tor Lillqvist AuthorDate: Thu Sep 15 14:44:27 2022 +0300 Commit: Tor Lillqvist CommitDate: Mon Sep 26 20:58:50 2022 +0200 Make --with-system-nss default on Linux again Functionally revert what I did in the 'Temporarily revert "tdf#147250 configure: default to --with-system-nss on..."' commit. Change-Id: Ic576d3969976057dd520ee03bc1cb32540078c63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140055 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index c4de07a897b9..7b855a5e89a3 100644 --- a/configure.ac +++ b/configure.ac @@ -10479,7 +10479,14 @@ dnl === dnl Check for system NSS dnl === if test "$enable_fuzzers" != "yes" -a "$enable_nss" = "yes"; then -libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8]) +case "$_os" in +Linux) +libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8],,,TRUE) +;; +*) +libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8]) +;; +esac AC_DEFINE(HAVE_FEATURE_NSS) ENABLE_NSS=TRUE elif test $_os != iOS ; then
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac m4/libo_externals.m4
configure.ac | 62 ++-
m4/libo_externals.m4 | 12 ++---
2 files changed, 26 insertions(+), 48 deletions(-)
New commits:
commit be7a238c33dc02dfba40b2ad60485a56f4685d26
Author: Jan-Marek Glogowski
AuthorDate: Tue Dec 7 05:19:01 2021 +0100
Commit: Tor Lillqvist
CommitDate: Mon Sep 26 20:54:56 2022 +0200
Simplify FONTCONFIG and FREETYPE tests
Add an additional option to libo_CHECK_SYSTEM_MODULE to select
the default external lookup.
Don't "if" the libo_CHECK_SYSTEM_MODULE, so the AC_SUBST are
always run, but set the test_* flags instead.
Change-Id: Ie0a1204b34d596fdd57a7ee770418f91bf8c5d00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126464
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140050
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index 910c6f6655b9..c4de07a897b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1171,6 +1171,9 @@ if test "$using_freetype_fontconfig" = yes; then
AC_DEFINE(ENABLE_HEADLESS)
ENABLE_HEADLESS=TRUE
fi
+else
+test_fontconfig=no
+test_freetype=no
fi
AC_SUBST(ENABLE_HEADLESS)
@@ -5863,23 +5866,7 @@ fi
AC_SUBST(ENABLE_CUPS)
-# fontconfig checks
-if test "$using_freetype_fontconfig" = yes; then
-AC_MSG_CHECKING([which fontconfig to use])
-fi
-if test "$using_freetype_fontconfig" = yes -a "$test_system_fontconfig" != no;
then
-AC_MSG_RESULT([external])
-PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.4.1])
-SYSTEM_FONTCONFIG=TRUE
-FilterLibs "${FONTCONFIG_LIBS}"
-FONTCONFIG_LIBS="${filteredlibs}"
-elif test "$using_freetype_fontconfig" = yes; then
-AC_MSG_RESULT([internal])
-BUILD_TYPE="$BUILD_TYPE FONTCONFIG"
-fi
-AC_SUBST(FONTCONFIG_CFLAGS)
-AC_SUBST(FONTCONFIG_LIBS)
-AC_SUBST([SYSTEM_FONTCONFIG])
+libo_CHECK_SYSTEM_MODULE([fontconfig],[FONTCONFIG],[fontconfig >=
2.4.1],,,TRUE)
dnl whether to find & fetch external tarballs?
dnl ===
@@ -9511,38 +9498,25 @@ fi
dnl ===
dnl Check whether freetype is available
+dnl
+dnl FreeType has 3 different kinds of versions
+dnl * release, like 2.4.10
+dnl * libtool, like 13.0.7 (this what pkg-config returns)
+dnl * soname
+dnl FreeType's docs/VERSION.DLL provides a table mapping between the three
+dnl
+dnl 9.9.3 is 2.2.0
+dnl When the minimal version is at least 2.8.1, remove Skia's check down below.
dnl ===
-if test "$using_freetype_fontconfig" = yes; then
-AC_MSG_CHECKING([which freetype to use])
-fi
-if test "$using_freetype_fontconfig" = yes -a "$test_system_freetype" != no;
then
-AC_MSG_RESULT([external])
-# FreeType has 3 different kinds of versions
-# * release, like 2.4.10
-# * libtool, like 13.0.7 (this what pkg-config returns)
-# * soname
-# FreeType's docs/VERSION.DLL provides a table mapping between the three
-#
-# 9.9.3 is 2.2.0
-# When the minimal version is at least 2.8.1, remove Skia's check down
below.
-PKG_CHECK_MODULES(FREETYPE, freetype2 >= 9.9.3)
-FREETYPE_CFLAGS=$(printf '%s' "$FREETYPE_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
-FilterLibs "${FREETYPE_LIBS}"
-FREETYPE_LIBS="${filteredlibs}"
-SYSTEM_FREETYPE=TRUE
-elif test "$using_freetype_fontconfig" = yes; then
-AC_MSG_RESULT([internal])
-FREETYPE_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"
+if test "$test_freetype" != no; then
if test "x$ac_config_site_64bit_host" = xYES; then
-FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib64
-lfreetype"
+
FREETYPE_LIBS_INTERNAL="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib64
-lfreetype"
else
-FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib
-lfreetype"
+
FREETYPE_LIBS_INTERNAL="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib
-lfreetype"
fi
-BUILD_TYPE="$BUILD_TYPE FREETYPE"
fi
-AC_SUBST(FREETYPE_CFLAGS)
-AC_SUBST(FREETYPE_LIBS)
-AC_SUBST([SYSTEM_FREETYPE])
+libo_CHECK_SYSTEM_MODULE([freetype],[FREETYPE],[freetype2 >= 9.9.3],
+
["${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"],["$FREETYPE_LIBS_INTERNAL"],TRUE)
# ===
# Check for system libxslt
diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4
index d19178ab8250..b2b314fec933 100644
--- a/m4/libo_externals.m4
+++ b/m4/libo_externals.m4
@@ -6,15 +6,19 @@ dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil;
fill-column: 102 -*
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+# ,,,
+# ,,
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a47d18cc45904e5df15c1777a51a8427728338bb Author: Tor Lillqvist AuthorDate: Tue Sep 13 09:16:30 2022 +0300 Commit: Tor Lillqvist CommitDate: Tue Sep 13 21:50:32 2022 +0200 Bump minimum iOS runtime version to 14.5 Change-Id: I69a0676f7a622a7b08041d87e0b0da82c0ba1a73 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139857 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index 6303df071dde..121af3c74626 100644 --- a/configure.ac +++ b/configure.ac @@ -3595,10 +3595,10 @@ if test $_os = iOS; then older_sdk_vers="15.6 15.5 15.4 15.2 15.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator -versionmin=-mios-simulator-version-min=13.6 +versionmin=-mios-simulator-version-min=14.5 else platform=iPhoneOS -versionmin=-miphoneos-version-min=13.6 +versionmin=-miphoneos-version-min=14.5 fi xcode_developer=`xcode-select -print-path`
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c9873a39cdc3e2a859f7728bc7b4c227501cfa1c Author: Tor Lillqvist AuthorDate: Tue Sep 13 09:14:16 2022 +0300 Commit: Tor Lillqvist CommitDate: Tue Sep 13 15:29:09 2022 +0200 Bump current iOS SDK to 16.0 Change-Id: Id44c90b5077e2ac4addb814e1089ed5d0d95df8a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139855 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index 5bee3b43cbf7..6303df071dde 100644 --- a/configure.ac +++ b/configure.ac @@ -3591,8 +3591,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.5 -older_sdk_vers="15.4 15.2 15.0" +current_sdk_ver=16.0 +older_sdk_vers="15.6 15.5 15.4 15.2 15.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=13.6
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 30693e89567ede19cba2387d23579623efab4022 Author: Andras Timar AuthorDate: Thu Sep 8 13:58:49 2022 +0200 Commit: Andras Timar CommitDate: Thu Sep 8 13:58:49 2022 +0200 Bump version to 22.05.6.1 Change-Id: I5018f2f3cdaec0ecd5d15639c7f766e2fc0de8b0 diff --git a/configure.ac b/configure.ac index 1bbf6b84ef35..5bee3b43cbf7 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],[22.05.5.3],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.6.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f0c1e32132dab8bdc942614b9e0a18de81f8dbb7 Author: Aron Budea AuthorDate: Thu Aug 11 10:53:34 2022 +0200 Commit: Aron Budea CommitDate: Thu Aug 11 18:32:42 2022 +0200 Bump version to 22.05.5.3 Change-Id: I44fe400479963bd59526296622acbd521886d754 diff --git a/configure.ac b/configure.ac index 274ebd124902..16611284b0b9 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],[22.05.5.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.5.3],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fe4468db8de113d2844a8733dd094506af778b51 Author: Andras Timar AuthorDate: Mon Jul 11 19:06:49 2022 +0200 Commit: Andras Timar CommitDate: Mon Jul 11 19:06:49 2022 +0200 Bump version to 22.05.4.1 Change-Id: I613ba29dfcdcf977677ede8c74e78272bcb79ab7 diff --git a/configure.ac b/configure.ac index acfd70ed4859..f2284ec730ce 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],[22.05.3.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.4.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ff7b8ea3d38e0c747dfa069b33bf746839fd174d Author: Tor Lillqvist AuthorDate: Tue May 17 11:09:23 2022 +0300 Commit: Tor Lillqvist CommitDate: Mon Jul 11 07:36:12 2022 +0200 Accept iOS SDK 15.5 Change-Id: I19f54042613769993b92cfaf04de292cfbb72b5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134459 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136903 Tested-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index 568a1867786a..acfd70ed4859 100644 --- a/configure.ac +++ b/configure.ac @@ -3596,8 +3596,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.4 -older_sdk_vers="15.2 15.0" +current_sdk_ver=15.5 +older_sdk_vers="15.4 15.2 15.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=13.6
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d49e388d7d384d7328047d8fccceddfa5953d2e3 Author: Andras Timar AuthorDate: Mon May 30 08:57:06 2022 +0200 Commit: Andras Timar CommitDate: Mon May 30 08:57:06 2022 +0200 Bump version to 22.05.1.1 Change-Id: I8eb51386723330e08de3c39db37330ca54acffad diff --git a/configure.ac b/configure.ac index 19b227786bcb..187f1e599edc 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],[22.05.0.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.1.1],[],[],[https://collaboraoffice.com/]) 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 'distro/collabora/co-22.05' - configure.ac
configure.ac |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 6db3014de5e7c1852c27437287e327f765f2a88b Author: Tor Lillqvist AuthorDate: Wed May 19 14:18:56 2021 +0300 Commit: Tor Lillqvist CommitDate: Tue Apr 19 09:38:39 2022 +0200 We do want scripting on iOS, too The native-code.py script unconditionally generates references to that now. Change-Id: Ib0ca1e994af15597f8a191ccdd32d95efca063da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115796 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118897 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133016 diff --git a/configure.ac b/configure.ac index 6cdcb539da44..07a56aa37fd1 100644 --- a/configure.ac +++ b/configure.ac @@ -3001,11 +3001,7 @@ else fi if test -z "$enable_scripting"; then -# Disable scripting for iOS unless specifically overridden -# with --enable-scripting. -if test $_os != iOS -o $_os = Emscripten; then -enable_scripting=yes -fi +enable_scripting=yes fi DISABLE_SCRIPTING=''
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 69c10ca6dedb5b07abab0740fa17bf70beec7144 Author: Tor Lillqvist AuthorDate: Tue Mar 15 10:13:34 2022 +0200 Commit: Tor Lillqvist CommitDate: Wed Apr 13 08:31:39 2022 +0200 Accept iOS SDK 15.4 Change-Id: I53efea3dcc7308f2189d331a9f5ec52d0e610b42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131581 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132196 Tested-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132942 diff --git a/configure.ac b/configure.ac index 4d4a19a29c12..6cdcb539da44 100644 --- a/configure.ac +++ b/configure.ac @@ -3577,8 +3577,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.2 -older_sdk_vers="15.0 14.5" +current_sdk_ver=15.4 +older_sdk_vers="15.2 15.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=13.6
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 38054361895eb0d06a23a704d8b8402139f1bd63
Author: Tor Lillqvist
AuthorDate: Mon Mar 14 23:43:35 2022 +0200
Commit: Tor Lillqvist
CommitDate: Mon Mar 21 11:55:44 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
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131894
diff --git a/configure.ac b/configure.ac
index e55f8c8564c4..79af091ae68b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3280,7 +3280,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
@@ -3322,6 +3322,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])
;;
@@ -3391,8 +3394,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.12--12.3])
;;
esac
@@ -3459,8 +3465,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 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 13cb7e8f06e74dc7558333640760ce6ada3d8ad5 Author: Andras Timar AuthorDate: Sun Mar 13 10:53:05 2022 +0100 Commit: Andras Timar CommitDate: Sun Mar 13 21:31:39 2022 +0100 do not build HELPTOOLS for 'host' when cross compling * it's unnecessary, HELPTOOLS are only needed for the build * on armv7-32-bit we had build issues LinkTarget Library/libclucene.a not defined. Stop. probably because of the refactoring of help related options: 14069d84174ca7a4e60db4d75912903e9679b643 Change-Id: Ia32e7dba1d745eee80fb487f8749767d5d6648e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131463 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/configure.ac b/configure.ac index a7d6267c73cc..e55f8c8564c4 100644 --- a/configure.ac +++ b/configure.ac @@ -5412,7 +5412,7 @@ else fi AC_MSG_CHECKING([if we need to build the help index tooling]) -if test "$with_help" = yes -o "$enable_extension_integration" != no; then +if test "$cross_compiling" != yes -a \( "$with_help" = yes -o "$enable_extension_integration" != no \); then BUILD_TYPE="$BUILD_TYPE HELPTOOLS" test_clucene=yes AC_MSG_RESULT([yes])
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac helpcompiler/Module_helpcompiler.mk RepositoryExternal.mk
RepositoryExternal.mk |2 +- configure.ac|9 - helpcompiler/Module_helpcompiler.mk |2 +- 3 files changed, 10 insertions(+), 3 deletions(-) New commits: commit ef47b4c2aa50b74d1f337f764428bfb1a537faa8 Author: Jan-Marek Glogowski AuthorDate: Tue Dec 21 14:12:10 2021 +0100 Commit: Andras Timar CommitDate: Wed Mar 9 12:31:43 2022 +0100 Don't build clucene if not needed Just build it if HELPTOOLS or XMLHELP are in BUILD_TYPE. And simply tets for clucene just in this case. And since XMLHELP is not in the list of PERMITTED_BUILD_TARGETS, disable it. Change-Id: I13fdbf096c60191a428e23c22344f7e22e8c5d66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127231 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9044f574bc81..d86edc543e44 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2940,7 +2940,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ - clucene \ +$(call gb_Helper_optionals_or,HELPTOOLS XMLHELP,clucene) \ )) endif # SYSTEM_CLUCENE diff --git a/configure.ac b/configure.ac index 03e7fc52d688..a7d6267c73cc 100644 --- a/configure.ac +++ b/configure.ac @@ -813,6 +813,7 @@ disable_database_connectivity_dependencies() # === build_crypto=yes test_cmis=yes +test_clucene=no test_gdb_index=no test_openldap=yes test_split_debug=no @@ -5413,6 +5414,7 @@ fi AC_MSG_CHECKING([if we need to build the help index tooling]) if test "$with_help" = yes -o "$enable_extension_integration" != no; then BUILD_TYPE="$BUILD_TYPE HELPTOOLS" +test_clucene=yes AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -5442,6 +5444,7 @@ fi AC_MSG_CHECKING([whether to include the XML-help support]) if test "$enable_xmlhelp" = yes; then BUILD_TYPE="$BUILD_TYPE XMLHELP" +test_clucene=yes AC_DEFINE(HAVE_FEATURE_XMLHELP) AC_MSG_RESULT([yes]) else @@ -5552,6 +,7 @@ if test "$cross_compiling" = "yes"; then --build="$build_alias" \ --disable-cairo-canvas \ --disable-cups \ +--disable-customtarget-components \ --disable-firebird-sdbc \ --disable-gpgmepp \ --disable-gstreamer-1-0 \ @@ -5564,6 +5568,7 @@ if test "$cross_compiling" = "yes"; then --disable-pdfimport \ --disable-postgresql-sdbc \ --disable-skia \ +--disable-xmlhelp \ --enable-icecream="$enable_icecream" \ --without-doxygen \ --without-webdav \ @@ -9324,8 +9329,8 @@ dnl === dnl we should rather be using dnl libo_CHECK_SYSTEM_MODULE([clucence],[CLUCENE],[liblucence-core]) here dnl but the contribs-lib check seems tricky -if test "$enable_xmlhelp" = yes -o "$enable_extension_integration" = yes; then AC_MSG_CHECKING([which clucene to use]) +if test "$test_clucene" = yes; then if test "$with_system_clucene" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_CLUCENE=TRUE @@ -9352,6 +9357,8 @@ else SYSTEM_CLUCENE= BUILD_TYPE="$BUILD_TYPE CLUCENE" fi +else +AC_MSG_RESULT([not needed]) fi AC_SUBST(SYSTEM_CLUCENE) AC_SUBST(CLUCENE_CFLAGS) diff --git a/helpcompiler/Module_helpcompiler.mk b/helpcompiler/Module_helpcompiler.mk index 146e3868df3f..344faba3a1b8 100644 --- a/helpcompiler/Module_helpcompiler.mk +++ b/helpcompiler/Module_helpcompiler.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,helpcompiler)) $(eval $(call gb_Module_add_targets,helpcompiler,\ -Library_helplinker \ +$(call gb_Helper_optionals_or,HELPTOOLS XMLHELP,Library_helplinker) \ )) $(eval $(call gb_Module_add_targets_for_build,helpcompiler,\
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a4ddc0ae5bd6b5a70a5441969a9c4c196b044cd6 Author: Tor Lillqvist AuthorDate: Thu Dec 16 19:29:07 2021 +0200 Commit: Andras Timar CommitDate: Sun Feb 13 23:45:27 2022 +0100 Accept iOS SDK 15.2 Change-Id: I42182f86673586ce48905bdda3281ef4499263a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126958 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index eaab62102bdc..633311f0b9f9 100644 --- a/configure.ac +++ b/configure.ac @@ -3567,8 +3567,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.0 -older_sdk_vers="14.5" +current_sdk_ver=15.2 +older_sdk_vers="15.0 14.5" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=13.6
