extra/cantor to 19.12.0-1

extra/cantor/PKGBUILD

@@ -6,38 +6,39 @@
 #  - drop julia make/optdepends, doesn't build on ARM
 
 pkgname=cantor
-pkgver=19.08.3
-pkgrel=3
+pkgver=19.12.0
+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 kdeedu)
-depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate hicolor-icon-theme discount qt5-xmlpatterns)
-makedepends=(extra-cmake-modules python python2 kdoctools luajit r)
+depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate hicolor-icon-theme qt5-xmlpatterns poppler-qt5)
+makedepends=(extra-cmake-modules python kdoctools luajit r)
 optdepends=('maxima: Maxima backend'
             'octave: Octave backend'
             'r: R backend'
             'luajit: LUA backend'
             'python: Python 3 backend'
-	    'python2: Python 2 backend'
-            'sagemath: SageMath backend')
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('5b0f0b0b3990c83a927d2545baa9596119025dbf25242a9d46b1c76a26fcbfe5'
+            'sagemath: SageMath backend'
+            'julia: Julia backend')
+source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('58af0ddc0b8b731970998cdd67c926f37c5b7609019c5923f8d7724c3ac6e5c5'
             'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+#  patch -p1 -i ../cantor-no-python2.patch # Fix build without python 2
 }
 
 build() {
   cd build
   cmake ../$pkgname-$pkgver \
-    -DBUILD_TESTING=OFF \
-    -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so
+    -DBUILD_TESTING=OFF
   make
 }