Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

plugins/vncserver/x11vnc-builtin/BuiltinX11VncServer.cpp: Fix FTBFS w… #864

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

sunweaver
Copy link
Contributor

…hen built with CMake option VEYON_X11VNC_EXTERNAL.

@tobydox
Copy link
Contributor

tobydox commented Jan 27, 2023

Thanks for your contribution! However I strongly recommend to keep the X-SHM check also with external x11vnc server to prevent crashes/misbehaviours we observed especially in Thin Client environments where X-SHM is not available (of course it's still possible to explicitely pass "-noshm" via Veyon configuration). To make this work, we have to move the methods from x11vnc-veyon.c to BuiltinX11VncServer.cpp. Besides that the commit also contains changes to submodules/unrelated parts/code.

@sunweaver
Copy link
Contributor Author

Oh wait, I pushed way to much stuff. Let me check.

…hen built with CMake option VEYON_X11VNC_EXTERNAL.
@sunweaver sunweaver force-pushed the pr/build-with-external-x11vnc branch from 9af273a to dd0d246 Compare February 3, 2023 09:38
@sunweaver
Copy link
Contributor Author

sunweaver commented Feb 3, 2023

@tobydox Not sure what went wrong with my patch originally sent, I updated this PR branch now. Please note, that without this patch the VEYON_X11VNC_EXTERNAL build method fails in the veyon Debian package (last time I tried without is a while ago, so I am just now doing another test build).

If you feel that this could be done with SHM, please let me know and provide a better patch, if possible. I will update the patch that I ship in Debian, then.
Cf. https://salsa.debian.org/debian-edu-pkg-team/veyon/-/blob/5d47f655737ec7bf378d6ab0a52c27e973b8af3d/debian/patches/1001_fix-external-x11vnc.patch

@sunweaver
Copy link
Contributor Author

Still failing without this patch in Debian's veyon package (4.7.5+repack-1)

[ 93%] Building CXX object master/CMakeFiles/veyon-master.dir/src/CheckableItemProxyModel.cpp.o
cd /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/master && /usr/bin/g++ -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050e00 -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_NO_KEYWORDS -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_STRICT_ITERATORS -DQT_USE_QSTRINGBUILDER -DQT_WIDGETS_LIB -D_FORTIFY_SOURCE=2 -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/master/veyon-master_autogen/include -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/master -I/<<PKGBUILDDIR>>/master/src -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/core -I/<<PKGBUILDDIR>>/core/src -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/core/src -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtConcurrent -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/Qca-qt5/QtCrypto -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fno-exceptions  -O2 -g -DNDEBUG -fvisibility=hidden -fvisibility-inlines-hidden -fPIE -Wall -Werror "-flto=8 -fno-fat-lto-objects" -fPIC -std=gnu++14 -MD -MT master/CMakeFiles/veyon-master.dir/src/CheckableItemProxyModel.cpp.o -MF CMakeFiles/veyon-master.dir/src/CheckableItemProxyModel.cpp.o.d -o CMakeFiles/veyon-master.dir/src/CheckableItemProxyModel.cpp.o -c /<<PKGBUILDDIR>>/master/src/CheckableItemProxyModel.cpp
/usr/bin/ld: /tmp/cc4Ikn0B.ltrans0.ltrans.o: in function `BuiltinX11VncServer::runServer(int, QCA::SecureArray const&)':
./obj-x86_64-linux-gnu/plugins/vncserver/x11vnc-builtin/./plugins/vncserver/x11vnc-builtin/BuiltinX11VncServer.cpp:76: undefined reference to `hasWorkingXShm'
collect2: error: ld returned 1 exit status
make[3]: *** [plugins/vncserver/x11vnc-builtin/CMakeFiles/builtin-x11vnc-server.dir/build.make:141: plugins/vncserver/x11vnc-builtin/builtin-x11vnc-server.so] Error 1
make[3]: Leaving directory '/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants