From 146025aa1c838c12fa7b4873414da73816bfb6bd Mon Sep 17 00:00:00 2001 From: root Date: Sat, 17 Dec 2011 23:14:43 +0000 Subject: Sat Dec 17 23:14:43 UTC 2011 --- extra/amarok/PKGBUILD | 11 +-- extra/clamav/PKGBUILD | 14 ++-- extra/clamav/install | 4 +- extra/clamav/rc.d | 117 ++++++++++++++---------------- extra/claws-mail-extra-plugins/PKGBUILD | 23 ++---- extra/claws-mail/PKGBUILD | 15 ++-- extra/gcin/PKGBUILD | 6 +- extra/gnome-keyring/PKGBUILD | 4 +- extra/gnome-keyring/gnome-keyring.install | 5 +- extra/java7-openjdk/PKGBUILD | 18 ++--- extra/java7-openjdk/jre7-openjdk.install | 2 +- extra/lcms2/PKGBUILD | 23 +++--- extra/libxi/PKGBUILD | 6 +- extra/qemu-kvm/PKGBUILD | 10 +-- extra/qemu/PKGBUILD | 10 +-- extra/tracker/PKGBUILD | 6 +- extra/vde2/PKGBUILD | 15 ++-- extra/vde2/vde2.install | 4 - extra/wxmaxima/PKGBUILD | 2 +- extra/xorg-server/PKGBUILD | 19 ++--- 20 files changed, 145 insertions(+), 169 deletions(-) (limited to 'extra') diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index c3ead5dc1..d8f0ce047 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 142612 2011-11-12 17:15:02Z ibiru $ -# Maintainer: Andrea Scarpino +# $Id: PKGBUILD 145092 2011-12-16 20:04:34Z ronald $ +# Maintainer: Ronald van Haren +# Contributor: Andrea Scarpino # Contributor: damir pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.4.3 -pkgrel=3 +pkgver=2.5.0 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org" @@ -21,7 +22,7 @@ optdepends=("libgpod: support for Apple iPod audio devices" "libmygpo-qt: gpodder.net Internet Service") install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('24e8141bcbd065448911fa872c50197d') +sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2') build() { cd "${srcdir}" diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index cee554750..c6f92be84 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 140665 2011-10-17 22:40:35Z bisson $ +# $Id: PKGBUILD 145066 2011-12-16 09:17:40Z bisson $ # Contributor: Dale Blount # Contributor: Gregor Ibic # Maintainer: Gaetan Bisson pkgname=clamav pkgver=0.97.3 -pkgrel=1 +pkgrel=2 pkgdesc='Anti-virus toolkit for Unix' -arch=('i686' 'x86_64') -depends=('bzip2' 'zlib' 'libtool') -options=('!libtool') +url='http://www.clamav.net/' license=('GPL') +options=('!libtool') +arch=('i686' 'x86_64') +depends=('bzip2' 'libltdl') backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') -url='http://www.clamav.net/' source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'rc.d' 'conf.d' 'logrotate' 'config.patch') sha1sums=('263c7b8b7dc1536652ab64e32263d1c60e138655' - '7f15f0b13a1c11235bc99ef0add01efd8a442f07' + '50cfe02c97e4297a0efd25b23142408380305d30' 'cb116cdab49a810381a515cbcfb6a6c148547f07' 'be3310d2b41a68ce06e33c84ab68ffe59fdce104' '701a61571788d10ff7af01597785835c6bfea918') diff --git a/extra/clamav/install b/extra/clamav/install index 9116dc394..144134dde 100644 --- a/extra/clamav/install +++ b/extra/clamav/install @@ -2,8 +2,8 @@ post_install() { getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null - install -d /var/{log,run}/clamav - chown clamav:root /var/{log,run}/clamav + install -d /var/log/clamav + chown clamav:root /var/log/clamav chown -R clamav:clamav /var/lib/clamav } diff --git a/extra/clamav/rc.d b/extra/clamav/rc.d index 8e9c6afa9..04e959903 100644 --- a/extra/clamav/rc.d +++ b/extra/clamav/rc.d @@ -3,70 +3,65 @@ . /etc/rc.conf . /etc/rc.d/functions -# source application-specific settings -[ -f /etc/conf.d/clamav ] && . /etc/conf.d/clamav +[[ -f /etc/conf.d/clamav ]] && . /etc/conf.d/clamav +[[ -d /var/run/clamav ]] || install -d -o clamav -g root /var/run/clamav -PID_FC=`pidof -o %PPID /usr/bin/freshclam` -PID_CD=`pidof -o %PPID /usr/sbin/clamd` +PID_FC=$(pidof -o %PPID /usr/bin/freshclam) +PID_CD=$(pidof -o %PPID /usr/sbin/clamd) case "$1" in - start) - # if clamd isn't started first, notifyclamd fails at times - if [ "$START_CLAMD" == "yes" ]; then - stat_busy "Starting ClamD" - [ -z "$PID_CD" ] && /usr/sbin/clamd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi + start) + if [[ $START_CLAMD = yes ]]; then + stat_busy "Starting ClamD" + [[ -z $PID_CD ]] && /usr/sbin/clamd + if [[ $? -gt 0 ]]; then + stat_fail + else + add_daemon clamav + stat_done + fi + fi + sleep 1 + if [[ $START_FRESHCLAM = yes ]]; then + stat_busy "Starting FreshClam" + [[ -z $PID_FC ]] && /usr/bin/freshclam -p /var/run/clamav/freshclam.pid -d $FRESHCLAM_OPTS + if [[ $? -gt 0 ]]; then + stat_fail + else + add_daemon clamav + stat_done + fi + fi + ;; + stop) + if [[ $START_CLAMD = yes ]]; then + stat_busy "Stopping ClamD" + [[ -n $PID_CD ]] && kill $PID_CD &> /dev/null + if [[ $? -gt 0 ]]; then + stat_fail + else + rm_daemon clamav + stat_done + fi + fi - # give clamd enough time to start - sleep 1 - - if [ "$START_FRESHCLAM" == "yes" ]; then - stat_busy "Starting FreshClam" - [ -z "$PID_FC" ] && /usr/bin/freshclam -p /var/run/clamav/freshclam.pid -d $FRESHCLAM_OPTS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - ;; - stop) - if [ "$START_CLAMD" == "yes" ]; then - stat_busy "Stopping ClamD" - [ -n "$PID_CD" ] && kill $PID_CD &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - - if [ "$START_FRESHCLAM" == "yes" ]; then - stat_busy "Stopping FreshClam" - [ -n "$PID_FC" ] && kill $PID_FC &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - ;; - restart) - $0 stop - # will not start if not fully stopped, so sleep - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + if [[ $START_FRESHCLAM = yes ]]; then + stat_busy "Stopping FreshClam" + [[ -n $PID_FC ]] && kill $PID_FC &> /dev/null + if [[ $? -gt 0 ]]; then + stat_fail + else + rm_daemon clamav + stat_done + fi + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD index e252bbe96..e2c87804e 100644 --- a/extra/claws-mail-extra-plugins/PKGBUILD +++ b/extra/claws-mail-extra-plugins/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 139484 2011-10-02 07:11:06Z andyrtr $ +# $Id: PKGBUILD 145087 2011-12-16 15:46:57Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Mildred pkgname=claws-mail-extra-plugins -pkgver=3.7.10 -pkgrel=2 +pkgver=3.8.0 +pkgrel=1 pkgdesc="Extra plugins for claws-mail" url="http://www.claws-mail.org/plugins.php?branch=EXT" license=('GPL3') arch=('i686' 'x86_64') -depends=('claws-mail>=3.7.10') +depends=('claws-mail>=3.8.0') makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1' 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata') @@ -32,26 +32,17 @@ conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn') replaces=('sylpheed-claws-extra-plugins') options=('!libtool' '!strip') -source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2 - webkit1.6.1.patch) -md5sums=('fe782b2d4762c9727e22c1bb7979f7d6' - '8b94fa44072331b9c3926607eb42ba26') -sha1sums=('c5200936cb4811022774e960dc3f43d19eb320cf' - '8efd800617406dfe58a14422f243a678c582a90d') +source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2) +md5sums=('0783008baff9e09cb21ffc8947e9f2ee') build() { cd "$srcdir/claws-mail-extra-plugins-$pkgver" - # fix for new webkit api - pushd fancy* - patch -Np0 -i ${srcdir}/webkit1.6.1.patch - popd - # fix for python2 export PYTHON="/usr/bin/python2" # fix gdata plugin build - sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.2/configure + sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure for dir in */; do [[ $dir != geolocation_plugin-* ]] && ( diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index 500ba4c05..6d6fd0683 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144878 2011-12-08 21:06:16Z andyrtr $ +# $Id: PKGBUILD 145085 2011-12-16 15:46:54Z andyrtr $ # Maintainer: Andreas Radke pkgname=claws-mail -pkgver=3.7.10 -pkgrel=2 +pkgver=3.8.0 +pkgrel=1 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64') license=('GPL3') @@ -19,16 +19,11 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 - gnutls_buildfix.patch) -md5sums=('fcf58dcff52f0908ff3bc368d820408b' - '372bf7a9da58ae49d9da50f79db69fb6') +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) +md5sums=('df9f1657d7f34959a2205344d952c2e3') build() { cd ${srcdir}/${pkgname}-${pkgver} - - # fix build with latest gnutls - patch -Np1 -i ${srcdir}/gnutls_buildfix.patch sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 6f72cc5c5..bd344fc5a 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145012 2011-12-14 10:17:16Z bisson $ +# $Id: PKGBUILD 145112 2011-12-17 04:54:41Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andreas Radke # Contributor: damir pkgname=gcin -pkgver=2.5.4 +pkgver=2.6.0 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('4c0d3582eb370b4e295268801806c3bdd47a6940' +sha1sums=('4abef8d37492b68d54ba40420f65d04779ee2ec5' '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc') install=install diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 9c5b48ec0..c72b7e7ea 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 142880 2011-11-17 18:34:39Z ibiru $ +#$Id: PKGBUILD 145081 2011-12-16 15:41:26Z ibiru $ # Maintainer: Jan De Groot pkgname=gnome-keyring pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) license=('GPL' 'LGPL') diff --git a/extra/gnome-keyring/gnome-keyring.install b/extra/gnome-keyring/gnome-keyring.install index e899ab5a2..9635ee505 100644 --- a/extra/gnome-keyring/gnome-keyring.install +++ b/extra/gnome-keyring/gnome-keyring.install @@ -11,5 +11,8 @@ post_upgrade() { } post_remove() { - post_install $1 + glib-compile-schemas /usr/share/glib-2.0/schemas + update-mime-database /usr/share/mime 1> /dev/null + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q } diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 84488e042..ae3f7e808 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -20,7 +20,7 @@ _LANGTOOLS_CHANGESET=9b85f1265346 _OPENJDK_CHANGESET=0a76e5390e68 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver} -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -92,7 +92,7 @@ build() { unset JAVA_HOME unset CLASSPATH # default is to build with first found java-environment found in our repos - is jdk7-openjdk - [ -f /etc/profile.d/jdk7.sh ] && . /etc/profile.d/jdk7.sh + [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh unset MAKEFLAGS export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" @@ -120,11 +120,8 @@ build() { --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \ --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ --enable-pulse-java \ -# --with-rhino #--help - #--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \ - #--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \ - #--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \ +# --with-rhino #--help # --enable-systemtap Enable inclusion of SystemTap trace support # --enable-nss Enable inclusion of NSS security provider @@ -140,15 +137,16 @@ check() { package_jre7-openjdk() { pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment" - depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' + depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libcups' 'gtk2' 'lcms2' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng' 'gsettings-desktop-schemas') optdepends=('icedtea-web-java7: web browser plugin + Java Web Start' 'alsa-lib: for sound' - 'giflib: for gif format support') + 'giflib: for gif format support' + 'libpulse: for advanced sound') provides=('java-runtime=7') conflicts=('java-runtime') # replaces=('openjdk6') # once we remove openjdk6 pkg from the repos - backup=(etc/profile.d/jre7.sh) + backup=(etc/profile.d/jre.sh etc/profile.d/jre.csh) install=jre7-openjdk.install _jvmdir=/usr/lib/jvm/java-7-openjdk @@ -208,7 +206,7 @@ package_jdk7-openjdk() { provides=('java-environment=7') conflicts=('java-environment') # replaces=('openjdk6') - backup=(etc/profile.d/jdk7.sh) + backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh) _jvmdir=/usr/lib/jvm/java-7-openjdk diff --git a/extra/java7-openjdk/jre7-openjdk.install b/extra/java7-openjdk/jre7-openjdk.install index d311e6e44..d19979bf6 100644 --- a/extra/java7-openjdk/jre7-openjdk.install +++ b/extra/java7-openjdk/jre7-openjdk.install @@ -5,7 +5,7 @@ post_install() { fi echo "when you use a non-reparenting window manager" echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" - echo "/etc/profile.d/jre7.sh" + echo "/etc/profile.d/jre.sh" # update-desktop-database -q } diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD index 7cdcf8bfa..0ac1474d8 100644 --- a/extra/lcms2/PKGBUILD +++ b/extra/lcms2/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 127369 2011-06-13 20:26:40Z eric $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 145076 2011-12-16 15:20:33Z eric $ +# Maintainer: Eric Bélanger # Contributor: Lukas Jirkovsky pkgname=lcms2 -pkgver=2.2 +pkgver=2.3 pkgrel=1 pkgdesc="Small-footprint color management engine, version 2" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('MIT') -depends=('libtiff>=3.9.4') +depends=('libtiff') url="http://www.littlecms.com" options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/lcms/$pkgname-$pkgver.tar.gz) -md5sums=('aaf33c7c25675e6163189ba488ae20f5') +source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz) +sha1sums=('67d5fabda2f5777ca8387766539b9c871d993133') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm 644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD index 26c64dbc0..05897b97f 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 130682 2011-07-07 17:24:45Z andyrtr $ +# $Id: PKGBUILD 145122 2011-12-17 08:47:23Z andyrtr $ # Maintainer: Jan de Groot pkgname=libxi -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'xorg-util-macros') options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -sha1sums=('c66cfdee74e8d169a7992b5f257395e653ca761b') +sha1sums=('e4ca1b45368214ba246bfad398ea087125c79f31') build() { cd "${srcdir}/libXi-${pkgver}" diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 22d412f9b..e934f7b2f 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 141295 2011-10-28 08:03:30Z tpowa $ +# $Id: PKGBUILD 145070 2011-12-16 11:39:16Z tpowa $ # Maintainer: Tobias Powalowski pkgname=qemu-kvm -pkgver=0.15.1 +pkgver=1.0 pkgrel=1 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64) license=('GPL2' 'LGPL2.1') url="http://www.linux-kvm.org" -depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') +depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'libpulse') makedepends=('texi2html' 'perl' 'python2') backup=('etc/qemu/target-x86_64.conf') install=qemu-kvm.install @@ -25,7 +25,7 @@ build() ./configure --prefix=/usr \ --python=/usr/bin/python2 \ --sysconfdir=/etc \ - --audio-drv-list=alsa,sdl,oss \ + --audio-drv-list=alsa,sdl,oss,pa \ --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs make @@ -54,5 +54,5 @@ package() esac done } -md5sums=('8800a7d6b3aa4a168ea7f78dc66c0320' +md5sums=('00a825db46a70ba8ef9fc95da9cc7c1e' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index ba3890ab2..2852fe278 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 141293 2011-10-28 08:03:28Z tpowa $ +# $Id: PKGBUILD 145072 2011-12-16 12:11:13Z tpowa $ # Maintainer: Tobias Powalowski pkgname=qemu -pkgver=0.15.1 +pkgver=1.0 pkgrel=1 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" makedepends=('texi2html' 'perl' 'python2') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl') +depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl' 'libpulse') backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz @@ -19,7 +19,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i -e 's/lib64/lib/g' x86_64.ld - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \ + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs @@ -40,5 +40,5 @@ package() { done } -md5sums=('34f17737baaf1b3495c89cd6d4a607ed' +md5sums=('a64b36067a191451323b0d34ebb44954' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 1fcc15fb7..e5c25695b 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143537 2011-11-26 00:25:40Z heftig $ +# $Id: PKGBUILD 145110 2011-12-17 04:30:48Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Sergej Pupykin # Contributor: Alexander Fehr pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.12.8 +pkgver=0.12.9 _tver=${pkgver%.*} pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" @@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('92b18cc381a80d87d52e386f51ca1475b94f82cf5adf668424669c5b63474473') +sha256sums=('ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c') build() { cd "$srcdir/$pkgbase-$pkgver" diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD index 17dc83588..ab58cdaad 100644 --- a/extra/vde2/PKGBUILD +++ b/extra/vde2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87311 2010-08-12 11:45:43Z tpowa $ +# $Id: PKGBUILD 145068 2011-12-16 10:55:34Z tpowa $ # Contributor: Sergej Pupykin # Maintainer: Tobias Powalowski pkgname=vde2 -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="Virtual Distributed Ethernet for emulators like qemu" url="http://sourceforge.net/projects/vde/" @@ -18,13 +18,17 @@ source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 vde.conf vde.rc) install=vde2.install -options=(!libtool) +options=(!libtool !makeflags) build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \ --enable-experimental - make + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde @@ -35,7 +39,8 @@ build() { # install slirp license install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde } -md5sums=('22a7913beb50d6706155fc502ff3cbbe' + +md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' '7d9bc56d2e561d849e915000d1c0f269' 'a920123fc620bcedbccb703a8d1bdc55' 'cb8ace28e8efd4dad128be4be71b3b07' diff --git a/extra/vde2/vde2.install b/extra/vde2/vde2.install index 5005fb448..74e1710ff 100644 --- a/extra/vde2/vde2.install +++ b/extra/vde2/vde2.install @@ -8,7 +8,3 @@ post_install() { post_upgrade() { post_install $1 } - -op=$1 -shift -$op $* diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD index 1ab882ce8..d106536da 100644 --- a/extra/wxmaxima/PKGBUILD +++ b/extra/wxmaxima/PKGBUILD @@ -5,7 +5,7 @@ pkgname=wxmaxima pkgver=11.08.0 -pkgrel=1 +pkgrel=2 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima" arch=('i686' 'x86_64') url="http://wxmaxima.sourceforge.net/" diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index a55107e61..09463e789 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 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 +pkgver=1.11.3 +pkgrel=1 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -14,19 +14,16 @@ 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) -md5sums=('8796fff441e5435ee36a72579008af24' +md5sums=('a7194c437963627e1db0dd2d6c1a1984' '6c7e87d63ac4b535e19a80c89d0cf091' 'f8194638ca4872c2b0a67862a70bcebf' 'f6c84f4936f8e00abdfbd9fb4eda83fb' - '6fb42ec979ecd6125b6599f54dc00d14' '3f9de4dbfee2da90167192d8ca9eb2b4' - '47f9b979fe38043b42ff86eeee6fd0d0' '52fd3effd80d7bc6c1660d4ecf23d31c' '376c70308715cd2643f7bff936d9934b' 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') @@ -44,16 +41,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" - autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ -- cgit v1.2.3-54-g00ecf