Update math/libqalculate to 1.0.0a

Update math/qalculate to 1.0.0
Bump PORTREVISION on dependent ports (shlib bump in libqalculate)

10 files changed, 85 insertions, 21 deletions

diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 11ffe92..1709f33 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdeplasma-addons
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index caf1f13..f36eb18 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cantor
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index abb6de9d..4451d23 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -2,21 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	libqalculate
-PORTVERSION=	0.9.10
+DISTVERSION=	1.0.0a
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Multi-purpose desktop calculator (backend library)
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcln.so:math/cln
 
-USES=		autoreconf gmake gettext libtool \
-		localbase pathfix pkgconfig readline:port
+USES=		autoreconf gmake gettext libtool localbase \
+		ncurses pathfix pkgconfig readline:port
 USE_GNOME=	glib20 intltool libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -28,8 +27,6 @@ GH_ACCOUNT=	Qalculate
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|po ||g' ${WRKSRC}/Makefile.am
 
diff --git a/math/libqalculate/distinfo b/math/libqalculate/distinfo
index 07b73de..75f1877 100644
--- a/math/libqalculate/distinfo
+++ b/math/libqalculate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476486857
-SHA256 (Qalculate-libqalculate-v0.9.10_GH0.tar.gz) = f19f13c06c11f2e576d4c95b48c87417649f4ad598127e9759316b6e4b601f72
-SIZE (Qalculate-libqalculate-v0.9.10_GH0.tar.gz) = 573204
+TIMESTAMP = 1501594307
+SHA256 (Qalculate-libqalculate-v1.0.0a_GH0.tar.gz) = 3d9e9e983cf1bfded8063e4704587d42e2253cbfc5d60a9ecefc1b9b43ab2f8a
+SIZE (Qalculate-libqalculate-v1.0.0a_GH0.tar.gz) = 599217
diff --git a/math/libqalculate/files/patch-git_issue38 b/math/libqalculate/files/patch-git_issue38
new file mode 100644
index 0000000..9cf369b
--- /dev/null
+++ b/math/libqalculate/files/patch-git_issue38
@@ -0,0 +1,68 @@
+Prevent qalc from segfaulting if started and immediately exited.
+See: https://github.com/Qalculate/libqalculate/issues/38
+
+diff --git a/libqalculate/Calculator.cc b/libqalculate/Calculator.cc
+index f5c183f..4963351 100644
+--- libqalculate/Calculator.cc.orig
++++ libqalculate/Calculator.cc
+@@ -224,8 +226,11 @@ void autoConvert(const MathStructure &morig, MathStructure &mconv, const Evaluat
+ void CalculateThread::run() {
+ 	enableAsynchronousCancel();
+ 	while(true) {
+-		bool b_parse = read<bool>();
+-		void *x = read<void *>();
++		bool failed = false;
++		bool b_parse = read<bool>(&failed);
++		if(failed) break;
++		void *x = read<void *>(&failed);
++		if(failed) break;
+ 		MathStructure *mstruct = (MathStructure*) x;
+ 		CALCULATOR->startControl();
+ 		if(b_parse) {
+diff --git a/libqalculate/util.h b/libqalculate/util.h
+index 0edcb50..533f5c7 100644
+--- libqalculate/util.h.orig
++++ libqalculate/util.h
+@@ -128,14 +128,16 @@ public:
+ protected:
+ 	virtual void run() = 0;
+ 	void enableAsynchronousCancel();
+-	template <class T> T read() {
++	template <class T> T read(bool *failed = NULL) {
+ #ifdef _WIN32
+ 		MSG msg;
+ 		int ret = GetMessage(&msg, NULL, WM_USER, WM_USER);
++		if(failed && (ret == 0 || ret == -1)) *failed = true;
+ 		return (T) msg.wParam;
+ #else
+ 		T x;
+-		fread(&x, sizeof(T), 1, m_pipe_r);
++		int ret = fread(&x, sizeof(T), 1, m_pipe_r);
++		if(failed && ret != 1) *failed = true;
+ 		return x;
+ #endif
+ 	}
+diff --git a/src/qalc.cc b/src/qalc.cc
+index 4a4e4b2..43c3556 100644
+--- src/qalc.cc.orig
++++ src/qalc.cc
+@@ -2821,12 +2821,15 @@ void on_abort_display() {
+ 
+ void ViewThread::run() {
+ 	while(true) {
+-	
+-		void *x = read<void *>();
++
++		bool failed = false;
++		void *x = read<void *>(&failed);
++		if(failed) break;
+ 		MathStructure m(*((MathStructure*) x));
+ 		//bool b_stack = read<bool>();
+-		read<bool>();
+-		x = read<void *>();
++		read<bool>(&failed);
++		x = read<void *>(&failed);
++		if(failed) break;
+ 		CALCULATOR->startControl();
+ 		if(x) {
+ 			PrintOptions po;
diff --git a/math/libqalculate/pkg-plist b/math/libqalculate/pkg-plist
index 8f7ffd0..ae77d17 100644
--- a/math/libqalculate/pkg-plist
+++ b/math/libqalculate/pkg-plist
@@ -14,8 +14,8 @@ include/libqalculate/qalculate.h
 include/libqalculate/util.h
 lib/libqalculate.a
 lib/libqalculate.so
-lib/libqalculate.so.6
-lib/libqalculate.so.6.0.0
+lib/libqalculate.so.10
+lib/libqalculate.so.10.0.0
 libdata/pkgconfig/libqalculate.pc
 %%NLS%%share/locale/fr/LC_MESSAGES/libqalculate.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/libqalculate.mo
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 024d39c..4018ffb 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qalculate
-PORTVERSION=	0.9.9
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
diff --git a/math/qalculate/distinfo b/math/qalculate/distinfo
index a516bc7..9e23f3f 100644
--- a/math/qalculate/distinfo
+++ b/math/qalculate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476485110
-SHA256 (Qalculate-qalculate-gtk-v0.9.9_GH0.tar.gz) = 6f62dc3c7a908be196c56bb7ef6841cc94a88f8b9d9df87f8af5791a995f316d
-SIZE (Qalculate-qalculate-gtk-v0.9.9_GH0.tar.gz) = 1686275
+TIMESTAMP = 1501601677
+SHA256 (Qalculate-qalculate-gtk-v1.0.0_GH0.tar.gz) = f314153b376411e752924e513b0cfb9d89caac116aa151a896fd36c7dc344f23
+SIZE (Qalculate-qalculate-gtk-v1.0.0_GH0.tar.gz) = 1731963
diff --git a/science/step/Makefile b/science/step/Makefile
index 702b7ba..c1d590e 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	step
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 373b299..64a90ae 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kde-workspace
 PORTVERSION=	${KDE4_WORKSPACE_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11 kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org