diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
| commit | 2906c522e750f7e013d7af606f01ad849a7d3876 (patch) | |
| tree | d62491c93d6534817db7f9b7d07adf64b9670b48 /extra/xorg-server | |
| parent | 193046ad8ed67a836ffe11e235296e6201e56ce8 (diff) | |
| parent | bd614ac21d2754d778a796cd5e92d1568ec8baec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/mesa/PKGBUILD
extra/nmap/PKGBUILD
extra/openmpi/PKGBUILD
extra/rasqal/PKGBUILD
extra/sqlite/PKGBUILD
extra/totem/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-mesa/PKGBUILD
staging/libreoffice/PKGBUILD
testing/udev/PKGBUILD
testing/udev/initcpio-hooks-udev
testing/udev/initcpio-install-udev
Diffstat (limited to 'extra/xorg-server')
| -rw-r--r-- | extra/xorg-server/PKGBUILD | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index f7b20cd68..a35c4b65c 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 159237 2012-05-18 15:27:59Z andyrtr $ +# $Id: PKGBUILD 159267 2012-05-20 08:22:19Z 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.12.1.901 -pkgrel=3 +pkgver=1.12.1.902 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -17,21 +17,12 @@ options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch - EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff - git-fixes.patch + #EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff + #git-fixes.patch xvfb-run xvfb-run.1 10-quirks.conf loongson.patch) -sha1sums=('bb9985bae271aa896de7fa12e49a0dbd8e244d2c' - '63836e5cfb4ae7353fb2e31239a544409c7ead32' - '175de5630b43dbc97778adfba5563b7fdd77f11f' - '4acb39587f73bcbb9a331377d6ef99cb73eb95a8' - '526cbffbc742dc3449065e3501d290a607d80aa3' - 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' - '6838fc00ef4618c924a77e0fb03c05346080908a' - '993798f3d22ad672d769dae5f48d1fa068d5578f' - 'ac016ff8e3adfbd584fe16a770f6891724e254f4') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -48,7 +39,7 @@ build() { # patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff # Add post-release patches from 1.12 branch - patch -Np1 -i ${srcdir}/git-fixes.patch +# patch -Np1 -i ${srcdir}/git-fixes.patch # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html patch -Np1 -i "${srcdir}/loongson.patch" |