Date: Thursday, February 8, 2018 @ 16:58:46
  Author: arojas
Revision: 316323

archrelease: copy trunk to extra-x86_64

Added:
  cantor/repos/extra-x86_64/PKGBUILD
    (from rev 316322, cantor/trunk/PKGBUILD)
  cantor/repos/extra-x86_64/cantor-julia-0.6.patch
    (from rev 316322, 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               |  108 +++++++++++++++++++++++------------------------
 cantor-julia-0.6.patch |   28 ++++++------
 2 files changed, 68 insertions(+), 68 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2018-02-08 16:58:33 UTC (rev 316322)
+++ PKGBUILD    2018-02-08 16:58:46 UTC (rev 316323)
@@ -1,54 +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.12.1
-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=('8adfb48b0cdbfffcc80bbb597c84a77b11a88ac9352366c151d66899c4d9b2cb'
-            '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
-  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 316322, 
cantor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2018-02-08 16:58:46 UTC (rev 316323)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+
+pkgname=cantor
+pkgver=17.12.2
+pkgrel=1
+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=('cc58c93b6277df0c2169028da2e078d75de4cbe6fe02e9397744e3bb982b05ac'
+            '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
+  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      2018-02-08 16:58:33 UTC (rev 316322)
+++ cantor-julia-0.6.patch      2018-02-08 16:58:46 UTC (rev 316323)
@@ -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 316322, 
cantor/trunk/cantor-julia-0.6.patch)
===================================================================
--- cantor-julia-0.6.patch                              (rev 0)
+++ cantor-julia-0.6.patch      2018-02-08 16:58:46 UTC (rev 316323)
@@ -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)
+

Reply via email to