diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-23 10:21:54 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-23 12:08:30 +0200 |
| commit | 1e51a325a8e21eb5f900336a0c9e1bd78ed330ab (patch) | |
| tree | 4f2caf2f76be2b46d956dbfd129c8fd02b671112 /external/zxing | |
| parent | c8d4ae2ad0cfdac770d897e7aca72fbb4a87765f (diff) | |
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 <sbergman@redhat.com>
Diffstat (limited to 'external/zxing')
| -rw-r--r-- | external/zxing/UnpackedTarball_zxing.mk | 1 | ||||
| -rw-r--r-- | external/zxing/include.patch.0 | 10 |
2 files changed, 11 insertions, 0 deletions
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, |