From 1e672992aa0bc934e852e40b5522ad1ab682feee Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Fri, 17 Nov 2023 08:52:10 -0600
Subject: [PATCH] Update to 2.43.1

Also, add License tag to webkit2gtk-4.1-doc

Also, there are only two builds now instead of three, now that
webkit2gtk-4.0 has been removed.

Also, there is a new dependency on libbacktrace, but Fedora does not
package this library so we have to disable it.
---
 .gitignore     |  1 +
 sources        |  4 ++--
 webkitgtk.spec | 20 ++++++++++++++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c55df06..115f44f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /webkitgtk-2.42.0.tar.xz.asc
 /webkitgtk-2.42.1.tar.xz.asc
 /webkitgtk-2.42.2.tar.xz.asc
+/webkitgtk-2.43.1.tar.xz.asc
diff --git a/sources b/sources
index 1321837..a7ba79d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.42.2.tar.xz) = 4cbd057c55c96bdc6b4f8ece89cb9803e8503146de62f74427cdcea8de5f2a644fa213160a02dfbb0df1529fbf84fd4cd73ba3953466d11d7b0b9cad04c3214f
-SHA512 (webkitgtk-2.42.2.tar.xz.asc) = 00af175e5b4a0f6f47ea552fd52d68eeeb431277424fb584a72d348cfbd99e7a05b877dfcc5abbe41f3aa78e35b075c17cda3f90e4d4081736a3d47755942c10
+SHA512 (webkitgtk-2.43.1.tar.xz.asc) = 53b7a2c141edade9733c556b9662cd51d4ff23f2605d7c0b49ecbc5f20e6802eb9fb0061c236d18aa90767d55531a2fd6f591af1c06aeb5caadd40197a309bc0
+SHA512 (webkitgtk-2.43.1.tar.xz) = 7ee064c4655bcbb53ffc3d5f6c1bd166eb3dfdf2165c20c5fbbb5eb7f394704aebf53c32d98db84694fd4ba88c073861f7c7361c1dd57b26424526e041923d25
diff --git a/webkitgtk.spec b/webkitgtk.spec
index 5137b9e..94fcbdb 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -18,7 +18,7 @@
 %bcond_without docs
 
 Name:           webkitgtk
-Version:        2.42.2
+Version:        2.43.1
 Release:        %autorelease
 Summary:        GTK web content engine library
 
@@ -207,7 +207,7 @@ Recommends:     gi-docgen-fonts
 # Documentation/webkit2gtk-web-extension-4.1/*html is BSD, LGPL-2.1
 # Documentation/webkit2gtk-web-extension-4.1/solarized* is MIT
 # Documentation/webkit2gtk-web-extension-4.1/style.css is Apache-2.0 OR GPL-3.0-or-later
-License:        MIT AND LGPL-2.1-only AND BSD-3-Clause AND  (Apache-2.0 OR GPL-3.0-or-later)
+License:        MIT AND LGPL-2.1-only AND BSD-3-Clause AND (Apache-2.0 OR GPL-3.0-or-later)
 
 %description -n webkitgtk6.0-doc
 This package contains developer documentation for webkitgtk6.0.
@@ -218,6 +218,15 @@ BuildArch:      noarch
 Requires:       webkit2gtk4.1 = %{version}-%{release}
 Recommends:     gi-docgen-fonts
 
+# Documentation/jsc-glib-4.1/fzy.js is MIT
+# Documentation/jsc-glib-4.1/*.js and *css is Apache-2.0 OR GPL-3.0-or-later
+# Documentation/jsc-glib-4.1/*html is BSD, LGPL-2.1
+# Documentation/webkit2gtk-4.1/*html is  BSD, LGPL-2.1
+# Documentation/webkit2gtk-web-extension-4.1/*html is BSD, LGPL-2.1
+# Documentation/webkit2gtk-web-extension-4.1/solarized* is MIT
+# Documentation/webkit2gtk-web-extension-4.1/style.css is Apache-2.0 OR GPL-3.0-or-later
+License:        MIT AND LGPL-2.1-only AND BSD-3-Clause AND (Apache-2.0 OR GPL-3.0-or-later)
+
 %description -n webkit2gtk4.1-doc
 This package contains developer documentation for webkit2gtk4.1.
 %endif
@@ -292,6 +301,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
   -DUSE_GTK4=ON \
+  -DUSE_LIBBACKTRACE=OFF \
 %if %{without docs}
   -DENABLE_DOCUMENTATION=OFF \
 %endif
@@ -310,6 +320,8 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
   -GNinja \
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
+  -DUSE_GTK4=OFF \
+  -DUSE_LIBBACKTRACE=OFF \
   -DENABLE_WEBDRIVER=OFF \
 %if %{without docs}
   -DENABLE_DOCUMENTATION=OFF \
@@ -325,11 +337,11 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
   %{nil}
 
 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
-export NINJA_STATUS="[1/3][%f/%t %es] "
+export NINJA_STATUS="[1/2][%f/%t %es] "
 %cmake_build %limit_build -m 3072
 
 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
-export NINJA_STATUS="[2/3][%f/%t %es] "
+export NINJA_STATUS="[2/2][%f/%t %es] "
 %cmake_build %limit_build -m 3072
 
 %install