From def73efccccb818d214cb818e8b4de8385444a43 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Fri, 28 Mar 2014 03:35:53 +0000 Subject: Fri Mar 28 03:32:00 UTC 2014 --- extra/brltty/PKGBUILD | 24 +++--- extra/dbus-python/PKGBUILD | 4 +- extra/gedit/PKGBUILD | 4 +- extra/gnome-music/PKGBUILD | 4 +- extra/guile/PKGBUILD | 31 +++---- extra/ibus/PKGBUILD | 4 +- extra/kdebindings-python/PKGBUILD | 16 ++-- extra/kdebindings-python/sip-4.15.5.patch | 12 +++ extra/kdesdk-kate/PKGBUILD | 4 +- extra/kdevelop-python/PKGBUILD | 16 ++-- extra/liblouis/PKGBUILD | 4 +- extra/libpeas/PKGBUILD | 4 +- extra/libreoffice/PKGBUILD | 10 +-- extra/pyalpm/PKGBUILD | 4 +- extra/pycrypto/PKGBUILD | 10 +-- extra/pygobject/PKGBUILD | 17 ++-- extra/pygobject2/PKGBUILD | 4 +- extra/pyqt4/PKGBUILD | 14 ++-- extra/pyqt5/PKGBUILD | 6 +- extra/python-cairo/PKGBUILD | 17 ++-- .../pycairo-1.10.0-waf-python3.4.patch | Bin 0 -> 160375 bytes extra/python-cffi/PKGBUILD | 4 +- extra/python-cryptography/PKGBUILD | 4 +- extra/python-lxml/PKGBUILD | 4 +- extra/python-markupsafe/PKGBUILD | 4 +- extra/python-numpy/PKGBUILD | 8 +- extra/python-pycurl/PKGBUILD | 4 +- extra/python-urwid/PKGBUILD | 4 +- extra/python-zope-interface/PKGBUILD | 6 +- extra/python/PKGBUILD | 30 ++++--- extra/python/PKGBUILD.3.4 | 89 --------------------- extra/qscintilla/PKGBUILD | 10 +-- extra/r/PKGBUILD | 10 +-- extra/r/r.desktop | 2 +- extra/sip/PKGBUILD | 12 +-- extra/snarf/PKGBUILD | 13 +-- extra/speech-dispatcher/PKGBUILD | 4 +- extra/sqlite/PKGBUILD | 10 +-- extra/vde2/PKGBUILD | 4 +- 39 files changed, 190 insertions(+), 241 deletions(-) create mode 100644 extra/kdebindings-python/sip-4.15.5.patch create mode 100644 extra/python-cairo/pycairo-1.10.0-waf-python3.4.patch delete mode 100644 extra/python/PKGBUILD.3.4 (limited to 'extra') diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index e3e101a2e..cb6373270 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 203074 2014-01-03 11:03:11Z tomegun $ +# $Id: PKGBUILD 208810 2014-03-27 14:42:59Z fyan $ # Maintainer: Tom Gundersen # Contributor: Jan de Groot # Contributor: Giovanni Scafora pkgname=brltty pkgver=4.5 -pkgrel=6 +pkgrel=7 pkgdesc="Braille display driver for Linux/Unix" arch=(i686 x86_64) url="http://mielke.cc/brltty" license=(GPL LGPL) depends=(libxaw gpm icu tcl cython) -makedepends=(bluez-libs at-spi2-core) +makedepends=(bluez-libs at-spi2-core tcl) optdepends=('bluez-libs: bluetooth support' - 'at-spi2-core: X11/GNOME Apps accessibility' - 'atk: ATK bridge for X11/GNOME accessibility') + 'at-spi2-core: X11/GNOME Apps accessibility' + 'atk: ATK bridge for X11/GNOME accessibility') backup=(etc/brltty.conf) options=('!emptydirs') install=brltty.install -source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz +source=(https://github.com/brltty/brltty/archive/${pkgname^^}-$pkgver.tar.gz brltty.service) +prepare() { + cd $pkgname-${pkgname^^}-$pkgver + ./autogen +} + build() { - cd $pkgname-$pkgver + cd $pkgname-${pkgname^^}-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --mandir=/usr/share/man \ --with-tables-directory=/usr/share/brltty \ @@ -35,10 +40,11 @@ build() { } package() { - cd $pkgname-$pkgver + cd $pkgname-${pkgname^^}-$pkgver make INSTALL_ROOT="$pkgdir" install install -Dm644 Documents/brltty.conf "$pkgdir/etc/brltty.conf" install -Dm644 ../brltty.service "$pkgdir/usr/lib/systemd/system/brltty.service" } -md5sums=('7b52fa7746fed41ed344a1f75ce55951' + +md5sums=('c21cfd64fd84b21739383e63e1ec81b3' '0cad54bb5470122535f5e3a11d5ca123') diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD index 98fc6a508..59e8ea589 100644 --- a/extra/dbus-python/PKGBUILD +++ b/extra/dbus-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204499 2014-01-21 10:11:01Z jgc $ +# $Id: PKGBUILD 208811 2014-03-27 14:43:00Z fyan $ # Maintainer: Jan de Groot pkgbase=dbus-python pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common') pkgver=1.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings for DBUS" arch=('i686' 'x86_64') license=('GPL' 'LGPL') diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 742ccf644..16e2b68ea 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204519 2014-01-22 00:27:30Z heftig $ +# $Id: PKGBUILD 208814 2014-03-27 14:43:02Z fyan $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gedit pkgver=3.10.4 -pkgrel=1 +pkgrel=2 pkgdesc="A text editor for GNOME" arch=(i686 x86_64) license=(GPL) diff --git a/extra/gnome-music/PKGBUILD b/extra/gnome-music/PKGBUILD index ea633a08d..5945d0b62 100644 --- a/extra/gnome-music/PKGBUILD +++ b/extra/gnome-music/PKGBUILD @@ -2,12 +2,12 @@ pkgname=gnome-music pkgver=3.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="Music player and management application" arch=(i686 x86_64) license=('GPL') url="https://wiki.gnome.org/Apps/Music" -depends=(grilo grilo-plugins tracker python gobject-introspection libdmapsharing python-dbus dbus-glib gnome-icon-theme gnome-themes-standard gtk3 gvfs tracker python-gobject) +depends=(grilo grilo-plugins tracker python gobject-introspection libdmapsharing python-dbus dbus-glib gnome-icon-theme gnome-themes-standard gtk3 gvfs python-gobject) makedepends=(intltool) groups=('gnome-extra') install=gnome-music.install diff --git a/extra/guile/PKGBUILD b/extra/guile/PKGBUILD index 22c96e612..2dcc27be4 100644 --- a/extra/guile/PKGBUILD +++ b/extra/guile/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 198089 2013-10-30 12:44:09Z allan $ +# $Id: PKGBUILD 208804 2014-03-27 09:45:06Z bpiotrowski $ +# Maintainer: Jan de Groot +# Maintainer: Bartłomiej Piotrowski # Contributor: Tom Newsom -# Maintainer: Jan de Groot pkgname=guile -pkgver=2.0.9 +pkgver=2.0.11 pkgrel=1 -pkgdesc="a portable, embeddable Scheme implementation written in C" -url="http://www.gnu.org/software/guile/" -arch=(i686 x86_64) +pkgdesc='Portable, embeddable Scheme implementation written in C' +url='http://www.gnu.org/software/guile/' +arch=('i686' 'x86_64') license=('GPL') -depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo' 'libunistring' 'gc' 'libffi') +depends=('gmp' 'libltdl' 'ncurses' 'texinfo' 'libunistring' 'gc' 'libffi') install=guile.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('531839c3fe887382ca9d4774db544d34') +source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('e532c68c6f17822561e3001136635ddd') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr \ - --disable-static \ - --disable-error-on-warning - make LDFLAGS+="-lpthread" + --disable-static \ + --disable-error-on-warning + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make -C $pkgname-$pkgver DESTDIR="$pkgdir" install + rm "$pkgdir"/usr/lib/libguile-2.0.so.22.7.2-gdb.scm } diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index fb0f71693..1d70918de 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 207688 2014-03-13 13:24:32Z fyan $ +# $Id: PKGBUILD 208816 2014-03-27 14:43:04Z fyan $ # Maintainer: Felix Yan pkgbase=ibus pkgname=(ibus libibus) pkgver=1.5.6 -pkgrel=1 +pkgrel=2 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64') url="http://ibus.googlecode.com" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 324727a91..36c5ec264 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206944 2014-03-06 12:05:57Z andrea $ +# $Id: PKGBUILD 208817 2014-03-27 14:43:05Z fyan $ # Maintainer: Andrea Scarpino pkgbase=kdebindings-python @@ -6,20 +6,24 @@ pkgname=('kdebindings-python' 'kdebindings-python2' 'kdebindings-python-common') pkgver=4.12.3 -pkgrel=1 +pkgrel=2 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4' 'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') -source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('6e5cab25aee404469d6875d067bf2ad3382e4a1a') +source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz" + sip-4.15.5.patch) +sha1sums=('6e5cab25aee404469d6875d067bf2ad3382e4a1a' + 'bffd9f642ad10fb3a49c42e4b457b2b90665d641') prepare() { mkdir build cd pykde4-${pkgver} + # Fix build with sip 4.15.5 upstream: https://bugs.kde.org/show_bug.cgi?id=332223 + patch -p1 -i "$srcdir/sip-4.15.5.patch" } build() { @@ -31,7 +35,7 @@ build() { -DKDE4_BUILD_TESTS=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0 \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.4m.so.1.0 \ -DPYKDEUIC4_ALTINSTALL=TRUE make cd .. @@ -58,7 +62,7 @@ package_kdebindings-python() { rm -r "${pkgdir}"/usr/share/apps/pykde4/examples rm -r "${pkgdir}"/usr/share/sip/PyKDE4 - ln -s /usr/bin/pykdeuic4-3.3 "${pkgdir}"/usr/bin/pykdeuic4 + ln -s /usr/bin/pykdeuic4-3.4 "${pkgdir}"/usr/bin/pykdeuic4 } package_kdebindings-python2() { diff --git a/extra/kdebindings-python/sip-4.15.5.patch b/extra/kdebindings-python/sip-4.15.5.patch new file mode 100644 index 000000000..a3e9dad48 --- /dev/null +++ b/extra/kdebindings-python/sip-4.15.5.patch @@ -0,0 +1,12 @@ +diff -up pykde4-4.12.3/sip/phonon/backendcapabilities.sip.sip4_15_5 pykde4-4.12.3/sip/phonon/backendcapabilities.sip +--- pykde4-4.12.3/sip/phonon/backendcapabilities.sip.sip4_15_5 2014-01-18 13:18:35.000000000 -0600 ++++ pykde4-4.12.3/sip/phonon/backendcapabilities.sip 2014-03-16 16:56:36.865132943 -0500 +@@ -26,7 +26,7 @@ namespace Phonon + { + namespace BackendCapabilities + { +-class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/ ++class Notifier : QObject /NoDefaultCtors,PyQtNoQMetaObject/ + { + + signals: diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 209374b37..e39531afc 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206945 2014-03-06 12:05:58Z andrea $ +# $Id: PKGBUILD 208818 2014-03-27 14:43:06Z fyan $ # Maintainer: Andrea Scarpino pkgbase=kdesdk-kate @@ -6,7 +6,7 @@ pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') pkgver=4.12.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python') diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD index 64e694333..54002e95c 100644 --- a/extra/kdevelop-python/PKGBUILD +++ b/extra/kdevelop-python/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 201382 2013-12-10 11:10:02Z andrea $ +# $Id: PKGBUILD 208819 2014-03-27 14:43:08Z fyan $ # Maintainer: Andrea Scarpino pkgname=kdevelop-python -pkgver=1.6.0 -_pkgver=4.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="Python language and documentation plugin for KDevelop" arch=('i686' 'x86_64') url="http://www.kdevelop.org/" license=('GPL') -depends=('kdevelop') +depends=('kdevelop' 'python') makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') -source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/kdev-python-${pkgver}.tar.xz") -sha1sums=('88618dbd3a80d5193f49f6c61a6ad02a5e9c0652') +source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}-py3.tar.xz") +sha1sums=('9fcb3250fe966ed86c26493ff4b341373c7ed018') prepare() { mkdir build @@ -20,7 +19,7 @@ prepare() { build() { cd build - cmake ../kdev-python-${pkgver} \ + cmake ../kdev-python-v${pkgver}-py3 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make @@ -29,7 +28,4 @@ build() { package() { cd build make DESTDIR="${pkgdir}" install - - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/share/apps/kdevpythonsupport/encodings/encodings/rot_13.py } diff --git a/extra/liblouis/PKGBUILD b/extra/liblouis/PKGBUILD index 355ecbd36..50ede195b 100644 --- a/extra/liblouis/PKGBUILD +++ b/extra/liblouis/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198193 2013-10-30 13:22:18Z allan $ +# $Id: PKGBUILD 208820 2014-03-27 14:43:09Z fyan $ # Maintainer: Ionut Biru pkgname=liblouis pkgver=2.5.2 -pkgrel=2 +pkgrel=3 pkgdesc="Open-source braille translator and back-translator" arch=(i686 x86_64) url="http://code.google.com/p/liblouis/" diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD index 935ac05d1..67306d861 100644 --- a/extra/libpeas/PKGBUILD +++ b/extra/libpeas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198220 2013-10-30 13:32:24Z allan $ +# $Id: PKGBUILD 208821 2014-03-27 14:43:10Z fyan $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=libpeas pkgver=1.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="A GObject-based plugins engine" arch=(i686 x86_64) url="http://www.gtk.org/" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index ff15945d5..73bbaa83e 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 207986 2014-03-16 16:06:48Z andyrtr $ +# $Id: PKGBUILD 208822 2014-03-27 14:43:11Z fyan $ # Maintainer: AndyRTR # Maintainer: Bartłomiej Piotrowski @@ -20,7 +20,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.2.2.1 pkgver=4.2.2 -pkgrel=2 +pkgrel=5 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -378,9 +378,9 @@ package_libreoffice-common() { rm -rf ${pkgdir}/etc/bash_completion.d # make pyuno find its modules - install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages - ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py - ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py + install -dm755 ${pkgdir}/usr/lib/python3.4/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.4/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.4/site-packages/unohelper.py # workaround all packages now depend on that file cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd diff --git a/extra/pyalpm/PKGBUILD b/extra/pyalpm/PKGBUILD index 1771f8f07..e029b008d 100644 --- a/extra/pyalpm/PKGBUILD +++ b/extra/pyalpm/PKGBUILD @@ -2,12 +2,12 @@ pkgname=pyalpm pkgver=0.6.2 -pkgrel=1 +pkgrel=2 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>=4.1') +depends=('python>=3.4' 'pacman>=4.1') source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz") sha1sums=('15e9911c4f91d78e22e8dbd679177334707482d2') diff --git a/extra/pycrypto/PKGBUILD b/extra/pycrypto/PKGBUILD index b40ad2fbe..ea00c1550 100644 --- a/extra/pycrypto/PKGBUILD +++ b/extra/pycrypto/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 199045 2013-11-07 22:03:21Z jgc $ +# $Id: PKGBUILD 208827 2014-03-27 14:43:15Z fyan $ # Maintainer: Jan de Groot # Contributor: Kritoke pkgbase=pycrypto pkgname=('python2-crypto' 'python-crypto') pkgver=2.6.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') -makedepends=('python2' 'python') +makedepends=('python2' 'python' 'gmp') url="http://www.dlitz.net/software/pycrypto/" license=('custom') source=(http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz{,.asc}) @@ -31,7 +31,7 @@ build() { package_python2-crypto() { pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 2." - depends=('python2') + depends=('python2' 'gmp') replaces=('pycrypto') conflicts=('pycrypto') provides=("pycrypto=${pkgver}") @@ -45,7 +45,7 @@ package_python2-crypto() { package_python-crypto() { pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3." - depends=('python') + depends=('python' 'gmp') cd ${pkgbase}-${pkgver}-py3 python setup.py install --root="${pkgdir}" --optimize=1 diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 9ea8ae2bd..4f7071294 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,26 +1,31 @@ -# $Id: PKGBUILD 199350 2013-11-11 16:08:18Z heftig $ +# $Id: PKGBUILD 208828 2014-03-27 14:43:16Z fyan $ # Maintainer: Ionut Biru pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) pkgver=3.10.2 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="https://live.gnome.org/PyGObject" license=(LGPL) -makedepends=(python python2 python-cairo python2-cairo gobject-introspection) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz) -sha256sums=('75608f2c4052f0277508fc79debef026d9e84cb9261de2b922387c093d32c326') +makedepends=(python python2 python-cairo python2-cairo gobject-introspection gnome-common) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz + "python3.4-gi-types.patch::https://git.gnome.org/browse/pygobject/patch/?id=2ff095ea0b0c05fbf6cc332eeadf26cfeb9e69f7") +sha256sums=('75608f2c4052f0277508fc79debef026d9e84cb9261de2b922387c093d32c326' + '5a25f46e5d90f1c21430017e5a932cd066c4c847005eace63f98b062d731ec4d') prepare() { mkdir build-py2 build-py3 devel cd ${pkgbase}-${pkgver} sed -i '/Werror=format/d' configure # gcc 4.8 + + # Fix installation on Python 3.4, reference: https://git.gnome.org/browse/pygobject/commit/?id=2ff095ea0b0c05fbf6cc332eeadf26cfeb9e69f7 + patch -p1 -i "$srcdir/python3.4-gi-types.patch" } build() { cd build-py2 - ../${pkgbase}-${pkgver}/configure --prefix=/usr --with-python=/usr/bin/python2 + ../${pkgbase}-${pkgver}/autogen.sh --prefix=/usr --with-python=/usr/bin/python2 make cd ../build-py3 diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD index 9fbbb1e9a..ff388753b 100644 --- a/extra/pygobject2/PKGBUILD +++ b/extra/pygobject2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198382 2013-10-30 14:31:56Z allan $ +# $Id: PKGBUILD 208829 2014-03-27 14:43:17Z fyan $ # Maintainer: Jan de Groot pkgbase=pygobject2 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) pkgver=2.28.6 -pkgrel=9 +pkgrel=10 arch=(i686 x86_64) url="http://www.pygtk.org/" license=(LGPL) diff --git a/extra/pyqt4/PKGBUILD b/extra/pyqt4/PKGBUILD index 440015b85..8409ba099 100644 --- a/extra/pyqt4/PKGBUILD +++ b/extra/pyqt4/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 193533 2013-08-22 14:50:14Z andrea $ +# $Id: PKGBUILD 208833 2014-03-27 14:43:20Z fyan $ # Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade # Contributor: riai Ben pkgbase=pyqt4 pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64') url='http://www.riverbankcomputing.com/software/pyqt/intro' @@ -13,7 +13,7 @@ license=('GPL') makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa' 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('8b13d2ab64e4d2fd0037b81b7e78c15c') +md5sums=('20940f6b2c957269cdd02d0efe537515') build() { cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} @@ -39,7 +39,7 @@ build() { # Thanks Gerardo for the rpath fix find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' - + make } @@ -49,11 +49,11 @@ package_pyqt4-common(){ replaces=('pyqt-common') conflicts=('pyqt-common') provides=("pyqt-common=${pkgver}") - + cd PyQt-x11-gpl-${pkgver} make -C pyrcc DESTDIR="${pkgdir}" install make -C pylupdate DESTDIR="${pkgdir}" install - + install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } @@ -93,7 +93,7 @@ package_python2-pyqt4(){ # Fix conflicts with python-pyqt4 mv "${pkgdir}"/usr/bin/{,python2-}pyuic4 - + # Provided by python-pyqt4 rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpyqt4.so diff --git a/extra/pyqt5/PKGBUILD b/extra/pyqt5/PKGBUILD index d24c93e1f..4c3a95083 100644 --- a/extra/pyqt5/PKGBUILD +++ b/extra/pyqt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203385 2014-01-09 08:20:28Z andrea $ +# $Id: PKGBUILD 208834 2014-03-27 14:43:21Z fyan $ # Maintainer: Andrea Scarpino # Contributor: Yichao Yu # Contributor: Douglas Soares de Andrade @@ -7,7 +7,7 @@ pkgbase=pyqt5 pkgname=pyqt5 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5') -pkgver=5.2 +pkgver=5.2.1 pkgrel=1 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" @@ -16,7 +16,7 @@ makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl' 'python2-dbus' 'python-dbus' 'qt5-multimedia' 'qt5-tools' 'qt5-svg' 'qt5-serialport') source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz") -md5sums=('567a0a72a4e186e9b373c26a9dcf380d') +md5sums=('8ab34b17b7d76ad613ff3af3c59e0c20') build() { cp -r PyQt-gpl-${pkgver} Py2Qt-gpl-${pkgver} diff --git a/extra/python-cairo/PKGBUILD b/extra/python-cairo/PKGBUILD index 2ecb2b88f..fe4cd5832 100644 --- a/extra/python-cairo/PKGBUILD +++ b/extra/python-cairo/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 198388 2013-10-30 14:34:05Z allan $ +# $Id: PKGBUILD 208839 2014-03-27 14:43:25Z fyan $ # Maintainer: Angel Velasquez # Maintainer: Jan de Groot pkgname=python-cairo pkgver=1.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="Python bindings for the cairo graphics library" arch=('i686' 'x86_64') url="http://www.cairographics.org/pycairo" license=('LGPL3') depends=('python' 'cairo') -source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2) -md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5') +source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2 + pycairo-1.10.0-waf-python3.4.patch) +md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5' + '418e36055c75392f6501918d1c33d448') build() { - cd "${srcdir}/pycairo-${pkgver}" + cd pycairo-${pkgver} + + # https://bugs.gentoo.org/show_bug.cgi?id=504342 + patch -i "$srcdir/pycairo-1.10.0-waf-python3.4.patch" # Ensure that ./waf has created the cached unpacked version # of the wafadmin source tree. @@ -27,6 +32,6 @@ build() { } package() { - cd "${srcdir}/pycairo-${pkgver}" + cd pycairo-${pkgver} ./waf install --destdir="${pkgdir}" } diff --git a/extra/python-cairo/pycairo-1.10.0-waf-python3.4.patch b/extra/python-cairo/pycairo-1.10.0-waf-python3.4.patch new file mode 100644 index 000000000..a7d17bb5d Binary files /dev/null and b/extra/python-cairo/pycairo-1.10.0-waf-python3.4.patch differ diff --git a/extra/python-cffi/PKGBUILD b/extra/python-cffi/PKGBUILD index 46bf6a56e..b00712046 100644 --- a/extra/python-cffi/PKGBUILD +++ b/extra/python-cffi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 207734 2014-03-14 03:35:05Z fyan $ +# $Id: PKGBUILD 208840 2014-03-27 14:43:25Z fyan $ # Maintainer: Felix Yan # Contributor: lilydjwg @@ -6,7 +6,7 @@ _name=cffi pkgbase=python-$_name pkgname=(python-$_name python2-$_name) pkgver=0.8.2 -pkgrel=3 +pkgrel=4 pkgdesc="Foreign Function Interface for Python calling C code" arch=('i686' 'x86_64') url="http://cffi.readthedocs.org/" diff --git a/extra/python-cryptography/PKGBUILD b/extra/python-cryptography/PKGBUILD index 4f111327e..e60e0739b 100644 --- a/extra/python-cryptography/PKGBUILD +++ b/extra/python-cryptography/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 207736 2014-03-14 03:47:23Z fyan $ +# $Id: PKGBUILD 208842 2014-03-27 14:43:27Z fyan $ # Maintainer: Felix Yan pkgbase=python-cryptography pkgname=('python-cryptography' 'python2-cryptography') pkgver=0.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A package designed to expose cryptographic recipes and primitives to Python developers" arch=('i686' 'x86_64') license=('Apache') diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 3d2779651..81595fd0b 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 208047 2014-03-17 08:12:53Z fyan $ +# $Id: PKGBUILD 208846 2014-03-27 14:43:31Z fyan $ # Maintainer: Angel Velasquez pkgbase=python-lxml pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs') pkgver=3.3.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('BSD' 'custom') url="http://lxml.de/" diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD index 1b302e731..e05ead47b 100644 --- a/extra/python-markupsafe/PKGBUILD +++ b/extra/python-markupsafe/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 208037 2014-03-17 07:42:18Z fyan $ +# $Id: PKGBUILD 208848 2014-03-27 14:43:32Z fyan $ # Maintainer : Ionut Biru # Contributor: Alex Anthony pkgname=('python-markupsafe' 'python2-markupsafe') pkgver=0.19 -pkgrel=1 +pkgrel=2 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python" arch=('i686' 'x86_64') url="http://pypi.python.org/pypi/MarkupSafe" diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index a9d6dd708..94b414122 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 205836 2014-02-11 12:33:14Z jgc $ +# $Id: PKGBUILD 208850 2014-03-27 14:43:34Z fyan $ # Maintainer: Jan de Groot # Contributor: Douglas Soares de Andrade # Contributor: Angel 'angvp' Velasquez @@ -6,7 +6,7 @@ pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') pkgver=1.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64') license=('custom') @@ -71,8 +71,8 @@ package_python-numpy() { replaces=('python3-numpy') conflicts=('python3-numpy') - _pyver=3.3 - _pyinc=3.3m + _pyver=3.4 + _pyinc=3.4m export ATLAS=None export LDFLAGS="$LDFLAGS -shared" diff --git a/extra/python-pycurl/PKGBUILD b/extra/python-pycurl/PKGBUILD index 86bd6201c..de88e58cd 100644 --- a/extra/python-pycurl/PKGBUILD +++ b/extra/python-pycurl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 205506 2014-02-06 10:55:43Z fyan $ +# $Id: PKGBUILD 208855 2014-03-27 14:43:37Z fyan $ # Maintainer: Felix Yan # Contributor: Sergej Pupykin # Contributor: Angel 'angvp' Velasquez @@ -7,7 +7,7 @@ _pypiname=pycurl pkgbase=python-$_pypiname pkgname=('python-pycurl' 'python2-pycurl') pkgver=7.19.3.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://pycurl.sourceforge.net/" license=('LGPL' 'MIT') diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD index 5e7fcc6b5..05d85c5a2 100644 --- a/extra/python-urwid/PKGBUILD +++ b/extra/python-urwid/PKGBUILD @@ -5,11 +5,11 @@ pkgname=('python-urwid' 'python2-urwid') pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Urwid is a curses-based user interface library." license=('LGPL') arch=('i686' 'x86_64') -makedepends=('python2-distribute' 'python-distribute') +makedepends=('python2-setuptools' 'python-setuptools') url="http://excess.org/urwid/" source=(https://pypi.python.org/packages/source/u/urwid/urwid-$pkgver.tar.gz) md5sums=('ea046a0f683bc2d46b08df70b29c7f66') diff --git a/extra/python-zope-interface/PKGBUILD b/extra/python-zope-interface/PKGBUILD index f83ae12eb..f8afc152b 100644 --- a/extra/python-zope-interface/PKGBUILD +++ b/extra/python-zope-interface/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206137 2014-02-20 04:37:49Z fyan $ +# $Id: PKGBUILD 208860 2014-03-27 14:43:41Z fyan $ # Maintainer : Felix Yan # Contributor: Ionut Biru # Contributor: Douglas Soares de Andrade @@ -6,7 +6,7 @@ pkgbase=python-zope-interface pkgname=('python-zope-interface' 'python2-zope-interface') pkgver=4.1.0 -pkgrel=1 +pkgrel=2 license=('ZPL') arch=('i686' 'x86_64') url="http://pypi.python.org/pypi/zope.interface" @@ -41,7 +41,7 @@ package_python-zope-interface() { depends=('python') cd "${srcdir}/zope.interface-${pkgver}" python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 - cp src/zope/__init__.py "${pkgdir}/usr/lib/python3.3/site-packages/zope/" + cp src/zope/__init__.py "${pkgdir}/usr/lib/python3.4/site-packages/zope/" } package_python2-zope-interface(){ diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 9c8783dc4..9c658ee23 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 207597 2014-03-12 17:46:22Z fyan $ -# Maintainer: Angel Velasquez -# Maintainer: Felix Yan +# $Id: PKGBUILD 208835 2014-03-27 14:43:22Z fyan $ +# Maintainer: Angel Velasquez # Contributor: Stéphane Gaudreault # Contributor: Allan McRae # Contributor: Jason Chu pkgname=python -pkgver=3.3.5 -pkgrel=1 -_pybasever=3.3 +pkgver=3.4.0 +pkgrel=2 +_pybasever=3.4 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64') license=('custom') url="http://www.python.org/" depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') makedepends=('tk>=8.6.0' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal') -optdepends=('sqlite' +optdepends=('python-setuptools' + 'python-pip' + 'sqlite' 'mpdecimal: for decimal' 'xz: for lzma' 'tk: for tkinter') options=('!makeflags') provides=('python3') replaces=('python3') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('6683b26dd2cfd23af852abfcf1aedf25bbd44839') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz + python3.4-test_sqlite.patch::http://hg.python.org/cpython/raw-rev/4d626a9df062) +sha1sums=('f54d7cf6af5dbd9bddbe31cf4772f39711381dbe' + 'b13a0b728d8e1fe1d81dea501b064cb1032f183b') prepare() { cd "${srcdir}/Python-${pkgver}" @@ -31,7 +34,10 @@ prepare() { # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py - # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), + # http://bugs.python.org/issue20901 + patch -p1 -i "$srcdir/python3.4-test_sqlite.patch" + + # Ensure that we are using the system copy of various libraries (expat, zlib, libffi, and libmpdec), # rather than copies shipped in the tarball rm -r Modules/expat rm -r Modules/zlib @@ -42,6 +48,7 @@ prepare() { build() { cd "${srcdir}/Python-${pkgver}" + # Disable bundled pip & setuptools ./configure --prefix=/usr \ --enable-shared \ --with-threads \ @@ -51,7 +58,8 @@ build() { --with-system-expat \ --with-dbmliborder=gdbm:ndbm \ --with-system-ffi \ - --with-system-libmpdec + --with-system-libmpdec \ + --without-ensurepip make } diff --git a/extra/python/PKGBUILD.3.4 b/extra/python/PKGBUILD.3.4 deleted file mode 100644 index e3d66ee1f..000000000 --- a/extra/python/PKGBUILD.3.4 +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 205852 2014-02-11 19:50:22Z angvp $ -# Maintainer: Angel Velasquez -# Contributor: Stéphane Gaudreault -# Contributor: Allan McRae -# Contributor: Jason Chu - -pkgname=python -pkgver=3.4.0rc2 -pkgrel=1 -_pybasever=3.4 -pkgdesc="Next generation of the python high-level scripting language" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.python.org/" -depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') -makedepends=('tk>=8.6.0' 'sqlite' 'valgrind' 'bluez-libs') -optdepends=('python-setuptools' - 'python-pip' - 'sqlite' - 'mpdecimal: for decimal' - 'xz: for lzma' - 'tk: for tkinter') -options=('!makeflags') -provides=('python3') -replaces=('python3') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('f03216f4b537c284afacb1e8308a52b9a62368e9') - -prepare() { - cd "${srcdir}/Python-${pkgver}" - - # FS#23997 - sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py - - # Ensure that we are using the system copy of various libraries (expat, zlib, libffi, and libmpdec), - # rather than copies shipped in the tarball - rm -r Modules/expat - rm -r Modules/zlib - rm -r Modules/_ctypes/{darwin,libffi}* - rm -r Modules/_decimal/libmpdec -} - -build() { - cd "${srcdir}/Python-${pkgver}" - - # Disable bundled pip & setuptools - ./configure --prefix=/usr \ - --enable-shared \ - --with-threads \ - --with-computed-gotos \ - --enable-ipv6 \ - --with-valgrind \ - --with-system-expat \ - --with-dbmliborder=gdbm:ndbm \ - --with-system-ffi \ - --with-system-libmpdec \ - --without-ensurepip - - make -} - -check() { - cd "${srcdir}/Python-${pkgver}" - LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging test_uuid -} - -package() { - cd "${srcdir}/Python-${pkgver}" - make DESTDIR="${pkgdir}" install maninstall - - # Why are these not done by default... - ln -sf python3 "${pkgdir}"/usr/bin/python - ln -sf python3-config "${pkgdir}"/usr/bin/python-config - ln -sf idle3 "${pkgdir}"/usr/bin/idle - ln -sf pydoc3 "${pkgdir}"/usr/bin/pydoc - ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python3.1 - ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1 - - # Fix FS#22552 - ln -sf ../../libpython${_pybasever}m.so \ - "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so" - - # Clean-up reference to build directory - sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile" - - # License - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 1f4d2db82..f1c72222d 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 199276 2013-11-09 07:16:28Z andrea $ +# $Id: PKGBUILD 208862 2014-03-27 14:43:42Z fyan $ # Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.8 +pkgver=2.8.1 pkgrel=1 license=('GPL') arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('02c406d8cd5db661f127303e91775c0b' +md5sums=('bbf4725583ee9817f89413dca6cd38d2' 'eae1bd23117c5f1f7f172a1c1e11f600') prepare() { @@ -60,7 +60,7 @@ package_python-qscintilla-common() { make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install # Provided by python-qscintilla - rm "${pkgdir}"/usr/lib/python3.3/site-packages/PyQt4/Qsci.so + rm "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so } package_python-qscintilla() { @@ -69,7 +69,7 @@ package_python-qscintilla() { cd QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ - "${pkgdir}"/usr/lib/python3.3/site-packages/PyQt4/Qsci.so + "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() { diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index e02efc3e4..a1eb2c23b 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 204929 2014-01-31 14:12:03Z ronald $ +# $Id: PKGBUILD 208800 2014-03-27 07:06:24Z ronald $ # Maintainer: Ronald van Haren # Contributor: Damir Perisa # Contributor: K. Piche pkgname=r -pkgver=3.0.2 -pkgrel=2 +pkgver=3.0.3 +pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64') license=('GPL') @@ -22,8 +22,8 @@ source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz" 'r.desktop' 'r.png' 'R.conf') -sha1sums=('f5d9daef00e09d36a465ff7b0bf4cab136bea227' - '13aa29219bcaa102e575de8c1c8e0833d233e836' +sha1sums=('82e83415d27a2fbbdcacb41c4aa14d8b36fdf470' + '97c711e62e62097328ff0178bd0ae0a7155d83a4' 'a69a07ec363440efc18ce0a7f2af103375dea978' '43668da6cfd1b4455a99f23e79e2059294dddac9') diff --git a/extra/r/r.desktop b/extra/r/r.desktop index 68b49c447..d0d3633d1 100644 --- a/extra/r/r.desktop +++ b/extra/r/r.desktop @@ -8,4 +8,4 @@ DocPath=/usr/lib/R/doc/html/index.html StartupNotify=true Terminal=true Type=Application -Categories=Education;Science;Math; +Categories=Education;Science; diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index e4f5727dc..366383dd3 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 203383 2014-01-09 08:19:52Z andrea $ +# $Id: PKGBUILD 208863 2014-03-27 14:43:43Z fyan $ # Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade # Contributor: riai , Ben pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.15.4 -pkgrel=1 +pkgver=4.15.5 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.riverbankcomputing.com/software/sip/intro' license=('custom:"sip"') makedepends=('python' 'python2') source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('1d5c9e92bc7fca5ac11e088a4cf6c83d') +md5sums=('4c95447c7b0391b7f183cf9f92ae9bc6') build() { cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} @@ -44,8 +44,8 @@ package_python-sip() { cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install -C siplib - install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py - install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py + install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.4/site-packages/sipconfig.py + install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.4/site-packages/sipdistutils.py install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/snarf/PKGBUILD b/extra/snarf/PKGBUILD index 40c5a2294..6ad155424 100644 --- a/extra/snarf/PKGBUILD +++ b/extra/snarf/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 150394 2012-02-17 11:30:28Z allan $ +# $Id: PKGBUILD 208880 2014-03-27 20:25:38Z eric $ # Maintainer: -# Contributor: Judd Vinet pkgname=snarf pkgver=7.0 -pkgrel=5 +pkgrel=6 pkgdesc="Command-line URL retrieval tool (http/ftp/gopher)" arch=('i686' 'x86_64') url="http://www.xach.com/snarf/" license=('GPL') +depends=('glibc') source=(http://www.xach.com/snarf/download/source/${pkgname}-${pkgver}.tar.gz) md5sums=('7470d8457bc0d347b5cd8668c9e735c4') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} + CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD index 36eb479a4..c0a473f4f 100644 --- a/extra/speech-dispatcher/PKGBUILD +++ b/extra/speech-dispatcher/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 197563 2013-10-26 23:08:53Z eric $ +# $Id: PKGBUILD 208864 2014-03-27 14:43:44Z fyan $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Steve Holmes @@ -8,7 +8,7 @@ pkgname=speech-dispatcher pkgver=0.8 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="High-level device independent layer for speech synthesis interface" url="http://www.freebsoft.org/speechd" diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index f085b3d75..5696b0f8d 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 207516 2014-03-11 17:41:31Z andyrtr $ +# $Id: PKGBUILD 208876 2014-03-27 19:59:45Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Tom Newsom pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') -_amalgamationver=3080401 +_amalgamationver=3080402 _docver=${_amalgamationver} #_docver=3080001 -pkgver=3.8.4.1 +pkgver=3.8.4.2 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') @@ -19,8 +19,8 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/2014/sqlite-doc-${_docver}.zip license.txt) options=('!emptydirs') -sha1sums=('f8a77b74bd2632eb14cea62cd8b92c45026e248c' - '11c635048ad6378e86e704246c3c2d64568ce09d' +sha1sums=('97d727b46ca67c98eb7a0fa3f57a1cfeb7f08f74' + '3f615f9fa81b737e652b06eddef8307235d84f2c' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD index 403ad5e34..a90cd4885 100644 --- a/extra/vde2/PKGBUILD +++ b/extra/vde2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198476 2013-10-30 15:05:50Z allan $ +# $Id: PKGBUILD 208865 2014-03-27 14:43:45Z fyan $ # Contributor: Sergej Pupykin # Maintainer: Tobias Powalowski pkgname=vde2 pkgver=2.3.2 -pkgrel=5 +pkgrel=6 pkgdesc="Virtual Distributed Ethernet for emulators like qemu" url="http://sourceforge.net/projects/vde/" license=("GPL" "LGPL" "CUSTOM") -- cgit v1.2.3-54-g00ecf