math: update kde release service to 19.12.1

builds with qt 5.14, other changes unknown.

10 files changed, 56 insertions, 33 deletions

diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index 3f3fe127517..a683414fd6f 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2020/01/18 21:48:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.48 2020/02/02 02:53:52 markd Exp $
 
 DISTNAME=	analitza-${KAPPSVER}
-PKGREVISION=	1
 CATEGORIES=	math
 
 HOMEPAGE=	https://edu.kde.org/
diff --git a/math/analitza/distinfo b/math/analitza/distinfo
index 6da0733080c..c5d618d295b 100644
--- a/math/analitza/distinfo
+++ b/math/analitza/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2019/11/20 22:04:15 markd Exp $
+$NetBSD: distinfo,v 1.11 2020/02/02 02:53:52 markd Exp $
 
-SHA1 (analitza-19.08.3.tar.xz) = d69039d9a1a98962e184ec2f1bacc57f5eb8e76b
-RMD160 (analitza-19.08.3.tar.xz) = cb343a592b0acfb813afc7666ef175e1204b0469
-SHA512 (analitza-19.08.3.tar.xz) = 962e854383b44b8acaa12188d69dc60122455836275dae3f5f79cce7607a1ce998cfdf18f48d4557b2708d91ebc15964c4842b24aad7f9974b9d7299418912bb
-Size (analitza-19.08.3.tar.xz) = 332648 bytes
+SHA1 (analitza-19.12.1.tar.xz) = 58c8b3a84230f62c6c402302d015cba7240fbff1
+RMD160 (analitza-19.12.1.tar.xz) = 6b357e641c7b6123b1d47128f32b56d5e99cb91d
+SHA512 (analitza-19.12.1.tar.xz) = 793aba78447c1366860f90a6956e65e3a4af9e16a73c5dfe94a08c34ecb4eca364bf4485ac6bef1448f1748b1ac4b2f0fc3373f8fc194bb9435b1acda86a6d0a
+Size (analitza-19.12.1.tar.xz) = 333156 bytes
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index 2a205853ca7..e5fb857cc4d 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2020/01/18 21:49:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.59 2020/02/02 02:53:52 markd Exp $
 
 DISTNAME=	cantor-${KAPPSVER}
-PKGREVISION=	3
 CATEGORIES=	math
 
 HOMEPAGE=	https://kde.org/applications/education/cantor/
@@ -10,7 +9,7 @@ LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2
 
 .include "../../meta-pkgs/kde/applications.mk"
 
-BUILD_DEPENDS+=	kdoctools>=${KF5VER}:../../devel/kdoctools
+BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge pkg-config
 
@@ -53,14 +52,23 @@ CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/cantor_sage.knsrc \
 CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/cantor_scilab.knsrc \
 		${PKG_SYSCONFDIR}/xdg/cantor_scilab.knsrc
 
