extra/cantor to 24.12.0-1

This commit is contained in:
Kevin Mihelich 2024-12-14 00:18:17 +00:00
parent 450e50401b
commit cdd2fc28c4
3 changed files with 64 additions and 71 deletions

View file

@ -1,6 +1,6 @@
pkgbase = cantor
pkgdesc = KDE Frontend to Mathematical Software
pkgver = 24.08.3
pkgver = 24.12.0
pkgrel = 1
url = https://apps.kde.org/cantor/
arch = x86_64
@ -8,38 +8,42 @@ pkgbase = cantor
groups = kde-education
license = GPL-2.0-or-later
license = LGPL-2.0-or-later
makedepends = analitza
makedepends = extra-cmake-modules
makedepends = julia
makedepends = kdoctools5
makedepends = kdoctools
makedepends = luajit
makedepends = python
makedepends = r
depends = gcc-libs
depends = glibc
depends = karchive5
depends = kcompletion5
depends = kconfig5
depends = kconfigwidgets5
depends = kcoreaddons5
depends = kcrash5
depends = ki18n5
depends = kiconthemes5
depends = kio5
depends = knewstuff5
depends = kparts5
depends = ktexteditor5
depends = ktextwidgets5
depends = kwidgetsaddons5
depends = kxmlgui5
depends = karchive
depends = kcolorscheme
depends = kcompletion
depends = kconfig
depends = kconfigwidgets
depends = kcoreaddons
depends = kcrash
depends = ki18n
depends = kiconthemes
depends = kio
depends = knewstuff
depends = kparts
depends = ktexteditor
depends = ktextwidgets
depends = kwidgetsaddons
depends = kxmlgui
depends = libqalculate
depends = libspectre
depends = poppler-qt5
depends = qt5-base
depends = qt5-svg
depends = qt5-tools
depends = qt5-webengine
depends = qt5-xmlpatterns
depends = syntax-highlighting5
depends = libxml2
depends = libxslt
depends = poppler-qt6
depends = qt6-base
depends = qt6-svg
depends = qt6-tools
depends = qt6-webengine
depends = syntax-highlighting
optdepends = analitza: KAlgebra backend
optdepends = maxima: Maxima backend
optdepends = octave: Octave backend
optdepends = r: R backend
@ -47,12 +51,12 @@ pkgbase = cantor
optdepends = python: Python backend
optdepends = sagemath: SageMath backend
optdepends = julia: Julia backend
source = https://download.kde.org/stable/release-service/24.08.3/src/cantor-24.08.3.tar.xz
source = https://download.kde.org/stable/release-service/24.08.3/src/cantor-24.08.3.tar.xz.sig
source = https://download.kde.org/stable/release-service/24.12.0/src/cantor-24.12.0.tar.xz
source = https://download.kde.org/stable/release-service/24.12.0/src/cantor-24.12.0.tar.xz.sig
validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
validpgpkeys = D81C0CB38EB725EF6691C385BB463350D6EF31EF
sha256sums = 5621f65a6207029c5694e1fcf48b1f1bf7ae6b38377ea1ff1123f9d40f45c94c
sha256sums = 3c327a33377e0cd6895936b438fb33a1cea274ba394b997fb0002a80d273f337
sha256sums = SKIP
pkgname = cantor

View file

@ -6,44 +6,49 @@
# - drop julia make/optdepends, doesn't build on ARM
pkgname=cantor
pkgver=24.08.3
pkgver=24.12.0
pkgrel=1
pkgdesc='KDE Frontend to Mathematical Software'
url='https://apps.kde.org/cantor/'
arch=(x86_64)
license=(GPL-2.0-or-later LGPL-2.0-or-later)
license=(GPL-2.0-or-later
LGPL-2.0-or-later)
depends=(gcc-libs
glibc
karchive5
kcompletion5
kconfig5
kconfigwidgets5
kcoreaddons5
kcrash5
ki18n5
kiconthemes5
kio5
knewstuff5
kparts5
ktexteditor5
ktextwidgets5
kwidgetsaddons5
kxmlgui5
karchive
kcolorscheme
kcompletion
kconfig
kconfigwidgets
kcoreaddons
kcrash
ki18n
kiconthemes
kio
knewstuff
kparts
ktexteditor
ktextwidgets
kwidgetsaddons
kxmlgui
libqalculate
libspectre
poppler-qt5
qt5-base
qt5-svg
qt5-tools
qt5-webengine
qt5-xmlpatterns
syntax-highlighting5)
makedepends=(extra-cmake-modules
kdoctools5
libxml2
libxslt
poppler-qt6
qt6-base
qt6-svg
qt6-tools
qt6-webengine
syntax-highlighting)
makedepends=(analitza
extra-cmake-modules
kdoctools
luajit
python
r)
optdepends=('maxima: Maxima backend'
optdepends=('analitza: KAlgebra backend'
'maxima: Maxima backend'
'octave: Octave backend'
'r: R backend'
'luajit: LUA backend'
@ -52,7 +57,7 @@ optdepends=('maxima: Maxima backend'
groups=(kde-applications
kde-education)
source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
sha256sums=('5621f65a6207029c5694e1fcf48b1f1bf7ae6b38377ea1ff1123f9d40f45c94c'
sha256sums=('3c327a33377e0cd6895936b438fb33a1cea274ba394b997fb0002a80d273f337'
'SKIP')
validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid@kde.org>
F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cfeck@kde.org>

View file

@ -1,16 +0,0 @@
diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp
index 0eda2322..c84495c8 100644
--- a/src/backends/julia/juliaserver/juliaserver.cpp
+++ b/src/backends/julia/juliaserver/juliaserver.cpp
@@ -188,7 +188,11 @@ void JuliaServer::parseJlModule(jl_module_t* module, bool parseValue)
jl_function_t* jl_names_function = jl_get_function(jl_base_module, "names");
jl_value_t* names = jl_call1(jl_names_function, (jl_value_t*)module);
+#if QT_VERSION_CHECK(JULIA_VERSION_MAJOR, JULIA_VERSION_MINOR, 0) >= QT_VERSION_CHECK(1, 11, 0)
+ jl_value_t **data = (jl_value_t**)jl_array_data(names, void);
+#else
jl_value_t **data = (jl_value_t**)jl_array_data(names);
+#endif
for (size_t i = 0; i < jl_array_len(names); i++)
{
bool isBindingResolved = (bool)jl_binding_resolved_p(module, (jl_sym_t*)(data[i]));