[Libreoffice-commits] core.git: desktop/source desktop/unx framework/source include/vcl scp2/source solenv/gbuild vcl/headless vcl/inc vcl/source

2019-09-20 Thread Andras Timar (via logerrit) 
 desktop/source/app/app.cxx  |2 +-
 desktop/source/app/cmdlineargs.cxx  |8 
 desktop/source/app/sofficemain.cxx  |2 +-
 desktop/unx/source/splashx.c|3 ++-
 framework/source/fwe/helper/titlehelper.cxx |4 +++-
 include/vcl/opengl/OpenGLWrapper.hxx|   13 +++--
 scp2/source/ooo/module_hidden_ooo.scp   |2 --
 solenv/gbuild/gbuild.mk |5 -
 vcl/headless/svpinst.cxx|   22 --
 vcl/inc/svsys.h |4 +++-
 vcl/source/salmain/salmain.cxx  |3 ++-
 11 files changed, 35 insertions(+), 33 deletions(-)

New commits:
commit 693ba5704b0a26319b3b780f8553eb3e99bad7a1
Author: Andras Timar 
AuthorDate: Wed Sep 18 11:48:13 2019 +0200
Commit: Andras Timar 
CommitDate: Fri Sep 20 23:53:28 2019 +0200

Replace remaining occurrences of LIBO_HEADLESS with HAVE_FEATURE_UI

Change-Id: Ie2b04ee443dece851d3d96afbc932aa64369c75c
Reviewed-on: https://gerrit.libreoffice.org/79084
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b733080fd94a..c38958c05dd9 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1578,7 +1578,7 @@ int Desktop::Main()
 // In headless mode, reap the process started by 
fire_glxtest_process() early in soffice_main
 // (desktop/source/app/sofficemain.cxx), in a code block that needs to 
be covered by the same
 // #if condition as this code block:
-#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && 
!defined(LIBO_HEADLESS) && HAVE_FEATURE_OPENGL
+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && 
HAVE_FEATURE_UI && HAVE_FEATURE_OPENGL
 if (rCmdLineArgs.IsHeadless()) {
 reap_glxtest_process();
 }
diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
index 30d0c3f4cced..381147cd534e 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -695,12 +695,12 @@ void CommandLineArgs::InitParamValues()
 {
 m_minimized = false;
 m_norestore = false;
-#ifdef LIBO_HEADLESS
-m_invisible = true;
-m_headless = true;
-#else
+#if HAVE_FEATURE_UI
 m_invisible = false;
 m_headless = false;
+#else
+m_invisible = true;
+m_headless = true;
 #endif
 m_eventtesting = false;
 m_quickstart = false;
diff --git a/desktop/source/app/sofficemain.cxx 
b/desktop/source/app/sofficemain.cxx
index 917361ebf0d3..719446e03a81 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -129,7 +129,7 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 #endif
 #endif
 
-#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && 
!defined(LIBO_HEADLESS) && HAVE_FEATURE_OPENGL
+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && 
HAVE_FEATURE_UI && HAVE_FEATURE_OPENGL
 /* Run test for OpenGL support in own process to avoid crash with broken
  * OpenGL drivers. Start process as early as possible.
  * In non-headless mode, the process will be reaped in 
X11OpenGLDeviceInfo::GetData
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 9136876aa9df..d759ed3a4816 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -7,9 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
 #include "splashx.h"
 
-#if defined(ENABLE_QUICKSTART_LIBPNG) && !defined(LIBO_HEADLESS)
+#if defined(ENABLE_QUICKSTART_LIBPNG) && HAVE_FEATURE_UI
 
 #include 
 #include 
diff --git a/framework/source/fwe/helper/titlehelper.cxx 
b/framework/source/fwe/helper/titlehelper.cxx
index a09605ecc18a..a50cc4b401af 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include 
 #include 
 #include 
@@ -600,7 +602,7 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer& 
sTitle)
 OUString sVersion = ::utl::Bootstrap::getBuildIdData("development");
 sTitle.append(" [");
 sTitle.append(sVersion);
-#ifndef LIBO_HEADLESS
+#if HAVE_FEATURE_UI
 if (OpenGLWrapper::isVCLOpenGLEnabled())
 sTitle.append("-GL");
 #endif
diff --git a/include/vcl/opengl/OpenGLWrapper.hxx 
b/include/vcl/opengl/OpenGLWrapper.hxx
index 9c61a11c2a48..c84286ea5244 100644
--- a/include/vcl/opengl/OpenGLWrapper.hxx
+++ b/include/vcl/opengl/OpenGLWrapper.hxx
@@ -12,6 +12,7 @@
 #ifndef INCLUDED_VCL_OPENGL_OPENGLWRAPPER_HXX
 #define INCLUDED_VCL_OPENGL_OPENGLWRAPPER_HXX
 
+#include 
 #include 
 
 // All member functions static and VCL_DLLPUBLIC. Basically a glorified 
namespace.
@@ -22,18 +23,18 @@ struct VCL_DLLPUBLIC OpenGLWrapper
 /**

[Libreoffice-commits] core.git: desktop/source desktop/unx framework/source

2018-02-22 Thread 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(-)

New commits:
commit ce43b10ccac41d352bcbf3a40e36360c3d0483c2
Author: Thorsten Behrens 
Date:   Thu Feb 22 23:52:54 2018 +0100

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 

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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits