Date: Thursday, December 7, 2017 @ 16:47:56 Author: arojas Revision: 311779
archrelease: copy trunk to extra-x86_64 Added: cantor/repos/extra-x86_64/PKGBUILD (from rev 311778, cantor/trunk/PKGBUILD) cantor/repos/extra-x86_64/cantor-julia-0.6.patch (from rev 311778, cantor/trunk/cantor-julia-0.6.patch) Deleted: cantor/repos/extra-x86_64/PKGBUILD cantor/repos/extra-x86_64/cantor-julia-0.6.patch ------------------------+ PKGBUILD | 120 +++++++++++++++++++++++------------------------ cantor-julia-0.6.patch | 28 +++++----- 2 files changed, 74 insertions(+), 74 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-12-07 16:47:26 UTC (rev 311778) +++ PKGBUILD 2017-12-07 16:47:56 UTC (rev 311779) @@ -1,60 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=cantor -pkgver=17.08.3 -pkgrel=1 -pkgdesc="KDE Frontend to Mathematical Software" -url="https://kde.org/applications/education/cantor/" -arch=(i686 x86_64) -license=(GPL LGPL FDL) -groups=(kde-applications kdeedu) -depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate hicolor-icon-theme) -makedepends=(extra-cmake-modules python python2 kdoctools luajit r julia) -optdepends=('maxima: Maxima backend' - 'octave: Octave backend' - 'r: R backend' - 'luajit: LUA backend' - 'python: Python 3 backend' - 'python2: Python 2 backend' - 'sagemath: SageMath backend' - 'julia: Julia backend') -source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} cantor-julia-0.6.patch) -sha256sums=('3c59c8ac854930d19ec2345853cf613904d43df491e8efc44cb9d0cf3b0de77b' - 'SKIP' - '0d57a2edd7eb2c156ff0dee6c67b6e5679d68f55f2426e77c92f25c2ec3b1f61') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aa...@kde.org> - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cf...@kde.org> - -prepare() { - mkdir -p build - - cd $pkgname-$pkgver -# fix build with julia 0.6 - patch -p1 -i ../cantor-julia-0.6.patch -} - -build() { - cd build - - if [[ $CARCH == 'i686' ]]; then - export CFLAGS+=" -march=pentium4" - export CXXFLAGS+=" -march=pentium4" - fi - - cmake ../$pkgname-$pkgver \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_TESTING=OFF \ - -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: cantor/repos/extra-x86_64/PKGBUILD (from rev 311778, cantor/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-12-07 16:47:56 UTC (rev 311779) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=cantor +pkgver=17.08.3 +pkgrel=2 +pkgdesc="KDE Frontend to Mathematical Software" +url="https://kde.org/applications/education/cantor/" +arch=(x86_64) +license=(GPL LGPL FDL) +groups=(kde-applications kdeedu) +depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate hicolor-icon-theme) +makedepends=(extra-cmake-modules python python2 kdoctools luajit r julia) +optdepends=('maxima: Maxima backend' + 'octave: Octave backend' + 'r: R backend' + 'luajit: LUA backend' + 'python: Python 3 backend' + 'python2: Python 2 backend' + 'sagemath: SageMath backend' + 'julia: Julia backend') +source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} cantor-julia-0.6.patch) +sha256sums=('3c59c8ac854930d19ec2345853cf613904d43df491e8efc44cb9d0cf3b0de77b' + 'SKIP' + '0d57a2edd7eb2c156ff0dee6c67b6e5679d68f55f2426e77c92f25c2ec3b1f61') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aa...@kde.org> + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cf...@kde.org> + +prepare() { + mkdir -p build + + cd $pkgname-$pkgver +# fix build with julia 0.6 + patch -p1 -i ../cantor-julia-0.6.patch +} + +build() { + cd build + + if [[ $CARCH == 'i686' ]]; then + export CFLAGS+=" -march=pentium4" + export CXXFLAGS+=" -march=pentium4" + fi + + cmake ../$pkgname-$pkgver \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_TESTING=OFF \ + -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Deleted: cantor-julia-0.6.patch =================================================================== --- cantor-julia-0.6.patch 2017-12-07 16:47:26 UTC (rev 311778) +++ cantor-julia-0.6.patch 2017-12-07 16:47:56 UTC (rev 311779) @@ -1,14 +0,0 @@ -diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp -index dc8a48e5..91c2c338 100644 ---- a/src/backends/julia/juliaserver/juliaserver.cpp -+++ b/src/backends/julia/juliaserver/juliaserver.cpp -@@ -40,7 +40,7 @@ JuliaServer::~JuliaServer() - void JuliaServer::login(const QString &path) const - { - QString dir_path = QFileInfo(path).dir().absolutePath(); -- jl_init(dir_path.toLatin1().constData()); -+ jl_init_with_image(dir_path.toLatin1().constData(), NULL); - } - - void JuliaServer::runJuliaCommand(const QString &command) - Copied: cantor/repos/extra-x86_64/cantor-julia-0.6.patch (from rev 311778, cantor/trunk/cantor-julia-0.6.patch) =================================================================== --- cantor-julia-0.6.patch (rev 0) +++ cantor-julia-0.6.patch 2017-12-07 16:47:56 UTC (rev 311779) @@ -0,0 +1,14 @@ +diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp +index dc8a48e5..91c2c338 100644 +--- a/src/backends/julia/juliaserver/juliaserver.cpp ++++ b/src/backends/julia/juliaserver/juliaserver.cpp +@@ -40,7 +40,7 @@ JuliaServer::~JuliaServer() + void JuliaServer::login(const QString &path) const + { + QString dir_path = QFileInfo(path).dir().absolutePath(); +- jl_init(dir_path.toLatin1().constData()); ++ jl_init_with_image(dir_path.toLatin1().constData(), NULL); + } + + void JuliaServer::runJuliaCommand(const QString &command) +