external/liborcus/UnpackedTarball_liborcus.mk | 1 +
external/liborcus/liborcus_newline.patch.1 | 15 +++++++++++++++
2 files changed, 16 insertions(+)
New commits:
commit d9c75c2590651da775253963b2b587e8fc3cbe8d
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Sat May 1 18:19:27 2021 +0200
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun May 2 21:19:55 2021 +0200
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.st...@allotropia.de>
(cherry picked from commit aa38eede9d340cbb11a792ab1ebbe681521a4489)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114921
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 113e8e25818d..6cb0d8a51f7c 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 \
))
ifeq ($(OS),WNT)
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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
