From 0f02baec6afdab918d86a226ee9a984482b5a534 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 17 Apr 2013 00:05:54 -0700 Subject: Wed Apr 17 00:05:54 PDT 2013 --- extra/accountsservice/PKGBUILD | 6 +- extra/fakechroot/PKGBUILD | 12 ++- extra/fakechroot/fakechroot.install | 3 - extra/freeglut/PKGBUILD | 10 +-- extra/help2man/PKGBUILD | 6 +- extra/json-glib/PKGBUILD | 8 +- extra/lensfun/PKGBUILD | 14 ++-- extra/liblqr/PKGBUILD | 8 +- extra/libmp3splt/PKGBUILD | 12 ++- extra/libnl1/PKGBUILD | 18 ++--- extra/libnl1/fix-compilation.patch | 10 --- extra/libofx/PKGBUILD | 10 +-- extra/libofx/libofx-gcc47.patch | 11 --- extra/mp3splt/PKGBUILD | 6 +- extra/perl-ev/PKGBUILD | 41 ++++------ extra/perl-html-parser/PKGBUILD | 14 ++-- extra/perl-libintl-perl/PKGBUILD | 10 +-- extra/python-numpy/PKGBUILD | 13 +-- .../numpy-1.6.2-python-3.3-build-fix.patch | 92 ---------------------- extra/qemu/PKGBUILD | 15 ++-- extra/sharutils/PKGBUILD | 6 +- extra/wayland/PKGBUILD | 6 +- 22 files changed, 110 insertions(+), 221 deletions(-) delete mode 100644 extra/libnl1/fix-compilation.patch delete mode 100644 extra/libofx/libofx-gcc47.patch delete mode 100644 extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch (limited to 'extra') diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 0a5078c63..7a3ed0fbb 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173212 2012-12-13 09:39:25Z heftig $ +# $Id: PKGBUILD 182980 2013-04-16 15:48:01Z heftig $ # Maintainer: Ionut Biru pkgname=accountsservice -pkgver=0.6.30 +pkgver=0.6.31 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'systemd') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch) -md5sums=('8955b53b0ac9036b3f6a91202ff954f1' +md5sums=('d594f1da95c6a83c0463695ca31815b2' '1d5cf127e5aac407fe7c37b2f4fd503c') build() { diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD index 12587fced..7fdc2b3a6 100644 --- a/extra/fakechroot/PKGBUILD +++ b/extra/fakechroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144961 2011-12-12 08:42:45Z allan $ +# $Id: PKGBUILD 182910 2013-04-16 04:51:02Z allan $ # Maintainer : Allan McRae # Contributor: Aaron Griffin pkgname=fakechroot pkgver=2.16 -pkgrel=1 +pkgrel=2 pkgdesc="Gives a fake chroot environment" arch=('i686' 'x86_64') url="https://github.com/fakechroot/fakechroot/wiki" @@ -14,6 +14,14 @@ install=fakechroot.install source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz) md5sums=('3ea5efb76664e787450e0cfcefc1b807') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # https://github.com/fakechroot/fakechroot/issues/10 + sed -i "s#usr/sbin/chroot#usr/bin/chroot#" test/testtree.sh test/t/chroot.t +} + build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot --sysconfdir=/etc diff --git a/extra/fakechroot/fakechroot.install b/extra/fakechroot/fakechroot.install index 2b5eb2100..61c5b73e5 100644 --- a/extra/fakechroot/fakechroot.install +++ b/extra/fakechroot/fakechroot.install @@ -3,9 +3,6 @@ post_install() { } post_upgrade() { - if [ "$(vercmp $2 2.9-2)" -lt 0 ]; then - sed -i -e '/\/usr\/lib\/libfakechroot/d' etc/ld.so.conf - fi sbin/ldconfig -r . } diff --git a/extra/freeglut/PKGBUILD b/extra/freeglut/PKGBUILD index a0196905e..a1bd8e76c 100644 --- a/extra/freeglut/PKGBUILD +++ b/extra/freeglut/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168622 2012-10-13 15:13:40Z andyrtr $ +# $Id: PKGBUILD 182877 2013-04-15 22:13:33Z heftig $ # Maintainer: Eric Belanger # Contributor: Tom Newsom pkgname=freeglut -pkgver=2.8.0 -pkgrel=2 +pkgver=2.8.1 +pkgrel=1 pkgdesc="Provides functionality for small OpenGL programs" arch=('i686' 'x86_64') url="http://freeglut.sourceforge.net/" @@ -16,8 +16,8 @@ provides=('glut') conflicts=('glut') options=('!libtool') source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz) -md5sums=('5db8651af306bc403fbfd36934a20e1d') -sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1') +md5sums=('918ffbddcffbac83c218bc52355b6d5a') +sha1sums=('7330b622481e2226c0c9f6d2e72febe96b03f9c4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index d09a679d3..0068ad123 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176065 2013-01-27 09:20:55Z giovanni $ +# $Id: PKGBUILD 182988 2013-04-16 16:24:02Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Paul Mattal pkgname=help2man -pkgver=1.41.1 +pkgver=1.41.2 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('perl-locale-gettext') install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('4485615cd699a78eb42444324546942a') +md5sums=('48cb7fa1d9cca2ebea1844694668c8a8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD index 26e5b1a94..974018af5 100644 --- a/extra/json-glib/PKGBUILD +++ b/extra/json-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169945 2012-10-30 22:46:18Z heftig $ +# $Id: PKGBUILD 183001 2013-04-16 19:33:50Z heftig $ # Maintainer: Ionut Biru pkgname=json-glib -pkgver=0.15.2 +pkgver=0.16.0 pkgrel=1 pkgdesc="JSON library built on GLib" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ license=('GPL') depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.15/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('e4a3fd2f399e4c148aad608e6ed0a94095f2ddde9dd12f5aa2f072ecae5c1d37') build(){ cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/lensfun/PKGBUILD b/extra/lensfun/PKGBUILD index 425ac426b..a3a2cedd0 100644 --- a/extra/lensfun/PKGBUILD +++ b/extra/lensfun/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162692 2012-06-28 10:33:24Z tpowa $ +# $Id: PKGBUILD 182923 2013-04-16 07:16:05Z tpowa $ # Maintainer: Tobias Powalowski pkgname=lensfun -pkgver=0.2.6 +pkgver=0.2.7 pkgrel=1 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database" arch=(i686 x86_64) @@ -12,10 +12,14 @@ depends=('glibc' 'glib2') makedepends=('python2' 'libpng' 'doxygen') source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure - ./configure \ +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ --prefix=/usr \ --libdir=/usr/lib make all @@ -25,4 +29,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make INSTALL_PREFIX="$pkgdir" install } -md5sums=('740e4749db04da0a597630dd6339b966') +md5sums=('6061cc2d00a42d3e62512878426fc841') diff --git a/extra/liblqr/PKGBUILD b/extra/liblqr/PKGBUILD index 06d08637f..13a87ff91 100644 --- a/extra/liblqr/PKGBUILD +++ b/extra/liblqr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150613 2012-02-18 22:56:34Z pierre $ +# $Id: PKGBUILD 182915 2013-04-16 05:57:47Z eric $ # Maintainer: Tobias Powalowski pkgname=liblqr -pkgver=0.4.1 -pkgrel=3 +pkgver=0.4.2 +pkgrel=1 pkgdesc="A seam-carving C/C++ library called Liquid Rescale" arch=('i686' 'x86_64') url="http://liblqr.wikidot.com/" @@ -12,7 +12,7 @@ depends=('glib2') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=("http://liblqr.wikidot.com/local--files/en:download-page/$pkgname-1-$pkgver.tar.bz2") -md5sums=('0e24ed3c9fcdcb111062640764d7b87a') +md5sums=('915643d993da97e10665d48c0bf8f3d0') build() { cd "$srcdir/$pkgname-1-$pkgver" diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD index c5a01b5e3..318f80c71 100644 --- a/extra/libmp3splt/PKGBUILD +++ b/extra/libmp3splt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179313 2013-03-05 11:12:56Z tpowa $ +# $Id: PKGBUILD 182921 2013-04-16 07:10:02Z tpowa $ # Maintainer: Tobias Powalowski pkgname=libmp3splt -pkgver=0.8.1a +pkgver=0.8.2 pkgrel=1 pkgdesc="Library for splitting mp3 and ogg files without decoding" arch=('i686' 'x86_64') @@ -13,10 +13,14 @@ makedepends=('libtool') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz") -build() { +prepare() { cd $srcdir/$pkgname-$pkgver libtoolize --copy --force ./autogen.sh +} + +build() { + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr make } @@ -25,4 +29,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('5889dad7fc9443cd61987309622aa382') +md5sums=('562b39b6788f8128b7185b83f14ca516') diff --git a/extra/libnl1/PKGBUILD b/extra/libnl1/PKGBUILD index 6d35c216d..6130b5cde 100644 --- a/extra/libnl1/PKGBUILD +++ b/extra/libnl1/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 150908 2012-02-23 13:56:22Z heftig $ +# $Id: PKGBUILD 182913 2013-04-16 05:29:35Z eric $ # Maintainer: Jan de Groot # Contributor: William Rea pkgname=libnl1 -pkgver=1.1 +pkgver=1.1.3 pkgrel=1 pkgdesc="Library for applications dealing with netlink sockets (Legacy version)" arch=('i686' 'x86_64') url="http://www.infradead.org/~tgr/libnl/" license=('GPL') depends=('glibc') -source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz" - 'fix-compilation.patch') -md5sums=('ae970ccd9144e132b68664f98e7ceeb1' - 'e1f5e82c8aa1b3ad025c7b588178de1e') +options=('!staticlibs') +source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz") +md5sums=('4e4fa2197f4412b20c2952325d674b12') build() { - cd ${srcdir}/libnl-${pkgver} - patch -Np1 -i ${srcdir}/fix-compilation.patch + cd libnl-${pkgver} ./configure --prefix=/usr make } package() { - cd ${srcdir}/libnl-${pkgver} - make DESTDIR=${pkgdir} install + cd libnl-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/libnl1/fix-compilation.patch b/extra/libnl1/fix-compilation.patch deleted file mode 100644 index 891562a39..000000000 --- a/extra/libnl1/fix-compilation.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/include/netlink-local.h 2009-06-26 11:15:33.186011844 +0200 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD index 7ee36f258..85db72147 100644 --- a/extra/libofx/PKGBUILD +++ b/extra/libofx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165144 2012-08-11 18:49:23Z eric $ +# $Id: PKGBUILD 182911 2013-04-16 04:51:05Z eric $ # Maintainer: Aaron Griffin pkgbase=libofx pkgname=('libofx' 'libofx-doc') -pkgver=0.9.5 +pkgver=0.9.7 pkgrel=1 pkgdesc="API for the OFX banking standard" arch=('i686' 'x86_64') @@ -11,13 +11,11 @@ url="http://libofx.sourceforge.net" license=('GPL') depends=('opensp' 'curl' 'libxml++') checkdepends=('gnupg') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz libofx-gcc47.patch) -sha1sums=('7e5245d68a0f3f7efad2fd809b2afbbff6ba0e73' - '6c327e24543cb8ba901bfb204343a85c68264654') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('9c6ac208dcc6a89525281827c3ab56c08923a02c') build() { cd "$srcdir/$pkgbase-$pkgver" - patch -p1 -i "$srcdir/libofx-gcc47.patch" ./configure --prefix=/usr make } diff --git a/extra/libofx/libofx-gcc47.patch b/extra/libofx/libofx-gcc47.patch deleted file mode 100644 index 899fe09e0..000000000 --- a/extra/libofx/libofx-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff ---- libofx-0.9.4.orig/ofxconnect/ofxpartner.cpp 2011-03-30 22:30:50.000000000 +0000 -+++ libofx-0.9.4/ofxconnect/ofxpartner.cpp 2012-04-17 06:08:38.711940892 +0000 -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - using std::string; - using std::vector; diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD index 35e33f49c..3e2e12a23 100644 --- a/extra/mp3splt/PKGBUILD +++ b/extra/mp3splt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179311 2013-03-05 11:12:31Z tpowa $ +# $Id: PKGBUILD 182919 2013-04-16 07:09:21Z tpowa $ # Maintainer: Tobias Powalowski pkgname=mp3splt -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Commandline tool for splitting mp3 and ogg files without decoding" @@ -22,4 +22,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('c0c66be0058cbc26ed52cfd2b50659fd') +md5sums=('cd8eb9f866dddb934357b7cdefb5a370') diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD index 604dac065..5f968227e 100644 --- a/extra/perl-ev/PKGBUILD +++ b/extra/perl-ev/PKGBUILD @@ -1,9 +1,8 @@ -# Packager: Justin Davis (juster) -# $Id: PKGBUILD 160527 2012-06-02 10:27:33Z bluewind $ +# $Id: PKGBUILD 182901 2013-04-16 04:01:09Z eric $ pkgname=perl-ev -pkgver=4.11 -pkgrel=2 +pkgver=4.15 +pkgrel=1 pkgdesc='perl interface to libev, a high performance full-featured event loop' arch=(i686 x86_64) license=(PerlArtistic GPL) @@ -11,36 +10,24 @@ options=(!emptydirs) depends=(perl-common-sense) url=https://metacpan.org/release/EV source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/EV-$pkgver.tar.gz") -md5sums=(405c6d74f9dff12918b12560c1a57877) -sha512sums=(6aca3eeb617a313de7947b760558c12ed85af4fa8efd5bb4fd8bc2f271b4556312989aebf77cda4e212fd3b1351c268624aeaf2b1cf700507ff46c0c9dcc9db8) -_dir="$srcdir/EV-$pkgver" +md5sums=('546d10fb5901f2af937e53b41a92b2bb') -build() -( - cd "$_dir" +build() { + cd EV-$pkgver export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps unset PERL5LIB PERL_MM_OPT - /usr/bin/perl Makefile.PL + perl Makefile.PL make -) +} -check() -( - cd "$_dir" +check() { + cd EV-$pkgver export PERL_MM_USE_DEFAULT=1 unset PERL5LIB make test -) +} -package() -( - cd "$_dir" +package() { + cd EV-$pkgver make install INSTALLDIRS=vendor DESTDIR="$pkgdir" - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -) - -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: +} diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index b30443f40..1469dab58 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 160535 2012-06-02 10:27:46Z bluewind $ +# $Id: PKGBUILD 182897 2013-04-16 03:24:08Z eric $ # Maintainer: kevin # Contributor: Manolis Tzanidakis # Contributor: Firmicus pkgname=perl-html-parser _realname=HTML-Parser -pkgver=3.69 -pkgrel=2 +pkgver=3.70 +pkgrel=1 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-html-tagset' 'perl>=5.12.1') -options=(!emptydirs) +depends=('perl-html-tagset' 'perl') +checkdepends=('perl-test-pod') +options=('!emptydirs') source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('d22cc6468ce670a56034be907e4e7c54') +md5sums=('efe7699f5ece3a230d730a3682359c08') build() { cd "${srcdir}/${_realname}-${pkgver}" @@ -32,4 +33,3 @@ package() { cd "${srcdir}/${_realname}-${pkgver}" make install DESTDIR="${pkgdir}" } -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD index 6554a2524..add6c8a44 100644 --- a/extra/perl-libintl-perl/PKGBUILD +++ b/extra/perl-libintl-perl/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 160537 2012-06-02 10:27:49Z bluewind $ +# $Id: PKGBUILD 182899 2013-04-16 03:42:32Z eric $ # Maintainer: kevin # Contributor: Tobias Kieslich pkgname=perl-libintl-perl _realname=libintl-perl -pkgver=1.20 -pkgrel=4 +pkgver=1.23 +pkgrel=1 pkgdesc="Perl Module: Localization support" arch=('i686' 'x86_64') license=('LGPL') url="http://search.cpan.org/dist/${_realname}/" depends=('gettext' 'perl') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/G/GU/GUIDO/${_realname}-$pkgver.tar.gz) -md5sums=('cb36f58a7d2e15974f25b35381548b1b') +md5sums=('2e79dc842af1c9efc14fbe6664dc89bf') build() { cd "${srcdir}/${_realname}-$pkgver" diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index 5207bbb34..e8f9530f6 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 179941 2013-03-13 02:09:45Z jgc $ +# $Id: PKGBUILD 182931 2013-04-16 08:33:21Z jgc $ # Maintainer: Jan de Groot # Contributor: Douglas Soares de Andrade # Contributor: Angel 'angvp' Velasquez pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') -pkgver=1.7.0 -pkgrel=2 +pkgver=1.7.1 +pkgrel=1 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64') license=('custom') url="http://www.numpy.org/" makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) -md5sums=('4fa54e40b6a243416f0248123b6ec332') +md5sums=('0ab72b3b83528a7ae79c6df9042d61c6') build() { cd "${srcdir}" @@ -62,6 +62,7 @@ package_python-numpy() { conflicts=('python3-numpy') _pyver=3.3 + _pyinc=3.3m export ATLAS=None export LDFLAGS="$LDFLAGS -shared" @@ -72,6 +73,6 @@ package_python-numpy() { install -m755 -d "${pkgdir}/usr/share/licenses/python-numpy" install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python-numpy/" - install -m755 -d "${pkgdir}/usr/include/python${_pyver}" - ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyver}/numpy" + install -m755 -d "${pkgdir}/usr/include/python${_pyinc}" + ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyinc}/numpy" } diff --git a/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch b/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch deleted file mode 100644 index 072afbc0e..000000000 --- a/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c -index 00c71f9..0afdc17 100644 ---- a/numpy/core/src/multiarray/scalarapi.c -+++ b/numpy/core/src/multiarray/scalarapi.c -@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - itemsize = (((itemsize - 1) >> 2) + 1) << 2; - } - } -+#if PY_VERSION_HEX >= 0x03030000 -+ if (type_num == NPY_UNICODE) { -+ PyObject *u, *args; -+ char *buffer; -+ if (swap) { -+ buffer = malloc(itemsize); -+ if (buffer == NULL) { -+ PyErr_NoMemory(); -+ return NULL; -+ } -+ memcpy(buffer, data, itemsize); -+ byte_swap_vector(buffer, itemsize >> 2, 4); -+ } else { -+ buffer = data; -+ } -+ u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer, -+ itemsize >> 2); -+ if (swap) { -+ free(buffer); -+ } -+ if (u == NULL) { -+ return NULL; -+ } -+ args = Py_BuildValue("(O)", u); -+ if (args == NULL) { -+ Py_DECREF(u); -+ return NULL; -+ } -+ obj = type->tp_new(type, args, NULL); -+ Py_DECREF(u); -+ Py_DECREF(args); -+ return obj; -+ } -+#endif - if (type->tp_itemsize != 0) { - /* String type */ - obj = type->tp_alloc(type, itemsize); -@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - memcpy(destptr, data, itemsize); - return obj; - } -+#if PY_VERSION_HEX < 0x03030000 - else if (type_num == PyArray_UNICODE) { - /* tp_alloc inherited from Python PyBaseObject_Type */ - PyUnicodeObject *uni = (PyUnicodeObject*)obj; -@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - #endif - return obj; - } -+#endif // PY_VERSION_HEX < 0x03030000 - else { - PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj; - vobj->base = NULL; -diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src -index e547071..12745d7 100644 ---- a/numpy/core/src/multiarray/scalartypes.c.src -+++ b/numpy/core/src/multiarray/scalartypes.c.src -@@ -2592,7 +2592,11 @@ finish: - *((npy_@name@ *)dest) = *((npy_@name@ *)src); - #elif @default@ == 1 /* unicode and strings */ - if (itemsize == 0) { /* unicode */ -+#if PY_VERSION_HEX >= 0x03030000 -+ itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj); -+#else - itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE); -+#endif - } - memcpy(dest, src, itemsize); - /* @default@ == 2 won't get here */ -diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c -index c4147ef..119056c 100644 ---- a/numpy/core/src/multiarray/methods.c -+++ b/numpy/core/src/multiarray/methods.c -@@ -1587,7 +1587,7 @@ array_setstate(PyArrayObject *self, PyObject *args) - if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) { - int swap=!PyArray_ISNOTSWAPPED(self); - self->data = datastr; -- if (!_IsAligned(self) || swap) { -+ if (!_IsAligned(self) || swap || (len <= 1000)) { - intp num = PyArray_NBYTES(self); - self->data = PyDataMem_NEW(num); - if (self->data == NULL) { --- -1.7.12.3 diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 510c68258..df94d3eba 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179325 2013-03-05 14:58:22Z tpowa $ +# $Id: PKGBUILD 182925 2013-04-16 07:40:13Z tpowa $ # Maintainer: Tobias Powalowski pkgname=qemu -pkgver=1.4.0 -pkgrel=2 +pkgver=1.4.1 +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') @@ -17,13 +17,18 @@ source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 replaces=('qemu-kvm') options=(!strip) -build() +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld # fix building with tex version 5.0 # https://bugs.launchpad.net/qemu/+bug/1130533 patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch +} + +build () +{ + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ @@ -52,6 +57,6 @@ package() { done } -md5sums=('78f13b774814b6b7ebcaf4f9b9204318' +md5sums=('eb2d696956324722b5ecfa46e41f9a75' 'b431782f310bfc6af4ef21a8068f866b' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD index 735426b07..42a729254 100644 --- a/extra/sharutils/PKGBUILD +++ b/extra/sharutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181164 2013-04-02 02:28:47Z bisson $ +# $Id: PKGBUILD 182986 2013-04-16 16:21:08Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Kevin Piche # Contributor: Tom Newsom pkgname=sharutils -pkgver=4.13.4 +pkgver=4.13.5 pkgrel=1 pkgdesc='Makes so-called shell archives out of many files' url='http://www.gnu.org/software/sharutils/' @@ -12,7 +12,7 @@ license=('GPL') arch=('i686' 'x86_64') depends=('perl' 'gettext' 'texinfo') source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('9becdd47dd03a6e139f29c9a2ab311a541409553') +sha1sums=('8c2e352860994332fa03f2a6c92d789097fb2e52') install=install diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index d1596f352..2369b7f48 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180543 2013-03-23 00:31:47Z tomegun $ +# $Id: PKGBUILD 182997 2013-04-16 18:42:01Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb pkgname=wayland -pkgver=1.0.6 +pkgver=1.1.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64') @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('936a2590aea69fa3c0cf234d54b9137c') +md5sums=('d2dc9398a83692cafc16eba6e45f85d8') -- cgit v1.2.3-54-g00ecf