diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-04 10:49:42 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-04 10:49:42 -0300 |
| commit | 624e141150ea71c22164ca4ac6602d6d5a191674 (patch) | |
| tree | 7e4f924e39fd73afb927925fbd75f857a41fae9c /extra/xorg-server/PKGBUILD | |
| parent | 692010aa202808a5b0ab62a132e5e366e34273fc (diff) | |
| parent | b625511a28fd8401f524474b5339e75328595150 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mlt/PKGBUILD
community-testing/acetoneiso2/PKGBUILD
community-testing/paraview/PKGBUILD
community-testing/qbittorrent/PKGBUILD
community-testing/virtualbox/PKGBUILD
community-testing/virtualbox/virtualbox.install
community/chmsee/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/libmpdclient/PKGBUILD
extra/xf86-video-ati/PKGBUILD
extra/xfce4-session/PKGBUILD
extra/xfce4-smartbookmark-plugin/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-readline/PKGBUILD
Diffstat (limited to 'extra/xorg-server/PKGBUILD')
| -rw-r--r-- | extra/xorg-server/PKGBUILD | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 519a39078..af6d14caa 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141122 2011-10-24 13:18:15Z jgc $ +# $Id: PKGBUILD 141677 2011-11-02 06:41:51Z 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.1.901 +pkgver=1.11.1.902 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -15,15 +15,15 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch revert-trapezoids.patch - git-fixes.patch + #git-fixes.patch xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('bc72d860c34868aa6b1823230cb7f13136ceb092' +sha1sums=('235a5d77420df21c8a8eed34e196168bafdbb02b' '0249b892f27243d8fe6fe6d226bf4c2391cedf49' '962fecc159c128728f14e8ba231c5b00391ff4ac' 'd9f7d9553e772c2682c15079019d30c658a4f83b' - 'cd9291fe1fa1b497aa74675afeeb025fe6b23b95' + #'cd9291fe1fa1b497aa74675afeeb025fe6b23b95' 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' '6838fc00ef4618c924a77e0fb03c05346080908a' '993798f3d22ad672d769dae5f48d1fa068d5578f') @@ -41,7 +41,7 @@ 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" autoreconf -fi if [ "$CARCH" = "mips64el" ]; then |