Update to 1.19.1

3 files changed, 53 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 131512a5d694..443e64de8dd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Thu Jul 21 14:42:15 UTC 2016
+# Thu Jan 12 16:05:31 UTC 2017
 pkgbase = xorg-server-bug865
-	pkgver = 1.18.4
+	pkgver = 1.19.1
 	pkgrel = 1
 	url = http://xorg.freedesktop.org
 	arch = i686
@@ -27,7 +27,7 @@ pkgbase = xorg-server-bug865
 	makedepends = resourceproto
 	makedepends = xineramaproto
 	makedepends = libxkbfile
-	makedepends = libxfont
+	makedepends = libxfont2
 	makedepends = renderproto
 	makedepends = libpciaccess
 	makedepends = libxv
@@ -55,37 +55,35 @@ pkgbase = xorg-server-bug865
 	makedepends = dri3proto
 	makedepends = libxshmfence
 	makedepends = libunwind
-	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.4.tar.bz2
-	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.4.tar.bz2.sig
+	makedepends = systemd
+	makedepends = wayland-protocols
+	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.19.1.tar.bz2
+	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.19.1.tar.bz2.sig
 	source = xvfb-run
 	source = xvfb-run.1
 	source = freedesktop-bug-865.patch
-	sha256sums = 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8
+	sha256sums = 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb
 	sha256sums = SKIP
 	sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9
 	sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
-	sha256sums = dad4bbadda03db2fe7046c43d838afd5e41f98c821fdac0908f0f20493caa660
+	sha256sums = dcd7ace95b29beab7b5f4f3f31a69f4f3c46d88d6b623243c7817b162f2fcdcb
 
 pkgname = xorg-server-bug865
 	pkgdesc = Xorg X server with the patch for freedesktop bug 865 (need to kick hotkeys on release, not press)
 	install = xorg-server.install
 	depends = libepoxy
-	depends = libxdmcp
-	depends = libxfont
-	depends = libpciaccess
-	depends = libdrm
+	depends = libxfont2
 	depends = pixman
-	depends = libgcrypt
-	depends = libxau
 	depends = xorg-server-common
-	depends = libxshmfence
+	depends = libunwind
+	depends = dbus
 	depends = libgl
-	depends = xf86-input-driver
-	provides = X-ABI-VIDEODRV_VERSION=20
-	provides = X-ABI-XINPUT_VERSION=22.1
-	provides = X-ABI-EXTENSION_VERSION=9.0
+	depends = xf86-input-libinput
+	provides = X-ABI-VIDEODRV_VERSION=23
+	provides = X-ABI-XINPUT_VERSION=24.1
+	provides = X-ABI-EXTENSION_VERSION=10.0
 	provides = x-server
-	provides = xorg-server=1.18.0
+	provides = xorg-server=1.19.1
 	conflicts = nvidia-utils<=331.20
 	conflicts = glamor-egl
 	conflicts = xf86-video-modesetting
diff --git a/PKGBUILD b/PKGBUILD
index 5ed3642308ff..011d428d3213 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,31 +4,31 @@
 
 pkgbase=xorg-server-bug865
 pkgname=xorg-server-bug865
-pkgver=1.18.4
-pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgver=1.19.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
 url="http://xorg.freedesktop.org"
 makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 
              'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto'
-             'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv'
+             'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont2' 'renderproto' 'libpciaccess' 'libxv'
              'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres'
              'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy'
              'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto'
-             'libxshmfence' 'libunwind')
-source=(${url}/releases/individual/xserver/xorg-server-${pkgver}.tar.bz2{,.sig}
+             'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols')
+source=(https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${pkgver}.tar.bz2{,.sig}
         xvfb-run
         xvfb-run.1
         freedesktop-bug-865.patch)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
