www/wabt: Update 1.0.32 → 1.0.33

Reported by:	portscout

4 files changed, 30 insertions, 27 deletions

diff --git a/www/wabt/Makefile b/www/wabt/Makefile
index f585f7342da7..50ee969226fa 100644
--- a/www/wabt/Makefile
+++ b/www/wabt/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wabt
-DISTVERSION=	1.0.32
+DISTVERSION=	1.0.33
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -9,17 +9,18 @@ WWW=		https://github.com/WebAssembly/wabt
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:testing localbase:ldflags python
+TEST_DEPENDS=	googletest>0:devel/googletest
+
+USES=		cmake:testing localbase:ldflags python ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	WebAssembly
 GH_TUPLE=	dabeaz:ply:d776a2e:dabeaz_ply/third_party/ply \
-		google:googletest:703bd9c:googletest/third_party/gtest \
 		nodejs:uvwasi:55eff19:nodejs_uvwasi/third_party/uvwasi \
 		okdshin:PicoSHA2:27fcf69:picosha/third_party/picosha2 \
-		simd-everywhere:simde:97315b8:simde/third_party/simde \
-		WebAssembly:testsuite:3a04b2c:WebAssembly_testsuite/third_party/testsuite \
-		WebAssembly:wasm-c-api:d9a8009:WebAssembly_wasm_c_api/third_party/wasm-c-api
+		simd-everywhere:simde:54b8c8f:simde/third_party/simde \
+		WebAssembly:testsuite:7ef86dd:WebAssembly_testsuite/third_party/testsuite \
+		WebAssembly:wasm-c-api:b6dd1fb:WebAssembly_wasm_c_api/third_party/wasm-c-api
 
 CMAKE_ON=	BUILD_SHARED_LIBS USE_SYSTEM_GTEST
 CMAKE_OFF=	BUILD_TESTS
@@ -27,11 +28,11 @@ CMAKE_TESTING_ON=	BUILD_TESTS
 CMAKE_TESTING_TARGET=	${ALL_TARGET}
 
 OPTIONS_DEFINE=		FUZZ_TOOLS
+OPTIONS_DEFAULT=	FUZZ_TOOLS
 OPTIONS_SUB=		yes
 
 FUZZ_TOOLS_DESC=	Build tools that can repro fuzz bugs
 FUZZ_TOOLS_CMAKE_BOOL=	BUILD_FUZZ_TOOLS
-FUZZ_TOOLS_BROKEN=	fail to compile, see https://github.com/WebAssembly/wabt/issues/2153
 
 post-test:
 	@cd ${TEST_WRKSRC} && ./wabt-unittests
diff --git a/www/wabt/distinfo b/www/wabt/distinfo
index 8e7f37062cd3..84e313f897c8 100644
--- a/www/wabt/distinfo
+++ b/www/wabt/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1677551657
-SHA256 (WebAssembly-wabt-1.0.32_GH0.tar.gz) = 984cd748c69953a6db60bf3c8faeecd628ccefb2051376f86b573ac3cb59b4bc
-SIZE (WebAssembly-wabt-1.0.32_GH0.tar.gz) = 1170512
+TIMESTAMP = 1685071440
+SHA256 (WebAssembly-wabt-1.0.33_GH0.tar.gz) = 0c9616a90943c1bcd728f2ac84e2613a7cfdced21411fedb15300eb382bb665d
+SIZE (WebAssembly-wabt-1.0.33_GH0.tar.gz) = 1204437
 SHA256 (dabeaz-ply-d776a2e_GH0.tar.gz) = 36520ea1c1ead2139282096f6727fe0baf62a67950374f64ea4623955c45daac
 SIZE (dabeaz-ply-d776a2e_GH0.tar.gz) = 149787
 SHA256 (google-googletest-703bd9c_GH0.tar.gz) = 54bef85b53a02b21ed1e784848ea05cbfd78134f8976a7831a956cfebcef7204
@@ -9,9 +9,9 @@ SHA256 (nodejs-uvwasi-55eff19_GH0.tar.gz) = 4c1d796dde734cd596f571a8d193f60d164a
 SIZE (nodejs-uvwasi-55eff19_GH0.tar.gz) = 56399
 SHA256 (okdshin-PicoSHA2-27fcf69_GH0.tar.gz) = 9d4ed9a2c67c86d67c4f2c8cfde7f77120fb3e789194d53113d2f1d42b094717
 SIZE (okdshin-PicoSHA2-27fcf69_GH0.tar.gz) = 7620
