summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-01-28 03:27:16 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-01-28 03:27:16 +0000
commit462391357aa5e749dc9908c15f3baa0b4416f3d8 (patch)
tree11d4d3f054aae9ffd869adc634054f64a16d83b8 /extra
parent748e32a3a886569b58a27003e85b76be5746153d (diff)
Tue Jan 28 03:22:21 UTC 2014
Diffstat (limited to 'extra')
-rw-r--r--extra/gc/PKGBUILD27
-rw-r--r--extra/gphoto2/PKGBUILD13
-rw-r--r--extra/imlib2/PKGBUILD8
-rw-r--r--extra/lapack/PKGBUILD12
-rw-r--r--extra/libdvdnav/PKGBUILD16
-rw-r--r--extra/libdvdread/PKGBUILD15
-rw-r--r--extra/libgphoto2/PKGBUILD17
-rw-r--r--extra/libgphoto2/libgphoto2.install16
-rw-r--r--extra/libgpod/PKGBUILD13
-rw-r--r--extra/libpst/PKGBUILD16
-rw-r--r--extra/lyx/PKGBUILD8
-rw-r--r--extra/mod_fcgid/PKGBUILD16
-rw-r--r--extra/nss/PKGBUILD6
-rw-r--r--extra/octave/PKGBUILD26
-rw-r--r--extra/octave/mex-gcc-4.8.patch31
-rw-r--r--extra/octave/octave.install2
16 files changed, 105 insertions, 137 deletions
diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD
index 3d5550d03..a6ff99a15 100644
--- a/extra/gc/PKGBUILD
+++ b/extra/gc/PKGBUILD
@@ -1,33 +1,34 @@
-# $Id: PKGBUILD 197970 2013-10-30 11:59:52Z allan $
+# $Id: PKGBUILD 204775 2014-01-27 06:51:27Z jgc $
# Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
# Contributor: dorphell <dorphell@gmx.net>
pkgname=gc
-pkgver=7.2.d
-pkgrel=2
+pkgver=7.4.0
+pkgrel=1
pkgdesc="A garbage collector for C and C++"
arch=('i686' 'x86_64')
url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
license=('GPL')
-source=("http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-7.2d.tar.gz")
-depends=('gcc-libs')
-md5sums=('91340b28c61753a789eb6077675d87d2')
+source=("http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-${pkgver}.tar.gz")
+depends=('gcc-libs' 'libatomic_ops')
+md5sums=('f40d9a47c90d60791eeecb484f8df5ee')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ sed -i 's#pkgdata#doc#' doc/doc.am
+}
build() {
- cd "${srcdir}/${pkgname}-7.2"
+ cd ${pkgname}-${pkgver}
+ autoreconf -fi
./configure --prefix=/usr --enable-cplusplus --disable-static
make
}
package() {
- cd "${srcdir}/${pkgname}-7.2"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}/usr/share/gc"
- install -m755 -d "${pkgdir}/usr/share/doc/gc"
- install -m644 doc/README{,.{changes,contributors,environment,linux}} \
- "${pkgdir}/usr/share/doc/gc/"
-
sed -i -e 's/GC_MALLOC 1L/gc 3/' doc/gc.man
install -m755 -d "${pkgdir}/usr/share/man/man3"
install -m644 doc/gc.man "${pkgdir}/usr/share/man/man3/gc.3"
diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD
index 468b3f8be..b326354fc 100644
--- a/extra/gphoto2/PKGBUILD
+++ b/extra/gphoto2/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 188639 2013-06-17 09:41:26Z jgc $
+# $Id: PKGBUILD 204792 2014-01-27 08:53:52Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Eduardo Romero <eduardo@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=gphoto2
-pkgver=2.5.2
+pkgver=2.5.3
pkgrel=1
pkgdesc="A digital camera download and access program."
arch=(i686 x86_64)
url="http://www.gphoto.org"
license=('GPL' 'LGPL')
depends=('libgphoto2' 'popt' 'readline')
-source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7e59e7e06a58febd35820978c6e48287')
+source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2{,.asc})
+md5sums=('6d19aeabf196340e1698b3734f090d42'
+ 'SKIP')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
./configure --prefix=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index 75cb80b18..635ace90e 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198112 2013-10-30 12:51:45Z allan $
+# $Id: PKGBUILD 204813 2014-01-27 19:49:53Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Arjan Timmerman <arjan.archlinux.org>
# Contributor: Tom Newsom <Jeepster.gmx.co.uk>
pkgname=imlib2
-pkgver=1.4.5
-pkgrel=6
+pkgver=1.4.6
+pkgrel=1
pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
url="http://sourceforge.net/projects/enlightenment/"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('BSD')
depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
imlib2-giflib5.patch)
-sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0'
+sha1sums=('20e111d822074593e8d657ecf8aafe504e9e2967'
'29d0778ffbe6e57f08048918a79eb1ad6af87bce')
prepare() {
diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD
index 31ab30360..c2bb7e82a 100644
--- a/extra/lapack/PKGBUILD
+++ b/extra/lapack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198759 2013-11-03 11:28:03Z ronald $
+# $Id: PKGBUILD 204819 2014-01-27 20:49:33Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: damir <damir@archlinux.org>
@@ -6,8 +6,8 @@
pkgbase=lapack
pkgname=('lapack' 'blas')
-pkgver=3.4.2
-pkgrel=2
+pkgver=3.5.0
+pkgrel=1
url="http://www.netlib.org/lapack"
pkgdesc="Linear Algebra PACKage"
makedepends=('gcc-fortran' 'cmake')
@@ -16,7 +16,7 @@ arch=('i686' 'x86_64')
license=("custom")
source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz
LICENSE.blas)
-sha1sums=('93a6e4e6639aaf00571d53a580ddc415416e868b'
+sha1sums=('5870081889bf5d15fd977993daab29cf3c5ea970'
'2491a151a37f0162b25fc4e4e9a8ac444b574a76')
build() {
@@ -46,8 +46,8 @@ package_lapack() {
ln -sf ${libname}.so "${pkgdir}/usr/lib/${libname}.so.3"
done
- install -m755 ${srcdir}/build/bin/* ${pkgdir}/usr/bin
- install -m644 ${srcdir}/build/include/* ${pkgdir}/usr/include
+ install -m755 "${srcdir}"/build/bin/* "${pkgdir}/usr/bin"
+ install -m644 "${srcdir}"/build/include/* "${pkgdir}/usr/include"
install -m755 -d "${pkgdir}/usr/share/licenses/lapack"
install -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \
"${pkgdir}/usr/share/licenses/lapack/"
diff --git a/extra/libdvdnav/PKGBUILD b/extra/libdvdnav/PKGBUILD
index 73859b0b7..e5f148827 100644
--- a/extra/libdvdnav/PKGBUILD
+++ b/extra/libdvdnav/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 198151 2013-10-30 13:06:17Z allan $
+# $Id: PKGBUILD 204779 2014-01-27 07:23:49Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Arjan <arjan@archlinux.org>
# contributor Sarah Hay <sarahhay@mb.sympatico.ca>
pkgname=libdvdnav
-pkgver=4.2.0
-pkgrel=2
+pkgver=4.2.1
+pkgrel=1
pkgdesc="The library for xine-dvdnav plugin."
arch=('i686' 'x86_64')
license=('GPL')
url="http://dvdnav.mplayerhq.hu/"
depends=('libdvdread')
-source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550')
+source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
+ cd $pkgname-$pkgver
./autogen.sh --prefix=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
+ cd $pkgname-$pkgver
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/libdvdread/PKGBUILD b/extra/libdvdread/PKGBUILD
index 9eec2affd..e28b1e3c8 100644
--- a/extra/libdvdread/PKGBUILD
+++ b/extra/libdvdread/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198152 2013-10-30 13:06:40Z allan $
+# $Id: PKGBUILD 204777 2014-01-27 07:05:18Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=libdvdread
-pkgver=4.2.0
+pkgver=4.2.1
pkgrel=1
pkgdesc="Provides a simple foundation for reading DVD video disks"
arch=(i686 x86_64)
@@ -13,19 +13,16 @@ license=('GPL')
depends=('glibc')
makedepends=('libdvdcss')
optdepends=('libdvdcss: for decoding encrypted DVDs')
-source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097')
+source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('af9b98f049580a6521d56c978b736d3d609562dd12955e11d50e26d97542dcd4')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2009-February/000986.html (FS#19324)
-
+ cd $pkgname-$pkgver
./autogen.sh --prefix=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD
index 49a7ecdc3..a7449d95a 100644
--- a/extra/libgphoto2/PKGBUILD
+++ b/extra/libgphoto2/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 189864 2013-07-10 07:26:55Z bpiotrowski $
+# $Id: PKGBUILD 204790 2014-01-27 08:48:48Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tom Gundersen <teg@jklm.no>
# Contributor: Eduardo Romero <eduardo@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=libgphoto2
-pkgver=2.5.2
-pkgrel=2
+pkgver=2.5.3.1
+pkgrel=1
pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
arch=(i686 x86_64)
url="http://www.gphoto.org"
@@ -14,8 +14,9 @@ license=(LGPL)
depends=('libexif' 'libjpeg' 'gd' 'libltdl' 'libusb')
install=libgphoto2.install
options=('libtool')
-source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d9f4462957e59bf2b2eb3b1ea8423570')
+source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2{,.asc})
+md5sums=('aad2607a84442769c14f6acce2ca1ddf'
+ 'SKIP')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -32,11 +33,11 @@ package() {
# Remove unused udev helper
rm -rf "${pkgdir}/usr/lib/udev"
- install -m755 -d "${pkgdir}/usr/lib/udev/rules.d"
+ install -m755 -d "${pkgdir}/usr/lib/udev/hwdb.d"
LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
- "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 175 > \
- "${pkgdir}/usr/lib/udev/rules.d/40-gphoto.rules"
+ "${pkgdir}/usr/lib/libgphoto2/print-camera-list" hwdb > \
+ "${pkgdir}/usr/lib/udev/hwdb.d/20-gphoto.conf"
# Remove recursive symlink
rm -f "${pkgdir}/usr/include/gphoto2/gphoto2"
diff --git a/extra/libgphoto2/libgphoto2.install b/extra/libgphoto2/libgphoto2.install
index 3eb8301aa..c5a3c1545 100644
--- a/extra/libgphoto2/libgphoto2.install
+++ b/extra/libgphoto2/libgphoto2.install
@@ -1,6 +1,14 @@
+post_install() {
+ udevadm hwdb --update
+}
post_upgrade() {
-if [ "$(vercmp $2 2.4.13)" -lt 0 ]; then
- groupdel camera &>/dev/null
- echo "Users no longer need to be in the 'camera' group to use camera devices"
-fi
+ if [ "$(vercmp $2 2.4.13)" -lt 0 ]; then
+ groupdel camera &>/dev/null
+ echo "Users no longer need to be in the 'camera' group to use camera devices"
+ fi
+ post_install
+}
+
+post_remove() {
+ post_install
}
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index 8859054ee..a34881073 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 200005 2013-11-21 01:32:03Z allan $
+# $Id: PKGBUILD 204781 2014-01-27 07:47:56Z jgc $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=libgpod
-pkgver=0.8.2
-pkgrel=8
+pkgver=0.8.3
+pkgrel=1
pkgdesc="A shared library to access the contents of an iPod"
arch=(i686 x86_64)
license=('LGPL')
@@ -15,17 +15,16 @@ optdepends=('gtk-sharp-2: Mono bindings'
url="http://www.gtkpod.org/libgpod/"
source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
options=('!emptydirs')
-md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
+md5sums=('f8a0b7a34e768e33a708e8dd172bd6f8')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \
--enable-udev --with-python=/usr/bin/python2
make PREFIX=/usr
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
make PREFIX=/usr DESTDIR="${pkgdir}" install
}
-
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index e643c2937..37679f9ad 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 201261 2013-12-07 10:35:00Z bpiotrowski $
+# $Id: PKGBUILD 204783 2014-01-27 07:57:48Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=libpst
pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.58
-pkgrel=2
+pkgver=0.6.63
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.five-ten-sg.com/libpst/"
license=('GPL')
makedepends=('python2' 'boost' 'libgsf')
source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('c398d58b8b5106725f1659c900305c6385c0773e')
+sha1sums=('3625c94bc82555d490805d4bbac07d9160195537')
build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd $pkgbase-$pkgver
./configure --prefix=/usr --mandir=/usr/share/man \
--disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2
make
@@ -25,7 +25,7 @@ package_libpst() {
optdepends=('boost-libs: for libpst python interface')
options=('!docs')
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd $pkgbase-$pkgver
make DESTDIR="${pkgdir}" install
}
@@ -33,8 +33,8 @@ package_libpst-docs() {
pkgdesc="Documentation for Outlook .pst file converter"
options=('docs')
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd $pkgbase-$pkgver
make DESTDIR="${pkgdir}" install-htmlDATA
- cd "${srcdir}/${pkgbase}-${pkgver}/html"
+ cd html
make DESTDIR="${pkgdir}" install-htmldevelDATA
}
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index a57167412..944d22bb9 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 201264 2013-12-07 10:35:03Z bpiotrowski $
+# $Id: PKGBUILD 204817 2014-01-27 20:22:21Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=lyx
-pkgver=2.0.6
-pkgrel=4
+pkgver=2.0.7
+pkgrel=1
pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
arch=('i686' 'x86_64')
url="http://www.lyx.org"
@@ -18,7 +18,7 @@ install=lyx.install
options=('emptydirs')
source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
lyx.desktop lyxrc.dist)
-sha1sums=('d73ba7a5e796acdf32282207be0b29d66411c5f8'
+sha1sums=('4d54eb0cf98b0a44b5156ec84932e58c9c0efb07'
'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
'56416642cc3da2a13b87b84e6b87c1a239f3d09a')
diff --git a/extra/mod_fcgid/PKGBUILD b/extra/mod_fcgid/PKGBUILD
index 5d643940c..6000ddab9 100644
--- a/extra/mod_fcgid/PKGBUILD
+++ b/extra/mod_fcgid/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 171689 2012-11-21 14:00:30Z dan $
+# $Id: PKGBUILD 204785 2014-01-27 08:09:44Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=mod_fcgid
-pkgver=2.3.7
+pkgver=2.3.9
pkgrel=1
pkgdesc="A FastCGI module for Apache HTTP Server."
license=('APACHE')
arch=('i686' 'x86_64')
url="http://httpd.apache.org/mod_fcgid/"
depends=('apache')
-source=("http://apache.cs.utah.edu/httpd/mod_fcgid/mod_fcgid-$pkgver.tar.gz")
-sha256sums=('b72810cb34942945156f29ce60946da7dc941bb4cfca8b9d224573535bd8ef6d')
+source=(http://www.apache.org/dist/httpd/mod_fcgid/mod_fcgid-$pkgver.tar.bz2{,.asc})
+sha1sums=('f0b6d87dfcfe18b318905a3f91274051f3f17945'
+ 'SKIP')
build() {
- cd "$srcdir"/$pkgname-$pkgver
+ cd $pkgname-$pkgver
./configure.apxs
make
}
package() {
- cd "$srcdir"/$pkgname-$pkgver
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/{usr/share,etc}
+ rm -rf "${pkgdir}/usr/share"
+ rm -rf "${pkgdir}/etc"
}
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index 54e35d814..73004fee8 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 201408 2013-12-10 17:56:17Z heftig $
+# $Id: PKGBUILD 204787 2014-01-27 08:27:12Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=nss
-pkgver=3.15.3.1
+pkgver=3.15.4
pkgrel=1
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64)
@@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s
nss-config.in
ssl-renegotiate-transitional.patch
add_spi+cacert_ca_certs.patch)
-sha1sums=('4e0f81a1f770447dc5440201a579151b601463e2'
+sha1sums=('c164fac83fcbaff010786767e2a858ca23a89a5b'
'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
'8a964a744ba098711b80c0d279a2993524e8eb92'
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 626cd3c9d..12be4d12d 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,33 +1,25 @@
-# $Id: PKGBUILD 203485 2014-01-11 17:11:51Z bisson $
+# $Id: PKGBUILD 204807 2014-01-27 19:22:09Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor : shining <shiningxc.at.gmail.com>
# Contributor : cyberdune <cyberdune@gmail.com>
pkgname=octave
-pkgver=3.6.4
-pkgrel=6
+pkgver=3.8.0
+pkgrel=1
pkgdesc="A high-level language, primarily intended for numerical computations."
arch=('i686' 'x86_64')
url="http://www.octave.org"
license=('GPL')
depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 'glu')
-makedepends=('gcc-fortran' 'texlive-core' 'suitesparse')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot')
optdepends=('texinfo: for help-support in octave'
- 'gnuplot: alternative plotting')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}
- mex-gcc-4.8.patch)
+ 'gnuplot: alternative plotting'
+ 'qt4: experimental gui')
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig})
options=('!emptydirs')
install=octave.install
-sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4'
- 'SKIP'
- '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # https://savannah.gnu.org/bugs/?38746
- patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch"
-}
+sha1sums=('ebb03485b72d97fa01f105460f81016f94680f77'
+ 'SKIP')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/octave/mex-gcc-4.8.patch b/extra/octave/mex-gcc-4.8.patch
deleted file mode 100644
index 99d501879..000000000
--- a/extra/octave/mex-gcc-4.8.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# HG changeset patch
-# User Clemens Buchacher <drizzd@aon.at>
-# Date 1369937542 14400
-# Thu May 30 14:12:22 2013 -0400
-# Node ID 122d3f62e179ba044d47e58510905719220d8706
-# Parent e38a0fa08368d4dd6f3a0dfd20cbe28cf8555f73
-do not include C++ header in extern "C" context (bug #38746)
-
-* mex.h: Include mexproto.h outside of extern "C" block.
-
-diff -r e38a0fa08368 -r 122d3f62e179 src/mex.h
---- a/src/mex.h Mon May 27 21:41:57 2013 +0200
-+++ b/src/mex.h Thu May 30 14:12:22 2013 -0400
-@@ -64,6 +64,8 @@
-
- #define mxMAXNAME 64
-
-+#include "mexproto.h"
-+
- #if defined (__cplusplus)
- extern "C" {
- #endif
-@@ -74,8 +76,6 @@
- void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]);
- #endif
-
--#include "mexproto.h"
--
- /* V4 floating point routines renamed in V5. */
- #define mexIsNaN mxIsNaN
- #define mexIsFinite mxIsFinite
diff --git a/extra/octave/octave.install b/extra/octave/octave.install
index 8ee77c430..fb77bb100 100644
--- a/extra/octave/octave.install
+++ b/extra/octave/octave.install
@@ -1,5 +1,5 @@
info_dir=/usr/share/info
-info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5)
+info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5 octave.info-6 octave.info-7 octave.info-8)
post_install() {
for f in ${info_files[@]}; do