From 5d4a689293d47c7671315452f6b90a185fe809c0 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Mon, 18 Nov 2024 13:31:36 +0100 Subject: [PATCH] Introduce --enable-headless to add it as a possibility on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3ea0fbdab2d36bf9c9565ed3274eee978ba6764d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194791 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- RepositoryExternal.mk | 2 +- configure.ac | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 616498bc02c5..963e230685b7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1280,7 +1280,7 @@ endef else # !SYSTEM_CAIRO -ifneq ($(filter-out MACOSX WNT,$(OS)),) +ifneq ($(filter-out MACOSX$(ENABLE_HEADLESS) WNT,$(OS)),) $(eval $(call gb_Helper_register_packages_for_install,ooo,\ cairo \ diff --git a/configure.ac b/configure.ac index 1aab2af4b946..78c66e6b8151 100644 --- a/configure.ac +++ b/configure.ac @@ -1077,7 +1077,11 @@ cygwin*|wsl*) ;; darwin*) # macOS - using_freetype_fontconfig=no + if test "$enable_headless" != "yes"; then + using_freetype_fontconfig=no + else + using_freetype_fontconfig=yes + fi using_x11=no build_skia=yes enable_pagein=no @@ -1934,6 +1938,11 @@ AC_ARG_ENABLE(gen, Per default auto-enabled when X11 is used.]), ,test "${test_gen}" = no -o "${enable_gen+set}" = set || enable_gen=yes) +AC_ARG_ENABLE(headless, + AS_HELP_STRING([--enable-headless], + [Enable headless plugin (svp) even on macOS.]), +,using_headless_plugin=yes) + AC_ARG_ENABLE(gui, AS_HELP_STRING([--disable-gui], [Disable use of X11 or Wayland to reduce dependencies (e.g. for building LibreOfficeKit).]),