From 7de0a9c21ecdb7becae761d7c9f2e723cb9ae0d3 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Jan 2012 23:14:55 +0000 Subject: Tue Jan 17 23:14:54 UTC 2012 --- extra/at-spi2-atk/PKGBUILD | 14 ++--- extra/at-spi2-core/PKGBUILD | 14 ++--- extra/claws-mail-extra-plugins/PKGBUILD | 6 +- extra/cmake/PKGBUILD | 4 +- extra/ethtool/PKGBUILD | 6 +- extra/fontforge/PKGBUILD | 5 +- extra/gmime/PKGBUILD | 13 +++-- extra/gnucash/PKGBUILD | 14 +++-- extra/grilo-plugins/PKGBUILD | 4 +- extra/gvfs/PKGBUILD | 4 +- extra/hydrogen/PKGBUILD | 14 +++-- extra/hydrogen/install.patch | 12 ++++ extra/kdeutils/PKGBUILD | 4 +- extra/mail-notification/PKGBUILD | 19 +++--- .../mail-notification-5.4-gmime.patch | 63 ++++++++++++++++++++ .../mail-notification-5.4-libx11.patch | 13 +++++ extra/pyalpm/PKGBUILD | 6 +- extra/qemu/PKGBUILD | 18 +++++- extra/ristretto/PKGBUILD | 6 +- extra/sdl_image/PKGBUILD | 29 +++++---- extra/sdl_mixer/PKGBUILD | 37 +++++++----- extra/sdl_net/PKGBUILD | 24 ++++---- extra/sdl_ttf/PKGBUILD | 23 ++++---- extra/spamassassin/PKGBUILD | 68 ++++++++++++---------- extra/spamassassin/spamd | 10 +++- extra/totem-plparser/PKGBUILD | 16 ++--- extra/vim/PKGBUILD | 4 +- extra/xfce4-netload-plugin/PKGBUILD | 23 ++++---- extra/xmms/PKGBUILD | 10 ++-- 29 files changed, 312 insertions(+), 171 deletions(-) create mode 100644 extra/hydrogen/install.patch create mode 100644 extra/mail-notification/mail-notification-5.4-gmime.patch create mode 100644 extra/mail-notification/mail-notification-5.4-libx11.patch (limited to 'extra') diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index c78c48373..6179b042e 100644 --- a/extra/at-spi2-atk/PKGBUILD +++ b/extra/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140838 2011-10-20 05:41:39Z ibiru $ +# $Id: PKGBUILD 146694 2012-01-16 14:00:07Z ibiru $ # Maintainer: Ionut Biru pkgname=at-spi2-atk -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64') @@ -12,11 +12,11 @@ depends=('at-spi2-core' 'libx11' 'atk' 'dconf') makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') -source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('6677def34b16c9a28d6ad96473ea56a3c0e13aa968e584df004cd44c8691ea1a') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('b63b214cec23163bf59239c59b350d55a7fcfab7a95858ea833815e0b16a4041') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" sed -i -e '/AC_PATH_XTRA/d' configure.ac autoreconf --force --install @@ -27,8 +27,8 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index 73c41fd57..d77a8e8cf 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140840 2011-10-20 05:41:41Z ibiru $ +# $Id: PKGBUILD 146684 2012-01-16 11:06:00Z ibiru $ # Maintainer: Ionut Biru pkgname=at-spi2-core -pkgver=2.2.1 +pkgver=2.2.3 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64') @@ -11,11 +11,11 @@ license=('GPL2') depends=('dbus-core' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') -source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2a4129420decca3657e163a4dbb1a3cb28acafe32ea1292417fdd81084d48fac') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('fb97f0a02fa378795e50857e22e640e099be1768081e28ca2dbdb3835f5b6af1') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" sed -i -e '/AC_PATH_XTRA/d' configure.ac autoreconf --force --install @@ -26,8 +26,8 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD index e2c87804e..37e44a542 100644 --- a/extra/claws-mail-extra-plugins/PKGBUILD +++ b/extra/claws-mail-extra-plugins/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145087 2011-12-16 15:46:57Z andyrtr $ +# $Id: PKGBUILD 146705 2012-01-16 19:49:15Z dreisner $ # Maintainer: Andreas Radke # Contributor: Mildred pkgname=claws-mail-extra-plugins pkgver=3.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Extra plugins for claws-mail" url="http://www.claws-mail.org/plugins.php?branch=EXT" license=('GPL3') @@ -33,7 +33,7 @@ conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' 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) -md5sums=('0783008baff9e09cb21ffc8947e9f2ee') +md5sums=('4776f6e0357a694f384349ac73b6da52') build() { cd "$srcdir/claws-mail-extra-plugins-$pkgver" diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index c471fddf7..7b54bd725 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145779 2011-12-31 11:08:34Z andrea $ +# $Id: PKGBUILD 146707 2012-01-16 19:49:18Z dreisner $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=cmake pkgver=2.8.7 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') license=('custom') diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index 2d8745120..8e759763b 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144425 2011-12-05 19:20:31Z ibiru $ +# $Id: PKGBUILD 146699 2012-01-16 19:33:36Z ibiru $ # Maintainer : Ionut Biru # Contributor: Paul Mattal # Contributor: Martin Kemp pkgname=ethtool -pkgver=3.1 +pkgver=3.2 pkgrel=1 epoch=1 pkgdesc="Utility for controlling network drivers and hardware" @@ -13,7 +13,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/" license=('GPL') depends=('glibc') source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('dd0a93a70784fdeb2c3e699b3c709e8a') +md5sums=('4ed4a9dfd2039aa416176a9c06497b00') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD index 0ddc7805d..6319df46f 100644 --- a/extra/fontforge/PKGBUILD +++ b/extra/fontforge/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 145161 2011-12-18 12:09:19Z bisson $ +# $Id: PKGBUILD 146693 2012-01-16 13:56:18Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Eric Belanger # Contributor: William Rea pkgname=fontforge pkgver=20111214 -pkgrel=2 +pkgrel=3 pkgdesc='Outline and bitmap font editor' arch=('i686' 'x86_64') url='http://fontforge.sourceforge.net/' @@ -25,6 +25,7 @@ build() { --mandir=/usr/share/man \ --enable-type3 \ --enable-devicetables \ + --enable-double \ --with-regular-link \ --with-python=python2 \ --enable-pyextension \ diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index d60713620..8ed0d8e6e 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 146295 2012-01-08 17:45:05Z ibiru $ +# $Id: PKGBUILD 146717 2012-01-16 19:50:48Z dreisner $ # Maintainer: Jan de Groot # Contributor: Ben pkgname=gmime -pkgver=2.4.31 +pkgver=2.6.4 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64') license=('GPL') url="http://spruce.sourceforge.net/gmime/" -depends=('glib2' 'zlib') -makedepends=('gtk-sharp-2' 'pkgconfig') +depends=('glib2' 'gpgme' 'zlib') +makedepends=('gtk-sharp-2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d9601328ee3d2d5be57ac8397571af4835dba8eb2c68ad224de3ec722a81fd04') +sha256sums=('2e85076c223fe8bf1392a7c1affa4454cb3bb6dec83016ad6e3230c65533f163') build() { # get rid of that .wapi errors in fakeroot @@ -21,7 +21,8 @@ build() { mkdir -p "$MONO_SHARED_DIR" cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + + ./configure --prefix=/usr --disable-static make } diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index e77b1c3ba..78a5325cb 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141031 2011-10-22 05:09:05Z eric $ +# $Id: PKGBUILD 146667 2012-01-16 05:26:24Z eric $ # Maintainer: Aaron Griffin # Contributor: Mark Schneider pkgname=gnucash -pkgver=2.4.8 +pkgver=2.4.9 pkgrel=1 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64') @@ -14,21 +14,23 @@ makedepends=('intltool') optdepends=('evince: for print preview' 'perl-finance-quote: for stock information lookups' 'perl-date-manip: for stock information lookups') -options=('!libtool' '!makeflags') +options=('!libtool' '!makeflags' '!emptydirs') install=gnucash.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('cdd8793bc8e8cbb433a0237007023f4973a51781') +sha1sums=('a0ed6532e53164b7dc9a319d6503c6563310b878') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --sysconfdir=/etc --libexecdir=/usr/lib --enable-ofx --enable-aqbanking + ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \ + --libexecdir=/usr/lib --disable-schemas-install --enable-ofx --enable-aqbanking make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd src/doc/design + make DESTDIR="${pkgdir}" install-info install -dm755 "${pkgdir}/usr/share/gconf/schemas" gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnucash "${pkgdir}"/etc/gconf/schemas/*.schemas diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 95d13fa3f..22a211769 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144927 2011-12-10 21:25:05Z heftig $ +# $Id: PKGBUILD 146719 2012-01-16 19:50:53Z dreisner $ # Maintainer: Jan "heftig" Steffens pkgname=grilo-plugins pkgver=0.1.18 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index dd451a176..ab8552cec 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140933 2011-10-20 05:43:53Z ibiru $ +# $Id: PKGBUILD 146709 2012-01-16 19:49:21Z dreisner $ # Maintainer: Jan de Groot pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.10.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf') diff --git a/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD index b78606f9c..a5c607e79 100644 --- a/extra/hydrogen/PKGBUILD +++ b/extra/hydrogen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135233 2011-08-11 10:28:18Z schiv $ +# $Id: PKGBUILD 146711 2012-01-16 19:49:24Z dreisner $ # Maintainer: tobias # Maintainer: Ray Rashif # Contributor: K. Piche @@ -6,24 +6,28 @@ pkgname=hydrogen pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced Drum Machine" arch=('i686' 'x86_64') license=('GPL') url="http://www.hydrogen-music.org/" depends=('libarchive' 'liblrdf' 'qt' 'jack') makedepends=('scons') -options=('!makeflags') +#options=('!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - lrdf_raptor2.patch) + lrdf_raptor2.patch + install.patch) md5sums=('e96f291d60e58f5d62fe616cee577dc0' - '2124851e890f46158189b5fa90006d40') + '2124851e890f46158189b5fa90006d40' + 'ce3a83a069b55e46aa532b55e803c9a5') build() { cd "${srcdir}/${pkgname}-${pkgver}" export QTDIR=/usr patch -Np1 -i "${srcdir}/lrdf_raptor2.patch" + # http://www.assembla.com/spaces/hydrogen/tickets/204 + patch -Np0 -i "${srcdir}/install.patch" scons prefix=/usr libarchive=1 } diff --git a/extra/hydrogen/install.patch b/extra/hydrogen/install.patch new file mode 100644 index 000000000..2e6e707a1 --- /dev/null +++ b/extra/hydrogen/install.patch @@ -0,0 +1,12 @@ +*** Sconstruct.org 2011-11-06 12:15:40.018119106 +0100 +--- Sconstruct 2011-11-06 12:16:21.124122432 +0100 +*************** +*** 298,304 **** + + for N in glob.glob('./data/i18n/hydrogen.*'): + env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N)) +- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img")) + + #add every img in ./data/img to the install list. + os.path.walk("./data/img/",install_images,env) +--- 298,303 ---- diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD index 55e7ef87c..be1df93da 100644 --- a/extra/kdeutils/PKGBUILD +++ b/extra/kdeutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144741 2011-12-08 09:21:43Z andrea $ +# $Id: PKGBUILD 146715 2012-01-16 19:50:44Z dreisner $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -17,7 +17,7 @@ pkgname=('kdeutils-ark' 'kdeutils-superkaramba' 'kdeutils-sweeper') pkgver=4.7.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/mail-notification/PKGBUILD b/extra/mail-notification/PKGBUILD index edb5a8d03..b7789212a 100644 --- a/extra/mail-notification/PKGBUILD +++ b/extra/mail-notification/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 139560 2011-10-03 13:09:05Z jgc $ +# $Id: PKGBUILD 146721 2012-01-16 19:51:02Z dreisner $ # Maintainer: Roman Kyrylych pkgname=mail-notification pkgver=5.4 -pkgrel=9 +pkgrel=10 pkgdesc="Tray icon application that informs you if you have new mail" arch=('i686' 'x86_64') url="http://www.nongnu.org/mailnotify/" license=('GPL3' 'FDL') -depends=('gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome') +depends=('gmime' 'libnotify' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome') makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils' 'gtk2') options=('!libtool' '!emptydirs') install=mail-notification.install @@ -16,7 +16,6 @@ source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver} dont-update-cache.patch remove-ubuntu-special-case.patch mail-notification-5.4-evolution.patch - gmime-2.4.patch mail-notification-5.4-sasl_encode64.patch mail-notification-5.4-evolution-gtkhtml.patch mail-notification-5.4-camel_headers.patch @@ -26,12 +25,13 @@ source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver} mail-notification-5.4-kde-trayicon.patch mail-notification-5.4-evolution-3-0-support.patch mail-notification-5.4-gtk3-support.patch - mail-notification-5.4-add-fallback-icon.patch) + mail-notification-5.4-add-fallback-icon.patch + mail-notification-5.4-gmime.patch + mail-notification-5.4-libx11.patch) md5sums=('c8dc33a61251acb5474e56eab6b18f43' '6007bc30e789dab0a8282038e0335eb9' '9cadd61bbd9c324b2916ec980231e0f2' 'aa6f80820899f904c25988772f70ade9' - '447cc20f035b9cf1a391027684ce1297' '125513ed059f62469377eb0ab794dbed' 'c595a3962ab13a65be24a941e28faa9c' 'f79939f593b2e8659e302df72c2b54b1' @@ -41,7 +41,9 @@ md5sums=('c8dc33a61251acb5474e56eab6b18f43' 'c7991b831834724eddc1c6802c3e06a6' 'b370b1085ebb2814bd5d345a6d2b45ea' '1ba948759110787dd57097cff157b75a' - '09df61b4dc29c676ac81ff9054e840ac') + '09df61b4dc29c676ac81ff9054e840ac' + '0944695e9b9b30f39028f85c83c6a7e2' + 'c3f643ef16aab3b4fe9ff5b333bff41a') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -49,7 +51,6 @@ build() { patch -Np0 -i "${srcdir}/dont-update-cache.patch" patch -Np0 -i "${srcdir}/remove-ubuntu-special-case.patch" patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution.patch" - patch -Np1 -i "${srcdir}/gmime-2.4.patch" patch -Np1 -i "${srcdir}/mail-notification-5.4-sasl_encode64.patch" patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution-gtkhtml.patch" patch -Np1 -i "${srcdir}/mail-notification-5.4-camel_headers.patch" @@ -60,6 +61,8 @@ build() { patch -Np0 -i "${srcdir}/mail-notification-5.4-evolution-3-0-support.patch" patch -Np0 -i "${srcdir}/mail-notification-5.4-gtk3-support.patch" patch -Np0 -i "${srcdir}/mail-notification-5.4-add-fallback-icon.patch" + patch -Np1 -i "${srcdir}/mail-notification-5.4-gmime.patch" + patch -Np1 -i "${srcdir}/mail-notification-5.4-libx11.patch" gtk-builder-convert ui/mailbox-properties-dialog.glade ui/mailbox-properties-dialog.ui gtk-builder-convert ui/properties-dialog.glade ui/properties-dialog.ui diff --git a/extra/mail-notification/mail-notification-5.4-gmime.patch b/extra/mail-notification/mail-notification-5.4-gmime.patch new file mode 100644 index 000000000..5f516a46b --- /dev/null +++ b/extra/mail-notification/mail-notification-5.4-gmime.patch @@ -0,0 +1,63 @@ +diff -Nrbu mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c +--- mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c 2008-12-23 14:48:49.000000000 +0300 ++++ mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c 2008-12-23 14:48:28.000000000 +0300 +@@ -265,7 +265,7 @@ + mime_message = g_mime_parser_construct_message(parser); + if (mime_message) + { +- if (g_mime_message_get_header(mime_message, "X-Mozilla-Status")) ++ if (g_mime_object_get_header(mime_message, "X-Mozilla-Status")) + { + #if WITH_MOZILLA + type = MN_TYPE_MOZILLA_MAILBOX_BACKEND; +diff -Nrbu mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c +--- mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c 2008-12-23 14:48:49.000000000 +0300 ++++ mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c 2008-12-23 14:46:47.000000000 +0300 +@@ -167,7 +167,7 @@ + + const char *header; + +- header = g_mime_message_get_header(mime_message, header_name); ++ header = g_mime_object_get_header(mime_message, header_name); + if (header && mn_str_ishex(header)) + return strtol(header, NULL, 16); + else +diff -Nrbu mail-notification-5.4/jbsrc/jb.c mail-notification-5.4-OK/jbsrc/jb.c +--- mail-notification-5.4/jbsrc/jb.c 2008-05-22 19:47:04.000000000 +0400 ++++ mail-notification-5.4-OK/jbsrc/jb.c 2008-12-23 14:43:09.000000000 +0300 +@@ -166,7 +166,7 @@ + jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1"); + jb_require_packages("D-Bus", "dbus", "dbus-glib-1"); + +- jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7", ++ jb_check_packages_for_options("GMime", "gmime", "gmime-2.6", + "hotmail", + "imap", + "maildir", +diff -Nrbu mail-notification-5.4/src/mn-message-mime.c mail-notification-5.4-OK/src/mn-message-mime.c +--- mail-notification-5.4/src/mn-message-mime.c 2008-05-22 19:45:35.000000000 +0400 ++++ mail-notification-5.4-OK/src/mn-message-mime.c 2008-12-23 14:46:35.000000000 +0300 +@@ -33,12 +33,12 @@ + g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE); + + /* SpamAssassin */ +- spam = g_mime_message_get_header(mime_message, "X-Spam-Status"); ++ spam = g_mime_object_get_header(mime_message, "X-Spam-Status"); + if (spam && mn_ascii_str_case_has_prefix(spam, "yes")) + return TRUE; + + /* bogofilter */ +- spam = g_mime_message_get_header(mime_message, "X-Bogosity"); ++ spam = g_mime_object_get_header(mime_message, "X-Bogosity"); + if (spam && mn_ascii_str_case_has_prefix(spam, "yes")) + return TRUE; + +@@ -89,7 +89,7 @@ + { + const char *status; + +- status = g_mime_message_get_header(mime_message, "Status"); ++ status = g_mime_object_get_header(mime_message, "Status"); + if (status && strchr(status, 'R')) + return NULL; /* the message was read */ + else if (status && strchr(status, 'O')) diff --git a/extra/mail-notification/mail-notification-5.4-libx11.patch b/extra/mail-notification/mail-notification-5.4-libx11.patch new file mode 100644 index 000000000..bb3574fda --- /dev/null +++ b/extra/mail-notification/mail-notification-5.4-libx11.patch @@ -0,0 +1,13 @@ +Link with libX11 explicitly. + +--- mail-notification-5.4.dfsg.1.orig/jbsrc/jb.c ++++ mail-notification-5.4.dfsg.1/jbsrc/jb.c +@@ -445,6 +445,8 @@ + + jb_compile_options_add_libs(object->compile_options, "-lm"); + ++ jb_compile_options_add_libs(object->compile_options, "-lX11"); ++ + jb_compile_options_add_package(object->compile_options, "gettext"); + jb_compile_options_add_package(object->compile_options, "gnome"); + jb_compile_options_add_package(object->compile_options, "dbus"); diff --git a/extra/pyalpm/PKGBUILD b/extra/pyalpm/PKGBUILD index 40488fac2..6053b3214 100644 --- a/extra/pyalpm/PKGBUILD +++ b/extra/pyalpm/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer : Rémy Oudompheng pkgname=pyalpm -pkgver=0.4.3 +pkgver=0.5.3 pkgrel=1 pkgdesc="Libalpm bindings for Python 3" arch=('i686' 'x86_64') url="http://projects.archlinux.org/users/remy/pyalpm.git/" license=('GPL') -depends=('python>=3.2' 'pacman<3.6') +depends=('python>=3.2' 'pacman>=4') source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz") -md5sums=('396f9820eae9a40bd33d8bb366272c82') +md5sums=('a76019106d17de3a5933c773013a63d1') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 2852fe278..f82f81201 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 145072 2011-12-16 12:11:13Z tpowa $ +# $Id: PKGBUILD 146673 2012-01-16 08:01:45Z tpowa $ # Maintainer: Tobias Powalowski pkgname=qemu pkgver=1.0 -pkgrel=1 +pkgrel=2 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') +makedepends=('iasl' 'git' 'texi2html' 'perl' 'python2') 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 @@ -24,11 +24,23 @@ build() --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs make + # Use latest seabios version + # https://bugs.archlinux.org/task/27616 + cd ${srcdir}/ + git clone git://git.seabios.org/seabios.git + cd seabios + find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + make clean + make } package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install + # Use latest seabios version + # https://bugs.archlinux.org/task/27616 + cp ${srcdir}/seabios/out/bios.bin ${pkgdir}/usr/share/qemu/bios.bin + install -D -m644 ${srcdir}/65-kvm.rules \ ${pkgdir}/lib/udev/rules.d/65-kvm.rules # strip scripts directory diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD index 3c45bbd56..187d12948 100644 --- a/extra/ristretto/PKGBUILD +++ b/extra/ristretto/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146610 2012-01-14 08:51:04Z eric $ +# $Id: PKGBUILD 146669 2012-01-16 05:44:36Z eric $ # Maintainer: # Contributor: AndyRTR # Contributor: Ronald van Haren pkgname=ristretto -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 pkgdesc="A fast and lightweight picture-viewer for Xfce" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool') groups=('xfce4-goodies') install=ristretto.install source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2") -sha1sums=('1a0c4a5f0edf6594d14c7e24fb41a6127c4c1774') +sha1sums=('3ca49cd2ffa21d5a7ce3bd5dad87ff78c4898add') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/extra/sdl_image/PKGBUILD b/extra/sdl_image/PKGBUILD index 3eb670bd6..74a1b777c 100644 --- a/extra/sdl_image/PKGBUILD +++ b/extra/sdl_image/PKGBUILD @@ -1,22 +1,29 @@ -# $Id: PKGBUILD 64922 2010-01-23 10:17:20Z eric $ -# Maintainer: Allan McRae +# $Id: PKGBUILD 146687 2012-01-16 11:34:55Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae # Contributor: Tom Newsom pkgname=sdl_image -pkgver=1.2.10 -pkgrel=2 +pkgver=1.2.11 +pkgrel=1 pkgdesc="A simple library to load images of various formats as SDL surfaces" arch=('i686' 'x86_64') -license=('LGPL') +license=('custom') depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib') options=('!libtool') url="http://www.libsdl.org/projects/SDL_image/" -source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz) -md5sums=('6c06584b31559e2b59f2b982d0d1f628') +source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz) +md5sums=('1210d7a7e87ab95abebb4f3e79a0fd31') build() { - cd ${srcdir}/SDL_image-${pkgver} - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install + cd "$srcdir/SDL_image-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/SDL_image-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/sdl_mixer/PKGBUILD b/extra/sdl_mixer/PKGBUILD index f241519be..897875491 100644 --- a/extra/sdl_mixer/PKGBUILD +++ b/extra/sdl_mixer/PKGBUILD @@ -1,29 +1,38 @@ -# $Id: PKGBUILD 70367 2010-02-26 13:24:25Z allan $ -# Maintainer: Allan McRae +# $Id: PKGBUILD 146688 2012-01-16 11:35:40Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae # Contributor: Tom Newsom # Contributor: Lukas Sabota (Timidity Patch) pkgname=sdl_mixer -pkgver=1.2.11 -pkgrel=2 +pkgver=1.2.12 +pkgrel=1 pkgdesc="A simple multi-channel audio mixer" arch=('i686' 'x86_64') url="http://www.libsdl.org/projects/SDL_mixer/" -license=('LGPL' 'GPL') +license=('custom') depends=('sdl>=1.2.12' 'libvorbis' 'libmikmod' 'smpeg') +makedepends=('fluidsynth') +optdepends=('fluidsynth: MIDI software synth, replaces built-in timidity') options=('!libtool') -source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz) -md5sums=('65ada3d997fe85109191a5fb083f248c') +source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-$pkgver.tar.gz) +md5sums=('e03ff73d77a55e3572ad0217131dc4a1') build() { - cd ${srcdir}/SDL_mixer-${pkgver} + cd "$srcdir/SDL_mixer-$pkgver" - sed -e "/CONFIG_FILE_ETC/s/\/etc\/timidity.cfg/\/etc\/timidity++\/timidity.cfg/" \ - -e "/DEFAULT_PATH/s/\/etc\/timidity/\/etc\/timidity++/" \ - -e "/DEFAULT_PATH2/s/\/usr\/local\/lib\/timidity/\/usr\/lib\/timidity/" \ + sed -e "/CONFIG_FILE_ETC/s|/etc/timidity.cfg|/etc/timidity++/timidity.cfg|" \ + -e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \ + -e "/DEFAULT_PATH2/s|/usr/local/lib/timidity|/usr/lib/timidity|" \ -i timidity/config.h - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/SDL_mixer-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/sdl_net/PKGBUILD b/extra/sdl_net/PKGBUILD index 2e6f3862f..76605a50f 100644 --- a/extra/sdl_net/PKGBUILD +++ b/extra/sdl_net/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 137890 2011-09-12 09:39:20Z allan $ -# Maintainer: +# $Id: PKGBUILD 146689 2012-01-16 11:36:24Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) # Contributor: dorphell # Contributor: Tom Newsom pkgname=sdl_net -pkgver=1.2.7 -pkgrel=4 +pkgver=1.2.8 +pkgrel=1 pkgdesc="A small sample cross-platform networking library" arch=('i686' 'x86_64') +license=('custom') url="http://www.libsdl.org/projects/SDL_net/" -license=('GPL') depends=('sdl') options=('!libtool') -source=(http://www.libsdl.org/projects/SDL_net/release/SDL_net-${pkgver}.tar.gz) -md5sums=('6bd4662d1423810f3140d4da21b6d912') +source=(http://www.libsdl.org/projects/SDL_net/release/SDL_net-$pkgver.tar.gz) +md5sums=('20e64e61d65662db66c379034f11f718') build() { - cd ${srcdir}/SDL_net-${pkgver} - ./configure --prefix=/usr + cd "$srcdir/SDL_net-$pkgver" + ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/SDL_net-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/SDL_net-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/sdl_ttf/PKGBUILD b/extra/sdl_ttf/PKGBUILD index 56e56d9f0..7aa5b252b 100644 --- a/extra/sdl_ttf/PKGBUILD +++ b/extra/sdl_ttf/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 85134 2010-07-09 10:09:49Z allan $ -# Maintainer: Allan McRae +# $Id: PKGBUILD 146690 2012-01-16 11:37:07Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae # Contributor: Tom Newsom pkgname=sdl_ttf -pkgver=2.0.10 +pkgver=2.0.11 pkgrel=1 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications" arch=('i686' 'x86_64') -license=('LGPL') +license=('custom') url="http://www.libsdl.org/projects/SDL_ttf/" depends=('sdl>=1.2.12' 'freetype2') options=('!libtool') -source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${pkgver}.tar.gz) -md5sums=('814e6e17e8879254208d23b3b7e0354b') +source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz) +md5sums=('61e29bd9da8d245bc2471d1b2ce591aa') build() { - cd ${srcdir}/SDL_ttf-${pkgver} - ./configure --prefix=/usr + cd "$srcdir/SDL_ttf-$pkgver" + ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/SDL_ttf-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/SDL_ttf-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD index 164475d46..8228494e1 100644 --- a/extra/spamassassin/PKGBUILD +++ b/extra/spamassassin/PKGBUILD @@ -1,54 +1,58 @@ -# $Id: PKGBUILD 129532 2011-06-28 18:19:06Z angvp $ +# $Id: PKGBUILD 146678 2012-01-16 09:03:49Z bluewind $ # Maintainer: Dale Blount # Contributor: Manolis Tzanidakis pkgname=spamassassin pkgver=3.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="A mail filter to identify spam." -arch=(i686 x86_64) -license=(APACHE) +arch=('i686' 'x86_64') +license=('APACHE') url="http://spamassassin.apache.org" -depends=('perl>=5.14' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \ - 'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \ - 'perl-libwww' 'perl-mail-spf' \ - 'zlib' 're2c') - # perl-archive-tar perl-io-zlib) +depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl' + 'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http' + 'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay') makedepends=('razor' 'perl-dbi') -optdepends=('razor: to identify collaborately-flagged spam' - 'gnupg: gpg support, without this use --nogpg flag for sa-update' - 're2c: regexp compiler, for compiling rules with sa-compile' - 'perl-mail-dkim: DomainKeys Identified Mail (DKIM) checking') -backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \ - etc/mail/spamassassin/init.pre \ - etc/mail/spamassassin/v310.pre \ - etc/mail/spamassassin/v312.pre \ - etc/mail/spamassassin/v320.pre) -install=${pkgname}.install -options=(!emptydirs) -source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz \ - spamd.conf.d spamd) +optdepends=('razor: to identify collaborately-flagged spam') +backup=('etc/conf.d/spamd' + 'etc/mail/spamassassin/local.cf' + 'etc/mail/spamassassin/init.pre' + 'etc/mail/spamassassin/v310.pre' + 'etc/mail/spamassassin/v312.pre' + 'etc/mail/spamassassin/v320.pre' + 'etc/mail/spamassassin/v330.pre') +install="${pkgname}.install" +options=('!emptydirs') +source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz" + 'spamd.conf.d' 'spamd') md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' 'af501c6b0bb937a2775b747cc4b6d150' - '0534d3071a526a27ddc2b297afa03b04') + '57545e6877503d897db21e9a2e8bd2b9') build() { - cd ${srcdir}/Mail-SpamAssassin-${pkgver} + cd "${srcdir}/Mail-SpamAssassin-${pkgver}" # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor \ + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \ CONTACT_ADDRESS=root@localhost ENABLE_SSL=yes PERL_TAINT=no - /usr/bin/make + make } check() { - cd ${srcdir}/Mail-SpamAssassin-${pkgver} - /usr/bin/make test || true + cd "${srcdir}/Mail-SpamAssassin-${pkgver}" + + # SSLv2 is disabled by upstream so this test would fail + rm -rf t/spamd_ssl_v2.t + + # parallel tests cause lots of failures; disable for now + #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')" + + make test } package() { - cd ${srcdir}/Mail-SpamAssassin-${pkgver} - /usr/bin/make DESTDIR=${pkgdir} install + cd "${srcdir}/Mail-SpamAssassin-${pkgver}" + make DESTDIR="${pkgdir}" install - /bin/install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd - /bin/install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd + install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd" + install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd" } diff --git a/extra/spamassassin/spamd b/extra/spamassassin/spamd index 11d35f7cd..3fb97566e 100644 --- a/extra/spamassassin/spamd +++ b/extra/spamassassin/spamd @@ -6,11 +6,17 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/bin/vendor_perl/spamd` +PIDFILE=/var/run/spamd.pid +if [ -f $PIDFILE ]; then + PID=$(cat $PIDFILE) +else + PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat +fi + case "$1" in start) stat_busy "Starting spamd" - [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d ${SPAMD_OPTS} + [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d -r "$PIDFILE" ${SPAMD_OPTS} if [ $? -gt 0 ]; then stat_fail else diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 9506620d5..18feb7958 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 138355 2011-09-20 15:41:13Z ibiru $ +# $Id: PKGBUILD 146713 2012-01-16 19:49:27Z dreisner $ # Maintainer: Jan de Groot pkgname=totem-plparser pkgver=2.32.6 -pkgrel=1 +pkgrel=3 url="http://www.hadess.net/totem.php3" pkgdesc="Totem playlist parser library" license=('LGPL') arch=(i686 x86_64) -depends=('gmime' 'libsoup-gnome') -makedepends=('intltool' 'pkgconfig' 'gobject-introspection') +depends=('gmime' 'libsoup-gnome' 'libarchive') +makedepends=('intltool' 'gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-$pkgver.tar.xz) sha256sums=('8e6ccef547f1ad311474a975032d2482e621550ee3d4d22c725cdc6b496e4874') build() { - cd "${srcdir}/totem-pl-parser-${pkgver}" + cd "$srcdir/totem-pl-parser-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -24,6 +24,6 @@ build() { } package(){ - cd "${srcdir}/totem-pl-parser-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/totem-pl-parser-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 236d8ba93..24ca456e6 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146636 2012-01-15 06:31:34Z eric $ +# $Id: PKGBUILD 146756 2012-01-17 03:35:55Z eric $ # Contributor: Jan "heftig" Steffens # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths @@ -19,7 +19,7 @@ source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz{,.sig} pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872 vimrc archlinux.vim gvim.desktop) sha1sums=('99498cb48c0c720ae9972a6cd33d4926bdf733b7' - '72e9e1eff158e8acceeeb96279085214cbefb3ac' + 'ad14ce56f99ae1a86c96c5a5d0f44e48ad18a00e' '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' '3494baf53a63581ba69f86a81293640ff681c5c5' '25dd3c2ce436e73a367c8f73b68f7f6889682437' diff --git a/extra/xfce4-netload-plugin/PKGBUILD b/extra/xfce4-netload-plugin/PKGBUILD index 363df6eb7..664a28a85 100644 --- a/extra/xfce4-netload-plugin/PKGBUILD +++ b/extra/xfce4-netload-plugin/PKGBUILD @@ -1,34 +1,33 @@ -# $Id: PKGBUILD 104754 2011-01-04 20:48:54Z andyrtr $ +# $Id: PKGBUILD 146671 2012-01-16 06:54:09Z eric $ # Maintainer: aurelien # Contributor: Aurelien Foret pkgname=xfce4-netload-plugin -pkgver=1.0.0 +pkgver=1.1.0 pkgrel=1 pkgdesc="A netload plugin for the Xfce panel" -arch=(i686 x86_64) -license=('GPL2') +arch=('i686' 'x86_64') +license=('GPL') url="http://xfce-goodies.berlios.de/" groups=('xfce4-goodies') -depends=('xfce4-panel>=4.7.4' 'libxfcegui4' 'hicolor-icon-theme') +depends=('xfce4-panel') makedepends=('intltool') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2) -md5sums=('cab53e8cc2b9bfdf7ffd2230916ca3df') +install=xfce4-netload-plugin.install +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('8029daacf1602275c75ab07d1e2cccea0993caab') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ - --disable-static \ --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD index 628a19404..1a4e74b36 100644 --- a/extra/xmms/PKGBUILD +++ b/extra/xmms/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 134338 2011-08-02 23:29:16Z eric $ +# $Id: PKGBUILD 146759 2012-01-17 03:41:24Z eric $ # Maintainer: Eric Bélanger pkgname=xmms @@ -50,10 +50,10 @@ build() { patch -p1 < ../xmms-1.2.10-fonts.patch patch -p1 < ../xmms-1.2.11-CVE-2007-0653.0654.patch - if [ "$CARCH" == "x86_64" ]; then - SIMDOPT="--disable-simd" - else - SIMDOPT="--enable-simd" + if [ "$CARCH" == "i686" ]; then + SIMDOPT="--enable-simd" + else + SIMDOPT="--disable-simd" fi ./configure --prefix=/usr --mandir=/usr/share/man $SIMDOPT make -- cgit v1.2.3-54-g00ecf