1 Star 0 Fork 53

happyworker/webkit2gtk3

forked from src-openEuler/webkitgtk 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
backport-Fix-build-with-Ruby-3.2.patch 4.18 KB
一键复制 编辑 原始数据 按行查看 历史
周文培 提交于 2023-08-08 11:35 +08:00 . Fix build with Ruby 3.2
From b7ac5d0ccc7ca3ed6bf4f2d40fde60247ce87d3c Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 12 Dec 2022 21:24:11 -0800
Subject: [PATCH] Fix build with Ruby 3.2
https://bugs.webkit.org/show_bug.cgi?id=246743
Reviewed by Ross Kirsling.
File.exists has been declared deprecated since Ruby 2.1 (2013) and with Ruby 3.2 gets removed for good.
* Source/JavaScriptCore/offlineasm/config.rb:
* Source/JavaScriptCore/offlineasm/parser.rb:
* Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb:
Canonical link: https://commits.webkit.org/257775@main
---
Source/JavaScriptCore/offlineasm/config.rb | 4 ++--
Source/JavaScriptCore/offlineasm/parser.rb | 8 ++++----
.../Scripts/update-LegacyInspectorBackendCommands.rb | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Source/JavaScriptCore/offlineasm/config.rb b/Source/JavaScriptCore/offlineasm/config.rb
index ba0043119f32c..7811626db5e5b 100644
--- a/Source/JavaScriptCore/offlineasm/config.rb
+++ b/Source/JavaScriptCore/offlineasm/config.rb
@@ -23,11 +23,11 @@
buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR'];
headersFolderPath = ENV['WK_LIBRARY_HEADERS_FOLDER_PATH'];
-if buildProductsDirectory and File.exists?(buildProductsDirectory)
+if buildProductsDirectory and File.exist?(buildProductsDirectory)
$: << "#{buildProductsDirectory}#{headersFolderPath}/WebKitAdditions/Scripts"
end
sdkRootDirectory = ENV['SDKROOT'];
-if sdkRootDirectory and File.exists?(sdkRootDirectory)
+if sdkRootDirectory and File.exist?(sdkRootDirectory)
$: << "#{sdkRootDirectory}#{headersFolderPath}/WebKitAdditions/Scripts"
end
diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb
index 12a22b5cc819e..07e38b63972be 100644
--- a/Source/JavaScriptCore/offlineasm/parser.rb
+++ b/Source/JavaScriptCore/offlineasm/parser.rb
@@ -840,10 +840,10 @@ def parseSequence(final, comment)
additionsDirectoryName = "#{@buildProductsDirectory}#{@headersFolderPath}/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, @sources) if fileExists
else
@@ -876,10 +876,10 @@ def parseIncludes(final, comment, options)
additionsDirectoryName = "#{@buildProductsDirectory}#{@headersFolderPath}/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
if fileExists
parser = Parser.new(readTextFile(fileName), SourceFile.new(fileName), options)
diff --git a/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb b/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb
index 680dee7406d1e..40737afaa4c51 100755
--- a/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb
+++ b/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb
@@ -36,7 +36,7 @@ def run
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
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/happyworker/webkit2gtk3.git
git@gitee.com:happyworker/webkit2gtk3.git
happyworker
webkit2gtk3
webkit2gtk3
master

搜索帮助