From 3f8fdc60f0dbd72d350af3927657f9ff97eb249f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sat, 26 Jul 2014 03:59:52 +0000 Subject: Sat Jul 26 03:49:34 UTC 2014 --- community/docker/PKGBUILD | 17 +- community/docker/docker.install | 11 ++ community/gauche/PKGBUILD | 19 +- community/intellij-idea-libs/PKGBUILD | 8 +- community/liteide/PKGBUILD | 19 +- community/perl-net-dropbox-api/PKGBUILD | 31 +++ extra/git/PKGBUILD | 6 +- extra/kdebase-workspace/KDEBUG-336589.patch | 26 --- extra/kdebase-workspace/PKGBUILD | 19 +- extra/postgresql-old-upgrade/PKGBUILD | 11 +- extra/postgresql/PKGBUILD | 11 +- extra/qrencode/PKGBUILD | 6 +- extra/telepathy-qt/PKGBUILD | 15 +- extra/telepathy-qt/cmake.patch | 37 ---- extra/xorg-server/10-quirks.conf | 10 - extra/xorg-server/CVE-2013-6424.diff | 49 ----- extra/xorg-server/PKGBUILD | 211 --------------------- extra/xorg-server/autoconfig-nvidia.patch | 28 --- extra/xorg-server/autoconfig-sis.patch | 21 --- extra/xorg-server/xvfb-run | 180 ------------------ extra/xorg-server/xvfb-run.1 | 282 ---------------------------- 21 files changed, 105 insertions(+), 912 deletions(-) create mode 100644 community/perl-net-dropbox-api/PKGBUILD delete mode 100644 extra/kdebase-workspace/KDEBUG-336589.patch delete mode 100644 extra/telepathy-qt/cmake.patch delete mode 100644 extra/xorg-server/10-quirks.conf delete mode 100644 extra/xorg-server/CVE-2013-6424.diff delete mode 100644 extra/xorg-server/PKGBUILD delete mode 100644 extra/xorg-server/autoconfig-nvidia.patch delete mode 100644 extra/xorg-server/autoconfig-sis.patch delete mode 100644 extra/xorg-server/xvfb-run delete mode 100644 extra/xorg-server/xvfb-run.1 diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD index fb8df0247..aeca2bfde 100644 --- a/community/docker/PKGBUILD +++ b/community/docker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 115778 2014-07-16 13:54:27Z seblu $ +# $Id: PKGBUILD 116315 2014-07-24 22:59:14Z seblu $ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container' @@ -16,7 +16,7 @@ optdepends=('btrfs-progs: btrfs backend support' # don't strip binaries! A sha1 is used to check binary consistency. options=('!strip') install=$pkgname.install -source=("git+https://github.com/dotcloud/docker.git#tag=v$pkgver") +source=("git+https://github.com/docker/docker.git#tag=v$pkgver") md5sums=('SKIP') build() { @@ -39,10 +39,15 @@ package() { install -Dm644 'contrib/completion/bash/docker' "$pkgdir/usr/share/bash-completion/completions/docker" install -Dm644 'contrib/completion/zsh/_docker' "$pkgdir/usr/share/zsh/site-functions/_docker" # systemd - install -Dm644 'contrib/init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service" + install -Dm644 'contrib/init/systemd/socket-activation/docker.service' \ + "$pkgdir/usr/lib/systemd/system/docker.service" + install -Dm644 'contrib/init/systemd/socket-activation/docker.socket' \ + "$pkgdir/usr/lib/systemd/system/docker.socket" # vim syntax - install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim" - install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/dockerfile.vim" + install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' \ + "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim" + install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' \ + "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim" } # vim:set ts=2 sw=2 et: diff --git a/community/docker/docker.install b/community/docker/docker.install index f730503de..f75fd94aa 100644 --- a/community/docker/docker.install +++ b/community/docker/docker.install @@ -8,6 +8,7 @@ post_install() { # arg 2: the old package version post_upgrade() { (( $(vercmp $2 '1:0.7.1-1') < 0 )) && post_install "$1" || true + (( $(vercmp $2 '1:1.1.1-2') < 0 )) && socketactivation || true } # arg 1: the old package version @@ -15,4 +16,14 @@ post_remove() { groupdel docker >/dev/null 2>&1 || true } +socketactivation() { + if systemctl -q is-enabled docker; then + cat << EOF +The docker service switched to socket activation. +We will enable the socket file for you. Don't need to thanks us. +EOF + systemctl enable docker.socket + fi +} + # vim:set ts=2 sw=2 et: diff --git a/community/gauche/PKGBUILD b/community/gauche/PKGBUILD index efc16877c..360b47db2 100644 --- a/community/gauche/PKGBUILD +++ b/community/gauche/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 94289 2013-07-18 21:59:48Z arodseth $ +# $Id: PKGBUILD 116330 2014-07-25 12:11:18Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Stefan Husmann # Contributor: Motohiro Ueki # Contributor: nkoizu pkgname=gauche -pkgver=0.9.3.3 +pkgver=0.9.4 pkgrel=1 url='http://practical-scheme.net/gauche/' pkgdesc='R5RS Scheme implementation (provides gosh)' depends=('gdbm' 'zlib' 'slib') license=('BSD') arch=('x86_64' 'i686') -install="$pkgname.install" +install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/Gauche-$pkgver.tgz") -sha256sums=('3d8b70075faa0f7a24f8d112cc102ee3e1066680cdd19d324d59f33fab79caac') +sha256sums=('7b18bcd70beaced1e004594be46c8cff95795318f6f5830dd2a8a700410fc149') build() { - cd "$srcdir/Gauche-$pkgver" + cd "Gauche-$pkgver" - ./configure --prefix=/usr --enable-multibyte=utf-8 \ - --enable-threads=pthreads - make -j1 + ./configure --enable-multibyte=utf-8 --prefix=/usr + make } package() { - cd "$srcdir/Gauche-$pkgver" + cd "Gauche-$pkgver" - make -j1 DESTDIR="$pkgdir" install-pkg install-doc + make DESTDIR="$pkgdir" install-pkg install-doc install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 7cdd9cce0..959c4b47b 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 112069 2014-05-29 09:52:00Z stativ $ +# $Id: PKGBUILD 116325 2014-07-25 08:18:42Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=intellij-idea-libs -pkgver=13.1.3 -_pkgver=135.909 +pkgver=13.1.4 +_pkgver=135.1229 pkgrel=1 pkgdesc="Architecture dependent libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('Apache') depends=('glibc') options=(!strip) source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('f71c624bf4e98269d883e8ea8dd48145') +md5sums=('44771594016dd02a8906bb7da85fe623') package() { [ $CARCH == "x86_64" ] && SUFFIX=64 diff --git a/community/liteide/PKGBUILD b/community/liteide/PKGBUILD index 0f09d2f22..1e9525477 100644 --- a/community/liteide/PKGBUILD +++ b/community/liteide/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 113424 2014-06-22 12:27:45Z arodseth $ +# $Id: PKGBUILD 116338 2014-07-25 14:02:29Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: spambanane # Contributor: Matteo # Contributor: Matthew Zimmerman pkgname=liteide -pkgver=22 -pkgrel=3 +pkgver=23 +pkgrel=1 pkgdesc='IDE for editing and building projects written in the Go programming language' license=('LGPL') arch=('x86_64' 'i686') @@ -24,9 +24,12 @@ md5sums=('SKIP' prepare() { gendesk -f -n --name 'LiteIDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc" chmod +x "liteide-x$pkgver/build/"*_*.sh + # Fix for FS#4662 until fixed by upstream - sed -i 's/GOROOT/#GOROOT/g' "liteide-x$pkgver/liteidex/os_deploy/linux/liteenv/linux32.env" - sed -i 's/GOROOT/#GOROOT/g' "liteide-x$pkgver/liteidex/os_deploy/linux/liteenv/linux64.env" + for bits in 32 64; do + sed -i 's/GOROOT/#GOROOT/g' \ + "liteide-x$pkgver/liteidex/os_deploy/linux/liteenv/linux$bits.env" + done } build() { @@ -39,11 +42,6 @@ build() { ./update_pkg.sh ./build_linux.sh - - # Fixing insecure RPATH, need to test if this is still needed - cd ../liteidex - find . -name "*.so" -type f -exec sed -i 's|/home/win|/usr/lib/|g' {} \; - find . -name liteide -type f -exec sed -i 's|/home/win|/usr/lib/|g' {} \; } package() { @@ -68,7 +66,6 @@ package() { msg2 'Packaging libraries and plugins...' cp -r liteide/lib/liteide/* "$pkgdir/usr/lib/liteide" - cp -r liteide/bin/libliteapp.* "$pkgdir/usr/lib/" chmod -x "$pkgdir/usr/lib/liteide/plugins/"* msg2 'Packaging license and license exception...' diff --git a/community/perl-net-dropbox-api/PKGBUILD b/community/perl-net-dropbox-api/PKGBUILD new file mode 100644 index 000000000..84d1d0e2d --- /dev/null +++ b/community/perl-net-dropbox-api/PKGBUILD @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Felix Yan +# Contributor: Michael Kogan + +pkgname=perl-net-dropbox-api +pkgver=1.9 +pkgrel=3 +pkgdesc="Net::Dropbox::API - Perl dropbox API interface" +arch=('i686' 'x86_64') +url="http://search.cpan.org/~norbu/Net-Dropbox-API/lib/Net/Dropbox/API.pm" +license=('GPL' 'PerlArtistic') +depends=('perl-common-sense' 'perl-data-random' 'perl-http-message' 'perl-json' 'perl-libwww' 'perl-mouse' 'perl-net-oauth' 'perl-uri' 'perl-lwp-protocol-https') +checkdepends=('perl-test-pod' 'perl-test-pod-coverage') +source=("http://search.cpan.org/CPAN/authors/id/N/NO/NORBU/Net-Dropbox-API-${pkgver}.tar.gz") +sha1sums=('c1c5ba827492e171cb65124b65ece4da2442ea84') + +build() { + cd "$srcdir/Net-Dropbox-API-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "$srcdir/Net-Dropbox-API-${pkgver}" + make test +} + +package() { + cd "$srcdir/Net-Dropbox-API-${pkgver}" + make DESTDIR="$pkgdir" install +} diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 983401af9..76302d6c9 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 217409 2014-07-18 12:29:47Z dan $ +# $Id: PKGBUILD 217826 2014-07-25 02:34:22Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -105,6 +105,6 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('4515f5926ddae48fe42083a08bd958d5' +md5sums=('adb359afe25181c5939916c4ade58617' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/kdebase-workspace/KDEBUG-336589.patch b/extra/kdebase-workspace/KDEBUG-336589.patch deleted file mode 100644 index a38336f3c..000000000 --- a/extra/kdebase-workspace/KDEBUG-336589.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit e8241313fc979aefafc8c2a0207570d6394f1580 -Author: Martin Gräßlin -Date: Mon Jun 23 07:45:44 2014 +0200 - - [libkwineffects] Require strict binding for intel driver - - According to driver devs it's a "buggy micro-optimisation", see - https://bugs.freedesktop.org/show_bug.cgi?id=80349#c1 - - BUG: 336589 - REVIEW: 118893 - -diff --git a/libkwineffects/kwinglplatform.cpp b/libkwineffects/kwinglplatform.cpp -index 4b2e6f3..9a391a0 100644 ---- a/libkwineffects/kwinglplatform.cpp -+++ b/libkwineffects/kwinglplatform.cpp -@@ -811,7 +811,8 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface) - m_supportsGLSL = false; - - m_limitedGLSL = m_supportsGLSL && m_chipClass < I965; -- m_looseBinding = true; -+ // see https://bugs.freedesktop.org/show_bug.cgi?id=80349#c1 -+ m_looseBinding = false; - - if (m_chipClass < I915) { - m_recommendedCompositor = XRenderCompositing; diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index d60490577..ef652e6e1 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 215421 2014-06-24 16:59:40Z andrea $ +# $Id: PKGBUILD 217835 2014-07-25 07:29:41Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.11.10 -_pkgver=4.13.2 -pkgrel=2 +pkgver=4.11.11 +_pkgver=4.13.3 +pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -29,9 +29,8 @@ backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' - 'khotkeys-qt4.patch' - 'KDEBUG-336589.patch') -sha1sums=('2968043563e25d2d2618c9f49fdfbab5fa14c8cd' + 'khotkeys-qt4.patch') +sha1sums=('84d70bb81a5d3b42869b666a12963dea14a33722' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' 'c6afdf8964b2b2c4809b2e8e694729b2661e29df' @@ -40,8 +39,7 @@ sha1sums=('2968043563e25d2d2618c9f49fdfbab5fa14c8cd' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514' - 'aa9d2e5a69986c4c3d47829721ea99edb473be12' - 'e7a21bd2371ce069627ddbfffb3cf5caddcb1bff') + 'aa9d2e5a69986c4c3d47829721ea99edb473be12') prepare() { mkdir build @@ -57,9 +55,6 @@ prepare() { # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch - - cd kwin - patch -p1 -i "${srcdir}"/KDEBUG-336589.patch } build() { diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 4372fcfd4..0a3f67895 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 214241 2014-06-04 13:52:19Z bluewind $ +# $Id: PKGBUILD 217828 2014-07-25 02:50:41Z dan $ # Maintainer: Dan McGee pkgname=postgresql-old-upgrade -pkgver=9.2.8 +pkgver=9.2.9 _majorver=${pkgver%.*} -pkgrel=2 +pkgrel=1 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64') url="http://www.postgresql.org/" @@ -18,6 +18,7 @@ build() { ./configure --prefix=/opt/pgsql-${_majorver} \ --with-krb5 \ + --with-gssapi \ --with-libxml \ --with-openssl \ --with-perl \ @@ -47,5 +48,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('c5c65a9b45ee53ead0b659be21ca1b97') -sha256sums=('568ba482340219097475cce9ab744766889692ee7c9df886563e8292d66ed87c') +md5sums=('38b0937c86d537d5044c599273066cfc') +sha256sums=('94ec6d330f125b6fc725741293073b07d7d20cc3e7b8ed127bc3d14ad2370197') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 6b86cd081..ada384b59 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 214240 2014-06-04 13:52:17Z bluewind $ +# $Id: PKGBUILD 217830 2014-07-25 02:51:09Z dan $ # Maintainer: Dan McGee pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.3.4 +pkgver=9.3.5 _majorver=${pkgver%.*} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') @@ -14,14 +14,14 @@ source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar postgresql-run-socket.patch postgresql.pam postgresql.logrotate postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir) -md5sums=('d0a41f54c377b2d2fab4a003b0dac762' +md5sums=('5059857c7d7e6ad83b6d55893a121b59' '75c579eed03ffb2312631f0b649175b4' '96f82c38f3f540b53f3e5144900acf17' 'd28e443f9f65a5712c52018b84e27137' '89b48774b0dae7c37fbb0e907c3c1db8' '1c5a1f99e8e93776c593c468e2612985' 'ea7f9f914900e60835d20cb95010e63c') -sha256sums=('9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621' +sha256sums=('14176ffb1f90a189e7626214365be08ea2bfc26f26994bafb4235be314b9b4b0' '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' @@ -39,6 +39,7 @@ build() { --datadir=/usr/share/postgresql \ --sysconfdir=/etc \ --with-krb5 \ + --with-gssapi \ --with-libxml \ --with-openssl \ --with-perl \ diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index 70771cd57..010abf372 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198392 2013-10-30 14:35:36Z allan $ +# $Id: PKGBUILD 218178 2014-07-25 22:02:33Z bluewind $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau pkgname=qrencode -pkgver=3.4.3 +pkgver=3.4.4 pkgrel=1 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64) @@ -12,7 +12,7 @@ makedepends=(sdl) url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('89a90a3b8cbca60ac412b2e0e0c776e7') +md5sums=('62ba472bede0ad393cc63e0012b5f007') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index 8e438b15c..c1d6d0974 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 215850 2014-06-30 17:14:55Z andrea $ +# $Id: PKGBUILD 217832 2014-07-25 07:12:57Z andrea $ # Maintainer: Ionut Biru # Maintainer: Andrea Scarpino pkgname=telepathy-qt -pkgver=0.9.3 -pkgrel=8 +pkgver=0.9.4 +pkgrel=1 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org/wiki/" @@ -15,19 +15,16 @@ conflicts=('telepathy-qt4') replaces=('telepathy-qt4') provides=('telepathy-qt4') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc} - 'farstream-0.2.patch' - 'cmake.patch') -md5sums=('94ac93aedf5f6fff49837bc8368e5a37' + 'farstream-0.2.patch') +md5sums=('75b18e151b1c4fab9f149d0eb46a494d' 'SKIP' - '6b2421c59d20d29fece8d5e6445354c7' - '50e9db71c0e23b59dba1f20a592e4b8d') + '6b2421c59d20d29fece8d5e6445354c7') prepare() { mkdir build cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/farstream-0.2.patch - patch -p1 -i "${srcdir}"/cmake.patch } diff --git a/extra/telepathy-qt/cmake.patch b/extra/telepathy-qt/cmake.patch deleted file mode 100644 index 977752f5c..000000000 --- a/extra/telepathy-qt/cmake.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 05fe3f4980bbc6b016e25dcf07e44afe29e377c0 Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Sun, 29 Sep 2013 22:19:27 +0000 -Subject: Fix compilation on new versions of cmake - -Recent cmake has changed the argument count to -qt4_create_moc_command, we need to adjust accordingly - -Reviewed-by: Dario Freddi ---- -diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake -index c2eac76..b3131f0 100644 ---- a/cmake/modules/FindQt.cmake -+++ b/cmake/modules/FindQt.cmake -@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS) - - MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options) - IF(QT_VERSION_MAJOR MATCHES 4) -- QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") -+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) - ELSE(QT_VERSION_MAJOR MATCHES 4) - IF(QT_VERSION_MAJOR MATCHES 5) -- QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") -+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) - ENDIF(QT_VERSION_MAJOR MATCHES 5) - ENDIF(QT_VERSION_MAJOR MATCHES 4) - ENDMACRO(QT_CREATE_MOC_COMMAND) --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-server/10-quirks.conf b/extra/xorg-server/10-quirks.conf deleted file mode 100644 index 7afad22dc..000000000 --- a/extra/xorg-server/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/extra/xorg-server/CVE-2013-6424.diff b/extra/xorg-server/CVE-2013-6424.diff deleted file mode 100644 index 8c664b66e..000000000 --- a/extra/xorg-server/CVE-2013-6424.diff +++ /dev/null @@ -1,49 +0,0 @@ -From patchwork Wed Oct 2 13:47:54 2013 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: exa: only draw valid trapezoids -From: Maarten Lankhorst -X-Patchwork-Id: 14769 -Message-Id: <524C240A.9010607@canonical.com> -To: "X.Org Devel List" -Date: Wed, 02 Oct 2013 15:47:54 +0200 - -Fixes freedesktop.org bug https://bugs.freedesktop.org/show_bug.cgi?id=67484 - -If t->bottom is close to MIN_INT, removing top can wraparound, so do the check properly. -A similar fix should also be applied to pixman. - -Signed-off-by: Maarten Lankhorst - ---- - - -diff --git a/exa/exa_render.c b/exa/exa_render.c -index 172e2b5..807eeba 100644 ---- a/exa/exa_render.c -+++ b/exa/exa_render.c -@@ -1141,7 +1141,8 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst, - - exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - for (; ntrap; ntrap--, traps++) -- (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); -+ if (xTrapezoidValid(traps)) -+ (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); - exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - - xRel = bounds.x1 + xSrc - xDst; -diff --git a/render/picture.h b/render/picture.h -index c85353a..fcd6401 100644 ---- a/render/picture.h -+++ b/render/picture.h -@@ -211,7 +211,7 @@ typedef pixman_fixed_t xFixed; - /* whether 't' is a well defined not obviously empty trapezoid */ - #define xTrapezoidValid(t) ((t)->left.p1.y != (t)->left.p2.y && \ - (t)->right.p1.y != (t)->right.p2.y && \ -- (int) ((t)->bottom - (t)->top) > 0) -+ ((t)->bottom > (t)->top)) - - /* - * Standard NTSC luminance conversions: - diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD deleted file mode 100644 index de5a53fb0..000000000 --- a/extra/xorg-server/PKGBUILD +++ /dev/null @@ -1,211 +0,0 @@ -# $Id: PKGBUILD 215781 2014-06-30 12:14:09Z lcarlier $ -# Maintainer: AndyRTR -# Maintainer: Jan de Groot - -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.15.2 -pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' - 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' - 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' - 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' - 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' - 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' 'libxshmfence') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - autoconfig-nvidia.patch - autoconfig-sis.patch - xvfb-run - xvfb-run.1 - 10-quirks.conf - CVE-2013-6424.diff) -sha256sums=('3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163' - '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' - 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - '89948993afd4d9aec6a0bdbaf62f494e9956bb77a0386307d497f340a818ff61') - -prepare() { - cd "${pkgbase}-${pkgver}" - # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i ../autoconfig-nvidia.patch - - # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i ../autoconfig-sis.patch - - # Fix CVE-2013-6424 (FS#38401) - patch -Np1 -i ../CVE-2013-6424.diff -} - -build() { - cd "${pkgbase}-${pkgver}" - autoreconf -fi - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-xorg \ - --enable-xephyr \ - --enable-glx-tls \ - --enable-kdrive \ - --enable-kdrive-evdev \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ - --enable-install-setuid \ - --enable-config-udev \ - --disable-config-dbus \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts - -# --without-dtrace \ -# --disable-linux-acpi --disable-linux-apm \ - - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -i hw/Makefile -} - -package_xorg-server-common() { - pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - - cd "${pkgbase}-${pkgver}" - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" - install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" - - make -C xkb DESTDIR="${pkgdir}" install-data - - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/lib/xorg" - install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" -} - -package_xorg-server() { - pkgdesc="Xorg X server" - depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on - # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg - provides=('X-ABI-VIDEODRV_VERSION=15' 'X-ABI-XINPUT_VERSION=20' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server') - groups=('xorg') - conflicts=('nvidia-utils<=331.20') - - cd "${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - -package_xorg-server-xephyr() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms') - - cd "${pkgbase}-${pkgver}/hw/kdrive" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" -} - -package_xorg-server-xvfb() { - pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common xorg-xauth) - - cd "${pkgbase}-${pkgver}/hw/vfb" - make DESTDIR="${pkgdir}" install - - install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" - install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" -} - -package_xorg-server-xnest() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt pixman xorg-server-common) - - cd "${pkgbase}-${pkgver}/hw/xnest" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" -} - -package_xorg-server-xdmx() { - pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) - - cd "${pkgbase}-${pkgver}/hw/dmx" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" -} - -package_xorg-server-devel() { - pkgdesc="Development files for the X.Org X server" - depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc - xproto randrproto renderproto xextproto inputproto kbproto - fontsproto pixman videoproto xf86driproto glproto - mesa dri2proto dri3proto xineramaproto libpciaccess - resourceproto scrnsaverproto presentproto - # not technically required but almost every Xorg pkg needs it to build - xorg-util-macros) - - cd "${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/usr/share/man" - rm -rf "${pkgdir}/usr/share/doc" - rm -rf "${pkgdir}/usr/share/X11" - rm -rf "${pkgdir}/usr/lib/xorg" - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" -} diff --git a/extra/xorg-server/autoconfig-nvidia.patch b/extra/xorg-server/autoconfig-nvidia.patch deleted file mode 100644 index 6d5220ac7..000000000 --- a/extra/xorg-server/autoconfig-nvidia.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c ---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 -+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 -@@ -1144,7 +1144,23 @@ - int idx = 0; - - #ifdef __linux__ -- driverList[idx++] = "nouveau"; -+ switch (dev->device_id) -+ { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[idx++] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[idx++] = "nouveau"; -+ break; -+ default: -+ driverList[idx++] = "nouveau"; -+ driverList[idx++] = "nvidia"; -+ break; -+ } - #endif - driverList[idx++] = "nv"; - break; diff --git a/extra/xorg-server/autoconfig-sis.patch b/extra/xorg-server/autoconfig-sis.patch deleted file mode 100644 index 0b50049db..000000000 --- a/extra/xorg-server/autoconfig-sis.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 -+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1200,9 +1200,15 @@ - break; - } - break; -- case 0x1039: -- driverList[0] = "sis"; -- break; -+ case 0x1039: -+ switch (dev->device_id) -+ { -+ case 0x6350: case 0x6351: -+ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; -+ default: -+ driverList[0] = "sis"; break; -+ } -+ break; - case 0x126f: - driverList[0] = "siliconmotion"; - break; diff --git a/extra/xorg-server/xvfb-run b/extra/xorg-server/xvfb-run deleted file mode 100644 index 4c2f4e0d3..000000000 --- a/extra/xorg-server/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/extra/xorg-server/xvfb-run.1 b/extra/xorg-server/xvfb-run.1 deleted file mode 100644 index 137d3a196..000000000 --- a/extra/xorg-server/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson . -.\" -.\" This is free software; you may redistribute it and/or modify -.\" it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2, -.\" or (at your option) any later version. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: -- cgit v1.2.2