From 719b384b38da367b449e453de300ac8b6b78d526 Mon Sep 17 00:00:00 2001
From: greepar <greepar@outlook.com>
Date: Tue, 21 Jul 2026 16:22:32 +0800
Subject: [PATCH] Fix 3.119.4-7922 native build inputs

---
 .../patches/angle-chromium-7922.patch         | 29 ++++---------------
 scripts/build-linux-static-graphics.sh        |  6 ++++
 scripts/build-macos-static-graphics.sh        |  6 ++++
 scripts/build-windows-static-graphics.ps1     |  6 ++++
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/External/NativeStatic/patches/angle-chromium-7922.patch b/External/NativeStatic/patches/angle-chromium-7922.patch
index 5e05a5a..e1c8812 100644
--- a/External/NativeStatic/patches/angle-chromium-7922.patch
+++ b/External/NativeStatic/patches/angle-chromium-7922.patch
@@ -2,9 +2,7 @@ diff --git a/DEPS b/DEPS
 index 8ba99a6..1a5e1a5 100644
 --- a/DEPS
 +++ b/DEPS
-@@ -767,11 +767,6 @@ deps = {
-     'condition': 'not build_with_chromium',
-   },
+@@ -769,7 +769,2 @@ deps = {
  
 -  'third_party/catapult': {
 -    'url': Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'),
@@ -12,10 +10,7 @@ index 8ba99a6..1a5e1a5 100644
 -  },
 -
    # Cherry is a dEQP/VK-GL-CTS management GUI written in Go. We use it for viewing test results.
-   'third_party/cherry': {
-     'url': Var('android_git') + '/platform/external/cherry@4f8fb08d33ca5ff05a1c638f04c85bbb8d8b52cc',
-@@ -794,10 +789,5 @@ deps = {
-   },
+@@ -796,7 +791,2 @@ deps = {
  
 -  'third_party/dawn': {
 -    'url': Var('dawn_git') + '/dawn.git' + '@' +  Var('dawn_revision'),
@@ -23,11 +18,7 @@ index 8ba99a6..1a5e1a5 100644
 -  },
 -
    'third_party/depot_tools': {
-     'url': Var('chromium_git') + '/chromium/tools/depot_tools.git@94e89b10b92cc9d6e58fc8d1b6474b7d29e8a114',
-     'condition': 'not build_with_chromium',
-@@ -874,11 +864,6 @@ deps = {
-     'condition': 'not build_with_chromium',
-   },
+@@ -876,7 +866,2 @@ deps = {
  
 -  'third_party/llvm/src': {
 -    'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project@67790d3fb06b184b7be9c4d3e36ab01f0ac4198e',
@@ -35,11 +26,7 @@ index 8ba99a6..1a5e1a5 100644
 -  },
 -
    'third_party/llvm-build/Release+Asserts': {
-     'dep_type': 'gcs',
-     'bucket': 'chromium-browser-clang',
-@@ -1216,11 +1201,6 @@ deps = {
-     'condition': 'checkout_android and not build_with_chromium',
-   },
+@@ -1218,7 +1203,2 @@ deps = {
  
 -  'third_party/SwiftShader': {
 -    'url': Var('swiftshader_git') + '/SwiftShader@f3e464b1e56795940f826a972b39e19bd9f6ac6c',
@@ -47,16 +34,10 @@ index 8ba99a6..1a5e1a5 100644
 -  },
 -
    'third_party/turbine/cipd': {
-       'packages': [
-           {
-@@ -1232,10 +1212,6 @@ deps = {
-       'dep_type': 'cipd',
-   },
+@@ -1234,6 +1214,2 @@ deps = {
  
 -  'third_party/VK-GL-CTS/src': {
 -    'url': Var('chromium_git') + '/external/github.com/KhronosGroup/VK-GL-CTS' + '@' + Var('vk_gl_cts_revision'),
 -  },
 -
    'third_party/vulkan-deps': {
-     'url': Var('chromium_git') + '/vulkan-deps@f2b9fece7c6772c09379b3a6938dbcd2573f2a3e',
-     'condition': 'not build_with_chromium',
diff --git a/scripts/build-linux-static-graphics.sh b/scripts/build-linux-static-graphics.sh
index 5ae6b11..f76c88c 100755
--- a/scripts/build-linux-static-graphics.sh
+++ b/scripts/build-linux-static-graphics.sh
@@ -149,11 +149,17 @@ sync_skiasharp() {
 prepare_skia_git_sync_deps() {
   local sync_deps="$1/tools/git-sync-deps"
   python3 - "$sync_deps" <<'PY'
+import re
 import pathlib
 import sys
 
 path = pathlib.Path(sys.argv[1])
 text = path.read_text()
+deps_path = path.with_name("DEPS")
+if deps_path.exists():
+    deps = deps_path.read_text()
+    deps = re.sub(r'^\s*"third_party/externals/dng_sdk"\s*:\s*"[^"]+",\s*\n', '', deps, flags=re.MULTILINE)
+    deps_path.write_text(deps)
 old = "  multithread(git_checkout_to_directory, list_of_arg_lists)"
 new = "  for args in list_of_arg_lists:\n    git_checkout_to_directory(*args)"
 if old in text:
diff --git a/scripts/build-macos-static-graphics.sh b/scripts/build-macos-static-graphics.sh
index 9676d60..34d5f70 100755
--- a/scripts/build-macos-static-graphics.sh
+++ b/scripts/build-macos-static-graphics.sh
@@ -68,11 +68,17 @@ sync_skiasharp() {
 prepare_skia_git_sync_deps() {
   local sync_deps="$1/tools/git-sync-deps"
   python3 - "$sync_deps" <<'PY'
+import re
 import pathlib
 import sys
 
 path = pathlib.Path(sys.argv[1])
 text = path.read_text()
+deps_path = path.with_name("DEPS")
+if deps_path.exists():
+    deps = deps_path.read_text()
+    deps = re.sub(r'^\s*"third_party/externals/dng_sdk"\s*:\s*"[^"]+",\s*\n', '', deps, flags=re.MULTILINE)
+    deps_path.write_text(deps)
 old = "  multithread(git_checkout_to_directory, list_of_arg_lists)"
 new = "  for args in list_of_arg_lists:\n    git_checkout_to_directory(*args)"
 if old in text:
diff --git a/scripts/build-windows-static-graphics.ps1 b/scripts/build-windows-static-graphics.ps1
index 47bfa39..be31550 100644
--- a/scripts/build-windows-static-graphics.ps1
+++ b/scripts/build-windows-static-graphics.ps1
@@ -356,6 +356,12 @@ function Sync-SkiaSharp {
 function Prepare-SkiaGitSyncDeps($SkiaDir) {
     $syncDeps = Join-Path $SkiaDir "tools\git-sync-deps"
     $text = Get-Content -Path $syncDeps -Raw
+    $depsPath = Join-Path $SkiaDir "DEPS"
+    if (Test-Path $depsPath) {
+        $depsText = Get-Content -Path $depsPath -Raw
+        $depsText = [regex]::Replace($depsText, '(?m)^\s*"third_party/externals/dng_sdk"\s*:\s*"[^"]+",\s*\r?\n', '')
+        Set-Content -Path $depsPath -Value $depsText -NoNewline -Encoding UTF8
+    }
     $old = "  multithread(git_checkout_to_directory, list_of_arg_lists)"
     $new = "  for args in list_of_arg_lists:`n    git_checkout_to_directory(*args)"
     if ($text.Contains($old)) {