external/breakpad/UnpackedTarball_breakpad.mk | 1 + external/breakpad/include.patch | 10 ++++++++++ external/liborcus/UnpackedTarball_liborcus.mk | 1 + external/liborcus/include.patch.0 | 20 ++++++++++++++++++++ external/pdfium/UnpackedTarball_pdfium.mk | 2 ++ external/pdfium/include.patch | 11 +++++++++++ external/zxing/UnpackedTarball_zxing.mk | 1 + external/zxing/include.patch.0 | 10 ++++++++++ 8 files changed, 56 insertions(+)
New commits: commit 5fb04477e6850fdfb54bb481c1901accea397ffe Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Mon May 23 10:21:54 2022 +0200 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Mon Jun 20 16:54:18 2022 +0200 tdf#149639 Missing #include <stdint.h> in various external code ...which is a problem presumably since GCC 13 trunk <https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6f038efd93593da6e661b829d1bd3877e75550f1> "libstdc++: Avoid including <cstdint> for std::char_traits". (All the broken C++ code used unqualified uintptr_t etc. rather than std::uintptr_t etc., so I deemed it more appropriate to include <stdint.h> rather than <cstdint>.) Change-Id: Id9dfc383c5986126a425971c4557b90ac45ac963 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134760 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> (cherry picked from commit 1e51a325a8e21eb5f900336a0c9e1bd78ed330ab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136163 Tested-by: Caolán McNamara <caol...@redhat.com> Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/external/breakpad/UnpackedTarball_breakpad.mk b/external/breakpad/UnpackedTarball_breakpad.mk index 9a10a5ac1abb..eca3d550d0d4 100644 --- a/external/breakpad/UnpackedTarball_breakpad.mk +++ b/external/breakpad/UnpackedTarball_breakpad.mk @@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,breakpad,\ external/breakpad/breakpad-no-env.patch.1 \ external/breakpad/SIGSTKSZ.patch \ external/breakpad/sanitizer.patch \ + external/breakpad/include.patch \ )) $(eval $(call gb_UnpackedTarball_add_files,breakpad,src/tools/windows/dump_syms,\ diff --git a/external/breakpad/include.patch b/external/breakpad/include.patch new file mode 100644 index 000000000000..e90ae9c11744 --- /dev/null +++ b/external/breakpad/include.patch @@ -0,0 +1,10 @@ +--- src/client/linux/handler/minidump_descriptor.h ++++ src/client/linux/handler/minidump_descriptor.h +@@ -31,6 +31,7 @@ + #define CLIENT_LINUX_HANDLER_MINIDUMP_DESCRIPTOR_H_ + + #include <assert.h> ++#include <stdint.h> + #include <sys/types.h> + + #include <string> diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index eaa730255071..2ad70119179b 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -38,6 +38,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/forcepoint-87.patch.1 \ external/liborcus/forcepoint-88.patch.1 \ external/liborcus/forcepoint-95.patch.1 \ + external/liborcus/include.patch.0 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/include.patch.0 b/external/liborcus/include.patch.0 new file mode 100644 index 000000000000..1131d04d3046 --- /dev/null +++ b/external/liborcus/include.patch.0 @@ -0,0 +1,20 @@ +--- include/orcus/base64.hpp ++++ include/orcus/base64.hpp +@@ -9,6 +9,7 @@ + #define __ORCUS_BASE64_HPP__ + + #include "env.hpp" ++#include <stdint.h> + #include <vector> + #include <string> + +--- include/orcus/types.hpp ++++ include/orcus/types.hpp +@@ -16,6 +16,7 @@ + #pragma GCC diagnostic ignored "-Wshadow" + #endif + ++#include <stdint.h> + #include <cstdlib> + #include <vector> + #include <string> diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk index 3a19feed8ea2..bff977899555 100644 --- a/external/pdfium/UnpackedTarball_pdfium.mk +++ b/external/pdfium/UnpackedTarball_pdfium.mk @@ -24,6 +24,8 @@ pdfium_patches += AndroidNDK19.patch.1 # --with-latest-c++: pdfium_patches += gcc-c++20-comparison.patch +pdfium_patches += include.patch + $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium)) $(eval $(call gb_UnpackedTarball_set_tarball,pdfium,$(PDFIUM_TARBALL))) diff --git a/external/pdfium/include.patch b/external/pdfium/include.patch new file mode 100644 index 000000000000..75c0e3b9272a --- /dev/null +++ b/external/pdfium/include.patch @@ -0,0 +1,11 @@ +--- constants/annotation_flags.h ++++ constants/annotation_flags.h +@@ -5,6 +5,8 @@ + #ifndef CONSTANTS_ANNOTATION_FLAGS_H_ + #define CONSTANTS_ANNOTATION_FLAGS_H_ + ++#include <stdint.h> ++ + namespace pdfium { + namespace annotation_flags { + diff --git a/external/zxing/UnpackedTarball_zxing.mk b/external/zxing/UnpackedTarball_zxing.mk index ff5f45e71c30..a171c86de7db 100644 --- a/external/zxing/UnpackedTarball_zxing.mk +++ b/external/zxing/UnpackedTarball_zxing.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,zxing, \ external/zxing/0002-Update-stb_image_write-from-1.14-to-1.16.patch \ external/zxing/0003-Update-stb_image-from-2.25-to-2.27.patch \ external/zxing/0004-Apply-stb-PR-1223-to-stb_image.patch \ + external/zxing/include.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/zxing/include.patch.0 b/external/zxing/include.patch.0 new file mode 100644 index 000000000000..8852b533311d --- /dev/null +++ b/external/zxing/include.patch.0 @@ -0,0 +1,10 @@ +--- core/src/textcodec/JPTextEncoder.cpp ++++ core/src/textcodec/JPTextEncoder.cpp +@@ -36,6 +36,7 @@ + // and the grateful thanks of the Qt team. + + #include "JPTextEncoder.h" ++#include <stdint.h> + + /* + * This data is derived from Unicode 1.1,