From ce43b10ccac41d352bcbf3a40e36360c3d0483c2 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Thu, 22 Feb 2018 23:52:54 +0100 Subject: [PATCH] get headless build to work again for Linux This makes --disable-gui option build successfully again - which means we again run on a headless server w/o any X11 or OpenGL libs. Change-Id: I60019af571aecdac277adbe6d34d5fff065014f9 Reviewed-on: https://gerrit.libreoffice.org/50214 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens --- desktop/source/lib/init.cxx | 2 +- desktop/unx/source/splashx.c | 2 +- framework/source/fwe/helper/titlehelper.cxx | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 1953b05daf70..a741d09f7a3b 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2016,7 +2016,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis, return; } -#if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS) +#if defined(UNX) && !defined(MACOSX) #if defined(IOS) SystemGraphicsData aData; diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index 8a1064e3673c..e6bc534726ab 100644 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -9,7 +9,7 @@ #include "splashx.h" -#ifdef ENABLE_QUICKSTART_LIBPNG +#if defined(ENABLE_QUICKSTART_LIBPNG) && !defined(LIBO_HEADLESS) #include #include diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 82ded83040f4..3d7943623753 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -562,8 +562,10 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle) OUString sVersion = ::utl::Bootstrap::getBuildIdData("development"); sTitle.append(" ["); sTitle.append(sVersion); +#ifndef LIBO_HEADLESS if (OpenGLWrapper::isVCLOpenGLEnabled()) sTitle.append("-GL"); +#endif sTitle.append("]"); } #else