-SHA256 (simd-everywhere-simde-97315b8_GH0.tar.gz) = 039b78c0e5b5cd85b48bec0854ba4b9ea0112cc831554cc662206489c6a2e07e
-SIZE (simd-everywhere-simde-97315b8_GH0.tar.gz) = 6028134
-SHA256 (WebAssembly-testsuite-3a04b2c_GH0.tar.gz) = 00e607c0392116563f941041a018401e37d1d6a1df33260026ecb6e6f68ac651
-SIZE (WebAssembly-testsuite-3a04b2c_GH0.tar.gz) = 604462
-SHA256 (WebAssembly-wasm-c-api-d9a8009_GH0.tar.gz) = e3aaaaffc4669303ef5ded6d820c7d9fa9845980fa06e3012a5a16eab331d7f9
-SIZE (WebAssembly-wasm-c-api-d9a8009_GH0.tar.gz) = 56426
+SHA256 (simd-everywhere-simde-54b8c8f_GH0.tar.gz) = 58a8bef5fae26922b245830ff85bac0627fe115c99c041436a53f6a20bdc662f
+SIZE (simd-everywhere-simde-54b8c8f_GH0.tar.gz) = 6138190
+SHA256 (WebAssembly-testsuite-7ef86dd_GH0.tar.gz) = cd16623d333bb136353facd7c8bd316258369468a52eb6ea1a2fc89b576fd8e7
+SIZE (WebAssembly-testsuite-7ef86dd_GH0.tar.gz) = 619412
+SHA256 (WebAssembly-wasm-c-api-b6dd1fb_GH0.tar.gz) = 19e41111cb2cb83bfa06ded6b1a16c81475248e0b293a98dd2c50e82d48d680c
+SIZE (WebAssembly-wasm-c-api-b6dd1fb_GH0.tar.gz) = 57094
diff --git a/www/wabt/files/patch-CMakeLists.txt b/www/wabt/files/patch-CMakeLists.txt
index 57dbf96bbb21..a01979dfb0ac 100644
--- a/www/wabt/files/patch-CMakeLists.txt
+++ b/www/wabt/files/patch-CMakeLists.txt
@@ -1,29 +1,29 @@
---- CMakeLists.txt.orig	2022-12-28 00:00:50 UTC
+--- CMakeLists.txt.orig	2023-05-12 21:56:46 UTC
 +++ CMakeLists.txt
-@@ -358,7 +358,7 @@ set(WABT_LIBRARY_H
+@@ -387,7 +387,7 @@ set(WABT_LIBRARY_H
  
  set(WABT_LIBRARY_SRC ${WABT_LIBRARY_CC} ${WABT_LIBRARY_H})
  
 -add_library(wabt STATIC ${WABT_LIBRARY_SRC})
 +add_library(wabt ${WABT_LIBRARY_SRC})
+ add_dependencies(wabt gen-wasm2c-prebuilt-target)
  add_library(wabt::wabt ALIAS wabt)
  
- target_compile_features(wabt PUBLIC cxx_std_17)
-@@ -382,7 +382,7 @@ if (WABT_INSTALL_RULES)
-   )
- endif ()
+@@ -420,7 +420,7 @@ endif ()
  
--add_library(wasm-rt-impl STATIC wasm2c/wasm-rt-impl.c wasm2c/wasm-rt-impl.h)
-+add_library(wasm-rt-impl wasm2c/wasm-rt-impl.c wasm2c/wasm-rt-impl.h)
+ set(WASM_RT_FILES "wasm2c/wasm-rt-impl.h" "wasm2c/wasm-rt-impl.c" "wasm2c/wasm-rt-exceptions-impl.c")
+ 
+-add_library(wasm-rt-impl STATIC ${WASM_RT_FILES})
++add_library(wasm-rt-impl ${WASM_RT_FILES})
  add_library(wabt::wasm-rt-impl ALIAS wasm-rt-impl)
  if (WABT_BIG_ENDIAN)
    target_compile_definitions(wasm-rt-impl PUBLIC WABT_BIG_ENDIAN=1)
-@@ -409,7 +409,7 @@ endif ()
+@@ -447,7 +447,7 @@ endif ()
  
  if (BUILD_FUZZ_TOOLS)
    set(FUZZ_FLAGS "-fsanitize=fuzzer,address")
 -  add_library(wabt-fuzz STATIC ${WABT_LIBRARY_SRC})
 +  add_library(wabt-fuzz ${WABT_LIBRARY_SRC})
+   target_link_libraries(wabt-fuzz PUBLIC wabt)
    set_target_properties(wabt-fuzz
      PROPERTIES
-     COMPILE_FLAGS "${FUZZ_FLAGS}"
diff --git a/www/wabt/pkg-plist b/www/wabt/pkg-plist
index 9c2355c90ea1..f10ab8d59af6 100644
--- a/www/wabt/pkg-plist
+++ b/www/wabt/pkg-plist
@@ -54,7 +54,6 @@ include/wabt/leb128.h
 include/wabt/lexer-source-line-finder.h
 include/wabt/lexer-source.h
 include/wabt/literal.h
-include/wabt/make-unique.h
 include/wabt/opcode-code-table.h
 include/wabt/opcode.def
 include/wabt/opcode.h
@@ -62,6 +61,7 @@ include/wabt/option-parser.h
 include/wabt/range.h
 include/wabt/resolve-names.h
 include/wabt/result.h
+include/wabt/sha256.h
 include/wabt/shared-validator.h
 include/wabt/stream.h
 include/wabt/string-format.h
@@ -76,6 +76,7 @@ include/wabt/validator.h
 include/wabt/wast-lexer.h
 include/wabt/wast-parser.h
 include/wabt/wat-writer.h
+include/wasm-rt-exceptions.h
 include/wasm-rt.h
 lib/cmake/wabt/wabt-config-version.cmake
 lib/cmake/wabt/wabt-config.cmake
@@ -95,5 +96,6 @@ share/man/man1/wasm2wat.1.gz
 share/man/man1/wast2json.1.gz
 share/man/man1/wat-desugar.1.gz
 share/man/man1/wat2wasm.1.gz
+%%DATADIR%%/wasm2c/wasm-rt-exceptions-impl.c
 %%DATADIR%%/wasm2c/wasm-rt-impl.c
 %%DATADIR%%/wasm2c/wasm-rt-impl.h