diff options
Diffstat (limited to 'extra')
25 files changed, 223 insertions, 129 deletions
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 1d8ecb84c..29c8d9b28 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 132306 2011-07-22 16:28:25Z bisson $ +# $Id: PKGBUILD 135326 2011-08-12 20:59:31Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.0 -pkgrel=5 +pkgver=3.0.1 +pkgrel=1 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' arch=('i686' 'x86_64' 'mips64el') url='http://audacious-media-player.org/' @@ -13,7 +13,7 @@ license=('GPL3') depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('unzip: zipped skins support') source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz") -sha1sums=('d32de719f5b09440d0f6c802a5140a32b3827475') +sha1sums=('1532fce78702da80418d940dea96b857b75c1f9e') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD index 5d3424581..664c29d51 100644 --- a/extra/bftpd/PKGBUILD +++ b/extra/bftpd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 123903 2011-05-14 09:54:29Z thomas $ +# $Id: PKGBUILD 135462 2011-08-13 23:06:44Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=bftpd -pkgver=3.4 +pkgver=3.6 pkgrel=1 pkgdesc="Small, easy-to-configure FTP server" arch=(i686 x86_64 'mips64el') @@ -19,7 +19,7 @@ source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz bftpd.logrotate bftpd.pam bftpd.xinetd) -md5sums=('dcee04b5fad8c918e86c49712424fcdd' +md5sums=('7c45b158646e3b266530bf46778fc2d0' '56a1bf7738a6db2b2cff89e611f4f11a' '853680dad0df39d0b4d2fb43d4be430a' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD index 800feeca4..ea646f637 100644 --- a/extra/bmp/PKGBUILD +++ b/extra/bmp/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 134409 2011-08-03 18:32:37Z angvp $ +# $Id: PKGBUILD 135355 2011-08-13 06:32:50Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> pkgname=bmp pkgver=0.9.7.1 -pkgrel=6 +pkgrel=8 pkgdesc="gtk2 port of xmms" -arch=(i686 x86_64 'mips64el') +arch=(i686 x86_64 mips64el) url="http://sourceforge.net/projects/beepmp/" license=('GPL') -depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'unzip') +depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils') makedepends=('libxt') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) +install=bmp.install +source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \ + ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) md5sums=('c25d5a8d49cc5851d13d525a20023c4c' 'fa1bdf5a8d03e8539a6bed5caa471176' '42ad4109ddb66024d4c6d1f3e572ab86') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 -i ../${pkgver}-visualization.patch patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch ./configure --prefix=/usr --mandir=/usr/share/man @@ -26,7 +28,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/bmp/bmp.install b/extra/bmp/bmp.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/extra/bmp/bmp.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/ettercap/01_pointers_and_ints_dont_mix.diff b/extra/ettercap/01_pointers_and_ints_dont_mix.diff index bf7022266..65571309c 100644 --- a/extra/ettercap/01_pointers_and_ints_dont_mix.diff +++ b/extra/ettercap/01_pointers_and_ints_dont_mix.diff @@ -1,12 +1,13 @@ See debian bug #521857, patch from Timothy Redaelli <timothy@redaelli.eu> +Revised by Robert Edmonds <edmonds@debian.org> ---- ettercap-0.7.3.orig/src/protocols/ec_tcp.c -+++ ettercap-0.7.3/src/protocols/ec_tcp.c +--- a/src/protocols/ec_tcp.c ++++ b/src/protocols/ec_tcp.c @@ -116,7 +116,7 @@ tcp = (struct tcp_header *)DECODE_DATA; opt_start = (u_char *)(tcp + 1); - opt_end = (u_char *)((int)tcp + tcp->off * 4); -+ opt_end = (u_char *)(tcp + tcp->off * 4); ++ opt_end = (u_char *)(((u_char *)tcp) + tcp->off * 4); DECODED_LEN = (u_int32)(tcp->off * 4); diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD index 4c26f1985..34d86d7e1 100644 --- a/extra/ettercap/PKGBUILD +++ b/extra/ettercap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134606 2011-08-06 11:42:31Z giovanni $ +# $Id: PKGBUILD 135334 2011-08-12 21:28:33Z giovanni $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ettercap pkgver=NG_0.7.3 _origver=NG-0.7.3 -pkgrel=17 +pkgrel=18 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" arch=('i686' 'x86_64' 'mips64el') url="http://ettercap.sourceforge.net/" @@ -18,8 +18,8 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar. 01_pointers_and_ints_dont_mix.diff ettercap-NG-0.7.3_dns_support_on_x86_64.patch) md5sums=('28fb15cd024162c55249888fe1b97820' - 'ad235cd90aaa3e168575d06efac4d862' - 'f3d66186eece056a6d71453f9f288623') + 'c8f2b004f69ac3522ffebb530478b324' + 'd44f80292afcefdc13cba9a30c6391d6') build() { cd ${srcdir}/${pkgname}-${_origver} diff --git a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch index ed455a878..1754f2e3d 100644 --- a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch +++ b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch @@ -14,7 +14,7 @@ else - if false; then -+if true; then ++ if true; then HAVE_DN_EXPAND_TRUE= HAVE_DN_EXPAND_FALSE='#' else diff --git a/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD index 3dc9b7c38..b56f92c4c 100644 --- a/extra/hydrogen/PKGBUILD +++ b/extra/hydrogen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115128 2011-03-17 06:06:23Z schiv $ +# $Id: PKGBUILD 135233 2011-08-11 10:28:18Z schiv $ # Maintainer: tobias <tobias@archlinux.org> # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: K. Piche <kpiche@rogers.com> @@ -14,13 +14,16 @@ url="http://www.hydrogen-music.org/" depends=('libarchive' 'liblrdf' 'qt' 'jack') makedepends=('scons') options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('e96f291d60e58f5d62fe616cee577dc0') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + lrdf_raptor2.patch) +md5sums=('e96f291d60e58f5d62fe616cee577dc0' + '2124851e890f46158189b5fa90006d40') build() { cd "${srcdir}/${pkgname}-${pkgver}" export QTDIR=/usr + patch -Np1 -i "${srcdir}/lrdf_raptor2.patch" scons prefix=/usr libarchive=1 } diff --git a/extra/hydrogen/lrdf_raptor2.patch b/extra/hydrogen/lrdf_raptor2.patch new file mode 100644 index 000000000..ec176b716 --- /dev/null +++ b/extra/hydrogen/lrdf_raptor2.patch @@ -0,0 +1,11 @@ +diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct +--- hydrogen-0.9.5.old/Sconstruct 2011-08-11 18:00:07.889112348 +0800 ++++ hydrogen-0.9.5/Sconstruct 2011-08-11 18:00:34.945632437 +0800 +@@ -83,6 +83,7 @@ + includes.append( './' ) + includes.append( 'gui/src/' ) + includes.append( '3rdparty/install/include' ) ++ includes.append( '/usr/include/raptor2' ) + + if sys.platform == "darwin": + ldflags.append( '-L/opt/local/lib' ) diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD index 91d32fd90..2f98df6db 100644 --- a/extra/java-commons-daemon/PKGBUILD +++ b/extra/java-commons-daemon/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=('java-commons-daemon' 'java-jsvc') pkgbase=java-commons-daemon -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 arch=('i686' 'x86_64') url="http://commons.apache.org/daemon/" license=('APACHE') _libname=commons-daemon source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz) -md5sums=('2fe0a35d4a9c0338ecd45dad20f33662') +md5sums=('28dc2e0a3634b2dc3605e9e6444d079f') makedepends=('apache-ant' 'docbook2x' 'docbook-xsl') @@ -25,7 +25,7 @@ build() { } package_java-commons-daemon() { - pkgdesc="Set of Apache libraries for making Java applications run on UNIX more easily" + pkgdesc="Alternative invocation mechanism for unix-daemon-like java code" depends=('java-runtime') cd "${srcdir}/${_libname}-${pkgver}-src" @@ -40,7 +40,6 @@ package_java-jsvc() { pkgdesc="Apache application for making Java applications run on UNIX more easily" depends=("java-${_libname}" 'libcap') - # jsvc cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix" install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 3fa56c015..239a2ca67 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132576 2011-07-25 00:12:30Z andrea $ +# $Id: PKGBUILD 135257 2011-08-11 16:57:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python pkgver=4.7.0 -pkgrel=1 -pkgdesc="KDE bindings for python" +pkgrel=2 +pkgdesc="KDE bindings for Python" url="http://kde.org/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 122ba1559..6dc563a50 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 133252 2011-07-27 22:57:56Z andrea $ +# $Id: PKGBUILD 135366 2011-08-13 08:45:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.6.95 +pkgver=4.7.0 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt') +depends=('kdebase-runtime' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-smoke') -source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") -sha1sums=('304fcb7a38b3656db1d6614b8ff77e6e27274de6') +source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") +sha1sums=('7f0366cc6144ea684c571ed3876dd0eac6d72fb6') build() { cd "${srcdir}" @@ -21,7 +21,8 @@ build() { cd build cmake ../smokeqt-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Qwt5=OFF make } diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD index 3f6cc1113..2040b2742 100644 --- a/extra/libxfont/PKGBUILD +++ b/extra/libxfont/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97682 2010-11-01 09:15:00Z jgc $ +# $Id: PKGBUILD 135207 2011-08-11 07:14:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfont -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="X11 font rasterisation library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2) -sha1sums=('191b40c566f80737cf6838747d86ebaee7b0c7d7') +sha1sums=('189dd7a3756cb80bcf41b779bf05ec3c366e3041') build() { cd "${srcdir}/libXfont-${pkgver}" diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 91e94bb66..8f6b5e32e 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 128517 2011-06-24 07:46:40Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 135431 2011-08-13 11:30:30Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.9.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') @@ -17,17 +17,23 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - nm09-more.patch) + nm09-more.patch + ticket-14351-multiple-display-of-room-members.patch) md5sums=('2cd285c7a40f93b7a51bfe733971d3a6' - 'a673659d86c7a65aa710f7c8c7feda82') + 'a673659d86c7a65aa710f7c8c7feda82' + '47f16f838b741cfdeda18d7b08a7b816') build() { cd "$srcdir/$pkgname-$pkgver" # Further fixes for NetworkManager 0.9 - # (http://developer.pidgin.im/ticket/13859) + # http://developer.pidgin.im/ticket/13859 patch -Np1 -i "$srcdir/nm09-more.patch" + # Fix upstream issue #14351: multiple display of room members + # http://developer.pidgin.im/ticket/14351 + patch -Np0 -i "$srcdir/ticket-14351-multiple-display-of-room-members.patch" + # Use Python 2 sed -i 's/env python$/\02/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} @@ -74,8 +80,7 @@ package_pidgin(){ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" - depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' - 'cyrus-sasl-plugins') + depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss') optdepends=('avahi: Bonjour protocol support' 'dbus-python: for purple-remote and purple-url-handler') diff --git a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch new file mode 100644 index 000000000..bf0966891 --- /dev/null +++ b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch @@ -0,0 +1,17 @@ +# +# +# patch "libpurple/conversation.c" +# from [cd6817f4863abafef969359f65cc025f9483b401] +# to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803] +# +============================================================ +--- libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401 ++++ libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803 +@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC + } + + g_hash_table_remove_all(chat->users); +- chat->users = NULL; + + g_list_free(users); + chat->in_room = NULL; diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index 5f2d31f30..ce2edc0c0 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122181 2011-05-02 17:31:08Z andrea $ +# $Id: PKGBUILD 135252 2011-08-11 16:55:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') -pkgver=4.8.4 +pkgver=4.8.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" @@ -13,7 +13,7 @@ license=('GPL') makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat') source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('97c5dc1042feb5b3fe20baabad055af1') +md5sums=('0e4264bb912edfbda319bb236ac84407') build() { cd "${srcdir}" diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 2f16810e5..e1016b0c9 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 126938 2011-06-08 20:01:54Z tpowa $ +# $Id: PKGBUILD 135290 2011-08-12 09:22:48Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm -pkgver=0.14.1 -pkgrel=2 +pkgver=0.15.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 'mips64el') license=('GPL2' 'LGPL2.1') url="http://www.linux-kvm.org" -depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'esound' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') -makedepends=('texi2html' 'perl') +depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') +makedepends=('texi2html' 'perl' 'python2') backup=('etc/qemu/target-x86_64.conf') install=qemu-kvm.install conflicts=('qemu') @@ -23,8 +23,9 @@ build() cd ${srcdir}/${pkgname}-${pkgver} # fix esound building ./configure --prefix=/usr \ + --python=/usr/bin/python2 \ --sysconfdir=/etc \ - --audio-drv-list=alsa,sdl,oss,esd \ + --audio-drv-list=alsa,sdl,oss \ --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs make @@ -53,5 +54,5 @@ package() esac done } -md5sums=('ed37a2c0b1981220b842920140574c63' +md5sums=('b45b0deebba4ce47dcaaab3807f6ed47' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index f6b1913ea..61389e8e7 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 124178 2011-05-17 13:06:59Z tpowa $ +# $Id: PKGBUILD 135285 2011-08-12 09:21:08Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=0.14.1 +pkgver=0.15.0 pkgrel=1 -pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." +pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" -makedepends=('texi2html' 'perl') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'esound' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl') +makedepends=('texi2html' 'perl' 'python2') +depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl') backup=('etc/qemu/target-x86_64.conf') install=qemu.install -source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz +source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz 65-kvm.rules) options=(!strip) @@ -19,10 +19,10 @@ 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,esd \ + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \ + --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs \ - --kerneldir="/usr/src/linux-$(uname -r)" + --enable-docs make } @@ -40,5 +40,5 @@ package() { done } -md5sums=('b6c713a8db638e173af53a62d5178640' +md5sums=('dbc55b014bcd21b98e347f6a90f7fb6d' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index c41f9caee..b2c5880a7 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124858 2011-05-24 19:56:15Z schiv $ +# $Id: PKGBUILD 135263 2011-08-11 18:35:34Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -13,22 +13,23 @@ url="http://www.rosegardenmusic.com/" license=('GPL') depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils' 'perl' 'qt' 'shared-mime-info') -makedepends=('pkgconfig' 'imake') +makedepends=('imake') optdepends=('lilypond: notation display' 'cups: printing support' 'okular: print preview, or any other PDF viewer' 'timidity++: MIDI playback, or any other softsynth' 'flac' 'wavpack') -[ "$CARCH" = "i686" ] && optdepends=("${optdepends[@]}" - 'dssi-vst: win32 VST support') +[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('77ab43d06de53ace338843ff82e26288') build() { cd "$srcdir/$pkgname-$pkgver" + # lrdf + raptor2 compatibility + export lrdf_CFLAGS="$(pkg-config --cflags raptor2)" ./configure --prefix=/usr make } @@ -36,7 +37,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch b/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch new file mode 100644 index 000000000..fe5a807ee --- /dev/null +++ b/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch @@ -0,0 +1,43 @@ +From b43c51beeb0569a38900e1e5a78606711f987742 Mon Sep 17 00:00:00 2001 +From: Paul Khuong <pvk@pvk.ca> +Date: Wed, 3 Aug 2011 10:20:41 -0400 +Subject: [PATCH] Fix version string parsing for Linux 3.0 + + Stop assuming the presence of minor and patch version numbers; missing + values are defaulted to 0 (e.g. 3.0.0). + + Reported by a few people on IRC. +--- + src/runtime/linux-os.c | 14 ++++++++++---- + 1 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c +index db72fa6..e262f41 100644 +--- a/src/runtime/linux-os.c ++++ b/src/runtime/linux-os.c +@@ -198,12 +198,18 @@ os_init(char *argv[], char *envp[]) + int patch_version; + char *p; + uname(&name); ++ + p=name.release; + major_version = atoi(p); +- p=strchr(p,'.')+1; +- minor_version = atoi(p); +- p=strchr(p,'.')+1; +- patch_version = atoi(p); ++ minor_version = patch_version = 0; ++ p=strchr(p,'.'); ++ if (p != NULL) { ++ minor_version = atoi(++p); ++ p=strchr(p,'.'); ++ if (p != NULL) ++ patch_version = atoi(++p); ++ } ++ + if (major_version<2) { + lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)\n", + major_version); +-- +1.7.6 + diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 6b53be48d..c1e659b61 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 132801 2011-07-26 10:22:05Z juergen $ +# $Id: PKGBUILD 135444 2011-08-13 20:11:24Z dreisner $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Leslie Polzer (skypher) +# Contributor: Leslie Polzer (skypher) pkgname=sbcl pkgver=1.0.50 -pkgrel=1 +pkgrel=2 pkgdesc="Steel Bank Common Lisp" +url="http://www.sbcl.org/" arch=('i686' 'x86_64' 'mips64el') license=('custom') depends=('glibc') @@ -20,17 +21,24 @@ source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pk md5sums=('74ce9b24516885d066ec4287cde52e8c' '7ac0c1936547f4278198b8bf7725204d' 'a456535d65d6c5b85b1b646f11455fce') -url="http://www.sbcl.org/" install=sbcl.install +source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" + "arch-fixes.lisp" + "0001-Fix-version-string-parsing-for-Linux-3.0.patch") +md5sums=('74ce9b24516885d066ec4287cde52e8c' + '7ac0c1936547f4278198b8bf7725204d' + '7af58d1de2d788ad6a8d82c89279a75f') build() { - export CFLAGS="${CFLAGS} -DSBCL_HOME=\\\"/usr/lib/sbcl\\\"" + cd "$srcdir/$pkgname-$pkgver" + + export CFLAGS+=" -DSBCL_HOME=\\\"/usr/lib/sbcl\\\"" export GNUMAKE="make -e" # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS - export LINKFLAGS="$LD_FLAGS" + export LINKFLAGS="$LDFLAGS" unset LDFLAGS - cd ${startdir}/src/${pkgname}-${pkgver} + # Make a multi-threaded SBCL, disable LARGEFILE cat >customize-target-features.lisp <<EOF (lambda (features) @@ -40,44 +48,40 @@ build() { (disable :largefile))) EOF + # fix build against 3.0-ARCH + patch -Np1 < "$srcdir/0001-Fix-version-string-parsing-for-Linux-3.0.patch" patch -Nup1 < "${srcdir}/mips-arch.h.diff" if [ "$CARCH" = "mips64el" ]; then - sh make.sh clisp + sh make.sh clisp else - sh make.sh sbcl + sh make.sh sbcl fi - mkdir -p ${startdir}/pkg/usr - pushd doc/manual - make info || return 1 - popd - INSTALL_ROOT=${startdir}/pkg/usr sh install.sh + + make -C doc/manual info +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + INSTALL_ROOT="$pkgdir/usr" sh install.sh src/runtime/sbcl --core output/sbcl.core --script ${startdir}/src/arch-fixes.lisp mv sbcl-new.core ${startdir}/pkg/usr/lib/sbcl/sbcl.core -# sources - mkdir -p ${startdir}/pkg/usr/share/sbcl-source - cp -R -t ${startdir}/pkg/usr/share/sbcl-source \ - ${startdir}/src/${pkgname}-${pkgver}/{src,contrib} + # sources + mkdir -p "$pkgdir/usr/share/sbcl-source" + cp -R -t "$pkgdir/usr/share/sbcl-source" "$srcdir/$pkgname-$pkgver/"{src,contrib} -# drop unwanted files - find ${startdir}/pkg/usr/share/sbcl-source -type f \ - -name \*.fasl -or \ - -name \*.o -or \ - -name \*.log -or \ - -name \*.so -or \ - -name a.out -delete - - rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl - rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl.nm + # license + install -D -m644 "$srcdir/$pkgname-$pkgver/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/license.txt" - find ${startdir}/pkg \( -name Makefile -o -name .cvsignore \) -delete + # drop unwanted files + find "$pkgdir" \( -name Makefile -o -name .cvsignore \) -delete + find "$pkgdir/usr/share/sbcl-source" -type f \ + \( -name \*.fasl -o -name \*.o -o -name \*.log -o -name \*.so -o -name a.out \) -delete - rm $startdir/pkg/usr/share/info/dir - gzip -9nf $startdir/pkg/usr/share/info/* + rm "$pkgdir/usr/share/sbcl-source/src/runtime/sbcl"{,.nm} - # license - install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt } diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD index c894ec8dd..1fa433641 100644 --- a/extra/scummvm/PKGBUILD +++ b/extra/scummvm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106447 2011-01-17 06:22:16Z angvp $ +# $Id: PKGBUILD 135227 2011-08-11 09:16:00Z juergen $ # Maintainer: juergen <juergen@hoetzel.info> # Contributor: Manolis Tzanidakis, Petter Gundersen pkgname=scummvm -pkgver=1.2.1 +pkgver=1.3.1 pkgrel=1 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games." arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') url="http://www.scummvm.org/" depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'flac>=1.1.4' 'sdl' 'fluidsynth') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b1d224d7640bc7fdccaca958164b31df') +md5sums=('87e5076e93bfa762f1c5d7f45b41d4e2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/sdl/PKGBUILD b/extra/sdl/PKGBUILD index b7c5035aa..daaf7073f 100644 --- a/extra/sdl/PKGBUILD +++ b/extra/sdl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 99967 2010-11-19 16:37:58Z heftig $ +# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=sdl pkgver=1.2.14 -pkgrel=6 +pkgrel=7 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64' 'mips64el') url="http://www.libsdl.org" license=('LGPL') depends=('glibc' 'libxext' 'libxrender' 'libx11') -makedepends=('alsa-lib' 'esound' 'mesa' 'libpulse') +makedepends=('alsa-lib' 'mesa' 'libpulse') options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz sdl-1.2.14-joystick-crash.diff diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 5d73e1d73..b326c385e 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,25 +1,20 @@ -# $Id: PKGBUILD 130000 2011-06-30 19:02:46Z andrea $ +# $Id: PKGBUILD 135247 2011-08-11 16:54:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.12.3 -pkgrel=2 +pkgver=4.12.4 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') -source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz" - 'fix-regression.patch') -md5sums=('d0f1fa60494db04b4d115d4c2d92f79e' - '598ffc65ebaf1c0e8855a352b02c43e7') +source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") +md5sums=('6cbd56abb7d35aad833789c98ae61652') build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/fix-regression.patch - cd "${srcdir}" cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 7fd6833d9..3c35d24a2 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 126185 2011-06-02 11:28:46Z thomas $ +# $Id: PKGBUILD 135456 2011-08-13 22:59:53Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=0.8.4 +pkgver=0.8.5 pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('qt') optdepends=('qt') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7') +sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c') build() { cd "${srcdir}/${pkgname}-${pkgver}" |