mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get headless build to work again for Linux

Browse Source 
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 <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
This commit is contained in:
Thorsten Behrens
2018-02-22 23:52:54 +01:00
parent b37a46fdf9
commit ce43b10cca
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/source/lib/init.cxx
View File

@@ -2016,7 +2016,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
return; return;
} }
#if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS) #if defined(UNX) && !defined(MACOSX)
#if defined(IOS) #if defined(IOS)
SystemGraphicsData aData; SystemGraphicsData aData;

2
desktop/unx/source/splashx.c
View File

@@ -9,7 +9,7 @@
#include "splashx.h" #include "splashx.h"
#ifdef ENABLE_QUICKSTART_LIBPNG #if defined(ENABLE_QUICKSTART_LIBPNG) && !defined(LIBO_HEADLESS)
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>

2
framework/source/fwe/helper/titlehelper.cxx
View File

@@ -562,8 +562,10 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle)
OUString sVersion = ::utl::Bootstrap::getBuildIdData("development"); OUString sVersion = ::utl::Bootstrap::getBuildIdData("development");
sTitle.append(" ["); sTitle.append(" [");
sTitle.append(sVersion); sTitle.append(sVersion);
#ifndef LIBO_HEADLESS
if (OpenGLWrapper::isVCLOpenGLEnabled()) if (OpenGLWrapper::isVCLOpenGLEnabled())
sTitle.append("-GL"); sTitle.append("-GL");
#endif
sTitle.append("]"); sTitle.append("]");
} }
#else #else