From 632a33aba2feac524906cacb00c1e38bf53104c2 Mon Sep 17 00:00:00 2001
From: Frank <65999885+FrankXie05@users.noreply.github.com>
Date: Sat, 2 Sep 2023 06:33:40 +0800
Subject: [PATCH] [skia] disable the dev test (#33494)

* [skia] disable the dev test

* version

* add option

* v db

* revert

* v db

* add patch

* v db
---
 ports/skia/disable-dev-test.patch | 13 +++++++++++++
 ports/skia/portfile.cmake         |  1 +
 ports/skia/vcpkg.json             |  2 +-
 versions/baseline.json            |  2 +-
 versions/s-/skia.json             |  5 +++++
 5 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 ports/skia/disable-dev-test.patch

diff --git a/ports/skia/disable-dev-test.patch b/ports/skia/disable-dev-test.patch
new file mode 100644
index 00000000000000..9eb1be33d7c7b6
--- /dev/null
+++ b/ports/skia/disable-dev-test.patch
@@ -0,0 +1,13 @@
+diff --git a/BUILD.gn b/BUILD.gn
+index 3691123..8682b8e 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -97,7 +97,7 @@ config("skia_private") {
+   if (is_skia_dev_build && !is_wasm) {
+     defines += [
+       "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1",
+-      "GR_TEST_UTILS=1",
++      "GR_TEST_UTILS=0",
+     ]
+     if (skia_enable_graphite) {
+       defines += [ "GRAPHITE_TEST_UTILS=1" ]
diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake
index f07d07d61f5762..2f76ffcc662c6d 100644
--- a/ports/skia/portfile.cmake
+++ b/ports/skia/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_git(
         disable-msvc-env-setup.patch
         uwp.patch
         core-opengl32.patch
+        disable-dev-test.patch
 )
 
 # these following aren't available in vcpkg
diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json
index b8bb03a5bfc932..4cf4fe323a1289 100644
--- a/ports/skia/vcpkg.json
+++ b/ports/skia/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "skia",
   "version": "0.36.0",
-  "port-version": 8,
+  "port-version": 9,
   "description": [
     "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.",
     "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.",
diff --git a/versions/baseline.json b/versions/baseline.json
index ae8a6a396cba71..1df8c349d5a67d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7670,7 +7670,7 @@
     },
     "skia": {
       "baseline": "0.36.0",
-      "port-version": 8
+      "port-version": 9
     },
     "skyr-url": {
       "baseline": "1.13.0",
diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index ee8bed49024928..44b05ea611f1db 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9389efe5ea2540ef9a0885b796d13e0d730fb603",
+      "version": "0.36.0",
+      "port-version": 9
+    },
     {
       "git-tree": "59bcc7110298012cf8f0d6e68ec8d04a4cb01e8b",
       "version": "0.36.0",