-sha256sums=('278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8'
+sha256sums=('79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb'
             'SKIP'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            'dad4bbadda03db2fe7046c43d838afd5e41f98c821fdac0908f0f20493caa660')
+            'dcd7ace95b29beab7b5f4f3f31a69f4f3c46d88d6b623243c7817b162f2fcdcb')
 
 prepare() {
   cd "xorg-server-${pkgver}"
@@ -88,10 +88,10 @@ build() {
 
 package_xorg-server-bug865() {
   pkgdesc="Xorg X server with the patch for freedesktop bug 865 (need to kick hotkeys on release, not press)"
-  depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common libxshmfence libgl xf86-input-driver)
+  depends=(libepoxy libxfont2 pixman xorg-server-common libunwind dbus libgl xf86-input-libinput)
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-  provides=('X-ABI-VIDEODRV_VERSION=20' 'X-ABI-XINPUT_VERSION=22.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server' 'xorg-server=1.18.0')
+  provides=('X-ABI-VIDEODRV_VERSION=23' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server' 'xorg-server=1.19.1')
   conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting' 'xorg-server')
   replaces=('glamor-egl' 'xf86-video-modesetting')
   install=xorg-server.install
diff --git a/freedesktop-bug-865.patch b/freedesktop-bug-865.patch
index e3a9839530ee..c11f6dab8976 100644
--- a/freedesktop-bug-865.patch
+++ b/freedesktop-bug-865.patch
@@ -1,6 +1,6 @@
---- xorg-server-1.18.0/xkb/xkbActions.c.orig	2015-11-22 18:31:15.749839635 +0300
-+++ xorg-server-1.18.0/xkb/xkbActions.c	2015-11-22 18:39:39.621861737 +0300
-@@ -351,26 +351,83 @@
+--- xorg-server-1.19.1/xkb/xkbActions.c.orig	2017-01-12 18:34:23.435568903 +0300
++++ xorg-server-1.19.1/xkb/xkbActions.c	2017-01-12 18:54:24.799494948 +0300
+@@ -351,26 +351,82 @@
      return 1;
  }
  
@@ -29,7 +29,7 @@
 +
      if (filter->keycode == 0) /* initial press */
          AccessXCancelRepeatKey(xkbi, keycode);
- 
+-
 -    if (pAction && (pAction->type == XkbSA_LockGroup)) {
 -        if (pAction->group.flags & XkbSA_GroupAbsolute)
 -            xkbi->state.locked_group = XkbSAGroup(&pAction->group);
@@ -66,7 +66,7 @@
 +               sendEvent = _XkbFilterSetState(xkbi,filter,keycode,&act);
 +           }
 +       }
-+     }
++    }
 +    else {
 +       /* do nothing if some button else is pressed */
 +       if (!pAction)
@@ -92,17 +92,25 @@
          filter->upAction = *pAction;
          if (!(filter->upAction.mods.flags & XkbSA_LockNoLock))
              xkbi->state.locked_mods |= pAction->mods.mask;
-@@ -1250,9 +1307,12 @@
-                 sendEvent = _XkbFilterLatchState(xkbi, filter, key, &act);
-                 break;
-             case XkbSA_LockMods:
-+                filter = _XkbNextFreeFilter(xkbi);
-+                sendEvent=_XkbFilterLockMods(xkbi,filter,key,&act);
-+                break;
-             case XkbSA_LockGroup:
-                 filter = _XkbNextFreeFilter(xkbi);
--                sendEvent = _XkbFilterLockState(xkbi, filter, key, &act);
-+                sendEvent = _XkbFilterLockGroup(xkbi,filter,key,&act);
-                 break;
-             case XkbSA_ISOLock:
-                 filter = _XkbNextFreeFilter(xkbi);
+@@ -1224,7 +1280,12 @@
+         case XkbSA_LatchMods:
+         case XkbSA_LatchGroup:
+         case XkbSA_LockMods:
++            filter = _XkbNextFreeFilter(xkbi);
++            sendEvent=_XkbFilterLockMods(xkbi,filter,key,&act);
++            break;
+         case XkbSA_LockGroup:
++            filter = _XkbNextFreeFilter(xkbi);
++            sendEvent = _XkbFilterLockGroup(xkbi,filter,key,&act);
+             break;
+         default:
+             *sendEvent = 1;
+@@ -1246,7 +1307,7 @@
+     case XkbSA_LockMods:
+     case XkbSA_LockGroup:
+         filter = _XkbNextFreeFilter(xkbi);
+-        *sendEvent = _XkbFilterLockState(xkbi, filter, key, act);
++        *sendEvent = _XkbFilterLockGroup(xkbi, filter, key, act);
+         break;
+     case XkbSA_ISOLock:
+         filter = _XkbNextFreeFilter(xkbi);