From: Pierre Ossman <ossman@cendio.se>
Date: Mon, 15 Jun 2020 07:57:28 +0000 (+0200)
Subject: Merge branch 'regions' of https://github.com/CendioOssman/tigervnc
X-Git-Tag: v1.10.90~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b8a24f055f1a29886d8b18bb3f0902144dc5bd14;p=tigervnc.git

Merge branch 'regions' of https://github.com/CendioOssman/tigervnc
---

b8a24f055f1a29886d8b18bb3f0902144dc5bd14
diff --cc .travis.yml
index 222241cf,ee03e1da..b245d5ed
--- a/.travis.yml
+++ b/.travis.yml
@@@ -16,50 -16,6 +16,50 @@@ matrix
      script:
      - cmake -DCMAKE_BUILD_TYPE=Debug . && make
  
 +  - language: cpp
 +    os: windows
 +    env:
 +    # From https://docs.travis-ci.com/user/reference/windows/
 +    before_install:
 +    - |-
 +      [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64
 +      choco uninstall -y mingw
 +      choco upgrade --no-progress -y msys2
 +      export msys2='cmd //C RefreshEnv.cmd '
 +      export msys2+='& set MSYS=winsymlinks:nativestrict '
 +      export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
 +      export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
 +      export msys2+=" -msys2 -c "\"\$@"\" --"
 +      $msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-toolchain
-       $msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-fltk mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-gnutls
++      $msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-fltk mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-gnutls mingw-w64-x86_64-pixman
 +      taskkill //IM gpg-agent.exe //F  # https://travis-ci.community/t/4967
 +      export PATH=/C/tools/msys64/mingw64/bin:$PATH
 +      export MAKE=mingw32-make  # so that Autotools can find it
 +    script:
 +    - cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_C_COMPILER=gcc -DCMAKE=CXX_COMPILER=g++ . && mingw32-make
 +    before_cache:
 +    - |-
 +      # https://unix.stackexchange.com/a/137322/107554
 +      $msys2 pacman --sync --clean --noconfirm
 +    cache:
 +      directories:
 +      - $HOME/AppData/Local/Temp/chocolatey
 +      - /C/tools/msys64
 +
 +  - language: cpp
 +    os: osx
 +    # The default image is buggy ATM, use the latest
 +    osx_image: xcode11.5
 +    env:
 +    addons:
 +      homebrew:
 +        packages:
 +          - gettext
 +          - fltk
 +    before_install:
 +    script:
 +    - cmake -DCMAKE_BUILD_TYPE=Debug . && make
 +
    - language: java
      # compile with java 8 for backwards compatibility
      dist: xenial
diff --cc unix/xserver/hw/vnc/vncExtInit.cc
index e2dd4eee,d05bf85b..1d08f86e
--- a/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@@ -148,11 -148,8 +148,8 @@@ void vncExtensionInit(void
    vncExtGeneration = vncGetServerGeneration();
  
    if (vncGetScreenCount() > MAXSCREENS)
 -    vncFatalError("vncExtensionInit: too many screens");
 +    vncFatalError("vncExtensionInit: too many screens\n");
  
-   if (sizeof(ShortRect) != sizeof(struct UpdateRect))
-     vncFatalError("vncExtensionInit: Incompatible ShortRect size\n");
- 
    vncAddExtension();
  
    vncSelectionInit();