Update to 1.20.10

2 files changed, 13 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b0ca010b8d2..a468cc7d37af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xorg-server-dev
 	pkgdesc = Xorg X server - bleeding edge version
-	pkgver = 1.20.8
+	pkgver = 1.20.10
 	pkgrel = 1
 	url = https://xorg.freedesktop.org
 	arch = x86_64
@@ -35,22 +35,12 @@ pkgbase = xorg-server-dev
 	makedepends = libxshmfence
 	makedepends = libunwind
 	makedepends = systemd
-	makedepends = wayland-protocols
-	makedepends = egl-wayland
 	makedepends = meson
 	makedepends = git
-	makedepends = libgl
-	makedepends = nettle
-	makedepends = xf86-input-libinput
-	makedepends = xkeyboard-config
-	makedepends = xorg-setxkbmap
-	makedepends = xorg-xauth
-	makedepends = libdrm
-	makedepends = libxext
-	makedepends = libxfixes
-	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.8.tar.bz2
-	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.8.tar.bz2.sig
-	source = xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0
+	makedepends = wayland-protocols
+	makedepends = egl-wayland
+	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.10.tar.bz2
+	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.10.tar.bz2.sig
 	source = xserver-autobind-hotplug.patch
 	source = 0001-v2-FS-58644.patch
 	source = 0002-fix-libshadow-2.patch
@@ -59,11 +49,10 @@ pkgbase = xorg-server-dev
 	validpgpkeys = 7B27A3F1A6E18CD9588B4AE8310180050905E40C
 	validpgpkeys = C383B778255613DFDB409D91DB221A6900000011
 	validpgpkeys = DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3
-	validpgpkeys = 995ED5C8A6138EB0961F18474C09DD83CAAA50B2
+	validpgpkeys = 
 	validpgpkeys = 3BB639E56F861FA2E86505690FDD682D974CA72A
-	sha512sums = ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805
+	sha512sums = a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae
 	sha512sums = SKIP
-	sha512sums = d707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e
 	sha512sums = d84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22
 	sha512sums = 74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363
 	sha512sums = 3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1
diff --git a/PKGBUILD b/PKGBUILD
index 1539f687ec7f..7a8d5b5b4892 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,23 +6,21 @@ pkgbase=xorg-server-dev
 _srcname=xorg-server
 pkgname=('xorg-server-dev' 'xorg-server-xephyr-dev' 'xorg-server-xdmx-dev' 'xorg-server-xvfb-dev' 'xorg-server-xnest-dev'
          'xorg-server-xwayland-dev' 'xorg-server-common-dev' 'xorg-server-devel-dev')
-pkgver=1.20.8
+pkgver=1.20.10
 pkgrel=1
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
 pkgdesc='Xorg X server - bleeding edge version'
-url='https://xorg.freedesktop.org'
+url="https://xorg.freedesktop.org"
 makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
              'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv'
              'libxmu' 'libxrender' 'libxi' 'libxaw' 'libdmx' 'libxtst' 'libxres'
              'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy'
              'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms'
-             'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'egl-wayland' 'meson'
-             'git' 'libgl' 'nettle' 'xf86-input-libinput' 'xkeyboard-config'
-             'xorg-setxkbmap' 'xorg-xauth' 'libdrm' 'libxext' 'libxfixes')
+             'libxshmfence' 'libunwind' 'systemd' 'meson' 'git'
+             'wayland-protocols' 'egl-wayland')
 source=("https://xorg.freedesktop.org/releases/individual/xserver/${_srcname}-${pkgver}.tar.bz2"{,.sig}
-        'xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0'
         'xserver-autobind-hotplug.patch'
         '0001-v2-FS-58644.patch'
         '0002-fix-libshadow-2.patch'
@@ -31,11 +29,10 @@ source=("https://xorg.freedesktop.org/releases/individual/xserver/${_srcname}-${
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
+              ''
               '3BB639E56F861FA2E86505690FDD682D974CA72A')
-sha512sums=('ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805'
+sha512sums=('a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae'
             'SKIP'
-            'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
             'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
             '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363'
             '3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1'
@@ -43,9 +40,6 @@ sha512sums=('ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0
             'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
 
 prepare() {
-  # missing from tarball
-  cp xwayland-config.h.meson.in ${_srcname}-${pkgver}/include/
-
   cd "${_srcname}-${pkgver}"
 
   # patch from Fedora, not yet merged