[arch-commits] Commit in cantor/repos/extra-x86_64 (7 files)

Antonio Rojas arojas at archlinux.org
Mon Aug 20 23:04:43 UTC 2018


    Date: Monday, August 20, 2018 @ 23:04:43
  Author: arojas
Revision: 332722

archrelease: copy trunk to extra-x86_64

Added:
  cantor/repos/extra-x86_64/PKGBUILD
    (from rev 332721, cantor/trunk/PKGBUILD)
  cantor/repos/extra-x86_64/cantor-julia-0.7.patch
    (from rev 332721, cantor/trunk/cantor-julia-0.7.patch)
  cantor/repos/extra-x86_64/cantor-julia-1.0.patch
    (from rev 332721, cantor/trunk/cantor-julia-1.0.patch)
  cantor/repos/extra-x86_64/sage-8.3.patch
    (from rev 332721, cantor/trunk/sage-8.3.patch)
Deleted:
  cantor/repos/extra-x86_64/PKGBUILD
  cantor/repos/extra-x86_64/cantor-julia-0.7.patch
  cantor/repos/extra-x86_64/sage-8.3.patch

------------------------+
 PKGBUILD               |  116 +++++++++++++++++++++++------------------------
 cantor-julia-0.7.patch |   72 ++++++++++++++---------------
 cantor-julia-1.0.patch |   33 +++++++++++++
 sage-8.3.patch         |   26 +++++-----
 4 files changed, 141 insertions(+), 106 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-20 23:04:10 UTC (rev 332721)
+++ PKGBUILD	2018-08-20 23:04:43 UTC (rev 332722)
@@ -1,57 +0,0 @@
-# $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=18.08.0
-pkgrel=4
-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 sage-8.3.patch)
-sha256sums=('be6167ec88504091e9fa9914e0bd1fbb13637fb2b2b228c9274225db6dc85823'
-            'SKIP'
-            '366e1a734a968c4a933e91342308e4d18108c1bc023572848747ca6a2ec656f7'
-            'cf031eb1891a97f964c9147a4ff4d7e69f3821eee8fb5dab0693c6483dacd4ee'
-            '78c90097749e53433641b3acfd637b2aaa12f04c03a304b71c2cc5a5672cb4de')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at 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
-  patch -p1 -i ../sage-8.3.patch # fix sagemath backend with 8.3
-}
-
-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 332721, cantor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-08-20 23:04:43 UTC (rev 332722)
@@ -0,0 +1,59 @@
+# $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=18.08.0
+pkgrel=5
+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 sage-8.3.patch cantor-julia-1.0.patch)
+sha256sums=('be6167ec88504091e9fa9914e0bd1fbb13637fb2b2b228c9274225db6dc85823'
+            'SKIP'
+            '366e1a734a968c4a933e91342308e4d18108c1bc023572848747ca6a2ec656f7'
+            'cf031eb1891a97f964c9147a4ff4d7e69f3821eee8fb5dab0693c6483dacd4ee'
+            '78c90097749e53433641b3acfd637b2aaa12f04c03a304b71c2cc5a5672cb4de'
+            '81b6752473657318d91e748c6c1799cdd285037fa1bdfad29d401cacf9d98f7b')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at 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
+  patch -p1 -i ../cantor-julia-1.0.patch # support julia>=1.0
+  patch -p1 -i ../sage-8.3.patch # fix sagemath backend with 8.3
+}
+
+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
+}

Deleted: cantor-julia-0.7.patch
===================================================================
--- cantor-julia-0.7.patch	2018-08-20 23:04:10 UTC (rev 332721)
+++ cantor-julia-0.7.patch	2018-08-20 23:04:43 UTC (rev 332722)
@@ -1,36 +0,0 @@
-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
-+)

Copied: cantor/repos/extra-x86_64/cantor-julia-0.7.patch (from rev 332721, cantor/trunk/cantor-julia-0.7.patch)
===================================================================
--- cantor-julia-0.7.patch	                        (rev 0)
+++ cantor-julia-0.7.patch	2018-08-20 23:04:43 UTC (rev 332722)
@@ -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
++)

