From 30a11440d58d65ac4636c61306ec106f24b01e48 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Wed, 27 Feb 2019 10:27:26 -0300
Subject: [PATCH] xorg-server: update to 1.20.4.

---
 .../patches/add-missing-distfile.patch        | 30 -------------------
 srcpkgs/xorg-server/template                  | 10 +++----
 2 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/xorg-server/patches/add-missing-distfile.patch

diff --git a/srcpkgs/xorg-server/patches/add-missing-distfile.patch b/srcpkgs/xorg-server/patches/add-missing-distfile.patch
deleted file mode 100644
index d27aa092055..00000000000
--- a/srcpkgs/xorg-server/patches/add-missing-distfile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ccddf2e0ac4ad122302aa761d29b1b917ef35e6b Mon Sep 17 00:00:00 2001
-From: maxice8 <thinkabit.ukim@gmail.com>
-Date: Tue, 7 Aug 2018 15:28:00 -0300
-Subject: [PATCH] add missing xwayland-config.h.meson.in from tarball
-
----
- include/xwayland-config.h.meson.in | 11 +++++++++++
- 1 file changed, 11 insertions(+)
- create mode 100644 include/xwayland-config.h.meson.in
-
-diff --git a/include/xwayland-config.h.meson.in b/include/xwayland-config.h.meson.in
-new file mode 100644
-index 0000000..0943ff5
---- /dev/null
-+++ include/xwayland-config.h.meson.in
-@@ -0,0 +1,11 @@
-+/* xwayland-config.h.meson.in: not at all generated */
-+
-+#pragma once
-+
-+#include <dix-config.h>
-+
-+/* Build glamor support for Xwayland */
-+#mesondefine XWL_HAS_GLAMOR
-+
-+/* Build eglstream support for Xwayland */
-+#mesondefine XWL_HAS_EGLSTREAM
--- 
-2.18.0
-
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 96be1cf19f5..bfb7081d05e 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.3
+version=1.20.4
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -18,12 +18,12 @@ makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
 # See hw/xfree86/common/xf86Module.h. Only care for the major version.
 depends="xkeyboard-config $(vopt_if elogind 'elogind')"
-short_desc="The X11 server from X.org"
+short_desc="X11 server from X.org"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
-checksum=1b3ce466c12cacbe2252b3ad5b0ed561972eef9d09e75900d65fb1e21f9201de
+checksum=fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-24_1 xf86-video-modesetting-1_1"
 replaces="xf86-video-modesetting>=0"
@@ -98,14 +98,14 @@ xorg-server-xdmx_package() {
 }
 
 xorg-server-xwayland_package() {
-	short_desc="A nested X server that runs as a wayland client"
+	short_desc="Nested X server that runs as a wayland client"
 	pkg_install() {
 		vmove usr/bin/Xwayland
 	}
 }
 
 xorg-server-xnest_package() {
-	short_desc="A nested X server that runs as an X application"
+	short_desc="Nested X server that runs as an X application"
 	pkg_install() {
 		vmove usr/bin/Xnest
 		vmove usr/share/man/man1/Xnest.1