CVS commit: pkgsrc/x11/qt5-qtwebengine

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 16 13:06:28 UTC 2024

Modified Files:
        pkgsrc/x11/qt5-qtwebengine: distinfo
        pkgsrc/x11/qt5-qtwebengine/patches:
            patch-src_3rdparty_chromium_content_browser_BUILD.gn

Log Message:
qt5-qtwebengine: fix build with ninja 1.12

>From qt upstream via homebrew bug report via ninja bug report.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/qt5-qtwebengine/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_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/distinfo
diff -u pkgsrc/x11/qt5-qtwebengine/distinfo:1.23 pkgsrc/x11/qt5-qtwebengine/distinfo:1.24
--- pkgsrc/x11/qt5-qtwebengine/distinfo:1.23    Thu Mar 14 07:59:57 2024
+++ pkgsrc/x11/qt5-qtwebengine/distinfo Tue Apr 16 13:06:28 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2024/03/14 07:59:57 adam Exp $
+$NetBSD: distinfo,v 1.24 2024/04/16 13:06:28 wiz Exp $
 
 BLAKE2s (qtwebengine-everywhere-opensource-src-5.15.13.tar.xz) = 5233fe78d5d63fd48623699acdbf6e2ad38837076115469b7b9d2db1e8e749b7
 SHA512 (qtwebengine-everywhere-opensource-src-5.15.13.tar.xz) = 0c9aa844148e908c2eb5af93b51d2809f183f775d5760b4654f8f34ac825fd8b9d81a9b70cb9d79d16502bdce7bd6d77484c5b04797d99726f6ff5e9e40af03f
@@ -245,7 +245,7 @@ SHA1 (patch-src_3rdparty_chromium_compon
 SHA1 (patch-src_3rdparty_chromium_components_webcrypto_algorithms_test__helpers.cc) = 208b91b7b2172baf9a984a384f86f868db63d3ae
 SHA1 (patch-src_3rdparty_chromium_content_app_content__main.cc) = 598bc0a6abdfe3eff4581976915ff18f7b975638
 SHA1 (patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc) = 6d4022d4cf4abc946224ee155d29eea019dc9262
-SHA1 (patch-src_3rdparty_chromium_content_browser_BUILD.gn) = aabef87e186ec44ab5fa5767059104a13ab70cdc
+SHA1 (patch-src_3rdparty_chromium_content_browser_BUILD.gn) = 7fbbcf0eeb10339c4cbc78e69423dd6eb3d8b6fb
 SHA1 (patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc) = 5ba18f78394bb5b777bff072a447e14a12824636
 SHA1 (patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc) = c7603af71fba00d148c575c7dad8125fa8eff438
 SHA1 (patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc) = bded50a3060ac935616fcd66f94c0f6f2f5a7cdf

Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD.gn
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD.gn:1.3 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD.gn:1.4
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD.gn:1.3 Thu Jun  8 20:38:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD.gn     Tue Apr 16 13:06:28 2024
@@ -1,11 +1,19 @@
-$NetBSD: patch-src_3rdparty_chromium_content_browser_BUILD.gn,v 1.3 2023/06/08 20:38:06 markd Exp $
+$NetBSD: patch-src_3rdparty_chromium_content_browser_BUILD.gn,v 1.4 2024/04/16 13:06:28 wiz Exp $
 
 support bsd
 build with python3 (remove catapult)
 
---- src/3rdparty/chromium/content/browser/BUILD.gn.orig        2022-03-30 09:48:18.000000000 +0000
+--- src/3rdparty/chromium/content/browser/BUILD.gn.orig        2023-02-27 18:57:08.000000000 +0000
 +++ src/3rdparty/chromium/content/browser/BUILD.gn
-@@ -2067,7 +2067,7 @@ jumbo_static_library("browser") {
+@@ -36,6 +36,7 @@ jumbo_static_library("devtools_protocol"
+ 
+   deps = [
+     "//base",
++    "//components/spellcheck:buildflags",
+     "//content/browser/devtools:devtools_background_services_proto",
+     "//content/browser/devtools:protocol_sources",
+     "//content/common:buildflags",
+@@ -2067,7 +2068,7 @@ jumbo_static_library("browser") {
      deps += [ "//ui/events" ]
    }
  
@@ -14,7 +22,7 @@ build with python3 (remove catapult)
      sources += [
        "font_access/font_enumeration_cache_fontconfig.cc",
        "font_access/font_enumeration_cache_fontconfig.h",
-@@ -2110,7 +2110,7 @@ jumbo_static_library("browser") {
+@@ -2110,7 +2111,7 @@ jumbo_static_library("browser") {
      deps += [ "//chromecast:chromecast_buildflags" ]
    }
  
@@ -23,7 +31,7 @@ build with python3 (remove catapult)
      sources += [
        "tracing/cast_tracing_agent.cc",
        "tracing/cast_tracing_agent.h",
-@@ -2169,7 +2169,6 @@ jumbo_static_library("browser") {
+@@ -2169,7 +2170,6 @@ jumbo_static_library("browser") {
    if (!is_android) {
      deps += [
        "//components/vector_icons",
@@ -31,7 +39,7 @@ build with python3 (remove catapult)
      ]
    }
  
-@@ -2417,7 +2416,7 @@ jumbo_static_library("browser") {
+@@ -2417,7 +2417,7 @@ jumbo_static_library("browser") {
        sources += [ "renderer_host/pepper/pepper_truetype_font_list_pango.cc" ]
      }
  
@@ -40,7 +48,7 @@ build with python3 (remove catapult)
        deps += [ "//components/services/font:ppapi_fontconfig_matching" ]
      }
    }
-@@ -2455,7 +2454,7 @@ jumbo_static_library("browser") {
+@@ -2455,7 +2455,7 @@ jumbo_static_library("browser") {
      }
    }
  
@@ -49,7 +57,7 @@ build with python3 (remove catapult)
      deps += [ "//third_party/fontconfig" ]
    }
  
-@@ -2726,7 +2725,7 @@ jumbo_static_library("browser") {
+@@ -2726,7 +2726,7 @@ jumbo_static_library("browser") {
        "web_contents/aura/gesture_nav_simple.h",
      ]
  
@@ -58,7 +66,7 @@ build with python3 (remove catapult)
        deps += [ "//ui/base/ime/linux" ]
      }
    } else {  # Not aura.
-@@ -2807,7 +2806,7 @@ jumbo_static_library("browser") {
+@@ -2807,7 +2807,7 @@ jumbo_static_library("browser") {
      ]
    }