summaryrefslogtreecommitdiff
path: root/libre/xorg-server/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'libre/xorg-server/PKGBUILD')
-rw-r--r--libre/xorg-server/PKGBUILD12
1 files changed, 8 insertions, 4 deletions
diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD
index 1aa74bf6e..0e612b2f1 100644
--- a/libre/xorg-server/PKGBUILD
+++ b/libre/xorg-server/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 231799 2015-02-22 13:05:35Z lcarlier $
+# $Id: PKGBUILD 233821 2015-03-14 18:51:11Z lcarlier $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
@@ -6,7 +6,7 @@
pkgbase=xorg-server
pkgname=('xorg-server')
pkgver=1.17.1
-pkgrel=3.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgrel=4.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -21,7 +21,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
xvfb-run
xvfb-run.1
os-access-fix-regression-in-server-interpreted-auth.patch
- v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch)
+ v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
+ 0001-int10-Fix-error-check-for-pci_device_map_legacy.patch)
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
'C383B778255613DFDB409D91DB221A6900000011')
sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab'
@@ -29,7 +30,8 @@ sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
'8a9d76eecf8795ca645fb1ce261733965578e953f6606153ce001a0e15d036e8'
- 'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9')
+ 'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9'
+ '2ea82cdbd695f21c935710847913ed58e22d3d5c0c18c96175a4a6cc1142c071')
prepare() {
cd "${pkgbase}-${pkgver}"
@@ -37,6 +39,8 @@ prepare() {
patch -Np1 -i ../os-access-fix-regression-in-server-interpreted-auth.patch
# partially fix FS#43867, not yet upstream
patch -Np1 -i ../v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
+ # fix FS#43924, merged upstream
+ patch -Np1 -i ../0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
# fix os name:
#Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR=""