From 40616a5e954f7be1077ef37db3fbddbd5dcd1ca6 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Mon, 17 Jun 2024 21:09:53 +0200
Subject: [PATCH] [chromium-base] Don't use ambiguous variables (#39343)

For warnings in #39337.
---
 ports/chromium-base/portfile.cmake | 12 ++++++------
 ports/chromium-base/vcpkg.json     |  2 +-
 versions/baseline.json             |  2 +-
 versions/c-/chromium-base.json     |  5 +++++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ports/chromium-base/portfile.cmake b/ports/chromium-base/portfile.cmake
index 8fedaa10d553a6..d9e6e8e6a4f531 100644
--- a/ports/chromium-base/portfile.cmake
+++ b/ports/chromium-base/portfile.cmake
@@ -68,7 +68,7 @@ set(OPTIONS "\
     treat_warnings_as_errors=false")
 set(DEFINITIONS "")
 
-if(WIN32)
+if(VCPKG_TARGET_IS_WINDOWS)
     # Windows 10 SDK >= (10.0.19041.0) is required
     # https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk
     SET(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled)
@@ -76,7 +76,7 @@ if(WIN32)
     set(OPTIONS "${OPTIONS} use_lld=false")
 endif()
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Linux)
+if(VCPKG_TARGET_IS_LINUX)
     set(OPTIONS "${OPTIONS} use_allocator=\"none\" use_sysroot=false use_glib=false")
 endif()
 
@@ -88,8 +88,8 @@ if(CLANG MATCHES "-NOTFOUND")
 endif()
 get_filename_component(CLANG "${CLANG}" DIRECTORY)
 get_filename_component(CLANG "${CLANG}" DIRECTORY)
-if((WIN32 AND NOT EXISTS "${CLANG}/bin/clang-cl.exe") OR
-   (APPLE AND NOT EXISTS "${CLANG}/bin/clang"))
+if((VCPKG_TARGET_IS_WINDOWS AND NOT EXISTS "${CLANG}/bin/clang-cl.exe") OR
+   (VCPKG_TARGET_IS_OSX AND NOT EXISTS "${CLANG}/bin/clang"))
     message(FATAL_ERROR "Clang needs to be inside a bin directory.")
 endif()
 set(OPTIONS "${OPTIONS} clang_base_path=\"${CLANG}\"")
@@ -101,7 +101,7 @@ else()
     set(OPTIONS "${OPTIONS} is_component_build=false")
 endif()
 
-if(APPLE)
+if(VCPKG_TARGET_IS_OSX)
     set(OPTIONS "${OPTIONS} enable_dsyms=true")
 endif()
 
@@ -126,7 +126,7 @@ set(TARGETS
     base/third_party/dynamic_annotations
     base/third_party/double_conversion)
 
-if(WIN32)
+if(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND TARGETS base/win:pe_image)
 endif()
 
diff --git a/ports/chromium-base/vcpkg.json b/ports/chromium-base/vcpkg.json
index ec365b1c41dfa5..5fa9c7d57a4c29 100644
--- a/ports/chromium-base/vcpkg.json
+++ b/ports/chromium-base/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "chromium-base",
   "version": "86.0.4199.1",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.",
   "homepage": "https://chromium.googlesource.com/chromium/src",
   "license": "BSD-3-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 599d7a13863dab..665f501e9ae52e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1614,7 +1614,7 @@
     },
     "chromium-base": {
       "baseline": "86.0.4199.1",
-      "port-version": 5
+      "port-version": 6
     },
     "chronoengine": {
       "baseline": "8.0.0",
diff --git a/versions/c-/chromium-base.json b/versions/c-/chromium-base.json
index 471c5352c4d8fd..cb3c87223efa64 100644
--- a/versions/c-/chromium-base.json
+++ b/versions/c-/chromium-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7f3a0b54287d0d86a331bc8fdc004086b992ab05",
+      "version": "86.0.4199.1",
+      "port-version": 6
+    },
     {
       "git-tree": "08b399ae573db73407ae4095c79628553416a992",
       "version": "86.0.4199.1",