From 645a0fcc669e1e6b912dd15a26859ddeb688f101 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 03 2022 22:12:47 +0000
Subject: import webkit2gtk3-2.36.3-1.el8


---

diff --git a/.gitignore b/.gitignore
index e50b237..b2ca0ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/webkitgtk-2.36.1.tar.xz
+SOURCES/webkitgtk-2.36.3.tar.xz
 SOURCES/webkitgtk-keys.gpg
diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata
index 0b46c97..4808332 100644
--- a/.webkit2gtk3.metadata
+++ b/.webkit2gtk3.metadata
@@ -1,2 +1,2 @@
-36a95b906e54bcf94d2be04e1cbaac3584da7eb1 SOURCES/webkitgtk-2.36.1.tar.xz
+59ee6ee820be360ad57391870fa158064091c525 SOURCES/webkitgtk-2.36.3.tar.xz
 cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg
diff --git a/SOURCES/generate-preferences-ruby-error.patch b/SOURCES/generate-preferences-ruby-error.patch
deleted file mode 100644
index 4ac03ef..0000000
--- a/SOURCES/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/webkitgtk-2.36.1.tar.xz.asc b/SOURCES/webkitgtk-2.36.1.tar.xz.asc
deleted file mode 100644
index 914a4ea..0000000
--- a/SOURCES/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/SOURCES/webkitgtk-2.36.3.tar.xz.asc b/SOURCES/webkitgtk-2.36.3.tar.xz.asc
new file mode 100644
index 0000000..6dc431e
--- /dev/null
+++ b/SOURCES/webkitgtk-2.36.3.tar.xz.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYpHpvAAKCRCRxVnb5MkS
+O27PAJ9ptAQKzmWX16VWJ1yyn/CaHwKJ8QCfV5gesH/nXmV7IsZn5vv+jDixo58=
+=AWMS
+-----END PGP SIGNATURE-----
diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec
index f9969d0..e1c1580 100644
--- a/SPECS/webkit2gtk3.spec
+++ b/SPECS/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 <mcatanzaro@redhat.com> - 2.36.3-1
+- Update to 2.36.3
+- Related: #2061994
+- Resolves: #2075492
+
+* Wed May 18 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.2-1
+- Update to 2.36.2
+  Related: #2061994
+
 * Thu Apr 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.1-1
 - Update to 2.36.1
   Related: #2061994