instsetoo_native/inc_openoffice/unix/find-requires-x11.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 09d86496f05c979da5a1c8c09af448d74683fad0
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Mar 2 09:49:51 2022 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Mar 2 17:47:12 2022 +0100
Do not pull in X11 dependencies when the build is configured for LOKit
Change-Id: I44a1782cf523bbfbbbb0e0d5333364f36c7ed495
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130783
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
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
