[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Friday, November 27, 2020 @ 12:05:30 Author: foutrelis Revision: 402101 upgpkg: cantor 20.08.3-3: restore Python backend Modified: cantor/trunk/PKGBUILD --+ PKGBUILD | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-11-27 07:18:32 UTC (rev 402100) +++ PKGBUILD2020-11-27 12:05:30 UTC (rev 402101) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=20.08.3 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64) @@ -19,12 +19,19 @@ 'python: Python backend' 'sagemath: SageMath backend' 'julia: Julia backend') -source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}) +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} + $pkgname-py39.patch::https://invent.kde.org/education/cantor/-/commit/c794fb5f0f61.patch) sha256sums=('14aefe60ca2ff7aeaf7af8080dd00e80be8d747faeb9cd5a2df88f0d3af358da' -'SKIP') +'SKIP' +'cacf5ecf60fcf420b7bfeb0248d412f3a7272cf6d4e591e2f4c040a7b3b18800') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../$pkgname-py39.patch +} + build() { cmake -B build -S $pkgname-$pkgver \ -DBUILD_TESTING=OFF
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Thursday, November 12, 2020 @ 18:45:13 Author: foutrelis Revision: 400672 upgpkg: cantor 20.08.3-2: Python 3.9 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-11-12 18:41:25 UTC (rev 400671) +++ PKGBUILD2020-11-12 18:45:13 UTC (rev 400672) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=20.08.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Sunday, March 22, 2020 @ 08:55:56 Author: arojas Revision: 378296 julia 1.4 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-03-22 08:47:48 UTC (rev 378295) +++ PKGBUILD2020-03-22 08:55:56 UTC (rev 378296) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=19.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Thursday, December 12, 2019 @ 23:07:51 Author: arojas Revision: 371336 Remove bogus patch reference Modified: cantor/trunk/PKGBUILD --+ PKGBUILD | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-12-12 22:36:07 UTC (rev 371335) +++ PKGBUILD2019-12-12 23:07:51 UTC (rev 371336) @@ -16,22 +16,17 @@ 'octave: Octave backend' 'r: R backend' 'luajit: LUA backend' -'python: Python 3 backend' +'python: Python backend' 'sagemath: SageMath backend' 'julia: Julia backend') -source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} - cantor-no-python2.patch) +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}) sha256sums=('58af0ddc0b8b731970998cdd67c926f37c5b7609019c5923f8d7724c3ac6e5c5' -'SKIP' -'0f9ebf80115304e1c676863b0423dfaa01b4a889bd4d69a74cc9e25b40fea8dc') +'SKIP') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck prepare() { mkdir -p build - - cd $pkgname-$pkgver -# patch -p1 -i ../cantor-no-python2.patch # Fix build without python 2 } build() {
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Friday, December 6, 2019 @ 15:33:53 Author: arojas Revision: 370474 julia 1.3 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-12-06 14:58:45 UTC (rev 370473) +++ PKGBUILD2019-12-06 15:33:53 UTC (rev 370474) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=19.08.3 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Thursday, November 7, 2019 @ 13:46:20 Author: arojas Revision: 367127 python 3.8 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-11-07 13:41:59 UTC (rev 367126) +++ PKGBUILD2019-11-07 13:46:20 UTC (rev 367127) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=19.08.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Monday, November 4, 2019 @ 01:08:08 Author: felixonmars Revision: 366653 Python 3.8 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-11-04 00:16:23 UTC (rev 366652) +++ PKGBUILD2019-11-04 01:08:08 UTC (rev 366653) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=19.08.2 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Saturday, October 26, 2019 @ 16:51:12 Author: arojas Revision: 365886 Fix sagemath backend after sage-env removal Modified: cantor/trunk/PKGBUILD --+ PKGBUILD | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-10-26 16:37:23 UTC (rev 365885) +++ PKGBUILD2019-10-26 16:51:12 UTC (rev 365886) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=19.08.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64) @@ -20,14 +20,19 @@ 'python2: Python 2 backend' 'sagemath: SageMath backend' 'julia: Julia backend') -source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}) +source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} + cantor-no-sage-env.patch::"https://cgit.kde.org/cantor.git/patch/?id=13b8d731";) sha256sums=('039bb1e61b996ab3776502db9367ed1f7fb7e674292647f1b28f5bd9b1c1b9cb' -'SKIP') +'SKIP' +'2b1321df1b794cc968cdd821df58ab17f7e52781ce7a6720929c9118324ab611') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck prepare() { mkdir -p build + + cd $pkgname-$pkgver + patch -p1 -i ../cantor-no-sage-env.patch # Fix sagemath backend } build() {
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Sunday, August 25, 2019 @ 20:47:38 Author: arojas Revision: 361177 julia 1.2 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-08-25 20:36:13 UTC (rev 361176) +++ PKGBUILD2019-08-25 20:47:38 UTC (rev 361177) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=19.08.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64) @@ -33,7 +33,6 @@ build() { cd build cmake ../$pkgname-$pkgver \ --DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_TESTING=OFF \ -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Monday, March 18, 2019 @ 16:44:53 Author: arojas Revision: 348600 libqalculate 3.0.0 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-03-18 16:35:59 UTC (rev 348599) +++ PKGBUILD2019-03-18 16:44:53 UTC (rev 348600) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=18.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Monday, October 29, 2018 @ 20:49:58 Author: arojas Revision: 337511 libqalculate 2.8 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-10-29 20:49:50 UTC (rev 337510) +++ PKGBUILD2018-10-29 20:49:58 UTC (rev 337511) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=18.08.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD cantor-julia-1.0.patch)
Date: Monday, August 20, 2018 @ 23:04:10 Author: arojas Revision: 332721 julia 1.0 rebuild Added: cantor/trunk/cantor-julia-1.0.patch Modified: cantor/trunk/PKGBUILD + PKGBUILD |8 +--- cantor-julia-1.0.patch | 33 + 2 files changed, 38 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-08-20 21:54:39 UTC (rev 332720) +++ PKGBUILD2018-08-20 23:04:10 UTC (rev 332721) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=18.08.0 -pkgrel=4 +pkgrel=5 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64) @@ -22,12 +22,13 @@ '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.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') +'78c90097749e53433641b3acfd637b2aaa12f04c03a304b71c2cc5a5672cb4de' +'81b6752473657318d91e748c6c1799cdd285037fa1bdfad29d401cacf9d98f7b') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck @@ -37,6 +38,7 @@ 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 } Added: cantor-julia-1.0.patch === --- cantor-julia-1.0.patch (rev 0) +++ cantor-julia-1.0.patch 2018-08-20 23:04:10 UTC (rev 332721) @@ -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
[arch-commits] Commit in cantor/trunk (PKGBUILD sage-8.3.patch)
Date: Monday, August 20, 2018 @ 10:20:01 Author: arojas Revision: 332690 Fix sagemath backend Added: cantor/trunk/sage-8.3.patch Modified: cantor/trunk/PKGBUILD + PKGBUILD |8 +--- sage-8.3.patch | 13 + 2 files changed, 18 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-08-20 10:18:57 UTC (rev 332689) +++ PKGBUILD2018-08-20 10:20:01 UTC (rev 332690) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=18.08.0 -pkgrel=3 +pkgrel=4 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64) @@ -22,11 +22,12 @@ '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) + 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') +'cf031eb1891a97f964c9147a4ff4d7e69f3821eee8fb5dab0693c6483dacd4ee' +'78c90097749e53433641b3acfd637b2aaa12f04c03a304b71c2cc5a5672cb4de') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck @@ -36,6 +37,7 @@ 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() { Added: sage-8.3.patch === --- sage-8.3.patch (rev 0) +++ sage-8.3.patch 2018-08-20 10:20:01 UTC (rev 332690) @@ -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 + {
[arch-commits] Commit in cantor/trunk (PKGBUILD cantor-julia-0.7.patch)
Date: Sunday, August 19, 2018 @ 22:10:52 Author: arojas Revision: 332664 julia 0.7 rebuild Added: cantor/trunk/cantor-julia-0.7.patch Modified: cantor/trunk/PKGBUILD + PKGBUILD |8 +--- cantor-julia-0.7.patch | 36 2 files changed, 41 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-08-19 19:50:43 UTC (rev 332663) +++ PKGBUILD2018-08-19 22:10:52 UTC (rev 332664) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=18.08.0 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64) @@ -22,10 +22,11 @@ '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.patch::"https://cgit.kde.org/cantor.git/patch/?id=90b001d1"; cantor-julia-0.7.patch) sha256sums=('be6167ec88504091e9fa9914e0bd1fbb13637fb2b2b228c9274225db6dc85823' 'SKIP' -'366e1a734a968c4a933e91342308e4d18108c1bc023572848747ca6a2ec656f7') +'366e1a734a968c4a933e91342308e4d18108c1bc023572848747ca6a2ec656f7' +'cf031eb1891a97f964c9147a4ff4d7e69f3821eee8fb5dab0693c6483dacd4ee') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck @@ -34,6 +35,7 @@ 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 } build() { Added: cantor-julia-0.7.patch === --- cantor-julia-0.7.patch (rev 0) +++ cantor-julia-0.7.patch 2018-08-19 22:10:52 UTC (rev 332664) @@ -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 ++)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Saturday, August 18, 2018 @ 17:19:33 Author: arojas Revision: 332282 libqalculate 2.6.2 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-08-18 17:16:55 UTC (rev 332281) +++ PKGBUILD2018-08-18 17:19:33 UTC (rev 332282) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=18.08.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Monday, July 23, 2018 @ 16:06:20 Author: foutrelis Revision: 329449 Python 3.7 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-07-23 16:03:28 UTC (rev 329448) +++ PKGBUILD2018-07-23 16:06:20 UTC (rev 329449) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=18.04.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Friday, June 29, 2018 @ 18:21:35 Author: arojas Revision: 327779 Fix build with Python 3.7 Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-06-29 17:22:51 UTC (rev 327778) +++ PKGBUILD2018-06-29 18:21:35 UTC (rev 327779) @@ -22,10 +22,12 @@ 'sagemath: SageMath backend' 'julia: Julia backend') source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} - cantor-sagemath.patch::"https://cgit.kde.org/cantor.git/patch/?id=7e4d0819";) + cantor-sagemath.patch::"https://cgit.kde.org/cantor.git/patch/?id=7e4d0819"; + cantor-python3.7.patch::"https://cgit.kde.org/cantor.git/patch/?id=6286f14e";) sha256sums=('aab96ae512c3ddfaaf288ca0531b685c689a40a31222326441501b9a18bc320d' 'SKIP' -'5b5275ae4cee20af865fe861ae07da976608913372ceb031b6bf70653fc2d21b') +'5b5275ae4cee20af865fe861ae07da976608913372ceb031b6bf70653fc2d21b' +'f769334f37b6a0c4c6cb239709bca6f8a1369cf377dcb33fa2fa11535a408616') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck @@ -34,6 +36,7 @@ cd $pkgname-$pkgver patch -p1 -i ../cantor-sagemath.patch # Fix sagemath backend + patch -p1 -i ../cantor-python3.7.patch # fix build with Python 3.7 } build() {
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Sunday, June 24, 2018 @ 21:27:19 Author: arojas Revision: 327532 Fix sagemath backend Modified: cantor/trunk/PKGBUILD --+ PKGBUILD | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-06-24 21:11:19 UTC (rev 327531) +++ PKGBUILD2018-06-24 21:27:19 UTC (rev 327532) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=18.04.2 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64) @@ -21,14 +21,19 @@ 'python2: Python 2 backend' 'sagemath: SageMath backend' 'julia: Julia backend') -source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}) +source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} + cantor-sagemath.patch::"https://cgit.kde.org/cantor.git/patch/?id=7e4d0819";) sha256sums=('aab96ae512c3ddfaaf288ca0531b685c689a40a31222326441501b9a18bc320d' -'SKIP') +'SKIP' +'5b5275ae4cee20af865fe861ae07da976608913372ceb031b6bf70653fc2d21b') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck prepare() { mkdir -p build + + cd $pkgname-$pkgver + patch -p1 -i ../cantor-sagemath.patch # Fix sagemath backend } build() {
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Monday, June 11, 2018 @ 15:43:53 Author: arojas Revision: 326735 libqalculate 2.6.0 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-06-11 15:41:47 UTC (rev 326734) +++ PKGBUILD2018-06-11 15:43:53 UTC (rev 326735) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=18.04.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Tuesday, May 15, 2018 @ 14:17:41 Author: arojas Revision: 324280 libqalculate 2.5 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-05-15 14:15:35 UTC (rev 324279) +++ PKGBUILD2018-05-15 14:17:41 UTC (rev 324280) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=18.04.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Wednesday, April 11, 2018 @ 10:27:39 Author: arojas Revision: 321532 libqalculate 2.4.0 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-04-11 10:25:42 UTC (rev 321531) +++ PKGBUILD2018-04-11 10:27:39 UTC (rev 321532) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=17.12.3 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Saturday, March 31, 2018 @ 23:38:20 Author: arojas Revision: 320784 libqalculate 2.3.0 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-03-31 23:36:15 UTC (rev 320783) +++ PKGBUILD2018-03-31 23:38:20 UTC (rev 320784) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=17.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Wednesday, January 17, 2018 @ 11:13:32 Author: arojas Revision: 314981 libqalculate 2.2.1 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-01-17 11:12:17 UTC (rev 314980) +++ PKGBUILD2018-01-17 11:13:32 UTC (rev 314981) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=17.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Thursday, December 7, 2017 @ 16:47:26 Author: arojas Revision: 311778 libqalculate 2.2 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-12-07 16:45:05 UTC (rev 311777) +++ PKGBUILD2017-12-07 16:47:26 UTC (rev 311778) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=17.08.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(x86_64)
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Monday, October 2, 2017 @ 16:10:45 Author: arojas Revision: 306570 libqalculate 2.1.0 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-10-02 16:07:32 UTC (rev 306569) +++ PKGBUILD2017-10-02 16:10:45 UTC (rev 306570) @@ -5,7 +5,7 @@ pkgname=cantor pkgver=17.08.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=(i686 x86_64) @@ -47,7 +47,7 @@ cmake ../$pkgname-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ --DKDE_INSTALL_LIBDIR=lib \ +-DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_TESTING=OFF \ -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Monday, August 28, 2017 @ 14:35:09 Author: arojas Revision: 304297 Remove cln dependency Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-08-28 14:27:42 UTC (rev 304296) +++ PKGBUILD2017-08-28 14:35:09 UTC (rev 304297) @@ -5,14 +5,14 @@ pkgname=cantor pkgver=17.08.0 -pkgrel=2 +pkgrel=3 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 cln hicolor-icon-theme) -makedepends=(extra-cmake-modules python python2 kdoctools luajit r julia) +depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate hicolor-icon-theme) +makedepends=(extra-cmake-modules python python2 kdoctools luajit r julia cln) optdepends=('maxima: Maxima backend' 'octave: Octave backend' 'r: R backend'
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Monday, August 28, 2017 @ 13:59:55 Author: arojas Revision: 304286 libqalculate 2.0.0 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-08-28 13:52:26 UTC (rev 304285) +++ PKGBUILD2017-08-28 13:59:55 UTC (rev 304286) @@ -1,17 +1,18 @@ # $Id$ # Maintainer: Felix Yan +# Maintainer: Antonio Rojas # Contributor: Andrea Scarpino pkgname=cantor pkgver=17.08.0 -pkgrel=1 +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') +arch=(i686 x86_64) +license=(GPL LGPL FDL) +groups=(kde-applications kdeedu) +depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate cln hicolor-icon-theme) +makedepends=(extra-cmake-modules python python2 kdoctools luajit r julia) optdepends=('maxima: Maxima backend' 'octave: Octave backend' 'r: R backend' @@ -20,9 +21,7 @@ '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) +source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} cantor-julia-0.6.patch) sha256sums=('a00bb075045c54c6abaeb7ede386cbbff7054e64580e396266d554f54bc76757' 'SKIP' '0d57a2edd7eb2c156ff0dee6c67b6e5679d68f55f2426e77c92f25c2ec3b1f61')
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Monday, July 24, 2017 @ 17:17:45 Author: arojas Revision: 301212 libqalculate 1.0.0 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-07-24 17:14:07 UTC (rev 301211) +++ PKGBUILD2017-07-24 17:17:45 UTC (rev 301212) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=17.04.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64')
[arch-commits] Commit in cantor/trunk (PKGBUILD cantor-julia-0.6.patch)
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 === --- PKGBUILD2017-06-25 20:30:06 UTC (rev 299250) +++ PKGBUILD2017-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 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) +
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Tuesday, May 30, 2017 @ 17:43:01 Author: arojas Revision: 296846 libqalculate 0.9.12 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-05-30 17:38:11 UTC (rev 296845) +++ PKGBUILD2017-05-30 17:43:01 UTC (rev 296846) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=17.04.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64')
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Sunday, March 12, 2017 @ 11:14:19 Author: arojas Revision: 290662 libqalculate 0.9.11 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-03-12 11:06:51 UTC (rev 290661) +++ PKGBUILD2017-03-12 11:14:19 UTC (rev 290662) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=16.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="https://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64')
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Sunday, January 1, 2017 @ 22:16:27 Author: arojas Revision: 285169 Fix building python3 backend with Python 3.6 Modified: cantor/trunk/PKGBUILD --+ PKGBUILD | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-01-01 22:14:40 UTC (rev 285168) +++ PKGBUILD2017-01-01 22:16:27 UTC (rev 285169) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=16.12.0 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64') @@ -22,13 +22,19 @@ 'julia: Julia backend') conflicts=('kdeedu-cantor') replaces=('kdeedu-cantor') -source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig}) +source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"{,.sig} + cantor-python3.6.patch::"https://cgit.kde.org/cantor.git/patch/?id=2c67377";) sha1sums=('58498ba930688dd948c9796e06998bde9ec5c160' - 'SKIP') + 'SKIP' + '4778cda4f5289f0bd9ab1c7943c9e16c7f82197a') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid prepare() { mkdir -p build + +# Fix python3 backend build with python 3.6 + cd $pkgname-$pkgver + patch -p1 -i ../cantor-python3.6.patch } build() {
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Monday, December 26, 2016 @ 10:32:11 Author: felixonmars Revision: 284804 Python 3.6 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-12-26 10:25:04 UTC (rev 284803) +++ PKGBUILD2016-12-26 10:32:11 UTC (rev 284804) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=16.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64')
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Tuesday, July 26, 2016 @ 18:36:00 Author: arojas Revision: 272482 libqalculate 0.9.9 rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-07-26 18:31:39 UTC (rev 272481) +++ PKGBUILD2016-07-26 18:36:00 UTC (rev 272482) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=16.04.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64')
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Friday, May 27, 2016 @ 18:50:54 Author: arojas Revision: 268696 Backport fixes for sagemath backend Modified: cantor/trunk/PKGBUILD --+ PKGBUILD | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-05-27 13:39:36 UTC (rev 268695) +++ PKGBUILD2016-05-27 16:50:54 UTC (rev 268696) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=16.04.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64') @@ -21,11 +21,17 @@ 'sagemath: SageMath backend') conflicts=('kdeedu-cantor') replaces=('kdeedu-cantor') -source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz";) -sha1sums=('649f6c07b0f3bda8ee4417bb8ade0e191074e491') +source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"; + cantor-sagemath-7.2.patch::"https://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=f96c147a&hp=dc11d273&o=plain";) +sha1sums=('649f6c07b0f3bda8ee4417bb8ade0e191074e491' + '6f6bc35562737565b8eebba31b96e8e461967a10') prepare() { mkdir -p build + +# Fix sagemath backend + cd $pkgname-$pkgver + patch -p1 -i ../cantor-sagemath-7.2.patch } build() {
[arch-commits] Commit in cantor/trunk (PKGBUILD cantor.install)
Date: Wednesday, April 27, 2016 @ 16:58:37 Author: fyan Revision: 266237 upgpkg: cantor 16.04.0-2 Hooks rebuild (part 1) Modified: cantor/trunk/PKGBUILD Deleted: cantor/trunk/cantor.install + PKGBUILD |3 +-- cantor.install | 12 2 files changed, 1 insertion(+), 14 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-04-27 14:52:40 UTC (rev 266236) +++ PKGBUILD2016-04-27 14:58:37 UTC (rev 266237) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=16.04.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64') @@ -21,7 +21,6 @@ 'sagemath: SageMath backend') conflicts=('kdeedu-cantor') replaces=('kdeedu-cantor') -install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz";) sha1sums=('18c93ec173c48cd44a16b8d58d3f22404470fc33') Deleted: cantor.install === --- cantor.install 2016-04-27 14:52:40 UTC (rev 266236) +++ cantor.install 2016-04-27 14:58:37 UTC (rev 266237) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Sunday, February 7, 2016 @ 20:20:45 Author: arojas Revision: 258945 Fix sagemath backend Modified: cantor/trunk/PKGBUILD --+ PKGBUILD | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-02-07 19:05:24 UTC (rev 258944) +++ PKGBUILD2016-02-07 19:20:45 UTC (rev 258945) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=15.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64') @@ -22,11 +22,17 @@ conflicts=('kdeedu-cantor') replaces=('kdeedu-cantor') install=${pkgname}.install -source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz";) -sha1sums=('aea99e9fd5924996181b935f4ce3566c1517b241') +source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"; + cantor-sagemath.patch::"https://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=5d185d21&o=plain";) +sha1sums=('aea99e9fd5924996181b935f4ce3566c1517b241' + 'd325a8fe8567ff8ed03518043ebfe547448d81c2') prepare() { mkdir -p build + +# Fix sagemath backend http://bugs.kde.org/show_bug.cgi?id=348128 + cd $pkgname-$pkgver + patch -p1 -i ../cantor-sagemath.patch } build() {
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Tuesday, December 8, 2015 @ 13:54:29 Author: foutrelis Revision: 253795 C++11 ABI rebuild Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-08 12:53:42 UTC (rev 253794) +++ PKGBUILD2015-12-08 12:54:29 UTC (rev 253795) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=15.08.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64')
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Sunday, September 20, 2015 @ 12:04:48 Author: arojas Revision: 246999 Fix build and rebuild against python 3.5 Modified: cantor/trunk/PKGBUILD --+ PKGBUILD | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-09-20 09:47:54 UTC (rev 246998) +++ PKGBUILD2015-09-20 10:04:48 UTC (rev 246999) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=15.08.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64') @@ -22,11 +22,16 @@ conflicts=('kdeedu-cantor') replaces=('kdeedu-cantor') install=${pkgname}.install -source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz";) -sha1sums=('bcc5cb39bb9febf51bf70b3e8ebe03e58f1ca692') +source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"; python-3.5.patch) +sha1sums=('bcc5cb39bb9febf51bf70b3e8ebe03e58f1ca692' + 'd6d04b323e4d301587ebb82e88672c0cee923bc1') prepare() { mkdir -p build + +# Fix build against python 3.5 + cd $pkgname-$pkgver + patch -p1 -i ../python-3.5.patch } build() {
[arch-commits] Commit in cantor/trunk (PKGBUILD fix-qalculate-build.patch)
Date: Sunday, August 23, 2015 @ 17:24:37 Author: arojas Revision: 244741 Fix build of qalculate backend Added: cantor/trunk/fix-qalculate-build.patch Modified: cantor/trunk/PKGBUILD ---+ PKGBUILD | 13 + fix-qalculate-build.patch | 33 + 2 files changed, 42 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-08-23 15:12:18 UTC (rev 244740) +++ PKGBUILD2015-08-23 15:24:37 UTC (rev 244741) @@ -4,13 +4,13 @@ pkgname=cantor pkgver=15.08.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kde-applications' 'kdeedu') -depends=('analitza' 'libspectre' 'kdelibs4support' 'kpty' 'ktexteditor' 'knewstuff') # libqalculate https://bugs.kde.org/show_bug.cgi?id=350729 +depends=('analitza' 'libspectre' 'kdelibs4support' 'kpty' 'ktexteditor' 'knewstuff' 'libqalculate') makedepends=('extra-cmake-modules' 'python' 'python2' 'kdoctools' 'luajit' 'r') optdepends=('maxima: Maxima backend' 'octave: Octave backend' @@ -22,11 +22,16 @@ conflicts=('kdeedu-cantor') replaces=('kdeedu-cantor') install=${pkgname}.install -source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz";) -sha1sums=('1c38a1ec023a3b1f550c7f0a8d3a6d884c916e35') +source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"; 'fix-qalculate-build.patch') +sha1sums=('1c38a1ec023a3b1f550c7f0a8d3a6d884c916e35' + '1a632b5f86b7efff66d3024ff3ac4585339551ef') prepare() { mkdir -p build + + cd $pkgname-$pkgver +# Fix qalculate backend build https://bugs.kde.org/show_bug.cgi?id=350729 + patch -p1 -i ../fix-qalculate-build.patch } build() { Added: fix-qalculate-build.patch === --- fix-qalculate-build.patch (rev 0) +++ fix-qalculate-build.patch 2015-08-23 15:24:37 UTC (rev 244741) @@ -0,0 +1,33 @@ +From: Heiko Becker +Date: Fri, 07 Aug 2015 17:02:55 + +Subject: Fix building the qalculate backend +X-Git-Url: http://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=ceadbd453cfb4263755931635cb9b02d7aa29efa +--- +Fix building the qalculate backend + +Thanks to Christoph Feck who suggested the fix. + +BUG: 350729 +REVIEW: 124829 +--- + + +--- a/src/backends/qalculate/qalculateexpression.cpp b/src/backends/qalculate/qalculateexpression.cpp +@@ -773,12 +773,12 @@ + if (plotParameters.filetype == PLOT_FILETYPE_EPS || + plotParameters.filetype == PLOT_FILETYPE_PS || + (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 && +- plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) || ++ plotParameters.filename.substr(p-4,4) == ".eps") || + (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 && +- plotParameters.filename.substr(p-3,3) == QLatin1String(".ps"))) ++ plotParameters.filename.substr(p-3,3) == ".ps")) + setResult(new Cantor::EpsResult(QUrl(QString::fromStdString(plotParameters.filename; + else +-setResult(new Cantor::ImageResult(QUrl(QString::fromStdString(plotParameters.filename))); ++setResult(new Cantor::ImageResult(QUrl(QString::fromStdString(plotParameters.filename; + #else + setResult(new Cantor::ImageResult(QUrl::fromLocalFile(QString::fromStdString(plotParameters.filename; + #endif +
[arch-commits] Commit in cantor/trunk (PKGBUILD r-3.2.patch)
Date: Monday, June 15, 2015 @ 10:59:53 Author: arojas Revision: 240917 R 3.2 rebuild Added: cantor/trunk/r-3.2.patch Modified: cantor/trunk/PKGBUILD -+ PKGBUILD| 13 + r-3.2.patch | 44 2 files changed, 53 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-06-15 08:52:46 UTC (rev 240916) +++ PKGBUILD2015-06-15 08:59:53 UTC (rev 240917) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=15.04.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/"; arch=('i686' 'x86_64') @@ -22,16 +22,21 @@ conflicts=('kdeedu-cantor') replaces=('kdeedu-cantor') install=${pkgname}.install -source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz";) -sha1sums=('55b75171071deead3d22553d058342976b5b1ecd') +source=("http://download.kde.org/stable/applications/${pkgver}/src/cantor-${pkgver}.tar.xz"; 'r-3.2.patch') +sha1sums=('55b75171071deead3d22553d058342976b5b1ecd' + '97fa0a72f1b9b23d658f754b821da12215b255e7') prepare() { mkdir -p build + +# Fix build with R 3.2 + cd $pkgname-$pkgver + patch -p1 -i "$srcdir"/r-3.2.patch } build() { cd build - cmake ../cantor-${pkgver} \ + cmake ../$pkgname-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ Added: r-3.2.patch === --- r-3.2.patch (rev 0) +++ r-3.2.patch 2015-06-15 08:59:53 UTC (rev 240917) @@ -0,0 +1,44 @@ +From: Raymond Wooninck +Date: Mon, 25 May 2015 13:19:20 + +Subject: Fix build with latest R (version 3.2) +X-Git-Url: http://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=88b14d85b9504af29fa34ac41109db6ff1d8bdf5 +--- +Fix build with latest R (version 3.2) + +REVIEW: 123531 +--- + + +--- a/src/backends/R/rserver/rcallbacks.cpp b/src/backends/R/rserver/rcallbacks.cpp +@@ -26,6 +26,7 @@ + #include + + #include ++#include + + RServer* server; + Expression* currentExpression; + +--- a/src/backends/R/rserver/rcallbacks.h b/src/backends/R/rserver/rcallbacks.h +@@ -30,7 +30,6 @@ + #include + #include + #define R_INTERFACE_PTRS +-#include + #include + + //This File implements the necessary callbacks for R + +--- a/src/backends/R/rserver/rserver.cpp b/src/backends/R/rserver/rserver.cpp +@@ -42,7 +42,6 @@ + #include + #include + #define R_INTERFACE_PTRS +-#include + #include + + // Not making a member to prevent pulling R headers into rserver.h +
[arch-commits] Commit in cantor/trunk (PKGBUILD)
Date: Thursday, April 16, 2015 @ 20:21:19 Author: arojas Revision: 237243 sage-mathematics -> sagemath Modified: cantor/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-04-16 16:14:17 UTC (rev 237242) +++ PKGBUILD2015-04-16 18:21:19 UTC (rev 237243) @@ -18,7 +18,7 @@ 'luajit: LUA backend' 'python: Python 3 backend' 'python2: Python 2 backend' -'sage-mathematics: Sage backend') +'sagemath: SageMath backend') conflicts=('kdeedu-cantor') replaces=('kdeedu-cantor') install=${pkgname}.install