diff --git a/www/webkit2-gtk/Makefile b/www/webkit2-gtk/Makefile index 209bfbdf99ed..37a0c8cde74a 100644 --- a/www/webkit2-gtk/Makefile +++ b/www/webkit2-gtk/Makefile @@ -1,139 +1,137 @@ PORTNAME= webkit -DISTVERSION= 2.46.5 -PORTREVISION= 3 +DISTVERSION= 2.46.6 CATEGORIES= www MASTER_SITES= https://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk_${FLAVOR} DISTNAME= ${PORTNAME}gtk-${DISTVERSION} DIST_SUBDIR= gnome PATCH_SITES= https://github.com/WebKit/WebKit/commit/ -PATCHFILES= aa29001ade54425699e1345ce41bbd227dba805c.patch:-p1 MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK 3 toolkit WWW= https://webkitgtk.org/ LICENSE= GPLv2 BSD2CLAUSE LICENSE_COMB= dual BROKEN_riscv64= error: Unknown Architecture LIB_DEPENDS= libavif.so:graphics/libavif \ libdrm.so:graphics/libdrm \ libenchant-2.so:textproc/enchant2 \ libepoxy.so:graphics/libepoxy \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgcrypt.so:security/libgcrypt \ libgraphene-1.0.so:graphics/graphene \ libgpg-error.so:security/libgpg-error \ libharfbuzz-icu.so:print/harfbuzz-icu \ libharfbuzz.so:print/harfbuzz \ libhyphen.so:textproc/hyphen \ libicudata.so:devel/icu \ libjxl.so:graphics/libjxl \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libsecret-1.so:security/libsecret \ libsysinfo.so:devel/libsysinfo \ libtasn1.so:security/libtasn1 \ libwebp.so:graphics/webp \ libwoff2dec.so:devel/woff2 PORTSCOUT= limitw:1,even FLAVORS= 60 41 40 FLAVOR?= ${FLAVORS:[1]} USES= bison cmake compiler:c++23-lang cpe gettext gl gnome gperf \ jpeg localbase:ldflags perl5 pkgconfig python:build \ ruby:build sqlite tar:xz xorg USE_GNOME= cairo gdkpixbuf2 introspection:build libxml2 libxslt USE_GL= egl gbm gl glesv2 USE_LDCONFIG= yes USE_PERL5= build USE_XORG= x11 CPE_VENDOR= webkitgtk CPE_PRODUCT= webkitgtk BINARY_ALIAS= python=${PYTHON_CMD} CXXFLAGS+= -DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32 \ -I${LOCALBASE}/include -lsysinfo CMAKE_ARGS= -DPORT=GTK CMAKE_OFF= ${CMAKE_OFF_${ARCH}:U} \ ENABLE_GAMEPAD \ ENABLE_JOURNALD_LOG \ USE_LIBBACKTRACE \ USE_SYSTEM_MALLOC \ USE_SYSPROF_CAPTURE \ USE_SYSTEM_SYSPROF_CAPTURE CMAKE_OFF_armv6= ENABLE_JIT CMAKE_OFF_armv7= ENABLE_JIT INSTALL_TARGET= install .if ${FLAVOR:M60} USE_GNOME+= gtk40 PLIST= ${.CURDIR}/pkg-plist_${FLAVOR} API_VERSION= 6.0 -WEBKIT_LIBRARY_VERSION= 4 10 7 -JAVASCRIPTCORE_LIBRARY_VERSION= 1 3 14 +WEBKIT_LIBRARY_VERSION= 4 10 8 +JAVASCRIPTCORE_LIBRARY_VERSION= 1 3 15 .else USE_GNOME+= gtk30 CMAKE_OFF+= USE_GTK4 .endif .if ${FLAVOR:M40} LIB_DEPENDS+= libsoup-2.4.so:devel/libsoup CMAKE_ON+= USE_SOUP2 API_VERSION= 4.0 -WEBKIT_LIBRARY_VERSION= 37 71 7 -JAVASCRIPTCORE_LIBRARY_VERSION= 18 25 14 +WEBKIT_LIBRARY_VERSION= 37 71 8 +JAVASCRIPTCORE_LIBRARY_VERSION= 18 25 15 .else LIB_DEPENDS+= libsoup-3.0.so:devel/libsoup3 .endif .if ${FLAVOR:M41} API_VERSION= 4.1 -WEBKIT_LIBRARY_VERSION= 0 16 7 -JAVASCRIPTCORE_LIBRARY_VERSION= 0 6 14 +WEBKIT_LIBRARY_VERSION= 0 16 8 +JAVASCRIPTCORE_LIBRARY_VERSION= 0 6 15 .endif PLIST_SUB= API_VERSION=${API_VERSION} \ WEBKIT_LIBRARY_VERSION=${WEBKIT_LIBRARY_VERSION:ts.} \ WEBKIT_LIBRARY_VERSION_MAJOR=${WEBKIT_LIBRARY_VERSION:[1]} \ JAVASCRIPTCORE_LIBRARY_VERSION=${JAVASCRIPTCORE_LIBRARY_VERSION:ts.} \ JAVASCRIPTCORE_LIBRARY_VERSION_MAJOR=${JAVASCRIPTCORE_LIBRARY_VERSION:[1]} OPTIONS_DEFINE= DOCS GEOIP GSTREAMER WAYLAND OPTIONS_DEFAULT= GEOIP GSTREAMER WAYLAND OPTIONS_SUB= yes DOCS_CMAKE_BOOL= ENABLE_DOCUMENTATION DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gi-docgen>0:textproc/py-gi-docgen@${PY_FLAVOR} GEOIP_CMAKE_BOOL= ENABLE_GEOLOCATION GEOIP_BUILD_DEPENDS= geoclue>=2.4.3:net/geoclue GEOIP_RUN_DEPENDS= geoclue>=2.4.3:net/geoclue GSTREAMER_USES= gstreamer GSTREAMER_USE= GSTREAMER=bad,gl GSTREAMER_CMAKE_BOOL= ENABLE_VIDEO ENABLE_WEB_AUDIO WAYLAND_CMAKE_BOOL= ENABLE_WAYLAND_TARGET WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.12:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland .include .ifdef WITH_DEBUG DEBUG_FLAGS= -g1 # resulting package otherwise is huge .endif post-install: @${MV} ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver \ ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver-${API_VERSION} .include diff --git a/www/webkit2-gtk/distinfo b/www/webkit2-gtk/distinfo index ef5a2059537c..4d7b2a38f906 100644 --- a/www/webkit2-gtk/distinfo +++ b/www/webkit2-gtk/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1737410953 -SHA256 (gnome/webkitgtk-2.46.5.tar.xz) = bad4020bb0cfb3e740df3082c2d9cbf67cf4095596588a56aecdde6702137805 -SIZE (gnome/webkitgtk-2.46.5.tar.xz) = 42898600 -SHA256 (gnome/aa29001ade54425699e1345ce41bbd227dba805c.patch) = 9b3e89e1a903f8763c3f4149d24e4ab02938b7ff72b6b24e870af0c7efe2d9c4 -SIZE (gnome/aa29001ade54425699e1345ce41bbd227dba805c.patch) = 1301 +TIMESTAMP = 1741222652 +SHA256 (gnome/webkitgtk-2.46.6.tar.xz) = f2b31de693220ba9bab76ce6ddfe5b0bfab2515cb2b0a70f3c54d4050766c32b +SIZE (gnome/webkitgtk-2.46.6.tar.xz) = 42914744 diff --git a/www/webkit2-gtk/files/patch-Source_JavaScriptCore_wasm_WasmBBQJIT.h b/www/webkit2-gtk/files/patch-Source_JavaScriptCore_wasm_WasmBBQJIT.h new file mode 100644 index 000000000000..981debd03271 --- /dev/null +++ b/www/webkit2-gtk/files/patch-Source_JavaScriptCore_wasm_WasmBBQJIT.h @@ -0,0 +1,20 @@ +Excerpt from https://github.com/WebKit/WebKit/commit/406449de0ae5f7558bbcec552b8207ef3e7e6cff + +FAILED: Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/wasm/WasmBBQJIT.cpp.o +/usr/ports/www/webkit2-gtk/work-60/webkitgtk-2.46.6/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp:4545:9: error: use of undeclared identifier 'shouldFuseBranchCompare' + 4545 | if (shouldFuseBranchCompare && isCompareOpType(m_prevOpcode) + | ^ +1 error generated. + +--- Source/JavaScriptCore/wasm/WasmBBQJIT.h.orig 2025-02-05 09:13:05 UTC ++++ Source/JavaScriptCore/wasm/WasmBBQJIT.h +@@ -846,6 +846,9 @@ class BBQJIT { (public) + #define LOG_DEDENT() do { if (UNLIKELY(Options::verboseBBQJITInstructions())) { m_loggingIndent -= 2; } } while (false); + + public: ++ // FIXME: Support fused branch compare on 32-bit platforms. ++ static constexpr bool shouldFuseBranchCompare = is64Bit(); ++ + static constexpr bool tierSupportsSIMD = true; + + BBQJIT(CCallHelpers& jit, const TypeDefinition& signature, BBQCallee& callee, const FunctionData& function, uint32_t functionIndex, const ModuleInformation& info, Vector& unlinkedWasmToWasmCalls, MemoryMode mode, InternalFunction* compilation, std::optional hasExceptionHandlers, unsigned loopIndexForOSREntry, TierUpCount* tierUp);