diff --git a/unix/Xvnc/programs/Xserver/genpatch b/unix/Xvnc/programs/Xserver/genpatch
index 1f3e082ee..8f9c03b04 100755
--- a/unix/Xvnc/programs/Xserver/genpatch
+++ b/unix/Xvnc/programs/Xserver/genpatch
@@ -1,8 +1,7 @@
 #!/bin/bash
-
-PROJECT=xorg-server-1.20.14
+PROJECT=xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f
 FILE=$PROJECT.tar.gz
-URL=https://www.x.org/releases/individual/xserver
+URL=https://gitlab.freedesktop.org/xorg/xserver/-/archive/dbf6d1c24a00a1f598756c71028876ff2b3db17f/
 SRCDIR=`dirname $0`
 
 . $SRCDIR/../../genpatch | filterdiff -p1 -x Xserver/include/dix-config.h.in -x Xserver/include/version-config.h.in -x Xserver/include/xkb-config.h.in >$SRCDIR/turbovnc.patch
diff --git a/unix/Xvnc/programs/Xserver/os/connection.c b/unix/Xvnc/programs/Xserver/os/connection.c
index 32d2cda2a..31175e8e3 100644
--- a/unix/Xvnc/programs/Xserver/os/connection.c
+++ b/unix/Xvnc/programs/Xserver/os/connection.c
@@ -79,6 +79,8 @@ SOFTWARE.
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <sys/stat.h>
+
 #ifndef WIN32
 #include <sys/socket.h>
 
@@ -1000,15 +1002,34 @@ MakeClientGrabPervious(ClientPtr client)
 void
 ListenOnOpenFD(int fd, int noxauth)
 {
-    char port[256];
+    char port[PATH_MAX];
     XtransConnInfo ciptr;
     const char *display_env = getenv("DISPLAY");
 
-    if (display_env && (strncmp(display_env, "/tmp/launch", 11) == 0)) {
-        /* Make the path the launchd socket if our DISPLAY is set right */
-        strcpy(port, display_env);
+    /* First check if display_env matches a <absolute path to unix socket>[.<screen number>] scheme (eg: launchd) */
+    if (display_env && display_env[0] == '/') {
+        struct stat sbuf;
+
+        strlcpy(port, display_env, sizeof(port));
+
+        /* If the path exists, we don't have do do anything else.
+         * If it doesn't, we need to check for a .<screen number> to strip off and recheck.
+         */
+        if (0 != stat(port, &sbuf)) {
+            char *dot = strrchr(port, '.');
+            if (dot) {
+                *dot = '\0';
+
+                if (0 != stat(port, &sbuf)) {
+                    display_env = NULL;
+                }
+            } else {
+                display_env = NULL;
+            }
+        }
     }
-    else {
+
+    if (!display_env) {
         /* Just some default so things don't break and die. */
         snprintf(port, sizeof(port), ":%d", atoi(display));
     }
diff --git a/unix/Xvnc/programs/Xserver/present/present_scmd.c b/unix/Xvnc/programs/Xserver/present/present_scmd.c
index 3c68e690b..11391adbb 100644
--- a/unix/Xvnc/programs/Xserver/present/present_scmd.c
+++ b/unix/Xvnc/programs/Xserver/present/present_scmd.c
@@ -168,6 +168,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window)
     if (!screen_priv->info)
         return NULL;
 
+    if (!screen_priv->info->get_crtc)
+        return NULL;
+
     return (*screen_priv->info->get_crtc)(window);
 }
 
@@ -206,6 +209,9 @@ present_flush(WindowPtr window)
     if (!screen_priv->info)
         return;
 
+    if (!screen_priv->info->flush)
+        return;
+
     (*screen_priv->info->flush) (window);
 }
 
diff --git a/unix/Xvnc/programs/Xserver/turbovnc.patch b/unix/Xvnc/programs/Xserver/turbovnc.patch
index 081717fc8..b9a8e1a13 100644
--- a/unix/Xvnc/programs/Xserver/turbovnc.patch
+++ b/unix/Xvnc/programs/Xserver/turbovnc.patch
@@ -1,6 +1,6 @@
-diff --git a/xorg-server-1.20.14/Xext/saver.c b/Xserver/Xext/saver.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xext/saver.c b/Xserver/Xext/saver.c
 index c23907d..05b9ca3 100644
