diff --git a/attachment/repos/skia.patch b/attachment/repos/skia.patch index c568668d3cc99bd5c5eb83c33834eb78cbc7a676..1e6e940827a07644c75c0076c0a8659b054ff04e 100644 --- a/attachment/repos/skia.patch +++ b/attachment/repos/skia.patch @@ -932,6 +932,26 @@ index 0000000000..eb318dc3a3 +#endif + +#endif /* __gl2platform_h_ */ +diff --git a/src/gpu/ganesh/mtl/GrMtlGpu.mm b/src/gpu/ganesh/mtl/GrMtlGpu.mm +index 7979a2ede9..08440478db 100644 +--- a/src/gpu/ganesh/mtl/GrMtlGpu.mm ++++ b/src/gpu/ganesh/mtl/GrMtlGpu.mm +@@ -1584,13 +1584,13 @@ void copy_src_data(char* dst, + dispatch_semaphore_signal(semaphore); + }); + +- const void* cfFence = (__bridge_retained const void*) semaphore; ++ const void* cfFence = (const void*) semaphore; + return (GrFence) cfFence; + } + + bool GrMtlGpu::waitFence(GrFence fence) { + const void* cfFence = (const void*) fence; +- dispatch_semaphore_t semaphore = (__bridge dispatch_semaphore_t)cfFence; ++ dispatch_semaphore_t semaphore = (dispatch_semaphore_t)cfFence; + + long result = dispatch_semaphore_wait(semaphore, 0); + diff --git a/src/ports/skia_ohos/FontConfig_ohos.cpp b/src/ports/skia_ohos/FontConfig_ohos.cpp new file mode 100644 index 0000000000..10c967ee02 diff --git a/tools/gn b/tools/gn index 99b7b88e79303c6826e2d3c6db004a126cd310f1..a5efe0f75d58748cd6047a78e22dc9735d7e7eb5 100755 --- a/tools/gn +++ b/tools/gn @@ -160,7 +160,7 @@ def get_host_os(): # Rosetta. I.e., python3 is an x64 executable and we're on an arm64 Mac. def is_rosetta(): if platform.system() == 'Darwin': - proc = subprocess.Popen(['sysctl', '-in', 'sysctl.proc_translated'], + proc = subprocess.Popen(['sysctl', '-in', 'sysctl.proc_translated'], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) output, _ = proc.communicate()