[arch-commits] Commit in cantor/repos (3 files)

[Antonio Rojas]

    Date: Wednesday, April 11, 2018 @ 10:28:07
  Author: arojas
Revision: 321533

archrelease: copy trunk to staging-x86_64

Added:
  cantor/repos/staging-x86_64/
  cantor/repos/staging-x86_64/PKGBUILD
    (from rev 321532, cantor/trunk/PKGBUILD)
  cantor/repos/staging-x86_64/cantor-julia-0.6.patch
    (from rev 321532, cantor/trunk/cantor-julia-0.6.patch)

------------------------+
 PKGBUILD               |   53 +++++++++++++++++++++++++++++++++++++++++++++++
 cantor-julia-0.6.patch |   14 ++++++++++++
 2 files changed, 67 insertions(+)

Copied: cantor/repos/staging-x86_64/PKGBUILD (from rev 321532, cantor/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-04-11 10:28:07 UTC (rev 321533)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=17.12.3
+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-0.6.patch)
+sha256sums=('5c0cd0e73bea75c234c011baa850ba208739dd40bc29f12209baec4d4a5d5022'
+            'SKIP'
+            '0d57a2edd7eb2c156ff0dee6c67b6e5679d68f55f2426e77c92f25c2ec3b1f61')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at 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
+  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/staging-x86_64/cantor-julia-0.6.patch (from rev 321532, cantor/trunk/cantor-julia-0.6.patch)
===================================================================
--- staging-x86_64/cantor-julia-0.6.patch	                        (rev 0)
+++ staging-x86_64/cantor-julia-0.6.patch	2018-04-11 10:28:07 UTC (rev 321533)
@@ -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)
+