Date: Sunday, August 19, 2018 @ 22:11:21 Author: arojas Revision: 332665
archrelease: copy trunk to extra-x86_64 Added: cantor/repos/extra-x86_64/PKGBUILD (from rev 332664, cantor/trunk/PKGBUILD) cantor/repos/extra-x86_64/cantor-julia-0.7.patch (from rev 332664, cantor/trunk/cantor-julia-0.7.patch) Deleted: cantor/repos/extra-x86_64/PKGBUILD ------------------------+ PKGBUILD | 108 +++++++++++++++++++++++------------------------ cantor-julia-0.7.patch | 36 +++++++++++++++ 2 files changed, 91 insertions(+), 53 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-08-19 22:10:52 UTC (rev 332664) +++ PKGBUILD 2018-08-19 22:11:21 UTC (rev 332665) @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=cantor -pkgver=18.08.0 -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.patch::"https://cgit.kde.org/cantor.git/patch/?id=90b001d1") -sha256sums=('be6167ec88504091e9fa9914e0bd1fbb13637fb2b2b228c9274225db6dc85823' - 'SKIP' - '366e1a734a968c4a933e91342308e4d18108c1bc023572848747ca6a2ec656f7') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aa...@kde.org> - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cf...@kde.org> - -prepare() { - mkdir -p build - - cd $pkgname-$pkgver - patch -p1 -i ../cantor-julia.patch # Fix julia backend build -} - -build() { - cd build - cmake ../$pkgname-$pkgver \ - -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 332664, cantor/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-08-19 22:11:21 UTC (rev 332665) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=cantor +pkgver=18.08.0 +pkgrel=3 +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.patch::"https://cgit.kde.org/cantor.git/patch/?id=90b001d1" cantor-julia-0.7.patch) +sha256sums=('be6167ec88504091e9fa9914e0bd1fbb13637fb2b2b228c9274225db6dc85823' + 'SKIP' + '366e1a734a968c4a933e91342308e4d18108c1bc023572848747ca6a2ec656f7' + 'cf031eb1891a97f964c9147a4ff4d7e69f3821eee8fb5dab0693c6483dacd4ee') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aa...@kde.org> + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cf...@kde.org> + +prepare() { + mkdir -p build + + cd $pkgname-$pkgver + patch -p1 -i ../cantor-julia.patch # Fix julia backend build + patch -p1 -i ../cantor-julia-0.7.patch # support julia>=0.7 +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -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/cantor-julia-0.7.patch (from rev 332664, cantor/trunk/cantor-julia-0.7.patch) =================================================================== --- cantor-julia-0.7.patch (rev 0) +++ cantor-julia-0.7.patch 2018-08-19 22:11:21 UTC (rev 332665) @@ -0,0 +1,36 @@ +diff --git a/cmake/FindJulia.cmake b/cmake/FindJulia.cmake +index 77c9f7f8..2d4e1f6a 100644 +--- a/cmake/FindJulia.cmake ++++ b/cmake/FindJulia.cmake +@@ -1,7 +1,7 @@ + if(JULIA_FOUND) + return() + endif() +- ++ + # Find julia executable + find_program(JULIA_EXECUTABLE julia DOC "Julia executable") + +@@ -31,8 +31,14 @@ endif() + # + # Julia includes + # ++if(${JULIA_VERSION_STRING} VERSION_LESS 0.7.0) ++ set(JULIA_BINDIR "JULIA_HOME") ++else() ++ set(JULIA_BINDIR "Sys.BINDIR") ++endif() ++ + execute_process( +- COMMAND ${JULIA_EXECUTABLE} -E "joinpath(match(r\"(.*)(bin)\",JULIA_HOME).captures[1],\"include\",\"julia\")" ++ COMMAND ${JULIA_EXECUTABLE} -E "joinpath(match(r\"(.*)(bin)\",${JULIA_BINDIR}).captures[1],\"include\",\"julia\")" + OUTPUT_VARIABLE JULIA_INCLUDE_DIRS + # COMMAND ${JULIA_EXECUTABLE} -E "abspath(joinpath(JULIA_HOME, \"../..\", \"src\"))" + # OUTPUT_VARIABLE JULIA_INCLUDE_DIRS +@@ -80,4 +86,4 @@ find_package_handle_standard_args( + REQUIRED_VARS JULIA_LIBRARY JULIA_LIBRARY_DIR JULIA_INCLUDE_DIRS + VERSION_VAR JULIA_VERSION_STRING + FAIL_MESSAGE "Julia not found" +-) +\ No newline at end of file ++)