From nobody Thu Dec 29 15:59:34 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NjY466mM6z2cK4n; Thu, 29 Dec 2022 15:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NjY466HTDz4H01; Thu, 29 Dec 2022 15:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672329574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzAALTcnVffviZfUqEMuvBDOd5kEFg/Ka2ZVP2yQPAg=; b=tZIQBZEgsxhYODF6At2F8eQYFo6baJl0/X7GzZrqMIx16pJruTJrJMKYi1UtvYPEeKazKE 4qoKyYDl4nFCSE5jZTwGY3HHuo/NWZMl8bjd+GVqNHo9ghazo05tS0cD3W7KWjji+ELiQo ffizAJIvodaqfLAA4LXLFDxdvc4mFqSjtzFnZiYxTDYvvZlgZGFXywCXb4ZYpQfg63OfAA jQuj+4lanYD+D51XOEWiyUnPIBMHyDtv0k/wx9nmxFkpNbQs7bobsXpjYAwPWLCT8TVNql pcC7p8z9H85B/KgvByx4POXswYA/MFOrL3I6I/gizQhfKD2weUmjY/18GFcGtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672329574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzAALTcnVffviZfUqEMuvBDOd5kEFg/Ka2ZVP2yQPAg=; b=HgzAk4SuoI6fufkzn+LecuDDXqaAO0aybyOah/jUEQbQVkal0PMoFvIf3BS2Fc+UWXGeHx HWcyoDWD1MFpVnxHfklsByeeZkS20PEKiOwytgAukodh3xetmlUZVzO5P8hYwv+KT9D+aY GFkXczSnk16VKFhfxJVj245xsfvsxI0btjtRTOHKly363oVkJzRunAMw2PZhu8u94Gv0PP KPLVZ6HeF+FYNbsR3ubWbIyvfqmc4SLd7YixbiytBFLHu98aasVrW1YhCbjPCI4LQ07pfB EmnlDJSToG3crYLS4MZ37F+2Quv9w1m8SHSSqO1mr274lPKkIv3UDjOEYSZ2Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672329574; a=rsa-sha256; cv=none; b=flnf41QOiJogqCl9cd47iRxPiVHEZ6tFJmV2Yg+3HO6Yi4ldiTTW5t25rdAoj0OxE4lctr XKzdg2g95rg7UeZ4bxJcVGL+xkCQVLiCQpz1YXAZ/VvyOcgs18ExNVpuG/kRwglAQDuzrW owFuk72oMjy6ocuyQZEkEfp/m8Rp5qGiZBL6o6oAcQJ6U/NDGwNoZKUSMkPRjruwCJb5V2 s4M47nRr2RM400XYiUe5j9RA5Fo4evPo2/KSYGFB7a0xN3YGCmh/MgDmihXZs/CcRVIlca p8rpb2y31Z2LyUJnTUOREC2bt+4rYN7UkOLqQRurFLebGkh3BCTnT01k5C/3ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NjY465LKyzZ0q; Thu, 29 Dec 2022 15:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BTFxY8n017063; Thu, 29 Dec 2022 15:59:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BTFxYks017061; Thu, 29 Dec 2022 15:59:34 GMT (envelope-from git) Date: Thu, 29 Dec 2022 15:59:34 GMT Message-Id: <202212291559.2BTFxYks017061@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: af2fdae1efc8 - main - www/webkit2-gtk{3,4}: fix build with Ruby 3.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af2fdae1efc81b2c715300b8c24dfc675f3f9668 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=af2fdae1efc81b2c715300b8c24dfc675f3f9668 commit af2fdae1efc81b2c715300b8c24dfc675f3f9668 Author: Charlie Li AuthorDate: 2022-12-29 15:57:07 +0000 Commit: Charlie Li CommitDate: 2022-12-29 15:57:07 +0000 www/webkit2-gtk{3,4}: fix build with Ruby 3.2 https://bugs.webkit.org/show_bug.cgi?id=246743 https://github.com/WebKit/WebKit/commit/b7ac5d0ccc7ca3ed6bf4f2d40fde60247ce87d3c (upstream commit makes patch(1) sad so manually generated) Approved by: mentors (implicit) --- ...atch-Source_JavaScriptCore_offlineasm_config.rb | 16 +++++++++++++ ...atch-Source_JavaScriptCore_offlineasm_parser.rb | 28 ++++++++++++++++++++++ ...cripts_update-LegacyInspectorBackendCommands.rb | 11 +++++++++ ...atch-Source_JavaScriptCore_offlineasm_config.rb | 16 +++++++++++++ ...atch-Source_JavaScriptCore_offlineasm_parser.rb | 28 ++++++++++++++++++++++ ...cripts_update-LegacyInspectorBackendCommands.rb | 11 +++++++++ 6 files changed, 110 insertions(+) diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_config.rb b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_config.rb new file mode 100644 index 000000000000..9a99da9a8a91 --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_config.rb @@ -0,0 +1,16 @@ +--- Source/JavaScriptCore/offlineasm/config.rb.orig 2021-05-17 13:22:35 UTC ++++ Source/JavaScriptCore/offlineasm/config.rb +@@ -22,11 +22,11 @@ buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR']; + # 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 + diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_parser.rb b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_parser.rb new file mode 100644 index 000000000000..12a141cefb52 --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_parser.rb @@ -0,0 +1,28 @@ +--- Source/JavaScriptCore/offlineasm/parser.rb.orig 2021-10-21 08:52:07 UTC ++++ Source/JavaScriptCore/offlineasm/parser.rb +@@ -832,10 +832,10 @@ class Parser + @idx += 1 + additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/" + 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) if fileExists + else +@@ -864,10 +864,10 @@ class Parser + @idx += 1 + additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/" + 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 diff --git a/www/webkit2-gtk3/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb b/www/webkit2-gtk3/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb new file mode 100644 index 000000000000..5b1f4eef7e6b --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb @@ -0,0 +1,11 @@ +--- Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb.orig 2021-05-17 13:22:42 UTC ++++ 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 diff --git a/www/webkit2-gtk4/files/patch-Source_JavaScriptCore_offlineasm_config.rb b/www/webkit2-gtk4/files/patch-Source_JavaScriptCore_offlineasm_config.rb new file mode 100644 index 000000000000..9a99da9a8a91 --- /dev/null +++ b/www/webkit2-gtk4/files/patch-Source_JavaScriptCore_offlineasm_config.rb @@ -0,0 +1,16 @@ +--- Source/JavaScriptCore/offlineasm/config.rb.orig 2021-05-17 13:22:35 UTC ++++ Source/JavaScriptCore/offlineasm/config.rb +@@ -22,11 +22,11 @@ buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR']; + # 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 + diff --git a/www/webkit2-gtk4/files/patch-Source_JavaScriptCore_offlineasm_parser.rb b/www/webkit2-gtk4/files/patch-Source_JavaScriptCore_offlineasm_parser.rb new file mode 100644 index 000000000000..12a141cefb52 --- /dev/null +++ b/www/webkit2-gtk4/files/patch-Source_JavaScriptCore_offlineasm_parser.rb @@ -0,0 +1,28 @@ +--- Source/JavaScriptCore/offlineasm/parser.rb.orig 2021-10-21 08:52:07 UTC ++++ Source/JavaScriptCore/offlineasm/parser.rb +@@ -832,10 +832,10 @@ class Parser + @idx += 1 + additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/" + 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) if fileExists + else +@@ -864,10 +864,10 @@ class Parser + @idx += 1 + additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/" + 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 diff --git a/www/webkit2-gtk4/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb b/www/webkit2-gtk4/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb new file mode 100644 index 000000000000..5b1f4eef7e6b --- /dev/null +++ b/www/webkit2-gtk4/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb @@ -0,0 +1,11 @@ +--- Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb.orig 2021-05-17 13:22:42 UTC ++++ 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