RepositoryExternal.mk | 2 +- configure.ac | 11 ++++++++++- include/LibreOfficeKit/LibreOfficeKitInit.h | 8 ++------ 3 files changed, 13 insertions(+), 8 deletions(-)
New commits: commit 5d4a689293d47c7671315452f6b90a185fe809c0 Author: Jan Holesovsky <[email protected]> AuthorDate: Mon Nov 18 13:31:36 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Nov 28 20:56:03 2025 +0100 Introduce --enable-headless to add it as a possibility on macOS Change-Id: I3ea0fbdab2d36bf9c9565ed3274eee978ba6764d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194791 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> 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).]), commit 7c8a7f98873fe407b8c7cfdd13b58b4bcf2ee226 Author: Jan Holesovsky <[email protected]> AuthorDate: Wed Apr 16 14:31:22 2025 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Nov 28 20:55:51 2025 +0100 LibreOfficeKit is actually supported on macOS Change-Id: I9d00dc356d11533ca3f8b436bf44fdb2bf1c82f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194788 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h index deefd8184d5f..f7fe24475902 100644 --- a/include/LibreOfficeKit/LibreOfficeKitInit.h +++ b/include/LibreOfficeKit/LibreOfficeKitInit.h @@ -35,12 +35,8 @@ #define TARGET_LIB "lib" "sofficeapp" ".dylib" #define TARGET_MERGED_LIB "lib" "mergedlo" ".dylib" - #if !defined TARGET_OS_IPHONE || TARGET_OS_IPHONE == 0 - #if defined TARGET_OS_OSX && TARGET_OS_OSX == 1 - #error LibreOfficeKit is not supported on macOS - #else - #error LibreOfficeKit is not supported on tvOS, visionOS or watchOS - #endif + #if (!defined TARGET_OS_IPHONE || TARGET_OS_IPHONE == 0) && (!defined TARGET_OS_OSX || TARGET_OS_OSX == 0) + #error LibreOfficeKit is not supported on tvOS, visionOS or watchOS #endif #else #define TARGET_LIB "lib" "sofficeapp" ".so"
