CVS commit: pkgsrc/www/webkit-gtk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan 12 15:21:31 UTC 2021

Modified Files:
        pkgsrc/www/webkit-gtk: distinfo
        pkgsrc/www/webkit-gtk/patches:
            patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
Added Files:
        pkgsrc/www/webkit-gtk/patches:
            patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp
            patch-Source_WTF_wtf_Assertions.h
            patch-Source_WebCore_platform_network_DNS.h

Log Message:
webkit-gtk: More portability fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Assertions.h \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_network_DNS.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp

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

Modified files:

Index: pkgsrc/www/webkit-gtk/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.143 pkgsrc/www/webkit-gtk/distinfo:1.144
--- pkgsrc/www/webkit-gtk/distinfo:1.143        Tue Dec 15 17:59:00 2020
+++ pkgsrc/www/webkit-gtk/distinfo      Tue Jan 12 15:21:31 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.143 2020/12/15 17:59:00 leot Exp $
+$NetBSD: distinfo,v 1.144 2021/01/12 15:21:31 jperkin Exp $
 
 SHA1 (webkitgtk-2.30.4.tar.xz) = 330f45d7badf944fb01a3238ebb2ceaad8c2a91f
 RMD160 (webkitgtk-2.30.4.tar.xz) = ea588aa4436262f93aa4972d85c45ec0ee9150ad
@@ -14,8 +14,10 @@ SHA1 (patch-Source_JavaScriptCore_jit_Ex
 SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93
 SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 23bc86a389f8009ec829c3ee0fe3effe3f20b012
 SHA1 (patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh) = b6506b0f273a81f2a16a19abc604c3402f57f259
+SHA1 (patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp) = 73dfe781efe7e8aa7d49094af8820a87c501818f
 SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = a5454eb891ad1f9d8285c28af2e9efb4ff439e6b
+SHA1 (patch-Source_WTF_wtf_Assertions.h) = 427de20eba4627578087feaa7de2f23e80b9debf
 SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 2fe7b7755646d9a1cc022aec3d01091766378aba
 SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = eb5598c20c8453314daba7897066f15827bbede7
 SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 3787817a0e288d00aa747c417aecd9abf52866d1
@@ -28,12 +30,13 @@ SHA1 (patch-Source_WebCore_Scripts_gener
 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) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
+SHA1 (patch-Source_WebCore_platform_network_DNS.h) = a491ed31e288af1ef56c4a70564045609ecb4b6a
 SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
 SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8
 SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 14dfbee895aa7c70bf3b61b4dbb5bccd96d9583a
 SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba90bbff9d
-SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 35b62538d09af8725202673a2a23d814f624f8bd
+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

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp:1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp:1.3
--- pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp:1.2  Tue Sep 10 22:10:04 2019
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp      Tue Jan 12 15:21:31 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp,v 1.2 2019/09/10 22:10:04 leot Exp $
+$NetBSD: patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp,v 1.3 2021/01/12 15:21:31 jperkin Exp $
 
 On NetBSD we see "Error sending IPC message: Message too long" due to
 the use of sendmsg with a large message body (EMSGSIZE).
@@ -7,9 +7,20 @@ WebKit already uses shared memory to com
 the message is too large, so force it to always use this method to avoid
 encountering EMSGSIZE.
 
---- Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp.orig    2017-08-09 09:13:52.000000000 +0000
+--- Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp.orig    2020-08-12 09:17:56.000000000 +0000
 +++ Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp
-@@ -380,8 +380,12 @@ bool Connection::sendOutgoingMessage(std
+@@ -56,6 +56,10 @@
+ #endif
+ #endif // SOCK_SEQPACKET
+ 
++#ifndef MSG_NOSIGNAL
++#define MSG_NOSIGNAL  0
++#endif
++
+ namespace IPC {
+ 
+ static const size_t messageMaxSize = 4096;
+@@ -417,8 +421,12 @@ bool Connection::sendOutgoingMessage(std
          return false;
      }
  

Added files:

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp:1.1
--- /dev/null   Tue Jan 12 15:21:31 2021
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp       Tue Jan 12 15:21:31 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp,v 1.1 2021/01/12 15:21:31 jperkin Exp $
+
+Need endian.h on SunOS.
+
+--- Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.cpp.orig      2020-08-12 09:17:53.000000000 +0000
++++ Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.cpp
+@@ -48,6 +48,9 @@ on big endian machines, or a byte-by-byt
+ -----------------------------------------------------------------------------*/
+ 
+ #include "PMurHash.h"
++#ifdef __sun
++#include <endian.h>
++#endif
+ #include <stdint.h>
+ 
+ /* I used ugly type names in the header to avoid potential conflicts with
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Assertions.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Assertions.h:1.1
--- /dev/null   Tue Jan 12 15:21:31 2021
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Assertions.h     Tue Jan 12 15:21:31 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WTF_wtf_Assertions.h,v 1.1 2021/01/12 15:21:31 jperkin Exp $
+
+Use regular static_assert on SunOS.
+
+--- Source/WTF/wtf/Assertions.h.orig   2020-08-12 09:17:54.000000000 +0000
++++ Source/WTF/wtf/Assertions.h
+@@ -452,7 +452,7 @@ constexpr bool assertionFailureDueToUnre
+ 
+ /* COMPILE_ASSERT */
+ #ifndef COMPILE_ASSERT
+-#if COMPILER_SUPPORTS(C_STATIC_ASSERT)
++#if COMPILER_SUPPORTS(C_STATIC_ASSERT) && !defined(__sun)
+ /* Unlike static_assert below, this also works in plain C code. */
+ #define COMPILE_ASSERT(exp, name) _Static_assert((exp), #name)
+ #else
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_network_DNS.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_network_DNS.h:1.1
--- /dev/null   Tue Jan 12 15:21:31 2021
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_network_DNS.h   Tue Jan 12 15:21:31 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-Source_WebCore_platform_network_DNS.h,v 1.1 2021/01/12 15:21:31 jperkin Exp $
+
+Include sys/socket.h for AF_*.
+
+--- Source/WebCore/platform/network/DNS.h.orig 2020-08-12 09:17:55.000000000 +0000
++++ Source/WebCore/platform/network/DNS.h
+@@ -30,6 +30,7 @@
+ #include <ws2tcpip.h>
+ #else
+ #include <netinet/in.h>
++#include <sys/socket.h>
+ #endif
+ 
+ #include <wtf/Forward.h>