This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 0cb65f3 x2goclient.pro: while a linux scope seems to work fine with Qt5, Qt4 doesn't recognize that, so add another linux-* catch. new 6c7a731 Windows: add support for x3270-fonts, including adding a pretty nasty but necessary fonts.* file regeneration hook. new 1175599 {x2goclient,help,onmainwindow}.cpp: implement new --bypass-cleanup-helper parameter. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: copy-deps-win32.bat | 9 +++++++++ debian/changelog | 4 ++++ src/help.cpp | 3 +++ src/onmainwindow.cpp | 6 ++++++ src/x2goclient.cpp | 1 + 5 files changed, 23 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 6c7a731e7cd4ce1ec41e5ebe22832ac624c7f141 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 7 08:41:17 2019 +0200 Windows: add support for x3270-fonts, including adding a pretty nasty but necessary fonts.* file regeneration hook. --- copy-deps-win32.bat | 9 +++++++++ debian/changelog | 2 ++ 2 files changed, 11 insertions(+) diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat index d686cc5..829220f 100755 --- a/copy-deps-win32.bat +++ b/copy-deps-win32.bat @@ -13,6 +13,15 @@ xcopy /E /Y %1\MSVC-DLLs\2013-12.0.21005.1-x86\msvcr120.dll %3\ || exit /b % xcopy /E /Y %1\pulse\7.1-2.2_bin %3\ || exit /b %errorlevel% xcopy /E /Y %1\PuTTY\0.71_bin %3\ || exit /b %errorlevel% xcopy /E /Y /I %1\VcXsrv\1.20.1.4_bin %3\VcXsrv || exit /b %errorlevel% +xcopy /E /Y /I %1\x3270-fonts\3.6ga4\misc %3\VcXsrv\fonts\misc || exit /b %errorlevel% +xcopy /E /Y %1\x3270-fonts\3.6ga4\copyright-x3270-fonts %3\VcXsrv\ || exit /b %errorlevel% +rem We have to call mkfontscale and mkfontdir after updating the misc font directory. +rem Sadly this can't be done statically, so we need a usable Cygwin installation with +rem the mentioned packages installed. +pushd %3\VcXsrv\fonts\misc +C:\cygwin.latest\bin\bash.exe -c "/usr/bin/mkfontdir" +C:\cygwin.latest\bin\bash.exe -c "/usr/bin/mkfontscale" +popd xcopy /E /Y %1\zlib\1.2.8_bin\zlib1.dll %3\ || exit /b %errorlevel% xcopy /E /Y %1\zlib\x86-mingw4-1.2.7-1_bin\bin\libz.dll %3\ || exit /b %errorlevel% xcopy /E /Y %2\bin\ssleay32.dll %3\ || exit /b %errorlevel% diff --git a/debian/changelog b/debian/changelog index c981004..c3df242 100644 --- a/debian/changelog +++ b/debian/changelog @@ -87,6 +87,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium clang, llvm, icc etc. - x2goclient.pro: while a linux scope seems to work fine with Qt5, Qt4 doesn't recognize that, so add another linux-* catch. + - Windows: add support for x3270-fonts, including adding a pretty nasty + but necessary fonts.* file regeneration hook. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 1175599f05b1a4d6edc25fe0036a66a36bc2043d Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 7 08:54:18 2019 +0200 {x2goclient,help,onmainwindow}.cpp: implement new --bypass-cleanup-helper parameter. --- debian/changelog | 2 ++ src/help.cpp | 3 +++ src/onmainwindow.cpp | 6 ++++++ src/x2goclient.cpp | 1 + 4 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index c3df242..e894c2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -89,6 +89,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium doesn't recognize that, so add another linux-* catch. - Windows: add support for x3270-fonts, including adding a pretty nasty but necessary fonts.* file regeneration hook. + - {x2goclient,help,onmainwindow}.cpp: implement new + --bypass-cleanup-helper parameter. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: diff --git a/src/help.cpp b/src/help.cpp index 8956b17..9331c6d 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -173,6 +173,9 @@ help::params_t help::build_params () { "If <num> is zero or a negative number, no limit is imposed." NEWLINE "The limits for <num> are platform dependent. If the passed value is out of bounds, X2Go Client falls back to the default value.")); #endif /* defined (Q_OS_WIN) */ +#if defined (Q_OS_UNIX) + ADD_OPT ("--bypass-cleanup-helper", QT_TRANSLATE_NOOP ("Help", "Disables X2Go Client's UNIX cleanup helper. This will prevent X2Go Client from terminating spawned processes after the main program terminates or crashes. Use with care and when in doubt, do not use this parameter at all.")); +#endif /* defined (Q_OS_UNIX) */ # undef NEWLINE # undef ADD_OPT diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index ec7cb77..7c7c1ba 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -7335,6 +7335,12 @@ void ONMainWindow::slotReadApplications(bool result, QString output, bool ONMainWindow::parseParameter ( QString param ) { +#if defined (Q_OS_UNIX) + if ("--bypass-cleanup-helper" == param) { + return (true); + } +#endif /* defined (Q_OS_UNIX) */ + if ( param=="--help" ) { showHelp(); diff --git a/src/x2goclient.cpp b/src/x2goclient.cpp index bd5fc82..73f4291 100644 --- a/src/x2goclient.cpp +++ b/src/x2goclient.cpp @@ -107,6 +107,7 @@ int main (int argc, char **argv) { * refactored into a special options parser class. */ const std::string bypass_flags[] = { + "--bypass-cleanup-helper", "--help", "--help-pack", "--version", -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org