CVS commit: pkgsrc/textproc/qore-json-module

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Oct 12 18:38:48 UTC 2017

Modified Files:
        pkgsrc/textproc/qore-json-module: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/textproc/qore-json-module/patches: patch-src_ql__json.qpp

Log Message:
Revbump and add patch for building with c++11 because of lang/qore update.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/qore-json-module/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/qore-json-module/buildlink3.mk \
    pkgsrc/textproc/qore-json-module/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/qore-json-module/patches/patch-src_ql__json.qpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/qore-json-module/Makefile
diff -u pkgsrc/textproc/qore-json-module/Makefile:1.4 pkgsrc/textproc/qore-json-module/Makefile:1.5
--- pkgsrc/textproc/qore-json-module/Makefile:1.4       Sun Aug  7 11:44:43 2016
+++ pkgsrc/textproc/qore-json-module/Makefile   Thu Oct 12 18:38:47 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2016/08/07 11:44:43 nros Exp $
+# $NetBSD: Makefile,v 1.5 2017/10/12 18:38:47 nros Exp $
 
 DISTNAME=      qore-json-module-1.5
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=   ${MASTER_SITE_GITHUB:=qorelanguage/}
 EXTRACT_SUFX=   .tar.bz2
@@ -15,7 +16,7 @@ LICENSE=      gnu-lgpl-v2.1 OR mit
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++11
 USE_TOOLS+=    gmake pax
 PTHREAD_OPTS+= native
 

Index: pkgsrc/textproc/qore-json-module/buildlink3.mk
diff -u pkgsrc/textproc/qore-json-module/buildlink3.mk:1.3 pkgsrc/textproc/qore-json-module/buildlink3.mk:1.4
--- pkgsrc/textproc/qore-json-module/buildlink3.mk:1.3  Wed Jul 20 13:05:12 2016
+++ pkgsrc/textproc/qore-json-module/buildlink3.mk      Thu Oct 12 18:38:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/07/20 13:05:12 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2017/10/12 18:38:47 nros Exp $
 
 BUILDLINK_TREE+=       qore-json-module
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        qore-json-module
 QORE_JSON_MODULE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qore-json-module+=       qore-json-module>=1.4
-BUILDLINK_ABI_DEPENDS.qore-json-module?=       qore-json-module>=1.5
+BUILDLINK_ABI_DEPENDS.qore-json-module?=       qore-json-module>=1.5nb1
 BUILDLINK_PKGSRCDIR.qore-json-module?= ../../textproc/qore-json-module
 
 .include "../../lang/qore/buildlink3.mk"
Index: pkgsrc/textproc/qore-json-module/distinfo
diff -u pkgsrc/textproc/qore-json-module/distinfo:1.3 pkgsrc/textproc/qore-json-module/distinfo:1.4
--- pkgsrc/textproc/qore-json-module/distinfo:1.3       Wed Jul 20 13:05:12 2016
+++ pkgsrc/textproc/qore-json-module/distinfo   Thu Oct 12 18:38:47 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2016/07/20 13:05:12 nros Exp $
+$NetBSD: distinfo,v 1.4 2017/10/12 18:38:47 nros Exp $
 
 SHA1 (qore-json-module-1.5.tar.bz2) = d57041166648d8a6b2083e129e5bde6cda8a870d
 RMD160 (qore-json-module-1.5.tar.bz2) = 3e230f7c9e0fed96db0ad707a24af74c514a0411
 SHA512 (qore-json-module-1.5.tar.bz2) = 5b33fa47439090c798ac62a425e9bacd9bfae98b67e80781017cdf2b364a29c4d8cef04858fe2278828e68deb1d8511c2e4b782e35a6142013253ad8e4a91dd3
 Size (qore-json-module-1.5.tar.bz2) = 464088 bytes
+SHA1 (patch-src_ql__json.qpp) = 7067e0d4452329f1d9c5387aa6706b61249bdd0b

Added files:

Index: pkgsrc/textproc/qore-json-module/patches/patch-src_ql__json.qpp
diff -u /dev/null pkgsrc/textproc/qore-json-module/patches/patch-src_ql__json.qpp:1.1
--- /dev/null   Thu Oct 12 18:38:48 2017
+++ pkgsrc/textproc/qore-json-module/patches/patch-src_ql__json.qpp     Thu Oct 12 18:38:48 2017
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_ql__json.qpp,v 1.1 2017/10/12 18:38:48 nros Exp $
+Fix build using c++11
+--- src/ql_json.qpp.orig       2017-10-12 17:48:07.000000000 +0000
++++ src/ql_json.qpp
+@@ -474,7 +474,7 @@ static int do_json_value(QoreString* str
+    if (vtype == NT_FLOAT) {
+       double f = v.getAsFloat();
+       // check for nan, +/-inf and serialize as null
+-      if (isnan(f) || isinf(f))
++      if (std::isnan(f) || std::isinf(f))
+          str->concat("null");
+       else
+          str->sprintf("%.20g", f);