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