diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2019-03-15 16:50:42 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2019-03-15 16:50:42 +0000 |
| commit | 9697965c28219c2c1ab493d93ebe7db683cec048 (patch) | |
| tree | bbb7dfd5a181a5489258264b35b9586cffae56c0 | |
| parent | 25bc91dec58033ae35d03bd5317cf1c538efef77 (diff) | |
| parent | a475b25de8da4d2f82be29ed4728873f827524c9 (diff) | |
Merge branch 'cygwin-patches-for-1.20' into cygwin-release-1.20xserver-cygwin-1.20.4-1
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | hw/xwin/winerror.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 8fd7e0315..632b78b6e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,7 +15,7 @@ install: - if "%BUILD%"=="i686-pc-cygwin" set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin - curl -fsSL https://gist.githubusercontent.com/jon-turney/0338af595313f598bfab15a0ac0df847/raw/bd0eeca6be899e7846aa988fbcf15e4e12f5f842/zp_libtool_cleanlafiles.sh -o %CYGWIN_ROOT%\etc\postinstall\zp_libtool_cleanlafiles.sh - echo Updating Cygwin and installing build prerequisites -- '%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%CACHE%" -g -P "meson,binutils,bison,bzip2,diffutils,fileutils,findutils,flex,gawk,gcc-core,make,patch,pkg-config,python3,sed,tar,xorgproto,windowsdriproto,libdmx-devel,libfontenc-devel,libfreetype-devel,libGL-devel,libpixman1-devel,libX11-devel,libXRes-devel,libXau-devel,libXaw-devel,libXdmcp-devel,libXext-devel,libXfont2-devel,libXi-devel,libXinerama-devel,libXmu-devel,libXpm-devel,libXrender-devel,libXtst-devel,libxcb-ewmh-devel,libxcb-icccm-devel,libxcb-image-devel,libxcb-keysyms-devel,libxcb-randr-devel,libxcb-render-devel,libxcb-render-util-devel,libxcb-shape-devel,libxcb-util-devel,libxcb-xkb-devel,libxkbfile-devel,zlib-devel,font-util,khronos-opengl-registry,python3-lxml,xorg-util-macros,xtrans,xkbcomp,xkeyboard-config,libnettle-devel,libepoxy-devel,libtirpc-devel,libxcb-composite-devel,ImageMagick"' +- '%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%CACHE%" -g -P "meson,binutils,bison,bzip2,diffutils,fileutils,findutils,flex,gawk,gcc-core,make,patch,pkg-config,python3,sed,tar,xorgproto,windowsdriproto,libdmx-devel,libfontenc-devel,libfreetype-devel,libGL-devel,libpixman1-devel,libX11-devel,libXRes-devel,libXau-devel,libXaw-devel,libXdmcp-devel,libXext-devel,libXfont2-devel,libXi-devel,libXinerama-devel,libXmu-devel,libXpm-devel,libXrender-devel,libXtst-devel,libxcb-ewmh-devel,libxcb-icccm-devel,libxcb-image-devel,libxcb-keysyms-devel,libxcb-randr-devel,libxcb-render-devel,libxcb-render-util-devel,libxcb-shape-devel,libxcb-util-devel,libxcb-xkb-devel,libxkbfile-devel,zlib-devel,font-util,khronos-opengl-registry,python3-lxml,xorg-util-macros,xtrans,xkbcomp-devel,xkeyboard-config,libnettle-devel,libepoxy-devel,libtirpc-devel,libxcb-composite-devel,ImageMagick"' - echo Install done cache: - C:\cache diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c index 1191d27b8..e688ca22e 100644 --- a/hw/xwin/winerror.c +++ b/hw/xwin/winerror.c @@ -70,7 +70,8 @@ OsVendorFatalError(const char *f, va_list args) if (g_fSilentDupError) { if ((strcmp(f, "InitOutput - Duplicate invocation on display number: %s. Exiting.\n") == 0) || (strcmp(f, "Server is already active for display %s\n%s %s\n%s\n") == 0) - || (strcmp(f, "MakeAllCOTSServerListeners: server already running\n") == 0)) { + || (strcmp(f, "Cannot establish any listening sockets - Make sure an X server isn't already running") == 0) + || (strcmp(f, "_XSERVTransMakeAllCOTSServerListeners: server already running\n") == 0)) { g_fSilentFatalError = TRUE; } } |