[arch-commits] Commit in cantor/repos/kde-unstable-x86_64 (3 files)
Antonio Rojas
arojas at archlinux.org
Thu Mar 25 21:30:31 UTC 2021
Date: Thursday, March 25, 2021 @ 21:30:30
Author: arojas
Revision: 410956
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
cantor/repos/kde-unstable-x86_64/PKGBUILD
(from rev 410955, cantor/kde-unstable/PKGBUILD)
cantor/repos/kde-unstable-x86_64/cantor-julia-1.6.patch
(from rev 410955, cantor/kde-unstable/cantor-julia-1.6.patch)
Deleted:
cantor/repos/kde-unstable-x86_64/PKGBUILD
------------------------+
PKGBUILD | 80 +++++++++++++++++++++++++----------------------
cantor-julia-1.6.patch | 70 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 113 insertions(+), 37 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-25 21:30:07 UTC (rev 410955)
+++ PKGBUILD 2021-03-25 21:30:30 UTC (rev 410956)
@@ -1,37 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=21.03.80
-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 kde-education)
-depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate hicolor-icon-theme qt5-xmlpatterns poppler-qt5)
-makedepends=(extra-cmake-modules python kdoctools luajit r julia)
-optdepends=('maxima: Maxima backend'
- 'octave: Octave backend'
- 'r: R backend'
- 'luajit: LUA backend'
- 'python: Python backend'
- 'sagemath: SageMath backend'
- 'julia: Julia backend')
-source=("https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('1688022022560c64e056e21cc5171c4d6cb4d4c67b2e735bb4997191b0c56e6c'
- 'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid at kde.org>
- F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cfeck at kde.org>
- D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
-
-build() {
- cmake -B build -S $pkgname-$pkgver \
- -DBUILD_TESTING=OFF
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-}
Copied: cantor/repos/kde-unstable-x86_64/PKGBUILD (from rev 410955, cantor/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-03-25 21:30:30 UTC (rev 410956)
@@ -0,0 +1,43 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=21.03.80
+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 kde-education)
+depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate hicolor-icon-theme qt5-xmlpatterns poppler-qt5)
+makedepends=(extra-cmake-modules python kdoctools luajit r julia)
+optdepends=('maxima: Maxima backend'
+ 'octave: Octave backend'
+ 'r: R backend'
+ 'luajit: LUA backend'
+ 'python: Python backend'
+ 'sagemath: SageMath backend'
+ 'julia: Julia backend')
+source=("https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+ cantor-julia-1.6.patch)
+sha256sums=('1688022022560c64e056e21cc5171c4d6cb4d4c67b2e735bb4997191b0c56e6c'
+ 'SKIP'
+ '0e9477a712eb3eab129fd16cdb35c4eb56846f34584a6ba310a418cd314c6498')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid at kde.org>
+ F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cfeck at kde.org>
+ D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < cantor-julia-1.6.patch # Fix build with julia 1.6
+}
+
+build() {
+ cmake -B build -S $pkgname-$pkgver \
+ -DBUILD_TESTING=OFF
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
Copied: cantor/repos/kde-unstable-x86_64/cantor-julia-1.6.patch (from rev 410955, cantor/kde-unstable/cantor-julia-1.6.patch)
===================================================================
--- cantor-julia-1.6.patch (rev 0)
+++ cantor-julia-1.6.patch 2021-03-25 21:30:30 UTC (rev 410956)
@@ -0,0 +1,70 @@
+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
+ )
More information about the arch-commits
mailing list