Copied: cantor/repos/extra-x86_64/cantor-julia-1.0.patch (from rev 332721, cantor/trunk/cantor-julia-1.0.patch)
===================================================================
--- cantor-julia-1.0.patch	                        (rev 0)
+++ cantor-julia-1.0.patch	2018-08-20 23:04:43 UTC (rev 332722)
@@ -0,0 +1,33 @@
+diff --git a/cmake/FindJulia.cmake b/cmake/FindJulia.cmake
+index 2d4e1f6a..7f3d7a82 100644
+--- a/cmake/FindJulia.cmake
++++ b/cmake/FindJulia.cmake
+@@ -61,8 +61,14 @@ endif()
+ #
+ # Julia library location
+ #
++if(${JULIA_VERSION_STRING} VERSION_LESS 0.7.0)
++    set(JULIA_LIBDL_COMMAND "abspath(dirname(Libdl.dlpath(\"libjulia\")))")
++else()
++    set(JULIA_LIBDL_COMMAND "using Libdl; abspath(dirname(Libdl.dlpath(\"libjulia\")))")
++endif()
++
+ execute_process(
+-    COMMAND ${JULIA_EXECUTABLE} -E "abspath(dirname(Libdl.dlpath(\"libjulia\")))"
++    COMMAND ${JULIA_EXECUTABLE} -E ${JULIA_LIBDL_COMMAND}
+     OUTPUT_VARIABLE JULIA_LIBRARY_DIR
+     RESULT_VARIABLE RESULT
+ )
+diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp
+index 5369fe50..0a1e8889 100644
+--- a/src/backends/julia/juliaserver/juliaserver.cpp
++++ b/src/backends/julia/juliaserver/juliaserver.cpp
+@@ -43,7 +43,7 @@ JuliaServer::~JuliaServer()
+ 
+ void JuliaServer::login(const QString &path) const
+ {
+-#if JULIA_VERSION_MINOR > 5
++#if (JULIA_VERSION_MAJOR > 0 || JULIA_VERSION_MINOR > 5)
+     Q_UNUSED(path)
+     jl_init();
+ #else

Deleted: sage-8.3.patch
===================================================================
--- sage-8.3.patch	2018-08-20 23:04:10 UTC (rev 332721)
+++ sage-8.3.patch	2018-08-20 23:04:43 UTC (rev 332722)
@@ -1,13 +0,0 @@
-diff --git a/src/backends/sage/sagesession.cpp b/src/backends/sage/sagesession.cpp
-index c2973a8a..f23914ad 100644
---- a/src/backends/sage/sagesession.cpp
-+++ b/src/backends/sage/sagesession.cpp
-@@ -118,7 +118,7 @@ void SageSession::login()
-     m_process=new KPtyProcess(this);
-     updateSageVersion();
-     const QString& sageExecFile = SageSettings::self()->path().toLocalFile();
--    if (m_sageVersion >= SageSession::VersionInfo(8, 3))
-+    if (m_sageVersion >= SageSession::VersionInfo(8, 4))
-         m_process->setProgram(sageExecFile, QStringList() << QLatin1String("--simple-prompt"));
-     else
-         {

Copied: cantor/repos/extra-x86_64/sage-8.3.patch (from rev 332721, cantor/trunk/sage-8.3.patch)
===================================================================
--- sage-8.3.patch	                        (rev 0)
+++ sage-8.3.patch	2018-08-20 23:04:43 UTC (rev 332722)
@@ -0,0 +1,13 @@
+diff --git a/src/backends/sage/sagesession.cpp b/src/backends/sage/sagesession.cpp
+index c2973a8a..f23914ad 100644
+--- a/src/backends/sage/sagesession.cpp
++++ b/src/backends/sage/sagesession.cpp
+@@ -118,7 +118,7 @@ void SageSession::login()
+     m_process=new KPtyProcess(this);
+     updateSageVersion();
+     const QString& sageExecFile = SageSettings::self()->path().toLocalFile();
+-    if (m_sageVersion >= SageSession::VersionInfo(8, 3))
++    if (m_sageVersion >= SageSession::VersionInfo(8, 4))
+         m_process->setProgram(sageExecFile, QStringList() << QLatin1String("--simple-prompt"));
+     else
+         {



More information about the arch-commits mailing list