diff --git a/b7ac5d0c.patch b/b7ac5d0c.patch deleted file mode 100644 index d1af793..0000000 --- a/b7ac5d0c.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/webkit2gtk3.changes b/webkit2gtk3.changes index 2c732ed..cdfddbc 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Dec 22 14:54:41 UTC 2022 - Michael Gorse + +- Update to version 2.38.3 (boo#1206474): + + Fix runtime critical warnings from media player. + + Fix network process crash when fetching website data on + ephemeral session. + + Fix the build with Ruby 3.2. + + Fix several crashes and rendering issues. + + Security fixes: CVE-2022-42856. +- Drop b7ac5d0c.patch: fixed upstream. + ------------------------------------------------------------------- Wed Dec 14 16:45:15 UTC 2022 - Dominique Leuenberger diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index f54e05f..0126620 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -70,7 +70,7 @@ ExclusiveArch: do-not-build %endif Name: webkit2%{_gtknamesuffix} -Version: 2.38.2 +Version: 2.38.3 Release: 0 Summary: Library for rendering web content, GTK+ Port License: BSD-3-Clause AND LGPL-2.0-or-later @@ -83,8 +83,6 @@ Source99: webkit2gtk3.keyring # PATCH-FIX-OPENSUSE no-forced-sse.patch jengelh@iani.de -- cure execution of illegal instruction in i586 webkit Patch0: no-forced-sse.patch -# PATCH-FIX-UPSTREAM b7ac5d0c.patch dimstar@opensuse.org -- Fix build with Ruby 3.2 -Patch1: https://github.com/WebKit/WebKit/commit/b7ac5d0c.patch BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGL-devel diff --git a/webkitgtk-2.38.2.tar.xz b/webkitgtk-2.38.2.tar.xz deleted file mode 100644 index 50cd325..0000000 --- a/webkitgtk-2.38.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3eb82899651f583b4d99cacd16af784a1a7710fce9e7b6807bd6ccde909fe3e -size 33006668 diff --git a/webkitgtk-2.38.2.tar.xz.asc b/webkitgtk-2.38.2.tar.xz.asc deleted file mode 100644 index 5b9f501..0000000 --- a/webkitgtk-2.38.2.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCY2TNpwAKCRDz0yLQ7EWC -wyH5AJ4ktXefZTDTuk7ETZ3ZhjyVqaVqfQCg3uzmbd5M3POtdDuuG5eALaXQXhA= -=CshI ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.38.3.tar.xz b/webkitgtk-2.38.3.tar.xz new file mode 100644 index 0000000..b54f6fa --- /dev/null +++ b/webkitgtk-2.38.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a +size 33003928 diff --git a/webkitgtk-2.38.3.tar.xz.asc b/webkitgtk-2.38.3.tar.xz.asc new file mode 100644 index 0000000..f66edd1 --- /dev/null +++ b/webkitgtk-2.38.3.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCY6RfCAAKCRDz0yLQ7EWC +wzG/AKCCD+HOyJew0yO2axnvD6jJgoTxqwCdGvOdrkvog9HFFhdT5s8ykhc/3yk= +=UI7W +-----END PGP SIGNATURE-----