From: Debian Edu Packaging Team <debian-edu-pkg-team@lists.alioth.debian.org>
Date: Thu, 20 Oct 2022 20:51:21 +0000 (+0100)
Subject: _fix-external-x11vnc
X-Git-Tag: archive/raspbian/4.7.4+repack1-1+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=55f4cb0d0e298cc6bf9b54521d59bac74d626c3e;p=veyon.git

_fix-external-x11vnc


Gbp-Pq: Name 1001_fix-external-x11vnc.patch
---

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)