diff --git a/core_common-officefileformatchecker2-add-limits-include.patch b/core_common-officefileformatchecker2-add-limits-include.patch deleted file mode 100644 index f015968..0000000 --- a/core_common-officefileformatchecker2-add-limits-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/core/Common/OfficeFileFormatChecker2.cpp b/core/Common/OfficeFileFormatChecker2.cpp -index d2887d78..43c28a0b 100644 ---- a/core/Common/OfficeFileFormatChecker2.cpp -+++ b/core/Common/OfficeFileFormatChecker2.cpp -@@ -44,6 +44,7 @@ - - #include "3dParty/pole/pole.h" - #include -+#include - - #include "OfficeFileFormatDefines.h" - diff --git a/core_v8-use-system-clang.patch b/core_v8-use-system-clang.patch index cdbb4c9..d6af231 100644 --- a/core_v8-use-system-clang.patch +++ b/core_v8-use-system-clang.patch @@ -1,12 +1,13 @@ ---- a/build_tools/scripts/core_common/modules/v8_89.py +diff --git a/build_tools/scripts/core_common/modules/v8_89.py.orig b/build_tools/scripts/core_common/modules/v8_89.py +index 2c920a47..61dcafc9 100644 +--- a/build_tools/scripts/core_common/modules/v8_89.py.orig +++ b/build_tools/scripts/core_common/modules/v8_89.py -@@ -48,6 +48,8 @@ def make_args(args, platform, is_64=True, is_debug=False): - +@@ -55,6 +55,8 @@ def make_args(args, platform, is_64=True, is_debug=False): + linux_clang = False if (platform == "linux"): args_copy.append("is_clang=true") + args_copy.append("clang_base_path=\\\"/usr/lib/llvm-14\\\"") + args_copy.append("clang_use_chrome_plugins=false") - args_copy.append("use_sysroot=false") - if (platform == "windows"): - args_copy.append("is_clang=false") - + if "1" == config.option("use-clang"): + args_copy.append("use_sysroot=true") + linux_clang = True