+SUBST_CLASSES+=		fix-moc
+SUBST_STAGE.fix-moc=	post-configure
+SUBST_MESSAGE.fix-moc=	Cleaning up MOC includes
+SUBST_FILES.fix-moc=	_KDE_build/src/backends/*/CMakeFiles/cantor_*backend_autogen.dir/AutogenInfo.json
+SUBST_FILES.fix-moc+=	_KDE_build/src/panelplugins/variablemgr/CMakeFiles/cantor_variablemanagerplugin_autogen.dir/AutogenInfo.json
+SUBST_SED.fix-moc=	-e 's;"${PREFIX}/include",;;g'
+
 .include "../../devel/kpty/buildlink3.mk"
 .include "../../devel/ktexteditor/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../math/analitza/buildlink3.mk"
 .include "../../math/qalculate/buildlink3.mk"
 .include "../../net/knewstuff/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
+.include "../../print/poppler-qt5/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/discount/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/math/cantor/PLIST b/math/cantor/PLIST
index 4ce96468925..3edc75dc6a7 100644
--- a/math/cantor/PLIST
+++ b/math/cantor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/11/21 02:39:22 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/02/02 02:53:52 markd Exp $
 bin/cantor
 bin/cantor_python3server
 bin/cantor_scripteditor
@@ -14,8 +14,12 @@ include/cantor/epsresult.h
 include/cantor/expression.h
 include/cantor/extension.h
 include/cantor/helpresult.h
+include/cantor/htmlresult.h
 include/cantor/imageresult.h
+include/cantor/jupyterutils.h
 include/cantor/latexresult.h
+include/cantor/mimeresult.h
+include/cantor/renderer.h
 include/cantor/result.h
 include/cantor/session.h
 include/cantor/syntaxhelpobject.h
@@ -29,7 +33,7 @@ lib/libcantor_config.so
 lib/libcantor_pythonbackend.so
 lib/libcantorlibs.so
 lib/libcantorlibs.so.${PKGVERSION}
-lib/libcantorlibs.so.23
+lib/libcantorlibs.so.24
 qt5/plugins/cantor/assistants/cantor_advancedplotassistant.so
 qt5/plugins/cantor/assistants/cantor_creatematrixassistant.so
 qt5/plugins/cantor/assistants/cantor_differentiateassistant.so
@@ -45,7 +49,6 @@ qt5/plugins/cantor/assistants/cantor_runscriptassistant.so
 qt5/plugins/cantor/assistants/cantor_solveassistant.so
 qt5/plugins/cantor/backends/cantor_kalgebrabackend.so
 qt5/plugins/cantor/backends/cantor_maximabackend.so
-qt5/plugins/cantor/backends/cantor_nullbackend.so
 qt5/plugins/cantor/backends/cantor_octavebackend.so
 qt5/plugins/cantor/backends/cantor_python3backend.so
 qt5/plugins/cantor/backends/cantor_qalculatebackend.so
@@ -55,6 +58,7 @@ qt5/plugins/cantor/panels/cantor_helppanelplugin.so
 qt5/plugins/cantor/panels/cantor_variablemanagerplugin.so
 qt5/plugins/libcantorpart.so
 share/applications/org.kde.cantor.desktop
+share/cantor/latex/preview.sty
 share/cantor/maximabackend/cantor-initmaxima.lisp
 share/cantor/octavebackend/cantor_eigenvectors.m
 share/cantor/octavebackend/cantor_plot2d.m
diff --git a/math/cantor/distinfo b/math/cantor/distinfo
index c58f80d5769..be023791bd2 100644
--- a/math/cantor/distinfo
+++ b/math/cantor/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2019/11/20 22:30:06 markd Exp $
+$NetBSD: distinfo,v 1.11 2020/02/02 02:53:52 markd Exp $
 
-SHA1 (cantor-19.08.3.tar.xz) = 863e38a97587cc1f61f6952b69c4a1a4648ff9c9
-RMD160 (cantor-19.08.3.tar.xz) = 98e0c6bc845ac73607781a720a86ff0567c9a9d5
-SHA512 (cantor-19.08.3.tar.xz) = 1dc545c2c122d0303d418c757d7f4079250354e4326f2ec0d4796de343d00beb580ab47945ecc6ea491f4cd893bbfe6fced7eeb0ab8e3122000b4c75912ca807
-Size (cantor-19.08.3.tar.xz) = 2538816 bytes
+SHA1 (cantor-19.12.1.tar.xz) = d6cff361cca896973fcbfbb7d1876f68bd79c3a6
+RMD160 (cantor-19.12.1.tar.xz) = 439266b8690e7592a3e4300dea3863de22e6e710
+SHA512 (cantor-19.12.1.tar.xz) = 2466de7265a79a199c19b62b32fd27a949eee133bac187f9fcf46a7154aab279490f96403f4c5f61c052c6dde6ea20e35189c337c67a8f86e1a8ef1c3e82eb76
+Size (cantor-19.12.1.tar.xz) = 9011172 bytes
+SHA1 (patch-src_lib_jupyterutils.cpp) = d5af7e37e59bc7475112e22d5b37cc31a134fcbb
diff --git a/math/cantor/patches/patch-src_lib_jupyterutils.cpp b/math/cantor/patches/patch-src_lib_jupyterutils.cpp
new file mode 100644
index 00000000000..63b9c2c7f96
--- /dev/null
+++ b/math/cantor/patches/patch-src_lib_jupyterutils.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_lib_jupyterutils.cpp,v 1.1 2020/02/02 02:53:53 markd Exp $
+
+--- src/lib/jupyterutils.cpp.orig	2020-01-06 13:49:54.000000000 +0000
++++ src/lib/jupyterutils.cpp
+@@ -219,7 +219,7 @@ std::tuple<int, int> JupyterUtils::getNb
+     int nbformatMajor = notebook.value(nbformatKey).toInt();
+     int nbformatMinor = notebook.value(nbformatMinorKey).toInt();
+ 
+-    return {nbformatMajor, nbformatMinor};
++    return std::make_tuple(nbformatMajor, nbformatMinor);
+ }
+ 
+ QString JupyterUtils::getCellType(const QJsonObject& cell)
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index e1626e4a5c3..938676e9be6 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2020/01/18 21:49:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.43 2020/02/02 02:53:53 markd Exp $
 
 DISTNAME=	kalgebra-${KAPPSVER}
-PKGREVISION=	1
 CATEGORIES=	math
 
 HOMEPAGE=	https://kde.org/applications/education/kalgebra/
@@ -10,7 +9,7 @@ LICENSE=	gnu-lgpl-v2 AND gnu-gpl-v2 AND gnu-fdl-v1.2
 
 .include "../../meta-pkgs/kde/applications.mk"
 
-BUILD_DEPENDS+=	kdoctools>=${KF5VER}:../../devel/kdoctools
+BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge
 
diff --git a/math/kalgebra/distinfo b/math/kalgebra/distinfo
index eb56ed5a4e7..725ec1bfcbd 100644
--- a/math/kalgebra/distinfo
+++ b/math/kalgebra/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2019/11/20 22:33:37 markd Exp $
+$NetBSD: distinfo,v 1.11 2020/02/02 02:53:53 markd Exp $
 
-SHA1 (kalgebra-19.08.3.tar.xz) = 33fb7e1bc7a51001e5a103a95d9eff310fea209b
-RMD160 (kalgebra-19.08.3.tar.xz) = 2b73d49da25d21a2720da2afc52274264004ca5b
-SHA512 (kalgebra-19.08.3.tar.xz) = a623e4675b1e188411da358f965648b6f9ea60a65d3155c377dc5e60b288a2c757627f1c76cf98629ed23784374f60b2c748cc80ff22a93e3469ad2e3dff310b
-Size (kalgebra-19.08.3.tar.xz) = 1157236 bytes
+SHA1 (kalgebra-19.12.1.tar.xz) = e496032962212983a5359aebadfe13c4026fd45c
+RMD160 (kalgebra-19.12.1.tar.xz) = 28fa09ddd812fdc9b5487901c1cba6917f60cc62
+SHA512 (kalgebra-19.12.1.tar.xz) = 6c5d4c3c2737895f3d0101593a7329120777eb1c812f451df4d90103d7384040c43f8cbeb428e2899af19ec28f3a1f8ec5eef59d0c2332040876b971db2dfd3e
+Size (kalgebra-19.12.1.tar.xz) = 1156408 bytes
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 05c510f0a23..7d88d4676b9 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2020/01/18 23:32:51 rillig Exp $
+# $NetBSD: Makefile,v 1.45 2020/02/02 02:53:53 markd Exp $
 
 DISTNAME=	kcalc-${KAPPSVER}
-PKGREVISION=	1
 CATEGORIES=	math
 
 HOMEPAGE=	https://kde.org/applications/utilities/kcalc/
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index 8214b44c21e..6cbcc57d62d 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2019/11/17 04:28:49 markd Exp $
+$NetBSD: distinfo,v 1.12 2020/02/02 02:53:53 markd Exp $
 
-SHA1 (kcalc-19.08.3.tar.xz) = 66598d3a0527f12682d0c936fd1dfcc346db09ed
-RMD160 (kcalc-19.08.3.tar.xz) = 9c92305ab8181886d4ff3a44808978e677bb8b6e
-SHA512 (kcalc-19.08.3.tar.xz) = e27eefd90f3b32db383305e1eecade41545dfe8f9dd9a6c5b4f48b2082a7323e5a7d812ee54b45cea28c76ba6e82104e1fd2d001060f1588b4b1d62241421e7f
-Size (kcalc-19.08.3.tar.xz) = 372080 bytes
+SHA1 (kcalc-19.12.1.tar.xz) = 575487bf7dcbedb230dd02ea0c379279af8387ec
+RMD160 (kcalc-19.12.1.tar.xz) = 325fcc1c73328182582cbb86303ca4b5d382a6ed
+SHA512 (kcalc-19.12.1.tar.xz) = 8aa7fdb4bd1d9842f2e2036e3f94649328f9b5bc47b4c031aeb787cec0fdf28697ebf9f41cb60e120e59c38b44a2e6d366542ac9228abb859db6ec5eb28b4cf6
+Size (kcalc-19.12.1.tar.xz) = 374860 bytes