diff --git a/.gitignore b/.gitignore index 7c69b2b..dbe6b13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /webkitgtk-2.34.6.tar.xz /webkitgtk-keys.gpg /webkitgtk-2.36.1.tar.xz +/webkitgtk-2.36.3.tar.xz diff --git a/generate-preferences-ruby-error.patch b/generate-preferences-ruby-error.patch deleted file mode 100644 index 4ac03ef..0000000 --- a/generate-preferences-ruby-error.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Source/WTF/Scripts/GeneratePreferences.rb b/Source/WTF/Scripts/GeneratePreferences.rb -index de0f2268b178..ee603d9e5670 100644 ---- a/Source/WTF/Scripts/GeneratePreferences.rb -+++ b/Source/WTF/Scripts/GeneratePreferences.rb -@@ -228,11 +228,22 @@ def initializeParsedPreferences(parsedPreferences) - result - end - -+ def createTemplate(templateString) -+ # Newer versions of ruby deprecate and/or drop passing non-keyword -+ # arguments for trim_mode and friends, so we need to call the constructor -+ # differently depending on what it expects. This solution is suggested by -+ # rubocop's Lint/ErbNewArguments. -+ if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ -+ ERB.new(templateString, trim_mode:"-") -+ else -+ ERB.new(templateString, nil, "-") -+ end -+ end - def renderTemplate(templateFile, outputDirectory) - resultFile = File.join(outputDirectory, File.basename(templateFile, ".erb")) - tempResultFile = resultFile + ".tmp" - -- output = ERB.new(File.read(templateFile), trim_mode:"-").result(binding) -+ output = createTemplate(File.read(templateFile)).result(binding) - File.open(tempResultFile, "w+") do |f| - f.write(output) - end diff --git a/sources b/sources index 1e4aeca..3026339 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.36.1.tar.xz) = c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4 +SHA512 (webkitgtk-2.36.3.tar.xz) = dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692 SHA512 (webkitgtk-keys.gpg) = 0270af23e1b5a9c1d86899e7feed18481e0fa4a481abd076eae96b800492a84db2dfc0905f8b9b48a419c6f387c60f23caa497a410a041c13015f6275fe68785 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index f9969d0..e1c1580 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -11,7 +11,7 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.36.1 +Version: 2.36.3 Release: 1%{?dist} Summary: GTK Web content engine library @@ -34,9 +34,6 @@ Patch1: aarch64-page-size.patch # https://bugs.webkit.org/show_bug.cgi?id=235367 Patch2: icu60.patch -# https://bugs.webkit.org/show_bug.cgi?id=237035 -Patch3: generate-preferences-ruby-error.patch - BuildRequires: bison BuildRequires: cmake BuildRequires: flex @@ -306,6 +303,15 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog +* Thu Jun 02 2022 Michael Catanzaro - 2.36.3-1 +- Update to 2.36.3 +- Related: #2061994 +- Resolves: #2075492 + +* Wed May 18 2022 Michael Catanzaro - 2.36.2-1 +- Update to 2.36.2 + Related: #2061994 + * Thu Apr 21 2022 Michael Catanzaro - 2.36.1-1 - Update to 2.36.1 Related: #2061994 diff --git a/webkitgtk-2.36.1.tar.xz.asc b/webkitgtk-2.36.1.tar.xz.asc deleted file mode 100644 index 914a4ea..0000000 --- a/webkitgtk-2.36.1.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYmFK0AAKCRDz0yLQ7EWC -w3AtAJ9EW/jqgCXAQA4TJ4FhMXEyC5d/AACfffM4X1A/LRVy+YYbgFvPAvnr1L4= -=ds4K ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.36.3.tar.xz.asc b/webkitgtk-2.36.3.tar.xz.asc new file mode 100644 index 0000000..6dc431e --- /dev/null +++ b/webkitgtk-2.36.3.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYpHpvAAKCRCRxVnb5MkS +O27PAJ9ptAQKzmWX16VWJ1yyn/CaHwKJ8QCfV5gesH/nXmV7IsZn5vv+jDixo58= +=AWMS +-----END PGP SIGNATURE-----