CVS commit: pkgsrc/x11/qt5-qtwebengine

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Jun  2 11:34:20 UTC 2024

Modified Files:
        pkgsrc/x11/qt5-qtwebengine: Makefile
        pkgsrc/x11/qt5-qtwebengine/patches:
            patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn
Added Files:
        pkgsrc/x11/qt5-qtwebengine/patches:
            patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h
            patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_options.h
            patch-src_3rdparty_chromium_third__party_blink_renderer_core_page_scrolling_text__fragment__selector__generator.cc
            patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_pps__parser.h
            patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_sps__parser.h
            patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__processing_aec3_reverb__model__estimator.h
            patch-src_3rdparty_chromium_third__party_webrtc_modules_include_module__common__types__public.h

Log Message:
qt5-qtwebengine: fix build with ICU75 - patches from ArchLinux


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/x11/qt5-qtwebengine/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_options.h \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_page_scrolling_text__fragment__selector__generator.cc \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_pps__parser.h \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_sps__parser.h \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__processing_aec3_reverb__model__estimator.h \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_include_module__common__types__public.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn

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-qtwebengine/Makefile
diff -u pkgsrc/x11/qt5-qtwebengine/Makefile:1.69 pkgsrc/x11/qt5-qtwebengine/Makefile:1.70
--- pkgsrc/x11/qt5-qtwebengine/Makefile:1.69    Wed May 29 16:35:13 2024
+++ pkgsrc/x11/qt5-qtwebengine/Makefile Sun Jun  2 11:34:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2024/05/29 16:35:13 adam Exp $
+# $NetBSD: Makefile,v 1.70 2024/06/02 11:34:20 markd Exp $
 # FIXME: build fails when protobuf and abseil packages are installed.
 
 DISTNAME=      qtwebengine-everywhere-opensource-src-${QTVERSION}
@@ -12,6 +12,8 @@ INSTALLATION_DIRS+=   lib/pkgconfig
 
 .include "../../x11/qt5-qtbase/Makefile.common"
 
+FORCE_CXX_STD= gnu++17
+
 PYTHON_VERSIONS_INCOMPATIBLE=  312
 
 BUILD_TARGET=  first

Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn:1.2 
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn:1.2   Mon Apr 18 11:18:18 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn       Sun Jun  2 11:34:20 2024
@@ -1,6 +1,8 @@
-$NetBSD: patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn,v 1.2 2022/04/18 11:18:18 adam Exp $
+$NetBSD: patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn,v 1.3 2024/06/02 11:34:20 markd Exp $
 
---- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig  2021-02-19 16:41:59.000000000 +0000
+use c++17 for icu75 - from ArchLinux.
+
+--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig  2023-05-05 08:39:51.000000000 +0000
 +++ src/3rdparty/chromium/build/config/compiler/BUILD.gn
 @@ -241,7 +241,7 @@ config("compiler") {
      configs += [ "//build/config/win:compiler" ]
@@ -11,7 +13,7 @@ $NetBSD: patch-src_3rdparty_chromium_bui
      configs += [ "//build/config/linux:compiler" ]
      if (is_chromeos) {
        configs += [ "//build/config/chromeos:compiler" ]
-@@ -385,7 +385,7 @@ config("compiler") {
+@@ -386,7 +386,7 @@ config("compiler") {
  
    # Linux/Android/Fuchsia common flags setup.
    # ---------------------------------
@@ -20,7 +22,7 @@ $NetBSD: patch-src_3rdparty_chromium_bui
      asmflags += [ "-fPIC" ]
      cflags += [ "-fPIC" ]
      ldflags += [ "-fPIC" ]
-@@ -407,7 +407,7 @@ config("compiler") {
+@@ -408,7 +408,7 @@ config("compiler") {
  
      # Compiler instrumentation can introduce dependencies in DSOs to symbols in
      # the executable they are loaded into, so they are unresolved at link-time.
@@ -29,7 +31,7 @@ $NetBSD: patch-src_3rdparty_chromium_bui
        ldflags += [
          "-Wl,-z,defs",
          "-Wl,--as-needed",
-@@ -458,7 +458,7 @@ config("compiler") {
+@@ -459,7 +459,7 @@ config("compiler") {
      ldflags += [ "-Wl,--icf=all" ]
    }
  
@@ -38,7 +40,7 @@ $NetBSD: patch-src_3rdparty_chromium_bui
      cflags += [ "-pthread" ]
      # Do not use the -pthread ldflag here since it becomes a no-op
      # when using -nodefaultlibs, which would cause an unused argument
-@@ -498,7 +498,7 @@ config("compiler") {
+@@ -499,7 +499,7 @@ config("compiler") {
      ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
@@ -47,7 +49,7 @@ $NetBSD: patch-src_3rdparty_chromium_bui
      cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
  
      cflags += [
-@@ -531,7 +531,7 @@ config("compiler") {
+@@ -532,7 +532,7 @@ config("compiler") {
    # C11/C++11 compiler flags setup.
    # ---------------------------
    if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
@@ -56,7 +58,16 @@ $NetBSD: patch-src_3rdparty_chromium_bui
      if (target_os == "android") {
        cxx11_override = use_cxx11_on_android
      } else {
-@@ -1148,7 +1148,7 @@ config("compiler_deterministic") {
+@@ -566,7 +566,7 @@ config("compiler") {
+       # Override Chromium's default for projects that wish to stay on C++11.
+       cflags_cc += [ "-std=${standard_prefix}++11" ]
+     } else {
+-      cflags_cc += [ "-std=${standard_prefix}++14" ]
++      cflags_cc += [ "-std=${standard_prefix}++17" ]
+     }
+   } else if (!is_win && !is_nacl) {
+     if (target_os == "android") {
+@@ -1149,7 +1149,7 @@ config("compiler_deterministic") {
        "-Xclang",
        ".",
      ]
@@ -65,7 +76,7 @@ $NetBSD: patch-src_3rdparty_chromium_bui
        # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
        asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
      }
-@@ -1253,7 +1253,7 @@ config("runtime_library") {
+@@ -1254,7 +1254,7 @@ config("runtime_library") {
    # smaller.
    if (is_win) {
      configs += [ "//build/config/win:runtime_library" ]
@@ -74,7 +85,7 @@ $NetBSD: patch-src_3rdparty_chromium_bui
      configs += [ "//build/config/linux:runtime_library" ]
    } else if (is_ios) {
      configs += [ "//build/config/ios:runtime_library" ]
-@@ -1550,7 +1550,7 @@ config("default_warnings") {
+@@ -1551,7 +1551,7 @@ config("default_warnings") {
          cflags += [ "-Wno-nonportable-include-path" ]
        }
  
@@ -83,7 +94,7 @@ $NetBSD: patch-src_3rdparty_chromium_bui
          # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
          # recognize.
          cflags += [
-@@ -1802,7 +1802,7 @@ config("thin_archive") {
+@@ -1803,7 +1803,7 @@ config("thin_archive") {
    # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
    # have a "thin archive" mode (it does accept -T, but it means truncating
    # archive names to 16 characters, which is not what we want).
@@ -92,7 +103,7 @@ $NetBSD: patch-src_3rdparty_chromium_bui
      arflags = [ "-T" ]
    } else if (is_win && use_lld) {
      arflags = [ "/llvmlibthin" ]
-@@ -2385,7 +2385,7 @@ config("symbols") {
+@@ -2386,7 +2386,7 @@ config("symbols") {
      # DWARF info may be corrupt; offsets in a range list entry are in different
      # sections" there.  Maybe just a bug in nacl_switch_32.S.
      if (!is_apple && !is_nacl && current_cpu != "x86" &&

Added files:

Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h:1.1
--- /dev/null   Sun Jun  2 11:34:20 2024
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h    Sun Jun  2 11:34:20 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h,v 1.1 2024/06/02 11:34:20 markd Exp $
+
+ICU75 fix - from ArchLinux
+
+--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.orig  2023-05-05 08:39:51.000000000 +0000
++++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
+@@ -194,7 +194,7 @@ NumPartitionPagesPerSuperPage() {
+ //
+ // __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on all
+ // platforms, as Chrome's requirement is C++14 as of 2020.
+-#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
++#if 0
+ static constexpr size_t kAlignment =
+     std::max(alignof(std::max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__);
+ #else
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_options.h
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_options.h:1.1
--- /dev/null   Sun Jun  2 11:34:20 2024
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_options.h  Sun Jun  2 11:34:20 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_options.h,v 1.1 2024/06/02 11:34:20 markd Exp $
+
+ICU75 fix - from ArchLinux
+
+--- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h.orig      2023-05-05 08:39:51.000000000 +0000
++++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
+@@ -180,7 +180,7 @@
+ // absl::variant is a typedef of std::variant, use the feature macro
+ // ABSL_USES_STD_VARIANT.
+ 
+-#define ABSL_OPTION_USE_STD_VARIANT 2
++#define ABSL_OPTION_USE_STD_VARIANT 0
+ 
+ 
+ // ABSL_OPTION_USE_INLINE_NAMESPACE
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_page_scrolling_text__fragment__selector__generator.cc
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_page_scrolling_text__fragment__selector__generator.cc:1.1
--- /dev/null   Sun Jun  2 11:34:20 2024
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_page_scrolling_text__fragment__selector__generator.cc       Sun Jun  2 11:34:20 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_core_page_scrolling_text__fragment__selector__generator.cc,v 1.1 2024/06/02 11:34:20 markd Exp $
+
+ICU75 fix - from ArchLinux
+
+--- src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc.orig      2023-05-05 08:39:51.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
+@@ -15,6 +15,7 @@
+ #include "third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics.h"
+ #include "third_party/blink/renderer/core/page/scrolling/text_fragment_finder.h"
+ #include "third_party/blink/renderer/platform/text/text_boundaries.h"
++#include "absl/base/attributes.h"
+ 
+ namespace blink {
+ 
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_pps__parser.h
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_pps__parser.h:1.1
--- /dev/null   Sun Jun  2 11:34:20 2024
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_pps__parser.h Sun Jun  2 11:34:20 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_pps__parser.h,v 1.1 2024/06/02 11:34:20 markd Exp $
+
+ICU75 fix - from ArchLinux
+
+--- src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h.orig       2023-05-05 08:39:51.000000000 +0000
++++ src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
+@@ -12,6 +12,7 @@
+ #define COMMON_VIDEO_H264_PPS_PARSER_H_
+ 
+ #include "absl/types/optional.h"
++#include <cstdint>
+ 
+ namespace rtc {
+ class BitBuffer;
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_sps__parser.h
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_sps__parser.h:1.1
--- /dev/null   Sun Jun  2 11:34:20 2024
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_sps__parser.h Sun Jun  2 11:34:20 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_webrtc_common__video_h264_sps__parser.h,v 1.1 2024/06/02 11:34:20 markd Exp $
+
+ICU75 fix - from ArchLinux
+
+--- src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h.orig       2023-05-05 08:39:51.000000000 +0000
++++ src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
+@@ -12,6 +12,7 @@
+ #define COMMON_VIDEO_H264_SPS_PARSER_H_
+ 
+ #include "absl/types/optional.h"
++#include <cstdint>
+ 
+ namespace rtc {
+ class BitBuffer;
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__processing_aec3_reverb__model__estimator.h
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__processing_aec3_reverb__model__estimator.h:1.1
--- /dev/null   Sun Jun  2 11:34:20 2024
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__processing_aec3_reverb__model__estimator.h        Sun Jun  2 11:34:20 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__processing_aec3_reverb__model__estimator.h,v 1.1 2024/06/02 11:34:20 markd Exp $
+
+ICU75 fix - from ArchLinux
+
+--- src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h.orig       2023-05-05 08:39:51.000000000 +0000
++++ src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
+@@ -13,6 +13,7 @@
+ 
+ #include <array>
+ #include <vector>
++#include <memory>
+ 
+ #include "absl/types/optional.h"
+ #include "api/array_view.h"
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_include_module__common__types__public.h
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_include_module__common__types__public.h:1.1
--- /dev/null   Sun Jun  2 11:34:20 2024
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_webrtc_modules_include_module__common__types__public.h  Sun Jun  2 11:34:20 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_webrtc_modules_include_module__common__types__public.h,v 1.1 2024/06/02 11:34:20 markd Exp $
+
+ICU75 fix - from ArchLinux
+
+--- src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h.orig 2023-05-05 08:39:51.000000000 +0000
++++ src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
+@@ -12,6 +12,7 @@
+ #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
+ 
+ #include <limits>
++#include <cstdint>
+ 
+ #include "absl/types/optional.h"
+