From b7cbb41f8b26f003625b23af3a795d7783a9d601 Mon Sep 17 00:00:00 2001 From: Debian Edu Packaging Team Date: Fri, 12 Aug 2022 12:38:21 +0100 Subject: [PATCH] _fix-external-x11vnc Gbp-Pq: Name 1001_fix-external-x11vnc.patch --- plugins/vncserver/x11vnc-builtin/BuiltinX11VncServer.cpp | 4 ++++ plugins/vncserver/x11vnc-builtin/CMakeLists.txt | 2 ++ 2 files changed, 6 insertions(+) diff --git a/plugins/vncserver/x11vnc-builtin/BuiltinX11VncServer.cpp b/plugins/vncserver/x11vnc-builtin/BuiltinX11VncServer.cpp index e867c16..76a7413 100644 --- a/plugins/vncserver/x11vnc-builtin/BuiltinX11VncServer.cpp +++ b/plugins/vncserver/x11vnc-builtin/BuiltinX11VncServer.cpp @@ -32,7 +32,9 @@ #include "X11VncConfigurationWidget.h" extern "C" int x11vnc_main( int argc, char * * argv ); +#ifndef VEYON_X11VNC_EXTERNAL extern "C" int hasWorkingXShm(); +#endif BuiltinX11VncServer::BuiltinX11VncServer( QObject* parent ) : @@ -73,11 +75,13 @@ bool BuiltinX11VncServer::runServer( int serverPort, const Password& password ) cmdline.append( extraArguments.split( QLatin1Char(' ') ) ); } +#ifndef VEYON_X11VNC_EXTERNAL if( hasWorkingXShm() == false ) { vDebug() << "X shared memory extension not available - passing -noshm to x11vnc"; cmdline.append( QStringLiteral("-noshm") ); } +#endif const auto systemEnv = QProcessEnvironment::systemEnvironment(); diff --git a/plugins/vncserver/x11vnc-builtin/CMakeLists.txt b/plugins/vncserver/x11vnc-builtin/CMakeLists.txt index 29a207e..94e5e97 100644 --- a/plugins/vncserver/x11vnc-builtin/CMakeLists.txt +++ b/plugins/vncserver/x11vnc-builtin/CMakeLists.txt @@ -199,6 +199,8 @@ if(NOT VEYON_X11VNC_EXTERNAL) set_source_files_properties(${x11vnc_SOURCES} ${libvncserver_SOURCES} PROPERTIES COMPILE_FLAGS "${COMPILER_WARN_DISABLE_FLAGS} -Wno-deprecated-declarations -Wno-unused-result -Wno-unused-function -Wno-unused-variable -Wno-misleading-indentation") +else() + add_definitions ( -DVEYON_X11VNC_EXTERNAL ) endif() set(WITH_PCH OFF) -- 2.30.2