4 files changed, 44 insertions, 9 deletions
diff --git a/math/gnome-calculator/Makefile b/math/gnome-calculator/Makefile
index 55333ec6161..481446f7069 100644
--- a/math/gnome-calculator/Makefile
+++ b/math/gnome-calculator/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2016/04/10 19:38:52 prlw1 Exp $
+# $NetBSD: Makefile,v 1.10 2016/04/21 22:11:32 prlw1 Exp $
 
-DISTNAME=		gnome-calculator-3.16.2
-PKGREVISION=		2
+DISTNAME=		gnome-calculator-3.20.0
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-calculator/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=		.tar.xz
@@ -25,6 +24,8 @@ USE_PKGLOCALEDIR=	yes
 .include "../../devel/glib2/schemas.mk"
 .include "../../lang/vala/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libsoup+=		libsoup>=2.42
+.include "../../net/libsoup/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtksourceview3+=	gtksourceview3>=3.15.1
diff --git a/math/gnome-calculator/PLIST b/math/gnome-calculator/PLIST
index 401cc058ddb..73b17184781 100644
--- a/math/gnome-calculator/PLIST
+++ b/math/gnome-calculator/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2014/11/25 12:04:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/04/21 22:11:32 prlw1 Exp $
 bin/gcalccmd
 bin/gnome-calculator
+lib/gnome-calculator/libcalculator.la
 libexec/gnome-calculator-search-provider
 man/man1/gcalccmd.1
 man/man1/gnome-calculator.1
diff --git a/math/gnome-calculator/distinfo b/math/gnome-calculator/distinfo
index b4945c48062..1f3bdde0bfb 100644
--- a/math/gnome-calculator/distinfo
+++ b/math/gnome-calculator/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 23:33:33 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/04/21 22:11:32 prlw1 Exp $
 
-SHA1 (gnome-calculator-3.16.2.tar.xz) = 49284cc089ad6e11d0cd5606f2f51eb2eb799371
-RMD160 (gnome-calculator-3.16.2.tar.xz) = ed8d3a9f15a1b8f9937519fb832a821473ec48fa
-SHA512 (gnome-calculator-3.16.2.tar.xz) = f8141eca9eafa42277abd86fab4913e41c432471596f009c344915fc7f481172fcce240ab463597a70ff61c95e225fd0c618ca0fcb15b08c6f14e29b023cf218
-Size (gnome-calculator-3.16.2.tar.xz) = 1437060 bytes
+SHA1 (gnome-calculator-3.20.0.tar.xz) = 95bdd2f68cc55453a5120c82bc7787ea1d4e7f01
+RMD160 (gnome-calculator-3.20.0.tar.xz) = 75c4a6bff254b9ed1b776b0a987158a6e741c03a
+SHA512 (gnome-calculator-3.20.0.tar.xz) = 6f5daa64af19f91c35e9242e182aef759a13060e11476fac7965854af715ddf4c247e181e9146042a56e126a9665daf4ddd447950dc201f892ca9267e02a24e3
+Size (gnome-calculator-3.20.0.tar.xz) = 1347932 bytes
+SHA1 (patch-lib_equations-parser.vala) = 39debd2e1d4b5e141ab1bb7357e45612a3ed9f7e
diff --git a/math/gnome-calculator/patches/patch-lib_equations-parser.vala b/math/gnome-calculator/patches/patch-lib_equations-parser.vala
new file mode 100644
index 00000000000..7debb32c609
--- /dev/null
+++ b/math/gnome-calculator/patches/patch-lib_equations-parser.vala
@@ -0,0 +1,32 @@
+$NetBSD: patch-lib_equations-parser.vala,v 1.1 2016/04/21 22:11:32 prlw1 Exp $
+
+equation: fix precedence of the root operator with regards to the unary minus
+commit 87f716da
+
+--- ./lib/equation-parser.vala.orig	2016-02-15 16:53:44.000000000 +0000
++++ ./lib/equation-parser.vala
+@@ -26,15 +26,15 @@ private enum Precedence
+     MOD             = 3,
+     DIVIDE          = 3,
+     NOT             = 4,
+-    ROOT            = 5,
+-    FUNCTION        = 6,
+-    BOOLEAN         = 7,
+-    PERCENTAGE      = 8,
+-    /* UNARY_MINUS and POWER must have same precedence. */
+-    UNARY_MINUS     = 9,
+-    POWER           = 9,
+-    FACTORIAL       = 10,
+-    NUMBER_VARIABLE = 11,
++    FUNCTION        = 5,
++    BOOLEAN         = 6,
++    PERCENTAGE      = 7,
++    /* UNARY_MINUS, ROOT and POWER must have same precedence. */
++    UNARY_MINUS     = 8,
++    POWER           = 8,
++    ROOT            = 8,
++    FACTORIAL       = 9,
++    NUMBER_VARIABLE = 10,
+     /* DEPTH should be always at the bottom. It stops node jumping off the current depth level. */
+     DEPTH
+ }