configure.ac | 2 +-
instsetoo_native/inc_openoffice/unix/find-requires-x11.sh | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 90c4625dcfe402d11411a52a8625a18b7e934ede
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Mar 7 23:15:08 2022 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 7 23:15:08 2022 +0100
Bump version to 6.4-57
Change-Id: I4f3195e43a78a56fb4c7e6ef3776d7fdb4aa0ee1
diff --git a/configure.ac b/configure.ac
index 2a6567d1db20..3a60ffbc6fa4 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.4.10.56],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.57],[],[],[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
commit 66df2c2960978a7e7348295246a9adf9fb4263c1
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Mar 2 09:49:51 2022 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 7 23:13:58 2022 +0100
Do not pull in X11 dependencies when the build is configured for LOKit
Change-Id: I44a1782cf523bbfbbbb0e0d5333364f36c7ed495
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
index 0fe0b1d27dde..6808b3631d73 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
@@ -23,5 +23,7 @@ if [[ "${OS}" == "AIX" ]]; then
echo "libfreetype.a(libfreetype.so.6${mark64})"
else
echo "libfreetype.so.6${mark64}"
- echo "libXinerama.so.1${mark64}"
+ if [[ "${XINERAMA_LINK}" == "dynamic" ]]; then
+ echo "libXinerama.so.1${mark64}"
+ fi
fi
