Date: Thu, 29 Dec 2022 15:59:34 GMT
From: Charlie Li <vishwin@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: af2fdae1efc8 - main - www/webkit2-gtk{3,4}: fix build with Ruby 3.2
Message-ID: <202212291559.2BTFxYks017061@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=af2fdae1efc81b2c715300b8c24dfc675f3f9668 commit af2fdae1efc81b2c715300b8c24dfc675f3f9668 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2022-12-29 15:57:07 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212291559.2BTFxYks017061>