Authentication-Results: name.execsw.org; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=kMg2ykYM; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=vIWsVKFD Received: by mail.netbsd.org (Postfix, from userid 605) id 908AA84E70; Sun, 14 Apr 2024 12:44:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1713098694; bh=l9fG7MIIaILsZGAbSAJD2khHn+bv55SyI05iS6jkDtU=; h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe; b=kMg2ykYM2j70JHjmV5nCeKnOOkDPAFzZzgkba6Yj0jfu/xsK4tEunv6N1mYNDAkj6 m1uPINsowfZwTBsiTLsxNg3vETyk9vEr2mlungm/Dp6gQigN4wsMnpmX8NcBPSYu81 iqHwzRlohSuF6nf2W+JXkkr4OkrhheCQ15Shy7+k= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8329084E6F for ; Sun, 14 Apr 2024 12:44:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Authentication-Results: mail.netbsd.org (amavisd-new); dkim=pass (1024-bit key) header.d=netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 2hJVitdQaR79 for ; Sun, 14 Apr 2024 12:44:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8A2C584D4C for ; Sun, 14 Apr 2024 12:44:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1713098692; bh=l9fG7MIIaILsZGAbSAJD2khHn+bv55SyI05iS6jkDtU=; h=Date:From:Subject:To:Reply-To; b=vIWsVKFD/U1OHjcIDPDB7qG30FakdoVExx9FXCzQCSLaP9wtvOw4S2wkYd3WG0EFA H1Hn5XaXMnLJMBtQFwaVhqTgpSCVznU5RJsIK07g1tHPowdNRjR/V9pE35fvwbvSva 8tdiZV9dmwr6r9g96RW4MRvEOURqNW6SgopyACUE= Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7C6D8FA2C; Sun, 14 Apr 2024 12:44:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_171309869241130" MIME-Version: 1.0 Date: Sun, 14 Apr 2024 12:44:52 +0000 From: "Izumi Tsutsui" Subject: CVS commit: pkgsrc/www/webkit-gtk To: pkgsrc-changes@NetBSD.org Reply-To: tsutsui@netbsd.org X-Mailer: log_accum Message-Id: <20240414124452.7C6D8FA2C@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_171309869241130 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tsutsui Date: Sun Apr 14 12:44:52 UTC 2024 Modified Files: pkgsrc/www/webkit-gtk: Makefile distinfo Added Files: pkgsrc/www/webkit-gtk/patches: patch-Source_JavaScriptCore_offlineasm_config.rb patch-Source_JavaScriptCore_offlineasm_parser.rb patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb Log Message: webkit-gtk: Pull upstream fixes for Ruby 3.2. https://bugs.webkit.org/show_bug.cgi?id=246743 >> webkitgtk 2.38.0 fails to build with upcoming ruby 3.2 due to >> removed File.exists? https://github.com/WebKit/WebKit/commit/b7ac5d >> File.exists has been declared deprecated since Ruby 2.1 (2013) >> and with Ruby 3.2 gets removed for good. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 pkgsrc/www/webkit-gtk/Makefile cvs rdiff -u -r1.174 -r1.175 pkgsrc/www/webkit-gtk/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_offlineasm_config.rb \ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_offlineasm_parser.rb \ pkgsrc/www/webkit-gtk/patches/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_171309869241130 Content-Disposition: inline Content-Length: 8185 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/webkit-gtk/Makefile diff -u pkgsrc/www/webkit-gtk/Makefile:1.258 pkgsrc/www/webkit-gtk/Makefile:1.259 --- pkgsrc/www/webkit-gtk/Makefile:1.258 Sun Apr 7 07:35:13 2024 +++ pkgsrc/www/webkit-gtk/Makefile Sun Apr 14 12:44:52 2024 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.258 2024/04/07 07:35:13 wiz Exp $ +# $NetBSD: Makefile,v 1.259 2024/04/14 12:44:52 tsutsui Exp $ DISTNAME= webkitgtk-2.36.8 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= www MASTER_SITES= https://www.webkitgtk.org/releases/ EXTRACT_SUFX= .tar.xz @@ -103,9 +103,6 @@ SUBST_SED.python+= -e 's,"python3","${PY SUBST_STAGE.python= pre-configure SUBST_MESSAGE.python= Fixing path to python binary. -# Source/JavaScriptCore/offlineasm/parser.rb:877:in `block in parseIncludes': undefined method `exists?' for File:Class (NoMethodError) -RUBY_VERSIONS_INCOMPATIBLE= 32 - .include "../../lang/ruby/rubyversion.mk" .include "../../lang/ruby/replace.mk" TOOL_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} Index: pkgsrc/www/webkit-gtk/distinfo diff -u pkgsrc/www/webkit-gtk/distinfo:1.174 pkgsrc/www/webkit-gtk/distinfo:1.175 --- pkgsrc/www/webkit-gtk/distinfo:1.174 Sat Jan 27 17:28:11 2024 +++ pkgsrc/www/webkit-gtk/distinfo Sun Apr 14 12:44:52 2024 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.174 2024/01/27 17:28:11 wiz Exp $ +$NetBSD: distinfo,v 1.175 2024/04/14 12:44:52 tsutsui Exp $ BLAKE2s (webkitgtk-2.36.8.tar.xz) = 277ba5935bda3e3867083b4c736499d974b9c733dbd05bf574510857dde481a1 SHA512 (webkitgtk-2.36.8.tar.xz) = 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036 @@ -10,6 +10,8 @@ SHA1 (patch-Source_JavaScriptCore_assemb SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = 8f324091df41be96b011bcbeed5fd64c4464f010 SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 7f6c0c57d46478e83c4ff21dae2415f44085ba32 SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93 +SHA1 (patch-Source_JavaScriptCore_offlineasm_config.rb) = 64da5459255de458d481a8337aac4027b256a88c +SHA1 (patch-Source_JavaScriptCore_offlineasm_parser.rb) = 8b34d774a7e125cf60d0738e221b6d872207aa6e SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 6c3bdbf8041df27510da5999ee85f4e5ed09be8b SHA1 (patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp) = 73dfe781efe7e8aa7d49094af8820a87c501818f SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a @@ -33,6 +35,7 @@ SHA1 (patch-Source_WebCore_rendering_sha SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = 3a4d9415e7d3ac78a948b9e7eb5e0377575835c3 SHA1 (patch-Source_WebCore_xml_XSLTProcessor.h) = cce0bdced0626b2301b3aa2646ad1d2d444d647f SHA1 (patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp) = c8b96312a5cd107065d505909d67ad5a7dd1f980 +SHA1 (patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb) = 2f0a243ea12605009a3e1b6bceecd3a29c8e4093 SHA1 (patch-Source_WebKit_CMakeLists.txt) = 86d11b8a1142a1ab267e412873cca4f8924aaae8 SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 14dfbee895aa7c70bf3b61b4dbb5bccd96d9583a SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba90bbff9d Added files: Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_offlineasm_config.rb diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_offlineasm_config.rb:1.1 --- /dev/null Sun Apr 14 12:44:52 2024 +++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_offlineasm_config.rb Sun Apr 14 12:44:52 2024 @@ -0,0 +1,22 @@ +$NetBSD: patch-Source_JavaScriptCore_offlineasm_config.rb,v 1.1 2024/04/14 12:44:52 tsutsui Exp $ + +- Apply upstream fixes for Ruby 3.2: + https://bugs.webkit.org/show_bug.cgi?id=246743 + https://github.com/WebKit/WebKit/commit/b7ac5d0 + +--- Source/JavaScriptCore/offlineasm/config.rb.orig 2024-04-14 07:14:45.898589640 +0000 ++++ Source/JavaScriptCore/offlineasm/config.rb +@@ -22,11 +22,11 @@ + # THE POSSIBILITY OF SUCH DAMAGE. + + buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR']; +-if buildProductsDirectory and File.exists?(buildProductsDirectory) ++if buildProductsDirectory and File.exist?(buildProductsDirectory) + $: << "#{buildProductsDirectory}/usr/local/include/WebKitAdditions/Scripts" + end + sdkRootDirectory = ENV['SDKROOT']; +-if sdkRootDirectory and File.exists?(sdkRootDirectory) ++if sdkRootDirectory and File.exist?(sdkRootDirectory) + $: << "#{sdkRootDirectory}/usr/local/include/WebKitAdditions/Scripts" + end + Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_offlineasm_parser.rb diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_offlineasm_parser.rb:1.1 --- /dev/null Sun Apr 14 12:44:52 2024 +++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_offlineasm_parser.rb Sun Apr 14 12:44:52 2024 @@ -0,0 +1,34 @@ +$NetBSD: patch-Source_JavaScriptCore_offlineasm_parser.rb,v 1.1 2024/04/14 12:44:52 tsutsui Exp $ + +- Apply upstream fixes for Ruby 3.2: + https://bugs.webkit.org/show_bug.cgi?id=246743 + https://github.com/WebKit/WebKit/commit/b7ac5d0 + +--- Source/JavaScriptCore/offlineasm/parser.rb.orig 2024-04-14 07:15:12.925145845 +0000 ++++ Source/JavaScriptCore/offlineasm/parser.rb +@@ -838,10 +838,10 @@ class Parser + additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/" + end + fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName +- if not File.exists?(fileName) ++ if not File.exist?(fileName) + fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName + end +- fileExists = File.exists?(fileName) ++ fileExists = File.exist?(fileName) + raise "File not found: #{fileName}" if not fileExists and not isOptional + list << parse(fileName, @options) if fileExists + else +@@ -874,10 +874,10 @@ class Parser + additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/" + end + fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName +- if not File.exists?(fileName) ++ if not File.exist?(fileName) + fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName + end +- fileExists = File.exists?(fileName) ++ fileExists = File.exist?(fileName) + raise "File not found: #{fileName}" if not fileExists and not isOptional + fileList << fileName if fileExists + else Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb:1.1 --- /dev/null Sun Apr 14 12:44:52 2024 +++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb Sun Apr 14 12:44:52 2024 @@ -0,0 +1,17 @@ +$NetBSD: patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb,v 1.1 2024/04/14 12:44:52 tsutsui Exp $ + +- Apply upstream fixes for Ruby 3.2: + https://bugs.webkit.org/show_bug.cgi?id=246743 + https://github.com/WebKit/WebKit/commit/b7ac5d0 + +--- Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb.orig 2024-04-14 07:15:51.337488659 +0000 ++++ Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb +@@ -36,7 +36,7 @@ class Task + end + + generated_path = File.join tmpdir, output_filename +- if !File.exists?(generated_path) ++ if !File.exist?(generated_path) + puts "ERROR: Generated file does not exist at expected path." + exit 1 + end --_----------=_171309869241130--