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

Antonio Rojas arojas at archlinux.org
Mon Jul 24 17:18:08 UTC 2017


    Date: Monday, July 24, 2017 @ 17:18:07
  Author: arojas
Revision: 301213

archrelease: copy trunk to staging-i686, staging-x86_64

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

---------------------------------------+
 staging-i686/PKGBUILD                 |   61 ++++++++++++++++++++++++++++++++
 staging-i686/cantor-julia-0.6.patch   |   14 +++++++
 staging-x86_64/PKGBUILD               |   61 ++++++++++++++++++++++++++++++++
 staging-x86_64/cantor-julia-0.6.patch |   14 +++++++
 4 files changed, 150 insertions(+)

Copied: cantor/repos/staging-i686/PKGBUILD (from rev 301212, cantor/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2017-07-24 17:18:07 UTC (rev 301213)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=17.04.3
+pkgrel=2
+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')
+conflicts=('kdeedu-cantor')
+replaces=('kdeedu-cantor')
+source=("https://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig} cantor-julia-0.6.patch)
+sha256sums=('3c24ae740de7dff3f8d062cc27c6f6ad7d40538a96997e93a4df437f05839b51'
+            '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
+
+  if [[ $CARCH == 'i686' ]]; then
+    export CFLAGS+=" -march=pentium4"
+    export CXXFLAGS+=" -march=pentium4"
+  fi
+
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DKDE_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-i686/cantor-julia-0.6.patch (from rev 301212, cantor/trunk/cantor-julia-0.6.patch)
===================================================================
--- staging-i686/cantor-julia-0.6.patch	                        (rev 0)
+++ staging-i686/cantor-julia-0.6.patch	2017-07-24 17:18:07 UTC (rev 301213)
@@ -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)
+

Copied: cantor/repos/staging-x86_64/PKGBUILD (from rev 301212, cantor/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2017-07-24 17:18:07 UTC (rev 301213)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=17.04.3
+pkgrel=2
+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')
+conflicts=('kdeedu-cantor')
+replaces=('kdeedu-cantor')
+source=("https://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig} cantor-julia-0.6.patch)
+sha256sums=('3c24ae740de7dff3f8d062cc27c6f6ad7d40538a96997e93a4df437f05839b51'
+            '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
+
+  if [[ $CARCH == 'i686' ]]; then
+    export CFLAGS+=" -march=pentium4"
+    export CXXFLAGS+=" -march=pentium4"
+  fi
+
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DKDE_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 301212, 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	2017-07-24 17:18:07 UTC (rev 301213)
@@ -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)
+



More information about the arch-commits mailing list