Date: Friday, December 3, 2021 @ 21:42:32 Author: arojas Revision: 430652
Rebuild with julia 1.7 Added: cantor/trunk/cantor-julia-1.7.patch Modified: cantor/trunk/PKGBUILD Deleted: cantor/trunk/cantor-julia-1.6.patch ------------------------+ PKGBUILD | 12 ++++++-- cantor-julia-1.6.patch | 70 ----------------------------------------------- cantor-julia-1.7.patch | 15 ++++++++++ 3 files changed, 24 insertions(+), 73 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-03 21:37:00 UTC (rev 430651) +++ PKGBUILD 2021-12-03 21:42:32 UTC (rev 430652) @@ -4,7 +4,7 @@ pkgname=cantor pkgver=21.08.3 -pkgrel=1 +pkgrel=2 pkgdesc='KDE Frontend to Mathematical Software' url='https://apps.kde.org/cantor/' arch=(x86_64) @@ -19,13 +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} + cantor-julia-1.7.patch) sha256sums=('8ba6f89c2e1137d0ef2c4744ed77f5b89d9914e5f52a831dbb4dba3ca3027fd0' - 'SKIP') + 'SKIP' + 'a8588bb707e08c4e585a9bd251853395cc947454dab587c61386f346925c7390') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <[email protected]> F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <[email protected]> D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <[email protected]> +prepare() { + patch -d $pkgname-$pkgver -p1 < cantor-julia-1.7.patch # Fix build with julia 1.7 +} + build() { cmake -B build -S $pkgname-$pkgver \ -DBUILD_TESTING=OFF Deleted: cantor-julia-1.6.patch =================================================================== --- cantor-julia-1.6.patch 2021-12-03 21:37:00 UTC (rev 430651) +++ cantor-julia-1.6.patch 2021-12-03 21:42:32 UTC (rev 430652) @@ -1,70 +0,0 @@ -diff --git a/cmake/FindJulia.cmake b/cmake/FindJulia.cmake -index c7f64746..aba71a2d 100644 ---- a/cmake/FindJulia.cmake -+++ b/cmake/FindJulia.cmake -@@ -80,16 +80,46 @@ if(RESULT EQUAL 0) - CACHE PATH "Julia library directory") - endif() - -+if(NOT ${JULIA_VERSION_STRING} VERSION_LESS 1.6.0) -+ set(JULIA_INTERNAL_LIBDL_COMMAND "using Libdl\; abspath(dirname(Libdl.dlpath(\"libjulia-internal\")))") -+ execute_process( -+ COMMAND ${JULIA_EXECUTABLE} -E ${JULIA_INTERNAL_LIBDL_COMMAND} -+ OUTPUT_VARIABLE JULIA_INTERNAL_LIBRARY_DIR -+ RESULT_VARIABLE RESULT -+ ) -+ -+ if(RESULT EQUAL 0) -+ string(REGEX REPLACE "\"" "" JULIA_INTERNAL_LIBRARY_DIR ${JULIA_INTERNAL_LIBRARY_DIR}) -+ string(STRIP ${JULIA_INTERNAL_LIBRARY_DIR} JULIA_INTERNAL_LIBRARY_DIR) -+ set(JULIA_INTERNAL_LIBRARY_DIR ${JULIA_INTERNAL_LIBRARY_DIR} -+ CACHE PATH "Julia internal library directory") -+ endif() -+endif() -+ - find_library( JULIA_LIBRARY - NAMES julia - PATHS ${JULIA_LIBRARY_DIR} - ) - -+if(NOT ${JULIA_VERSION_STRING} VERSION_LESS 1.6.0) -+ find_library( JULIA_INTERNAL_LIBRARY -+ NAMES julia-internal -+ PATHS ${JULIA_INTERNAL_LIBRARY_DIR} -+ ) -+endif() - --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args( -- Julia -- REQUIRED_VARS JULIA_LIBRARY JULIA_LIBRARY_DIR JULIA_INCLUDE_DIRS -- VERSION_VAR JULIA_VERSION_STRING -- FAIL_MESSAGE "Julia not found" --) -+if(${JULIA_VERSION_STRING} VERSION_LESS 1.6.0) -+ find_package_handle_standard_args( -+ Julia -+ REQUIRED_VARS JULIA_LIBRARY JULIA_INCLUDE_DIRS -+ VERSION_VAR JULIA_VERSION_STRING -+ FAIL_MESSAGE "Julia not found" -+ ) -+else() -+ find_package_handle_standard_args( -+ Julia -+ REQUIRED_VARS JULIA_LIBRARY JULIA_INTERNAL_LIBRARY JULIA_INCLUDE_DIRS -+ VERSION_VAR JULIA_VERSION_STRING -+ FAIL_MESSAGE "Julia not found" -+ ) -+endif() -diff --git a/src/backends/julia/juliaserver/CMakeLists.txt b/src/backends/julia/juliaserver/CMakeLists.txt -index 7301eca0..f12628e1 100644 ---- a/src/backends/julia/juliaserver/CMakeLists.txt -+++ b/src/backends/julia/juliaserver/CMakeLists.txt -@@ -8,6 +8,7 @@ add_executable(cantor_juliaserver ${JuliaServer_SRCS}) - - target_link_libraries(cantor_juliaserver - ${JULIA_LIBRARY} -+ ${JULIA_INTERNAL_LIBRARY} - Qt5::Widgets - Qt5::DBus - ) Added: cantor-julia-1.7.patch =================================================================== --- cantor-julia-1.7.patch (rev 0) +++ cantor-julia-1.7.patch 2021-12-03 21:42:32 UTC (rev 430652) @@ -0,0 +1,15 @@ +diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp +index c68fd46f..e2995cb7 100644 +--- a/src/backends/julia/juliaserver/juliaserver.cpp ++++ b/src/backends/julia/juliaserver/juliaserver.cpp +@@ -91,7 +91,9 @@ void JuliaServer::runJuliaCommand(const QString &command) + + if (jl_exception_occurred()) { // If exception occurred + // Show it to user in stderr +-#if QT_VERSION_CHECK(JULIA_VERSION_MAJOR, JULIA_VERSION_MINOR, 0) >= QT_VERSION_CHECK(1, 1, 0) ++#if QT_VERSION_CHECK(JULIA_VERSION_MAJOR, JULIA_VERSION_MINOR, 0) >= QT_VERSION_CHECK(1, 7, 0) ++ jl_value_t *ex = jl_current_task->ptls->previous_exception; ++#elif QT_VERSION_CHECK(JULIA_VERSION_MAJOR, JULIA_VERSION_MINOR, 0) >= QT_VERSION_CHECK(1, 1, 0) + jl_value_t *ex = jl_get_ptls_states()->previous_exception; + #else + jl_value_t *ex = jl_exception_in_transit;