---- a/xorg-server-1.20.14/Xext/saver.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xext/saver.c
 +++ b/Xserver/Xext/saver.c
 @@ -1051,7 +1051,7 @@ ScreenSaverSetAttributes(ClientPtr client)
          pVlist++;
@@ -11,9 +11,9 @@ index c23907d..05b9ca3 100644
      pPriv->attr = pAttr;
      pAttr->resource = FakeClientID(client->index);
      if (!AddResource(pAttr->resource, AttrType, (void *) pAttr))
-diff --git a/xorg-server-1.20.14/Xext/shm.c b/Xserver/Xext/shm.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xext/shm.c b/Xserver/Xext/shm.c
 index 24c6b10..be2be20 100644
---- a/xorg-server-1.20.14/Xext/shm.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xext/shm.c
 +++ b/Xserver/Xext/shm.c
 @@ -1211,7 +1211,7 @@ shm_tmpfile(void)
          "/var/tmp",
@@ -42,9 +42,9 @@ index 24c6b10..be2be20 100644
          char template[PATH_MAX];
          snprintf(template, ARRAY_SIZE(template), "%s/shmfd-XXXXXX", shmdirs[i]);
  #ifdef HAVE_MKOSTEMP
-diff --git a/xorg-server-1.20.14/Xext/xtest.c b/Xserver/Xext/xtest.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xext/xtest.c b/Xserver/Xext/xtest.c
 index 38b8012..bf11789 100644
---- a/xorg-server-1.20.14/Xext/xtest.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xext/xtest.c
 +++ b/Xserver/Xext/xtest.c
 @@ -501,10 +501,11 @@ XTestSwapFakeInput(ClientPtr client, xReq * req)
  
@@ -60,9 +60,9 @@ index 38b8012..bf11789 100644
              client->errorValue = ev->u.u.type;
              return BadValue;
          }
-diff --git a/xorg-server-1.20.14/Xext/xvmain.c b/Xserver/Xext/xvmain.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xext/xvmain.c b/Xserver/Xext/xvmain.c
 index c520c7d..5f4c174 100644
---- a/xorg-server-1.20.14/Xext/xvmain.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xext/xvmain.c
 +++ b/Xserver/Xext/xvmain.c
 @@ -811,8 +811,10 @@ XvdiSelectVideoNotify(ClientPtr client, DrawablePtr pDraw, BOOL onoff)
          tpn = pn;
@@ -76,9 +76,9 @@ index c520c7d..5f4c174 100644
                  return Success;
              }
              if (!tpn->client)
-diff --git a/xorg-server-1.20.14/Xi/exevents.c b/Xserver/Xi/exevents.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xi/exevents.c b/Xserver/Xi/exevents.c
 index 659816a..0cb8d78 100644
