Sync with testing/xorg-server: upgpkg: xorg-server 1.19.1-2

1 files changed, 11 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a841a76c750e..e99ff86df85f 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.1 # http://lists.x.org/archives/xorg/2017-January/058559.html
-pkgrel=1
+pkgrel=2 # https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/xorg-server&id=63f2ddee51705b0055041fdf67895d7383cd07cc
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
@@ -17,6 +17,7 @@ makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtra
              'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto'
              'libxshmfence' 'libunwind' 'xfont2-git' 'wayland-protocols')
 source=(${url}/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig}
+        bug99358.patch
         xvfb-run
         xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
@@ -24,20 +25,18 @@ validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
 sha256sums=('79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb'
             'SKIP'
+            'f46a9d1a5ac43c5359fbd8c57b6e64b0bd313116b5cb638527bfe3701e6c3904'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
 
-# prepare() {
-  # cd "${_pkgbase}-${pkgver}"
-
-  # msg2 "Apply upstream fixes:
-     # - Revert \"damage: Make damageRegionProcessPending take a damage not a drawable\"
-     # - OS: return 0 from check_timers, if we touched any of them
-     # - Glamor: Trust eglGetPlatformDisplayEXT, if it exists
-     # - Present: Only call present_flip_notify if vblank->queued == FALSE
-     # - AttendClient of grab-pervious client should queue to saved_ready_clients"
-  # patch -Np1 -i ../git-fixes.diff
-# }
+prepare() {
+  cd "${_pkgbase}-${pkgver}"
+
+  msg2 "Fix: Bug 99358 - Xorg crashes with SIGSEGV in sna_set_cursor_position()"
+  msg2 "https://bugs.freedesktop.org/show_bug.cgi?id=99358"
+  msg2 "https://bugs.archlinux.org/task/52808"
+  patch -Np1 -i ../bug99358.patch
+}
 
 build() {
   cd "${_pkgbase}-${pkgver}"