Upgrade to 9.0.4-54
This commit is contained in:
parent
007139a8a6
commit
0c906b4e5e
3 changed files with 9 additions and 21 deletions
|
@ -9,8 +9,8 @@ jobs:
|
||||||
container:
|
container:
|
||||||
image: ubuntu:22.04
|
image: ubuntu:22.04
|
||||||
env:
|
env:
|
||||||
pkgver: 8.3.3
|
pkgver: 9.0.4
|
||||||
buildno: 21
|
buildno: 54
|
||||||
qtver: 5.15.3
|
qtver: 5.15.3
|
||||||
steps:
|
steps:
|
||||||
- name: Environment setup
|
- name: Environment setup
|
||||||
|
@ -37,7 +37,6 @@ jobs:
|
||||||
cd build
|
cd build
|
||||||
git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-use-system-clang.patch
|
git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-use-system-clang.patch
|
||||||
git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/disable-licensing-limits.patch
|
git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/disable-licensing-limits.patch
|
||||||
git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_common-officefileformatchecker2-add-limits-include.patch
|
|
||||||
- name: Development setup
|
- name: Development setup
|
||||||
run: |
|
run: |
|
||||||
mkdir -p build/build_tools/system_qt-$qtver/gcc_64
|
mkdir -p build/build_tools/system_qt-$qtver/gcc_64
|
||||||
|
|
|
@ -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 <algorithm>
|
|
||||||
+#include <limits>
|
|
||||||
|
|
||||||
#include "OfficeFileFormatDefines.h"
|
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
|
diff --git a/build_tools/scripts/core_common/modules/v8_89.py b/build_tools/scripts/core_common/modules/v8_89.py
|
||||||
|
index 2c920a4..61dcafc 100644
|
||||||
--- a/build_tools/scripts/core_common/modules/v8_89.py
|
--- a/build_tools/scripts/core_common/modules/v8_89.py
|
||||||
+++ b/build_tools/scripts/core_common/modules/v8_89.py
|
+++ 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"):
|
if (platform == "linux"):
|
||||||
args_copy.append("is_clang=true")
|
args_copy.append("is_clang=true")
|
||||||
+ args_copy.append("clang_base_path=\\\"/usr/lib/llvm-14\\\"")
|
+ args_copy.append("clang_base_path=\\\"/usr/lib/llvm-14\\\"")
|
||||||
+ args_copy.append("clang_use_chrome_plugins=false")
|
+ args_copy.append("clang_use_chrome_plugins=false")
|
||||||
args_copy.append("use_sysroot=false")
|
if "1" == config.option("use-clang"):
|
||||||
if (platform == "windows"):
|
args_copy.append("use_sysroot=true")
|
||||||
args_copy.append("is_clang=false")
|
linux_clang = True
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue