webkit-gtk: Adjust *.sh patches mismatches

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Dec 24 15:12:40 2022 +0100
Changeset:	956ca473def2310b5c958ca2ca8e27c7e217fe52

Modified Files:
	webkit-gtk/distinfo
	webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh
	webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh
	webkit-gtk/patches/patch-Source_WebKit_Scripts_generate-unified-sources.sh

Log Message:
webkit-gtk: Adjust *.sh patches mismatches

Regen the *.sh patches due context change.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=956ca473def2310b5c958ca2ca8e27c7e217fe52

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk/distinfo                                               | 6 +++---
 ...atch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh | 6 +++---
 .../patch-Source_WebCore_Scripts_generate-unified-sources.sh      | 8 ++++----
 .../patch-Source_WebKit_Scripts_generate-unified-sources.sh       | 6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diffs:
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index b155e55a4a..020e4a751b 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -4,7 +4,7 @@ BLAKE2s (webkitgtk-2.38.3.tar.xz) = 52f5f55e58f5b2cf5079b1307366c41a3d1c33654ace
 SHA512 (webkitgtk-2.38.3.tar.xz) = 1e5f0d73d6b1d64faf20ab909f1765439fab230dd360dd1906962f03a24725cf9f50a375b1987b615c64fb161ab32d29d6b1d49ea75c7b2b32f495e4ad0f38ce
 Size (webkitgtk-2.38.3.tar.xz) = 33003928 bytes
 SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528
-SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697
+SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 532091a5a3d77a2e380041e7538a0920fced027f
 SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 79c282ca90d0ba2ef4769da40d4648f5f709951b
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 70975aac175ec4131a4ed26a54dfe51e16ffb7cd
 SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = 8f324091df41be96b011bcbeed5fd64c4464f010
@@ -20,7 +20,7 @@ SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb498935
 SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6
 SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
 SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615
-SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 9b323aa1fa8e6e5599ac0a7ae08fbbed4348c70e
+SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 64b876041b6a444690e828fe186ee41a1f7cd1b4
 SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750
 SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
 SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 43f423af652533a64d0793ec6d15150b908da0f8
@@ -34,7 +34,7 @@ SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba9
 SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = f2ee81bf200fe1fe1bc59cb571e4459163a9cbde
 SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
 SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 22cc5ba1ababc6395aa0ef467db0c27c2fbf6878
-SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = def930cf3f706ac657b2f8835c8c0278ade8f663
+SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = 2180a91bd03eca7188bc712b5fa6ba4ccde28ab3
 SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d
 SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 22c23689fa79c930145068ed7966844bbf92a6a9
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 83f0bfdb104e9e5c5c9afb155d399ae4c767c450
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh b/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh
index 6bf6296dc4..91a1dfaef4 100644
--- a/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh
+++ b/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh
@@ -2,7 +2,7 @@ $NetBSD: patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh,v 1.1 2
 
 Avoid unportable `==' test(1) operator.
 
---- Source/JavaScriptCore/Scripts/generate-unified-sources.sh.orig	2019-02-12 11:21:03.000000000 +0000
+--- Source/JavaScriptCore/Scripts/generate-unified-sources.sh.orig	2022-08-31 07:59:51.490491200 +0000
 +++ Source/JavaScriptCore/Scripts/generate-unified-sources.sh
 @@ -7,7 +7,7 @@ ARGS=("$@")
  cd $SRCROOT
@@ -10,6 +10,6 @@ Avoid unportable `==' test(1) operator.
  if [ -z "${BUILD_SCRIPTS_DIR}" ]; then
 -    if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
 +    if [ "${DEPLOYMENT_LOCATION}" = "YES" ]; then
-         BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
+         BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
      else
-         BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+         BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
diff --git a/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh b/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh
index a13ff830e4..912a6fba7f 100644
--- a/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh
+++ b/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh
@@ -2,7 +2,7 @@ $NetBSD: patch-Source_WebCore_Scripts_generate-unified-sources.sh,v 1.2 2020/09/
 
 Avoid unportable `==' test(1) operator.
 
---- Source/WebCore/Scripts/generate-unified-sources.sh.orig	2020-08-12 09:17:55.000000000 +0000
+--- Source/WebCore/Scripts/generate-unified-sources.sh.orig	2022-08-31 07:59:55.654515700 +0000
 +++ Source/WebCore/Scripts/generate-unified-sources.sh
 @@ -7,7 +7,7 @@ ARGS=("$@")
  cd $SRCROOT
@@ -10,10 +10,10 @@ Avoid unportable `==' test(1) operator.
  if [ -z "${BUILD_SCRIPTS_DIR}" ]; then
 -    if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
 +    if [ "${DEPLOYMENT_LOCATION}" = "YES" ]; then
-         BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
+         BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
      else
-         BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
-@@ -22,7 +22,7 @@ if [ $# -eq 0 ]; then
+         BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
+@@ -23,7 +23,7 @@ if [ $# -eq 0 ]; then
  fi
  
  SOURCES="Sources.txt SourcesCocoa.txt"
diff --git a/webkit-gtk/patches/patch-Source_WebKit_Scripts_generate-unified-sources.sh b/webkit-gtk/patches/patch-Source_WebKit_Scripts_generate-unified-sources.sh
index 26851b80d3..53aca6d6d0 100644
--- a/webkit-gtk/patches/patch-Source_WebKit_Scripts_generate-unified-sources.sh
+++ b/webkit-gtk/patches/patch-Source_WebKit_Scripts_generate-unified-sources.sh
@@ -2,7 +2,7 @@ $NetBSD: patch-Source_WebKit_Scripts_generate-unified-sources.sh,v 1.1 2019/03/1
 
 Avoid unportable `==' test(1) operator.
 
---- Source/WebKit/Scripts/generate-unified-sources.sh.orig	2019-02-12 11:21:18.000000000 +0000
+--- Source/WebKit/Scripts/generate-unified-sources.sh.orig	2022-08-31 07:59:56.790522600 +0000
 +++ Source/WebKit/Scripts/generate-unified-sources.sh
 @@ -7,7 +7,7 @@ ARGS=("$@")
  cd $SRCROOT
@@ -10,6 +10,6 @@ Avoid unportable `==' test(1) operator.
  if [ -z "${BUILD_SCRIPTS_DIR}" ]; then
 -    if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
 +    if [ "${DEPLOYMENT_LOCATION}" = "YES" ]; then
-         BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
+         BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
      else
-         BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+         BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"