---- a/xorg-server-1.20.14/Xi/exevents.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xi/exevents.c
 +++ b/Xserver/Xi/exevents.c
 @@ -575,8 +575,10 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
              memcpy(to->button->xkb_acts, from->button->xkb_acts,
@@ -92,9 +92,9 @@ index 659816a..0cb8d78 100644
  
          memcpy(to->button->labels, from->button->labels,
                 from->button->numButtons * sizeof(Atom));
-diff --git a/xorg-server-1.20.14/Xi/xichangehierarchy.c b/Xserver/Xi/xichangehierarchy.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xi/xichangehierarchy.c b/Xserver/Xi/xichangehierarchy.c
 index 504defe..ad89a31 100644
---- a/xorg-server-1.20.14/Xi/xichangehierarchy.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xi/xichangehierarchy.c
 +++ b/Xserver/Xi/xichangehierarchy.c
 @@ -140,7 +140,7 @@ add_master(ClientPtr client, xXIAddMasterInfo * c, int flags[MAXDEVICES])
  {
@@ -132,9 +132,9 @@ index 504defe..ad89a31 100644
          XIBarrierRemoveMasterDevice(clients[i], ptr->id);
  
      /* disable the remove the devices, XTest devices must be done first
-diff --git a/xorg-server-1.20.14/Xi/xipassivegrab.c b/Xserver/Xi/xipassivegrab.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xi/xipassivegrab.c b/Xserver/Xi/xipassivegrab.c
 index d30f51f..89a5910 100644
---- a/xorg-server-1.20.14/Xi/xipassivegrab.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xi/xipassivegrab.c
 +++ b/Xserver/Xi/xipassivegrab.c
 @@ -133,6 +133,12 @@ ProcXIPassiveGrabDevice(ClientPtr client)
          return BadValue;
@@ -179,9 +179,9 @@ index d30f51f..89a5910 100644
      rc = dixLookupWindow(&win, stuff->grab_window, client, DixSetAttrAccess);
      if (rc != Success)
          return rc;
-diff --git a/xorg-server-1.20.14/Xi/xiproperty.c b/Xserver/Xi/xiproperty.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xi/xiproperty.c b/Xserver/Xi/xiproperty.c
 index 6ec419e..0cfa6e3 100644
---- a/xorg-server-1.20.14/Xi/xiproperty.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/Xi/xiproperty.c
 +++ b/Xserver/Xi/xiproperty.c
 @@ -890,7 +890,7 @@ ProcXChangeDeviceProperty(ClientPtr client)
      REQUEST(xChangeDevicePropertyReq);
@@ -201,9 +201,9 @@ index 6ec419e..0cfa6e3 100644
      unsigned long len;
  
      REQUEST(xXIChangePropertyReq);
-diff --git a/xorg-server-1.20.14/composite/compwindow.c b/Xserver/composite/compwindow.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/composite/compwindow.c b/Xserver/composite/compwindow.c
 index 54b4e6a..8db9d03 100644
---- a/xorg-server-1.20.14/composite/compwindow.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/composite/compwindow.c
 +++ b/Xserver/composite/compwindow.c
 @@ -613,6 +613,11 @@ compDestroyWindow(WindowPtr pWin)
      ret = (*pScreen->DestroyWindow) (pWin);
@@ -217,9 +217,9 @@ index 54b4e6a..8db9d03 100644
  /*    compCheckTree (pWin->drawable.pScreen); can't check -- tree isn't good*/
      return ret;
  }
-diff --git a/xorg-server-1.20.14/dix/events.c b/Xserver/dix/events.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/dix/events.c b/Xserver/dix/events.c
 index 427b891..0f32bd8 100644
---- a/xorg-server-1.20.14/dix/events.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/dix/events.c
 +++ b/Xserver/dix/events.c
 @@ -148,6 +148,12 @@ Equipment Corporation.
  #include "eventconvert.h"
@@ -253,9 +253,9 @@ index 427b891..0f32bd8 100644
      /* The client's event type must be a core event type or one defined by an
         extension. */
  
-diff --git a/xorg-server-1.20.14/dix/property.c b/Xserver/dix/property.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/dix/property.c b/Xserver/dix/property.c
 index ff1d669..5f493af 100644
---- a/xorg-server-1.20.14/dix/property.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/dix/property.c
 +++ b/Xserver/dix/property.c
 @@ -57,6 +57,10 @@ SOFTWARE.
  #include "swaprep.h"
@@ -290,9 +290,9 @@ index ff1d669..5f493af 100644
      return Success;
  }
  
-diff --git a/xorg-server-1.20.14/dix/registry.c b/Xserver/dix/registry.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/dix/registry.c b/Xserver/dix/registry.c
 index 84d48b4..3e80392 100644
---- a/xorg-server-1.20.14/dix/registry.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/dix/registry.c
 +++ b/Xserver/dix/registry.c
 @@ -1,6 +1,7 @@
  /************************************************************
@@ -340,9 +340,9 @@ index 84d48b4..3e80392 100644
  
      /* Add the core protocol */
      RegisterExtensionNames(&extEntry);
-diff --git a/xorg-server-1.20.14/dix/selection.c b/Xserver/dix/selection.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/dix/selection.c b/Xserver/dix/selection.c
 index d46103f..67509d4 100644
---- a/xorg-server-1.20.14/dix/selection.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/dix/selection.c
 +++ b/Xserver/dix/selection.c
 @@ -54,6 +54,14 @@ SOFTWARE.
  #include "selection.h"
