cad/surelog: update 1.73 → 1.74

Reported by: portscout
freebsd · Sep 1, 2023 · 28f3568 · 28f3568
1 parent 01a084e
commit 28f3568
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	surelog
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.73
+DISTVERSION=	1.74
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -16,8 +16,10 @@ BROKEN_i386=	compilation fails: conversion function cannot be redeclared, see ht
 
 BUILD_DEPENDS=	utf8cpp>0:devel/utf8cpp \
 		${PYTHON_PKGNAMEPREFIX}orderedmultidict>0:devel/py-orderedmultidict@${PY_FLAVOR}
+BUILD_DEPENDS+=	googletest>0:devel/googletest # workaround for https://github.com/chipsalliance/Surelog/issues/3826
 LIB_DEPENDS=	libcapnp.so:devel/capnproto \
 		libuhdm.so:cad/uhdm
+TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++17-lang localbase:ldflags tcl:86,build
 USE_JAVA=	17 # Java selection fails in cmake when Java 11 is also installed, see https://gitlab.kitware.com/cmake/cmake/-/issues/24674
@@ -29,10 +31,12 @@ JAVA_RUN=	no
 USE_GITHUB=	yes
 GH_ACCOUNT=	chipsalliance
 GH_PROJECT=	Surelog
-GH_TUPLE=	alainmarcel:antlr4:a27cf84:antlr4/third_party/antlr4 \
-		google:googletest:460ae98:googletest/third_party/googletest
+GH_TUPLE=	alainmarcel:antlr4:a27cf84:antlr4/third_party/antlr4
 
-CMAKE_ON=	BUILD_SHARED_LIBS SURELOG_USE_HOST_UHDM
+CMAKE_ON=	BUILD_SHARED_LIBS \
+		SURELOG_USE_HOST_UHDM \
+		SURELOG_USE_HOST_CAPNP \
+		SURELOG_USE_HOST_GTEST
 CMAKE_OFF=	SURELOG_BUILD_TESTS
 CMAKE_ARGS=	-DFREEBSD_JAVA_VERSION=${USE_JAVA} \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}

diff --git a/cad/surelog/distinfo b/cad/surelog/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1692899826
-SHA256 (chipsalliance-Surelog-v1.73_GH0.tar.gz) = 765e328afd18dd3e6b7f79f02b9cb16c282cc0630f9ba7ffdde1cb25b854f316
-SIZE (chipsalliance-Surelog-v1.73_GH0.tar.gz) = 92671300
+TIMESTAMP = 1693553013
+SHA256 (chipsalliance-Surelog-v1.74_GH0.tar.gz) = 0fb8d6e55ed3189ecb9aa3e33616d5b4b92f91fa25ff2e4415e1ee661d75fa88
+SIZE (chipsalliance-Surelog-v1.74_GH0.tar.gz) = 92673974
 SHA256 (alainmarcel-antlr4-a27cf84_GH0.tar.gz) = f1d2636c219d2fa9faad1672739e409d6a9a78ac1495a911ae2a5e43bd5194d1
 SIZE (alainmarcel-antlr4-a27cf84_GH0.tar.gz) = 4205182
-SHA256 (google-googletest-460ae98_GH0.tar.gz) = 24bd93d3b1676bfe43616d54f380d57210fec35e67820856646320769878defc
-SIZE (google-googletest-460ae98_GH0.tar.gz) = 867908