Date: Wednesday, March 1, 2017 @ 11:34:27
Author: arojas
Revision: 289754
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
octave/repos/extra-i686/PKGBUILD
(from rev 289753, octave/trunk/PKGBUILD)
octave/repos/extra-i686/octave-qscintilla-2.10.patch
(from rev 289753, octave/trunk/octave-qscintilla-2.10.patch)
octave/repos/extra-x86_64/PKGBUILD
(from rev 289753, octave/trunk/PKGBUILD)
octave/repos/extra-x86_64/octave-qscintilla-2.10.patch
(from rev 289753, octave/trunk/octave-qscintilla-2.10.patch)
Deleted:
octave/repos/extra-i686/PKGBUILD
octave/repos/extra-x86_64/PKGBUILD
-------------------------------------------+
/PKGBUILD | 108 ++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 45 -----------
extra-i686/octave-qscintilla-2.10.patch | 11 ++
extra-x86_64/PKGBUILD | 45 -----------
extra-x86_64/octave-qscintilla-2.10.patch | 11 ++
5 files changed, 130 insertions(+), 90 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-03-01 11:33:49 UTC (rev 289753)
+++ extra-i686/PKGBUILD 2017-03-01 11:34:27 UTC (rev 289754)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : shining <shiningxc.at.gmail.com>
-# Contributor : cyberdune <cyberd...@gmail.com>
-
-pkgname=octave
-pkgver=4.2.1
-pkgrel=3
-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' 'ghostscript'
- 'suitesparse' 'gl2ps' 'qscintilla-qt5' 'libsndfile')
-makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot'
'qt5-tools' 'portaudio')
-optdepends=('texinfo: for help-support in octave'
- 'gnuplot: alternative plotting'
- 'portaudio: audio support')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
-options=('!emptydirs')
-validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton
-sha1sums=('3d60e860d97c2497ec42de67f85a1eea2c79cdfd'
- 'SKIP')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr --libexecdir=/usr/lib \
- --enable-shared --disable-static \
- --with-quantum-depth=16 \
- --with-umfpack="-lumfpack -lsuitesparseconfig"
-#
https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
-
- LANG=C make
-}
-
-package(){
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- # add octave library path to ld.so.conf.d
- install -d "${pkgdir}/etc/ld.so.conf.d"
- echo "/usr/lib/${pkgname}/${pkgver}" >
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
-}
Copied: octave/repos/extra-i686/PKGBUILD (from rev 289753,
octave/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-03-01 11:34:27 UTC (rev 289754)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor : shining <shiningxc.at.gmail.com>
+# Contributor : cyberdune <cyberd...@gmail.com>
+
+pkgname=octave
+pkgver=4.2.1
+pkgrel=4
+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' 'ghostscript'
+ 'suitesparse' 'gl2ps' 'qscintilla-qt5' 'libsndfile')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot'
'qt5-tools' 'portaudio')
+optdepends=('texinfo: for help-support in octave'
+ 'gnuplot: alternative plotting'
+ 'portaudio: audio support')
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
octave-qscintilla-2.10.patch)
+options=('!emptydirs')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton
+sha1sums=('3d60e860d97c2497ec42de67f85a1eea2c79cdfd'
+ 'SKIP'
+ 'ba53969f6fd923051cd306f414af0646ed7dc526')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix qscintilla 2.10 detection
+ patch -p1 -i ../octave-qscintilla-2.10.patch
+ autoreconf -vi
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr --libexecdir=/usr/lib \
+ --enable-shared --disable-static \
+ --with-quantum-depth=16 \
+ --with-umfpack="-lumfpack -lsuitesparseconfig"
+#
https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
+
+ LANG=C make
+}
+
+package(){
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ # add octave library path to ld.so.conf.d
+ install -d "${pkgdir}/etc/ld.so.conf.d"
+ echo "/usr/lib/${pkgname}/${pkgver}" >
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+}
Copied: octave/repos/extra-i686/octave-qscintilla-2.10.patch (from rev 289753,
octave/trunk/octave-qscintilla-2.10.patch)
===================================================================
--- extra-i686/octave-qscintilla-2.10.patch (rev 0)
+++ extra-i686/octave-qscintilla-2.10.patch 2017-03-01 11:34:27 UTC (rev
289754)
@@ -0,0 +1,11 @@
+--- octave-4.2.1/m4/acinclude.m4.orig 2017-03-01 11:05:40.106105555 +0000
++++ octave-4.2.1/m4/acinclude.m4 2017-03-01 11:06:05.612735530 +0000
+@@ -1346,7 +1346,7 @@
+ ;;
+ 5)
+ QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
+- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
++ octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2
qscintilla2_qt5"
+ ;;
+ *)
+ AC_MSG_ERROR([Unrecognized Qt version $qt_version])
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-03-01 11:33:49 UTC (rev 289753)
+++ extra-x86_64/PKGBUILD 2017-03-01 11:34:27 UTC (rev 289754)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : shining <shiningxc.at.gmail.com>
-# Contributor : cyberdune <cyberd...@gmail.com>
-
-pkgname=octave
-pkgver=4.2.1
-pkgrel=3
-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' 'ghostscript'
- 'suitesparse' 'gl2ps' 'qscintilla-qt5' 'libsndfile')
-makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot'
'qt5-tools' 'portaudio')
-optdepends=('texinfo: for help-support in octave'
- 'gnuplot: alternative plotting'
- 'portaudio: audio support')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
-options=('!emptydirs')
-validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton
-sha1sums=('3d60e860d97c2497ec42de67f85a1eea2c79cdfd'
- 'SKIP')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr --libexecdir=/usr/lib \
- --enable-shared --disable-static \
- --with-quantum-depth=16 \
- --with-umfpack="-lumfpack -lsuitesparseconfig"
-#
https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
-
- LANG=C make
-}
-
-package(){
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- # add octave library path to ld.so.conf.d
- install -d "${pkgdir}/etc/ld.so.conf.d"
- echo "/usr/lib/${pkgname}/${pkgver}" >
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
-}
Copied: octave/repos/extra-x86_64/PKGBUILD (from rev 289753,
octave/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-03-01 11:34:27 UTC (rev 289754)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor : shining <shiningxc.at.gmail.com>
+# Contributor : cyberdune <cyberd...@gmail.com>
+
+pkgname=octave
+pkgver=4.2.1
+pkgrel=4
+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' 'ghostscript'
+ 'suitesparse' 'gl2ps' 'qscintilla-qt5' 'libsndfile')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot'
'qt5-tools' 'portaudio')
+optdepends=('texinfo: for help-support in octave'
+ 'gnuplot: alternative plotting'
+ 'portaudio: audio support')
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
octave-qscintilla-2.10.patch)
+options=('!emptydirs')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton
+sha1sums=('3d60e860d97c2497ec42de67f85a1eea2c79cdfd'
+ 'SKIP'
+ 'ba53969f6fd923051cd306f414af0646ed7dc526')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix qscintilla 2.10 detection
+ patch -p1 -i ../octave-qscintilla-2.10.patch
+ autoreconf -vi
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr --libexecdir=/usr/lib \
+ --enable-shared --disable-static \
+ --with-quantum-depth=16 \
+ --with-umfpack="-lumfpack -lsuitesparseconfig"
+#
https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
+
+ LANG=C make
+}
+
+package(){
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ # add octave library path to ld.so.conf.d
+ install -d "${pkgdir}/etc/ld.so.conf.d"
+ echo "/usr/lib/${pkgname}/${pkgver}" >
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+}
Copied: octave/repos/extra-x86_64/octave-qscintilla-2.10.patch (from rev
289753, octave/trunk/octave-qscintilla-2.10.patch)
===================================================================
--- extra-x86_64/octave-qscintilla-2.10.patch (rev 0)
+++ extra-x86_64/octave-qscintilla-2.10.patch 2017-03-01 11:34:27 UTC (rev
289754)
@@ -0,0 +1,11 @@
+--- octave-4.2.1/m4/acinclude.m4.orig 2017-03-01 11:05:40.106105555 +0000
++++ octave-4.2.1/m4/acinclude.m4 2017-03-01 11:06:05.612735530 +0000
+@@ -1346,7 +1346,7 @@
+ ;;
+ 5)
+ QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
+- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
++ octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2
qscintilla2_qt5"
+ ;;
+ *)
+ AC_MSG_ERROR([Unrecognized Qt version $qt_version])
