summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorDet2018-01-09 21:44:47 +0200
committerDet2018-01-09 21:44:47 +0200
commit37a412d0b3c90676339a4779363b53219ca2710d (patch)
tree3f2aedda7079965ad0f0d33bf47d08a5c0f27f67 /PKGBUILD
parent8217bd5087d15f83da189d6f88a82e42907672ee (diff)
downloadaur-37a412d0b3c90676339a4779363b53219ca2710d.tar.gz
Sync with [testing]
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD13
1 files changed, 10 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index a24a500329c..96ae79b089e 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.6 # http://lists.x.org/archives/xorg/2017-December/059095.html
-pkgrel=2 # https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/xorg-server&id=f29308c7c456c903e507602cd9c51d9577b3c655
+pkgrel=2 # https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/xorg-server&id=94da807f6fb18360c36249eea7cbbf52cef624ee
arch=('x86_64')
license=('custom')
groups=('xorg')
@@ -21,7 +21,8 @@ source=(${url}/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig}
xserver-autobind-hotplug.patch
xvfb-run
xvfb-run.1
- udev-changes.diff)
+ udev-changes.diff
+ xwrap-suid-race.patch)
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
'C383B778255613DFDB409D91DB221A6900000011'
'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
@@ -32,7 +33,9 @@ sha256sums=('3c0e4a354a6b1d5d357b121357946ee8ffdb2f52158b2e63e105be9cef013168'
'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
- 'ce9b235c053ac85a9da86fba3b60fcfc48d36a8bd789b94ed79d5d571bc7b0aa')
+ 'ce9b235c053ac85a9da86fba3b60fcfc48d36a8bd789b94ed79d5d571bc7b0aa'
+ 'bce0e105386d75239f473b867d8ea6bc60e5302d87e03fdc720f48f43f5454f1')
+
prepare() {
cd "${_pkgbase}-${pkgver}"
@@ -47,6 +50,10 @@ prepare() {
https://bugs.freedesktop.org/show_bug.cgi?id=104382"
patch -Rp1 -i ../udev-changes.diff
+ msg2 "https://bugs.archlinux.org/task/56893
+ Fixes Makefile race condition when installing Xorg.wrap"
+ patch -Np1 -i ../xwrap-suid-race.patch
+
msg2 "Starting autoreconf..."
autoreconf -vfi
}