diff --git a/.gitignore b/.gitignore index 2024a39..f076367 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /webkitgtk-2.38.2.tar.xz.asc /webkitgtk-2.39.1.tar.xz.asc /webkitgtk-2.39.2.tar.xz.asc +/webkitgtk-2.39.3.tar.xz.asc diff --git a/sources b/sources index 4c4e81f..4988aec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.39.2.tar.xz.asc) = 12cb43c56180e5f5a278dac0013cc47bd090773f6cafb8c67eeacd764087ecca35df7c7c18543fe5039781b3a7086b84cee798f1314c73827325a694dca5ffb6 -SHA512 (webkitgtk-2.39.2.tar.xz) = 0565cc1252d4fe807ad0966cd0db413d6d51857c8e9f09f586b62788ce63f7f81b42499971e87c031c8ef5c8977ace19bc30bec2402ffb0435974a7d8df35e0d +SHA512 (webkitgtk-2.39.3.tar.xz) = e729c8ce9a8b75e11a74a9757c51adac816b45e7c6a0956d713aab55ba614c54848c5880cc2a6ec611cfbf2f6a4b5ff377c0a5de1cbc3710c84e73f6354388b8 +SHA512 (webkitgtk-2.39.3.tar.xz.asc) = 8d1ee021c2c46120276ee15fc75070f3bb60c1f5a14a7ddff6c0fa50440297eb1bb48f076a346cba731c4bb39453b64960c8941426d192d8e7d669e7195fdfd0 diff --git a/webkitgtk-pr7531-ruby32-File_exists_removal.patch b/webkitgtk-pr7531-ruby32-File_exists_removal.patch deleted file mode 100644 index 04aa4bd..0000000 --- a/webkitgtk-pr7531-ruby32-File_exists_removal.patch +++ /dev/null @@ -1,82 +0,0 @@ -From b7ac5d0ccc7ca3ed6bf4f2d40fde60247ce87d3c Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -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 ba0043119f32..7811626db5e5 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 12a22b5cc819..07e38b63972b 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 680dee7406d1..40737afaa4c5 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 diff --git a/webkitgtk.spec b/webkitgtk.spec index 731ee41..d08a465 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -16,7 +16,7 @@ %bcond_without docs Name: webkitgtk -Version: 2.39.2 +Version: 2.39.3 Release: %autorelease Summary: GTK web content engine library @@ -28,10 +28,6 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # $ gpg --import aperez.key carlosgc.key # $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg Source2: webkitgtk-keys.gpg -# https://bugs.webkit.org/show_bug.cgi?id=246743 -# https://github.com/WebKit/WebKit/pull/7531 -# ruby3.2 removes File.exists? deprecated since ruby2.1 -Patch0: webkitgtk-pr7531-ruby32-File_exists_removal.patch BuildRequires: bison BuildRequires: bubblewrap @@ -209,6 +205,7 @@ Summary: Documentation files for webkit2gtk5.0 BuildArch: noarch Requires: webkitgtk6.0 = %{version}-%{release} Obsoletes: webkit2gtk5.0-doc < %{version}-%{release} +Recommends: gi-docgen-fonts %description -n webkitgtk6.0-doc This package contains developer documentation for webkitgtk6.0. @@ -217,6 +214,7 @@ This package contains developer documentation for webkitgtk6.0. Summary: Documentation files for webkit2gtk4.1 BuildArch: noarch Requires: webkit2gtk4.1 = %{version}-%{release} +Recommends: gi-docgen-fonts %description -n webkit2gtk4.1-doc This package contains developer documentation for webkit2gtk4.1. @@ -229,6 +227,7 @@ Obsoletes: webkitgtk4-doc < %{version}-%{release} Provides: webkitgtk4-doc = %{version}-%{release} Obsoletes: webkit2gtk3-doc < %{version}-%{release} Provides: webkit2gtk3-doc = %{version}-%{release} +Recommends: gi-docgen-fonts %description -n webkit2gtk4.0-doc This package contains developer documentation for webkit2gtk4.0.