From e7fdd9862a088544853362e1ba77d10bd0b718bc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 12 Jun 2015 02:29:56 -0300 Subject: xorg-server-1.17.1-7.parabola1: add some more patches from Fedora, fixes timeout issues with logind and missing SW cursor with modesetting driver --- libre/xorg-server/PKGBUILD | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'libre/xorg-server/PKGBUILD') diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD index a539ebbd4..32669605b 100644 --- a/libre/xorg-server/PKGBUILD +++ b/libre/xorg-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 240425 2015-06-08 19:29:45Z lcarlier $ +# $Id: PKGBUILD 240562 2015-06-11 11:05:23Z jgc $ # Maintainer (Arch): AndyRTR # Maintainer (Arch): Jan de Groot # Maintainer: Márcio Silva @@ -6,7 +6,7 @@ pkgbase=xorg-server pkgname=('xorg-server') pkgver=1.17.1 -pkgrel=6.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild +pkgrel=7.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" @@ -27,7 +27,10 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} 0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch - fix-CVE-2015-3164.patch) + fix-CVE-2015-3164.patch + systemd-logind-dont-second-guess-D-Bus-default-tim.patch + systemd-logind-filter-out-non-signal-messages-from.patch + 0001-modesetting-Fix-software-cursor-fallback.patch) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011') sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab' @@ -41,7 +44,10 @@ sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab' 'b4a4fbddebfa614d1a97e77dde98748682ee331fbf7be394480050670d6203aa' '3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7' '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96' - 'bc6ac3e686e16f0357fd3b939c1c1f2845fdb444d5ec9c8c37fb69167cc54a28') + 'bc6ac3e686e16f0357fd3b939c1c1f2845fdb444d5ec9c8c37fb69167cc54a28' + '84a1fea6fc7a764844de115e7bacd1dcfc5d2f53fef64772b290acb25933f44e' + 'd8120468e73a9f3ec9905933ca3baa828a6e0a676f7fb75782c1350ec20958a6' + 'a0c0dbf5fe27994d52d5892c9c7cecf72792c5fa35db57b112ee7b17980faa75') prepare() { cd "${pkgbase}-${pkgver}" @@ -61,6 +67,13 @@ prepare() { # fix CVE-2015-3164, merged upstream patch -Np1 -i ../fix-CVE-2015-3164.patch + # fix FS#44304, merged upstream + patch -Np1 -i ../systemd-logind-filter-out-non-signal-messages-from.patch + patch -Np1 -i ../systemd-logind-dont-second-guess-D-Bus-default-tim.patch + + # fix software cursor fallback (possible fix for FS#44602) + patch -Np1 -i ../0001-modesetting-Fix-software-cursor-fallback.patch + # fix os name: #Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR="" #Current Operating System = --kernel-name --nodename --kernel-release --kernel-version --machine -- cgit v1.2.3