-
Notifications
You must be signed in to change notification settings - Fork 740
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
www/webkit2-gtk{3,4}: fix build with Ruby 3.2
https://bugs.webkit.org/show_bug.cgi?id=246743 WebKit/WebKit@b7ac5d0 (upstream commit makes patch(1) sad so manually generated) Approved by: mentors (implicit)
- Loading branch information
Showing
6 changed files
with
110 additions
and
0 deletions.
There are no files selected for viewing
16 changes: 16 additions & 0 deletions
16
www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_config.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
|
|
28 changes: 28 additions & 0 deletions
28
www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_parser.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
11 changes: 11 additions & 0 deletions
11
...2-gtk3/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
16 changes: 16 additions & 0 deletions
16
www/webkit2-gtk4/files/patch-Source_JavaScriptCore_offlineasm_config.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
|
|
28 changes: 28 additions & 0 deletions
28
www/webkit2-gtk4/files/patch-Source_JavaScriptCore_offlineasm_parser.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
11 changes: 11 additions & 0 deletions
11
...2-gtk4/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |