Attempt to fix compilation introduced from 4f4f61bb19
This commit is contained in:
parent
101f52f9ab
commit
a4999b25e3
2 changed files with 13 additions and 0 deletions
|
@ -37,6 +37,7 @@ 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
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/core/Common/OfficeFileFormatChecker2.cpp.orig b/core/Common/OfficeFileFormatChecker2.cpp
|
||||||
|
index d2887d78..43c28a0b 100644
|
||||||
|
--- a/core/Common/OfficeFileFormatChecker2.cpp.orig
|
||||||
|
+++ b/core/Common/OfficeFileFormatChecker2.cpp
|
||||||
|
@@ -44,6 +44,7 @@
|
||||||
|
|
||||||
|
#include "3dParty/pole/pole.h"
|
||||||
|
#include <algorithm>
|
||||||
|
+#include <limits>
|
||||||
|
|
||||||
|
#include "OfficeFileFormatDefines.h"
|
||||||
|
|
Loading…
Add table
Reference in a new issue