Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Oct 2023 07:25:02 GMT
From:      Fernando =?utf-8?Q?Apestegu=C3=ADa?= <fernape@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ec7332139742 - main - devel/jsonnet: update to v0.20.0
Message-ID:  <202310130725.39D7P2Gq085874@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ec733213974264ea5602ec6f7aa7dad1046ec47f

commit ec733213974264ea5602ec6f7aa7dad1046ec47f
Author:     Pavel Timofeev <timp87@gmail.com>
AuthorDate: 2023-10-11 14:03:08 +0000
Commit:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
CommitDate: 2023-10-13 07:24:40 +0000

    devel/jsonnet: update to v0.20.0
    
    ChangeLogs:
     https://github.com/google/jsonnet/releases/tag/v0.19.0
     https://github.com/google/jsonnet/releases/tag/v0.19.1
     https://github.com/google/jsonnet/releases/tag/v0.20.0
    
    PR:             274397
    Reported by:    timp87@gmail.com
    Approved by:    gasol.wu@gmail.com (maintainer)
---
 devel/jsonnet/Makefile                |  4 ++--
 devel/jsonnet/distinfo                |  6 +++---
 devel/jsonnet/files/patch-core_vm.cpp | 13 ++++++++++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/devel/jsonnet/Makefile b/devel/jsonnet/Makefile
index 1da6097367ee..ba3db87e5c1d 100644
--- a/devel/jsonnet/Makefile
+++ b/devel/jsonnet/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	jsonnet
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.18.0
+DISTVERSION=	0.20.0
 CATEGORIES=	devel
 
 MAINTAINER=	gasol.wu@gmail.com
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	nlohmann-json>=3.6.1:devel/nlohmann-json
 LIB_DEPENDS=	libc4core.so:devel/c4core \
 		libryml.so:devel/rapidyaml
 
-USES=		compiler:c++11-lib cmake localbase:ldflags
+USES=		compiler:c++17-lang cmake localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
diff --git a/devel/jsonnet/distinfo b/devel/jsonnet/distinfo
index 6b336c0ba352..77f96212e93b 100644
--- a/devel/jsonnet/distinfo
+++ b/devel/jsonnet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641409936
-SHA256 (google-jsonnet-v0.18.0_GH0.tar.gz) = 85c240c4740f0c788c4d49f9c9c0942f5a2d1c2ae58b2c71068107bc80a3ced4
-SIZE (google-jsonnet-v0.18.0_GH0.tar.gz) = 22472162
+TIMESTAMP = 1696949293
+SHA256 (google-jsonnet-v0.20.0_GH0.tar.gz) = 77bd269073807731f6b11ff8d7c03e9065aafb8e4d038935deb388325e52511b
+SIZE (google-jsonnet-v0.20.0_GH0.tar.gz) = 22481277
diff --git a/devel/jsonnet/files/patch-core_vm.cpp b/devel/jsonnet/files/patch-core_vm.cpp
index 29f1ae59a6d1..484824c11a9b 100644
--- a/devel/jsonnet/files/patch-core_vm.cpp
+++ b/devel/jsonnet/files/patch-core_vm.cpp
@@ -1,4 +1,4 @@
---- core/vm.cpp.orig	2021-12-21 17:55:49 UTC
+--- core/vm.cpp.orig	2023-04-17 19:02:16 UTC
 +++ core/vm.cpp
 @@ -23,7 +23,7 @@ limitations under the License.
  
@@ -9,3 +9,14 @@
  #include "md5.h"
  #include "parser.h"
  #include "ryml_std.hpp" // include this before any other ryml header
+@@ -1710,6 +1710,10 @@ class Interpreter {
+             } break;
+ 
+             case json::value_t::discarded: {
++                abort();
++            }
++
++            case json::value_t::binary: {
+                 abort();
+             }
+         }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310130725.39D7P2Gq085874>