1 files changed, 10 insertions, 8 deletions
diff --git a/PKGBUILD b/PKGBUILD
index b3925828d90b..a9356897be67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgbase=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.19.0 # http://lists.x.org/archives/xorg/2016-November/058437.html
-pkgrel=1
+pkgrel=3 # https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/xorg-server&id=0be9f6c67493ff0f5388262ac675f6db7a2b23a7
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
@@ -18,21 +18,23 @@ makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtra
              'libxshmfence' 'libunwind' 'xfont2-git' 'wayland-protocols')
 source=(${url}/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig}
         xvfb-run
-        xvfb-run.1)
+        xvfb-run.1*
+        damageRegionProcessPending.diff)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
 sha256sums=('149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3'
             'SKIP'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
+            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
+            'c8344b94d946005b28ad1e0771c77174afd7288100763ab7bb7c2b50be52f1e0')
 
-# prepare() {
-  # cd "${_pkgbase}-${pkgver}"
+prepare() {
+  cd "${_pkgbase}-${pkgver}"
 
-  # msg2 "Fix glamor failing to initialize with mesa"
-  # patch -Np1 -i ../call-eglBindAPI-after-eglInitialize.patch
-# }
+  msg2 "Apply upstream commit to fix some EXA crashes"
+  patch -Np1 -i ../damageRegionProcessPending.diff
+}
 
 build() {
   cd "${_pkgbase}-${pkgver}"