From 347563dcabc0523b027591ddc27266c951da31f2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 22 Feb 2015 11:13:47 -0200 Subject: xorg-server-1.17.1-2.parabola1: fix FS#43884 -> https://bugs.archlinux.org/task/43884, and partially FS#43867 -> https://bugs.archlinux.org/task/43867 --- libre/xorg-server/PKGBUILD | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'libre/xorg-server/PKGBUILD') diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD index f6cd49ca3..23d5e83ec 100644 --- a/libre/xorg-server/PKGBUILD +++ b/libre/xorg-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 231249 2015-02-11 08:34:18Z lcarlier $ +# $Id: PKGBUILD 231711 2015-02-21 13:38:48Z lcarlier $ # Maintainer: AndyRTR # Maintainer: Jan de Groot # Maintainer (Parabola): Márcio Silva @@ -6,7 +6,7 @@ pkgbase=xorg-server pkgname=('xorg-server') pkgver=1.17.1 -pkgrel=1.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild +pkgrel=2.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" @@ -19,16 +19,24 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'libxshmfence') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} xvfb-run - xvfb-run.1) + xvfb-run.1 + os-access-fix-regression-in-server-interpreted-auth.patch + v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011') sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab' 'SKIP' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') + '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' + '8a9d76eecf8795ca645fb1ce261733965578e953f6606153ce001a0e15d036e8' + 'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9') prepare() { cd "${pkgbase}-${pkgver}" + # fix FS#43884, not yet upstream + 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 os name: #Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR="" -- cgit v1.2.3