[arch-commits] Commit in cantor/trunk (PKGBUILD cantor-julia-0.6.patch)

[Antonio Rojas]

    Date: Sunday, June 25, 2017 @ 21:14:18
  Author: arojas
Revision: 299251

julia 0.6 rebuild

Added:
  cantor/trunk/cantor-julia-0.6.patch
Modified:
  cantor/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   11 ++++++++---
 cantor-julia-0.6.patch |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-25 20:30:06 UTC (rev 299250)
+++ PKGBUILD	2017-06-25 21:14:18 UTC (rev 299251)
@@ -4,7 +4,7 @@
 
 pkgname=cantor
 pkgver=17.04.2
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Frontend to Mathematical Software"
 url="https://kde.org/applications/education/cantor/"
 arch=('i686' 'x86_64')
@@ -22,13 +22,18 @@
             'julia: Julia backend')
 conflicts=('kdeedu-cantor')
 replaces=('kdeedu-cantor')
-source=("https://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig} cantor-julia-0.6.patch)
 sha256sums=('f194eba838c08dea49877fecf17091f598b70f5357f4574388d91c8bc1392120'
-            'SKIP')
+            'SKIP'
+            '0d57a2edd7eb2c156ff0dee6c67b6e5679d68f55f2426e77c92f25c2ec3b1f61')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid 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() {

Added: cantor-julia-0.6.patch
===================================================================
--- cantor-julia-0.6.patch	                        (rev 0)
+++ cantor-julia-0.6.patch	2017-06-25 21:14:18 UTC (rev 299251)
@@ -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)
+