[arch-commits] Commit in cantor/repos/staging-x86_64 (3 files)

[Antonio Rojas]

    Date: Thursday, December 9, 2021 @ 10:28:57
  Author: arojas
Revision: 431070

archrelease: copy trunk to staging-x86_64

Added:
  cantor/repos/staging-x86_64/PKGBUILD
    (from rev 431069, cantor/trunk/PKGBUILD)
Deleted:
  cantor/repos/staging-x86_64/PKGBUILD
  cantor/repos/staging-x86_64/cantor-julia-1.7.patch

------------------------+
 PKGBUILD               |   80 +++++++++++++++++++++--------------------------
 cantor-julia-1.7.patch |   15 --------
 2 files changed, 37 insertions(+), 58 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-09 10:28:51 UTC (rev 431069)
+++ PKGBUILD	2021-12-09 10:28:57 UTC (rev 431070)
@@ -1,43 +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.08.3
-pkgrel=3
-pkgdesc='KDE Frontend to Mathematical Software'
-url='https://apps.kde.org/cantor/'
-arch=(x86_64)
-license=(GPL LGPL FDL)
-groups=(kde-applications kde-education)
-depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate qt5-xmlpatterns qt5-tools qt5-webengine 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/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}
-        cantor-julia-1.7.patch)
-sha256sums=('8ba6f89c2e1137d0ef2c4744ed77f5b89d9914e5f52a831dbb4dba3ca3027fd0'
-            'SKIP'
-            'a8588bb707e08c4e585a9bd251853395cc947454dab587c61386f346925c7390')
-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.7.patch # Fix build with julia 1.7
-}
-
-build() {
-  cmake -B build -S $pkgname-$pkgver \
-    -DBUILD_TESTING=OFF
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-}

Copied: cantor/repos/staging-x86_64/PKGBUILD (from rev 431069, cantor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-12-09 10:28:57 UTC (rev 431070)
@@ -0,0 +1,37 @@
+# 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.12.0
+pkgrel=2
+pkgdesc='KDE Frontend to Mathematical Software'
+url='https://apps.kde.org/cantor/'
+arch=(x86_64)
+license=(GPL LGPL FDL)
+groups=(kde-applications kde-education)
+depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate qt5-xmlpatterns qt5-tools qt5-webengine 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/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('a920eafc3eb67ef075eaf8cdb3171fd106a2258c488deba3d1e1412f4a188110'
+            '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
+}

Deleted: cantor-julia-1.7.patch
===================================================================
--- cantor-julia-1.7.patch	2021-12-09 10:28:51 UTC (rev 431069)
+++ cantor-julia-1.7.patch	2021-12-09 10:28:57 UTC (rev 431070)
@@ -1,15 +0,0 @@
-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;