diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-18 15:46:12 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-18 15:46:12 +0100 |
| commit | 82e56b34417677fc5ad8718a516874fb5351e60f (patch) | |
| tree | 2f157396a89875f5f3543c62e7f4d5f9042cfb94 /extra/xorg-server | |
| parent | e63aad93b3e68c372e525d86c3277b2fa4bddb24 (diff) | |
| parent | 146025aa1c838c12fa7b4873414da73816bfb6bd (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/python2-pymongo/PKGBUILD
extra/clamav/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/lcms2/PKGBUILD
extra/libxi/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'extra/xorg-server')
| -rw-r--r-- | extra/xorg-server/PKGBUILD | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index c2c9c34a2..510016849 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142918 2011-11-18 09:17:26Z jgc $ +# $Id: PKGBUILD 145131 2011-12-17 09:42:49Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.11.2 -pkgrel=2.1 +pkgver=1.11.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -15,20 +15,17 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch revert-trapezoids.patch - git-fixes.patch + #git-fixes.patch xserver-1.11.2-record-crasher.patch - Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch xvfb-run xvfb-run.1 10-quirks.conf loongson.patch) -md5sums=('8796fff441e5435ee36a72579008af24' +md5sums=('a7194c437963627e1db0dd2d6c1a1984' '6c7e87d63ac4b535e19a80c89d0cf091' 'f8194638ca4872c2b0a67862a70bcebf' 'f6c84f4936f8e00abdfbd9fb4eda83fb' - '6fb42ec979ecd6125b6599f54dc00d14' '3f9de4dbfee2da90167192d8ca9eb2b4' - '47f9b979fe38043b42ff86eeee6fd0d0' '52fd3effd80d7bc6c1660d4ecf23d31c' '376c70308715cd2643f7bff936d9934b' 'd4f7dfc6be4ef4e2c6dd7632a9d88abe' @@ -47,16 +44,12 @@ build() { patch -Np1 -i "${srcdir}/revert-trapezoids.patch" # Add post-release patches from 1.11 branch - patch -Np1 -i "${srcdir}/git-fixes.patch" +# patch -Np1 -i "${srcdir}/git-fixes.patch" # From Fedora. # Upstream URL: http://patchwork.freedesktop.org/patch/7866/ patch -Np1 -i "${srcdir}/xserver-1.11.2-record-crasher.patch" - # From Fedora. - # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298 - patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch" - # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html patch -Np1 -i "${srcdir}/loongson.patch" |