@@ -375,9 +375,9 @@ index d46103f..67509d4 100644
      else if (rc == Success && pSel->window != None) {
          event.u.u.type = SelectionRequest;
          event.u.selectionRequest.owner = pSel->window;
-diff --git a/xorg-server-1.20.14/dri3/dri3_request.c b/Xserver/dri3/dri3_request.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/dri3/dri3_request.c b/Xserver/dri3/dri3_request.c
 index 958877e..98d2e7d 100644
---- a/xorg-server-1.20.14/dri3/dri3_request.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/dri3/dri3_request.c
 +++ b/Xserver/dri3/dri3_request.c
 @@ -49,6 +49,8 @@ dri3_screen_can_one_point_two(ScreenPtr screen)
  static int
@@ -405,9 +405,9 @@ index 958877e..98d2e7d 100644
          if (!dri3_screen_can_one_point_two(screenInfo.gpuscreens[i])) {
              rep.minorVersion = 0;
              break;
-diff --git a/xorg-server-1.20.14/fb/fbimage.c b/Xserver/fb/fbimage.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/fb/fbimage.c b/Xserver/fb/fbimage.c
 index bd24728..801df20 100644
---- a/xorg-server-1.20.14/fb/fbimage.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/fb/fbimage.c
 +++ b/Xserver/fb/fbimage.c
 @@ -210,7 +210,7 @@ fbGetImage(DrawablePtr pDrawable,
  {
@@ -427,9 +427,9 @@ index bd24728..801df20 100644
                  dst[i] &= pm;
          }
      }
-diff --git a/xorg-server-1.20.14/glx/glxdricommon.c b/Xserver/glx/glxdricommon.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/glx/glxdricommon.c b/Xserver/glx/glxdricommon.c
 index 2e00bab..a16e1bc 100644
---- a/xorg-server-1.20.14/glx/glxdricommon.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/glx/glxdricommon.c
 +++ b/Xserver/glx/glxdricommon.c
 @@ -258,7 +258,11 @@ glxConvertConfigs(const __DRIcoreExtension * core,
      return head.next;
@@ -443,9 +443,9 @@ index 2e00bab..a16e1bc 100644
  
  /* Temporary define to allow building without a dri_interface.h from
   * updated Mesa.  Some day when we don't care about Mesa that old any
-diff --git a/xorg-server-1.20.14/glx/glxscreens.h b/Xserver/glx/glxscreens.h
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/glx/glxscreens.h b/Xserver/glx/glxscreens.h
 index 40649f8..5f89e5d 100644
---- a/xorg-server-1.20.14/glx/glxscreens.h
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/glx/glxscreens.h
 +++ b/Xserver/glx/glxscreens.h
 @@ -37,6 +37,7 @@
  
@@ -463,9 +463,9 @@ index 40649f8..5f89e5d 100644
  struct __GLXscreen {
      void (*destroy) (__GLXscreen * screen);
  
-diff --git a/xorg-server-1.20.14/glx/vndext.c b/Xserver/glx/vndext.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/glx/vndext.c b/Xserver/glx/vndext.c
 index 0513733..aa93900 100644
---- a/xorg-server-1.20.14/glx/vndext.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/glx/vndext.c
 +++ b/Xserver/glx/vndext.c
 @@ -213,6 +213,7 @@ GlxExtensionInit(void)
  {
@@ -484,9 +484,9 @@ index 0513733..aa93900 100644
          if (GlxGetVendorForScreen(serverClient, screenInfo.screens[i]))
              return;
      extEntry->base = 0;
-diff --git a/xorg-server-1.20.14/include/extinit.h b/Xserver/include/extinit.h
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/include/extinit.h b/Xserver/include/extinit.h
 index 46081ad..9b3a4d5 100644
---- a/xorg-server-1.20.14/include/extinit.h
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/include/extinit.h
 +++ b/Xserver/include/extinit.h
 @@ -1,6 +1,7 @@
  /************************************************************
@@ -510,9 +510,9 @@ index 46081ad..9b3a4d5 100644
 +#endif
 +
  #endif
-diff --git a/xorg-server-1.20.14/mi/miinitext.c b/Xserver/mi/miinitext.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/mi/miinitext.c b/Xserver/mi/miinitext.c
 index b7c7021..0e28272 100644
---- a/xorg-server-1.20.14/mi/miinitext.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/mi/miinitext.c
 +++ b/Xserver/mi/miinitext.c
 @@ -1,6 +1,7 @@
  /***********************************************************
@@ -535,9 +535,9 @@ index b7c7021..0e28272 100644
  };
  
  Bool
-diff --git a/xorg-server-1.20.14/os/backtrace.c b/Xserver/os/backtrace.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/os/backtrace.c b/Xserver/os/backtrace.c
 index 2aad0e3..d0447d7 100644
---- a/xorg-server-1.20.14/os/backtrace.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/os/backtrace.c
 +++ b/Xserver/os/backtrace.c
 @@ -160,8 +160,10 @@ xorg_backtrace(void)
  #else                           /* not glibc or glibc < 2.1 */
@@ -550,9 +550,9 @@ index 2aad0e3..d0447d7 100644
  
  #if defined(HAVE_WALKCONTEXT)   /* Solaris 9 & later */
  
-diff --git a/xorg-server-1.20.14/os/log.c b/Xserver/os/log.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/os/log.c b/Xserver/os/log.c
 index cc82191..f5d2891 100644
---- a/xorg-server-1.20.14/os/log.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/os/log.c
 +++ b/Xserver/os/log.c
 @@ -640,7 +640,7 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
  void
@@ -563,9 +563,9 @@ index cc82191..f5d2891 100644
  }
  
  void
-diff --git a/xorg-server-1.20.14/randr/rrmode.c b/Xserver/randr/rrmode.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/randr/rrmode.c b/Xserver/randr/rrmode.c
 index d34025b..d76a24d 100644
---- a/xorg-server-1.20.14/randr/rrmode.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/randr/rrmode.c
 +++ b/Xserver/randr/rrmode.c
 @@ -1,5 +1,6 @@
  /*
@@ -590,9 +590,9 @@ index d34025b..d76a24d 100644
      mode = malloc(sizeof(RRModeRec) + modeInfo->nameLength + 1);
      if (!mode)
          return NULL;
-diff --git a/xorg-server-1.20.14/xfixes/xfixes.c b/Xserver/xfixes/xfixes.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/xfixes/xfixes.c b/Xserver/xfixes/xfixes.c
 index 53a6bd6..28248d4 100644
---- a/xorg-server-1.20.14/xfixes/xfixes.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/xfixes/xfixes.c
 +++ b/Xserver/xfixes/xfixes.c
 @@ -221,7 +221,27 @@ XFixesExtensionInit(void)
          return;
@@ -622,9 +622,9 @@ index 53a6bd6..28248d4 100644
                                   XFixesNumberErrors,
                                   ProcXFixesDispatch, SProcXFixesDispatch,
                                   NULL, StandardMinorOpcode)) != 0) {
-diff --git a/xorg-server-1.20.14/xkb/xkb.c b/Xserver/xkb/xkb.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/xkb/xkb.c b/Xserver/xkb/xkb.c
 index 68c59df..3363b1d 100644
---- a/xorg-server-1.20.14/xkb/xkb.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/xkb/xkb.c
 +++ b/Xserver/xkb/xkb.c
 @@ -5157,7 +5157,7 @@ _GetCountedString(char **wire_inout, ClientPtr client, char **str)
  }
@@ -948,9 +948,9 @@ index 68c59df..3363b1d 100644
          memcpy((char *) &acts[stuff->firstBtn], (char *) wire, sz);
          wire += sz;
          ed.reason |= XkbXI_ButtonActionsMask;
-diff --git a/xorg-server-1.20.14/xkb/xkbInit.c b/Xserver/xkb/xkbInit.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/xkb/xkbInit.c b/Xserver/xkb/xkbInit.c
 index 9e45b4b..ddd5ef7 100644
---- a/xorg-server-1.20.14/xkb/xkbInit.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/xkb/xkbInit.c
 +++ b/Xserver/xkb/xkbInit.c
 @@ -767,6 +767,30 @@ XkbProcessArguments(int argc, char *argv[], int i)
              return -1;
@@ -983,9 +983,9 @@ index 9e45b4b..ddd5ef7 100644
      else if ((strncmp(argv[i], "-accessx", 8) == 0) ||
               (strncmp(argv[i], "+accessx", 8) == 0)) {
          int j = 1;
-diff --git a/xorg-server-1.20.14/xkb/xkbUtils.c b/Xserver/xkb/xkbUtils.c
+diff --git a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/xkb/xkbUtils.c b/Xserver/xkb/xkbUtils.c
 index 8975ade..9bc51fc 100644
---- a/xorg-server-1.20.14/xkb/xkbUtils.c
+--- a/xserver-dbf6d1c24a00a1f598756c71028876ff2b3db17f/xkb/xkbUtils.c
 +++ b/Xserver/xkb/xkbUtils.c
 @@ -1327,6 +1327,7 @@ _XkbCopyNames(XkbDescPtr src, XkbDescPtr dst)
          }