xorg-server-1.17.2-1.parabola1: updating version

1 files changed, 8 insertions, 44 deletions

diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD
index 32669605b..fb239ec55 100644
--- a/libre/xorg-server/PKGBUILD
+++ b/libre/xorg-server/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 240562 2015-06-11 11:05:23Z jgc $
+# $Id: PKGBUILD 240954 2015-06-16 17:41:01Z lcarlier $
 # Maintainer (Arch): AndyRTR <andyrtr@archlinux.org>
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=xorg-server
 pkgname=('xorg-server')
-pkgver=1.17.1
-pkgrel=7.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgver=1.17.2
+pkgrel=1.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"
@@ -20,59 +20,23 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto'
 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
-        0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
-        0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch
-        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
-        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)
+        0002-dix-hook-up-the-unaccelerated-valuator-masks.patch)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011')
-sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab'
+              'C383B778255613DFDB409D91DB221A6900000011'
+              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
+sha256sums=('f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993'
             'SKIP'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '8a9d76eecf8795ca645fb1ce261733965578e953f6606153ce001a0e15d036e8'
-            'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9'
-            '2ea82cdbd695f21c935710847913ed58e22d3d5c0c18c96175a4a6cc1142c071'
-            'ca89cc013844c5b50abfde4cc5e852ecdf4368f8b069ffd069a7100843c46e90'
-            'b4a4fbddebfa614d1a97e77dde98748682ee331fbf7be394480050670d6203aa'
             '3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7'
-            '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96'
-            'bc6ac3e686e16f0357fd3b939c1c1f2845fdb444d5ec9c8c37fb69167cc54a28'
-            '84a1fea6fc7a764844de115e7bacd1dcfc5d2f53fef64772b290acb25933f44e'
-            'd8120468e73a9f3ec9905933ca3baa828a6e0a676f7fb75782c1350ec20958a6'
-            'a0c0dbf5fe27994d52d5892c9c7cecf72792c5fa35db57b112ee7b17980faa75')
+            '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
-  # fix FS#43884, merged upstream
-  patch -Np1 -i ../os-access-fix-regression-in-server-interpreted-auth.patch
-  # partially fix FS#43867, merged 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 FS#43937, merged upstream
-  patch -Np1 -i ../0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch
-  # fix FS#45245, merged upstream
-  patch -Np1 -i ../0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
   # fix FS#45229, merged upstream
   patch -Np1 -i ../0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
   patch -Np1 -i ../0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
-  # 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=""