head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.32
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.30
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.28
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.26
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.24
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.22
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.20
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.18
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.16
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.14
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.12
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.10
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.8
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.6
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.4
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.2
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.1.0.6
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.4
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.2
	pkgsrc-2021Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2022.04.18.11.18.19;	author adam;	state Exp;
branches;
next	1.1;
commitid	ZUHidazvMzjhNFAD;

1.1
date	2021.08.03.21.04.35;	author markd;	state Exp;
branches;
next	;
commitid	zgriEB08Qe99kz3D;


desc
@@


1.2
log
@qt5: updated to 5.15.3

5.15.3:
Bug fix, LTS, release.

qt5-qtwebengine patches courtesy of @@markd.
@
text
@$NetBSD$

--- src/3rdparty/chromium/third_party/angle/gni/angle.gni.orig	2021-02-19 16:41:59.000000000 +0000
+++ src/3rdparty/chromium/third_party/angle/gni/angle.gni
@@@@ -33,7 +33,7 @@@@ if (angle_has_build) {
     is_asan = false
     build_with_chromium = false
     dcheck_always_on = false
-    angle_use_x11 = (is_linux || is_chromeos) && !is_ggp
+    angle_use_x11 = (is_linux || is_chromeos || is_bsd) && !is_ggp
     use_ozone = false
     use_fuzzing_engine = false
   }
@@@@ -100,7 +100,7 @@@@ declare_args() {
 
   angle_enable_d3d9 = is_win && !angle_is_winuwp
   angle_enable_d3d11 = is_win
-  angle_enable_gl = (ozone_platform_gbm || ozone_platform_x11 || (!is_linux && !is_chromeos) ||
+  angle_enable_gl = (ozone_platform_gbm || ozone_platform_x11 || (!is_linux && !is_chromeos && !is_bsd) ||
                      (angle_use_x11 && !is_chromeos)) && !is_fuchsia &&
                     !angle_is_winuwp && !is_ggp && !is_win_arm64
 
@@@@ -109,7 +109,7 @@@@ declare_args() {
   # Otherwise, API level 24 would have been enough.
   angle_enable_vulkan =
       angle_has_build && ((is_win && !angle_is_winuwp) ||
-                          (is_linux && (angle_use_x11 || ozone_platform_x11) && !is_chromeos) ||
+                          ((is_linux || is_bsd) && (angle_use_x11 || ozone_platform_x11) && !is_chromeos) ||
                           (is_android && ndk_api_level_at_least_26) ||
                           is_fuchsia || is_ggp || is_mac)
   angle_enable_null = true
@@@@ -158,7 +158,7 @@@@ if (angle_has_build) {
   angle_remove_configs += [ "//build/config/compiler:default_include_dirs" ]
 }
 angle_better_stack_traces = (is_debug || dcheck_always_on) &&
-                            (is_linux || is_chromeos) && !is_asan && !is_cfi
+                            (is_linux || is_chromeos || is_bsd) && !is_asan && !is_cfi
 
 if (angle_has_build && is_clang) {
   angle_remove_configs += [ "//build/config/clang:find_bad_constructs" ]
@@@@ -361,7 +361,7 @@@@ template("angle_test") {
         configs -= [ "//build/config/android:hide_all_but_jni" ]
       }
 
-      if ((is_linux || is_chromeos) && !is_component_build) {
+      if ((is_linux || is_chromeos || is_bsd) && !is_component_build) {
         # Set rpath to find shared libs in a non-component build.
         configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
       }
@@@@ -392,7 +392,7 @@@@ template("angle_test") {
              "//testing/xvfb.py",
            ]
 
-    if ((is_linux || is_chromeos) && !is_component_build) {
+    if ((is_linux || is_chromeos || is_bsd) && !is_component_build) {
       # Set rpath to find shared libs in a non-component build.
       configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
     }
@


1.1
log
@qt5-qtwebengine: add version 5.15.2nb1

Chromium-based web engine for Qt5
@
text
@d3 1
a3 1
--- src/3rdparty/chromium/third_party/angle/gni/angle.gni.orig	2020-11-07 01:22:36.000000000 +0000
d9 2
a10 2
-    angle_use_x11 = is_linux && !is_ggp
+    angle_use_x11 = (is_linux || is_bsd) && !is_ggp
d14 2
a15 1
@@@@ -95,7 +95,7 @@@@ declare_args() {
d18 4
a21 4
   angle_enable_gl =
-      (ozone_platform_gbm || ozone_platform_x11 || !is_linux || (angle_use_x11 && !is_chromeos)) &&
+      (ozone_platform_gbm || ozone_platform_x11 || !(is_linux || is_bsd) || (angle_use_x11 && !is_chromeos)) &&
       !is_fuchsia && !angle_is_winuwp && !is_ggp && !is_win_arm64
d23 1
a23 2
   # ANGLE Vulkan backend on Android requires API level 26, i.e. Oreo, due to
@@@@ -103,7 +103,7 @@@@ declare_args() {
d32 1
a32 1
@@@@ -149,7 +149,7 @@@@ if (angle_has_build) {
d35 3
a37 3
 angle_better_stack_traces =
-    (is_debug || dcheck_always_on) && is_linux && !is_asan && !is_cfi
+    (is_debug || dcheck_always_on) && (is_linux || is_bsd) && !is_asan && !is_cfi
d41 12
a52 3
@@@@ -314,7 +314,7 @@@@ template("angle_test") {
                  "$angle_root:extra_warnings",
                ]
d54 2
a55 2
-    if (is_linux && !is_component_build) {
+    if ((is_linux || is_bsd) && !is_component_build) {
@