xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml     |    2 +-
 exa/exa_accel.c    |    2 +-
 hw/xnest/Display.c |    2 +-
 randr/rrcrtc.c     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9937183e4bd2e96154bb4724805f74341ae84bd6
Author: Alexander Volkov <a.volkov at rusbitech.ru>
Date:   Tue Apr 21 12:38:03 2020 +0300

    Fix build with gcc 9.3.0's -Werror=alloc-size-larger-than=

diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 41fcb129f..e632331da 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -738,7 +738,7 @@ exaPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pSeg)
         }
     }
 
-    prect = xallocarray(nseg, sizeof(xRectangle));
+    prect = xallocarray((unsigned int)nseg, sizeof(xRectangle));
     for (i = 0; i < nseg; i++) {
         if (pSeg[i].x1 < pSeg[i].x2) {
             prect[i].x = pSeg[i].x1;
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index e6d07dfd1..dc59c6b91 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -41,7 +41,7 @@ XVisualInfo *xnestVisuals;
 int xnestNumVisuals;
 int xnestDefaultVisualIndex;
 Colormap *xnestDefaultColormaps;
-static int xnestNumDefaultColormaps;
+static unsigned int xnestNumDefaultColormaps;
 int *xnestDepths;
 int xnestNumDepths;
 XPixmapFormatValues *xnestPixmapFormats;
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index ae7e30605..d870a9ab3 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -1239,7 +1239,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
     rrScrPrivPtr pScrPriv;
     RRCrtcPtr crtc;
     RRModePtr mode;
-    int numOutputs;
+    unsigned int numOutputs;
     RROutputPtr *outputs = NULL;
     RROutput *outputIds;
     TimeStamp time;
commit 89f42b88216c0899977dd3861cbf13c5bae321d8
Author: Alexander Volkov <a.volkov at rusbitech.ru>
Date:   Tue Apr 21 01:01:21 2020 +0300

    gitlab-ci: Bump DEBIAN_TAG to build with gcc 9.3.0

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b82083d5..086538ccd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ variables:
     DEBIAN_VERSION: testing-slim
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
 
-    DEBIAN_TAG: "2020-01-06"
+    DEBIAN_TAG: "2020-04-21"
     IMAGE_LOCAL: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
 
 include: