CVS commit: pkgsrc/x11/qt5-qtwebkit

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Jun  2 12:26:24 UTC 2024

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: distinfo
        pkgsrc/x11/qt5-qtwebkit/patches: patch-Source_WTF_wtf_Platform.h

Log Message:
x11/qt5-qtwebkit: Fix build with ICU 75 with upstream patch


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h

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

Modified files:

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.32 pkgsrc/x11/qt5-qtwebkit/distinfo:1.33
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.32       Sat Jan 27 18:06:36 2024
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Sun Jun  2 12:26:24 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2024/01/27 18:06:36 wiz Exp $
+$NetBSD: distinfo,v 1.33 2024/06/02 12:26:24 ryoon Exp $
 
 BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -19,7 +19,7 @@ SHA1 (patch-Source_ThirdParty_gtest_incl
 SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 15b8ac40e49cfec78d46de634fd6a1edde2d2a96
 SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 7ffc086a21f645112ad10296571464a1e15b8b44
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 7dac41bf3e50944e49c3e3c29d482d2c3300665d
-SHA1 (patch-Source_WTF_wtf_Platform.h) = 73e8b07e8d7e718abe986a12b9f0b903dfcc4765
+SHA1 (patch-Source_WTF_wtf_Platform.h) = b1efac1a3c326033eb52b1eed456f84265b172f8
 SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = bfa570aa20e3508c77bbaebed051821a33f36209
 SHA1 (patch-Source_WebCore_css_makegrammar.pl) = 2f1977c925069243d76379ae6d065e850143b2e3
 SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = e8972f4b703a9ff45ce313609d2540f89064b4ff

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.4 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.5
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.4 Wed Aug  1 15:01:08 2018
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h     Sun Jun  2 12:26:24 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.4 2018/08/01 15:01:08 maya Exp $
+$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.5 2024/06/02 12:26:24 ryoon Exp $
 
 * Use system's malloc for NetBSD, do not use fastmalloc from qt5,
   fix segfault of qtwebkit consumers
@@ -6,9 +6,12 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h
 * Disable DISASSEMBLER on Linux. Unresolved symbols as not building
   UDis86Disassembler.cpp for some reason.
 
---- Source/WTF/wtf/Platform.h.orig     2017-06-04 20:16:06.000000000 +0000
+* Fix build with ICU 75.
+  From: https://github.com/qtwebkit/qtwebkit/commit/756e1c8f23dc2720471298281c421c0076d02df8.patch
+
+--- Source/WTF/wtf/Platform.h.orig     2024-06-02 11:06:38.219855486 +0000
 +++ Source/WTF/wtf/Platform.h
-@@ -691,6 +694,12 @@
+@@ -686,6 +686,12 @@
  #define USE_SYSTEM_MALLOC 1
  #endif
  
@@ -21,7 +24,7 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h
  #define ENABLE_DEBUG_WITH_BREAKPOINT 0
  #define ENABLE_SAMPLING_COUNTERS 0
  #define ENABLE_SAMPLING_FLAGS 0
-@@ -746,6 +754,10 @@
+@@ -741,6 +747,10 @@
  #define USE_UDIS86 1
  #endif
  
@@ -32,3 +35,17 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h
  #if !defined(ENABLE_DISASSEMBLER) && USE(UDIS86)
  #define ENABLE_DISASSEMBLER 1
  #endif
+@@ -1125,6 +1135,13 @@
+ #define ENABLE_PLATFORM_FONT_LOOKUP 1
+ #endif
+ 
++/* FIXME: This does not belong in Platform.h and should instead be included in another mechanism (compiler option, prefix header, config.h, etc) */
++/* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */
++#define U_SHOW_CPLUSPLUS_API 0
++#ifdef __cplusplus
++#define UCHAR_TYPE char16_t
++#endif
++
+ #if COMPILER(MSVC)
+ #undef __STDC_LIMIT_MACROS
+ #define __STDC_LIMIT_MACROS