diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-05-01 18:19:27 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-03 12:37:54 +0200 |
| commit | 20c6cb67a3450358d393a48770317434d36bfa28 (patch) | |
| tree | f42e379c0c8176cbd3cd4a5cb18580b406d6c8b5 | |
| parent | 9fd7055eb2ef20c5683995a1dc7a09a506e51203 (diff) | |
liborcus: newline problem with GCC 11 -E -fdirectives-only
ooxml_tokens.inl:3524:32: error: stray '#' in program
Change-Id: Ib7f50e1798e8c985f31a0338944ae1e9b439e98f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114975
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit aa38eede9d340cbb11a792ab1ebbe681521a4489)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114921
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 1 | ||||
| -rw-r--r-- | external/liborcus/liborcus_newline.patch.1 | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 3b54db0e49ce..710d126a8c17 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/libtool.patch.0 \ external/liborcus/fix-pch.patch.0 \ external/liborcus/include.patch.0 \ + external/liborcus/liborcus_newline.patch.1 \ )) $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ diff --git a/external/liborcus/liborcus_newline.patch.1 b/external/liborcus/liborcus_newline.patch.1 new file mode 100644 index 000000000000..421c30846b27 --- /dev/null +++ b/external/liborcus/liborcus_newline.patch.1 @@ -0,0 +1,15 @@ +Add newline at end of KRHangulMapping.h + +without this, compiling output of GCC 11 -E -fdirectives-only fails with: + +ooxml_tokens.inl:3524:32: error: stray '#' in program + +--- liborcus/src/liborcus/ooxml_tokens.inl.orig 2021-05-01 18:12:37.490131155 +0200 ++++ liborcus/src/liborcus/ooxml_tokens.inl 2021-05-01 18:12:50.994119453 +0200 +@@ -3521,4 +3521,4 @@ + "zoomToFit" // 3517 + }; + +-size_t token_name_count = 3518; +\ No newline at end of file ++size_t token_name_count = 3518; |