components/x11/xorg-server/patches/35-gcc-10.patch

   1 --- xorg-server-1.19.7/randr/rrprovider.c.orig  2020-05-14 10:17:01.138670184 +0000
   2 +++ xorg-server-1.19.7/randr/rrprovider.c       2020-05-14 10:17:12.964330073 +0000
   3 @@ -27,7 +27,7 @@
   4
   5  #include <X11/Xatom.h>
   6
   7 -RESTYPE RRProviderType;
   8 +RESTYPE RRProviderType = 0;
   9
  10  /*
  11   * Initialize provider type error value
  12 --- xorg-server-1.19.7/hw/xwayland/xwayland.c.orig      2020-05-14 09:58:09.466678754 +0000
  13 +++ xorg-server-1.19.7/hw/xwayland/xwayland.c   2020-05-14 09:58:17.105153183 +0000
  14 @@ -37,7 +37,7 @@
  15
  16  #ifdef XF86VIDMODE
  17  #include <X11/extensions/xf86vmproto.h>
  18 -_X_EXPORT Bool noXFree86VidModeExtension;
  19 +extern _X_EXPORT Bool noXFree86VidModeExtension;
  20  #endif
  21
  22  void
  23 --- xorg-server-1.19.7/hw/dmx/dmxextension.c.orig       2020-05-14 10:13:31.561339683 +0000
  24 +++ xorg-server-1.19.7/hw/dmx/dmxextension.c    2020-05-14 10:24:15.942597405 +0000
  25 @@ -68,9 +68,6 @@
  26   * _any_ header files. */
  27  extern FontPtr defaultFont;
  28
  29 -/* Hack to get Present to build (present requires RandR) */
  30 -RESTYPE RRCrtcType;
  31 -
  32  /** This routine provides information to the DMX protocol extension
  33   * about a particular screen. */
  34  Bool
  35 --- xorg-server-1.19.7/hw/dmx/dmxinit.c.orig    2020-05-14 10:14:15.502876876 +0000
  36 +++ xorg-server-1.19.7/hw/dmx/dmxinit.c 2020-05-14 10:17:31.072863884 +0000
  37 @@ -109,8 +109,6 @@
  38  Bool dmxGLXFinishSwap = FALSE;
  39  #endif
  40
  41 -RESTYPE RRProviderType = 0;
  42 -
  43  Bool dmxIgnoreBadFontPaths = FALSE;
  44
  45  Bool dmxAddRemoveScreens = FALSE;
  46 --- xorg-server-1.19.7/test/xi2/protocol-common.h.orig  2020-05-14 10:01:18.017983252 +0000
  47 +++ xorg-server-1.19.7/test/xi2/protocol-common.h       2020-05-14 10:01:31.913514784 +0000
  48 @@ -97,7 +97,7 @@
  49   * The reply handler called from WriteToClient. Set this handler if you need
  50   * to check the reply values.
  51   */
  52 -void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
  53 +extern void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
  54
  55  /**
  56   * The default screen used for the windows. Initialized by init_simple().
  57 --- xorg-server-1.19.7/test/xi2/protocol-common.c.orig  2020-05-14 10:01:56.497798794 +0000
  58 +++ xorg-server-1.19.7/test/xi2/protocol-common.c       2020-05-14 10:02:16.462669794 +0000
  59 @@ -44,6 +44,8 @@
  60
  61  void *global_userdata;
  62
  63 +void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
  64 +
  65  static void
  66  fake_init_sprite(DeviceIntPtr dev)
  67  {
  68 --- xorg-server-1.19.7/test/misc.c.orig 2020-05-14 09:58:56.076213502 +0000
  69 +++ xorg-server-1.19.7/test/misc.c      2020-05-14 09:59:03.347755949 +0000
  70 @@ -31,7 +31,7 @@
  71  #include "dix.h"
  72  #include "dixstruct.h"
  73
  74 -ScreenInfo screenInfo;
  75 +extern ScreenInfo screenInfo;
  76
  77  static void
  78  dix_version_compare(void)
  79 --- xorg-server-1.19.7/hw/dmx/config/dmxconfig.c.orig   2020-05-17 03:21:32.467842842 +0000
  80 +++ xorg-server-1.19.7/hw/dmx/config/dmxconfig.c        2020-05-17 03:22:23.371810328 +0000
  81 @@ -72,7 +72,7 @@
  82      DMXConfigList *xinputs;
  83  } DMXConfigCmd, *DMXConfigCmdPtr;
  84
  85 -DMXConfigEntryPtr dmxConfigEntry;
  86 +extern DMXConfigEntryPtr dmxConfigEntry;
  87  static DMXConfigCmd dmxConfigCmd;
  88
  89  static int dmxDisplaysFromCommandLine;
  90 --- xorg-server-1.19.7/hw/dmx/config/xdmxconfig.c.orig  2020-05-17 03:21:26.309385341 +0000
  91 +++ xorg-server-1.19.7/hw/dmx/config/xdmxconfig.c       2020-05-17 03:21:57.852228446 +0000
  92 @@ -82,7 +82,7 @@
  93  #define DMX_CANVAS_WIDTH  400
  94  #define DMX_CANVAS_HEIGHT 500
  95
  96 -DMXConfigEntryPtr dmxConfigEntry;
  97 +extern DMXConfigEntryPtr dmxConfigEntry;
  98  static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual;
  99  static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay;
 100  static int dmxConfigGrabbed, dmxConfigGrabbedFine;