diff options
| author | Kohei Yoshida <kohei@libreoffice.org> | 2023-11-09 20:26:47 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei@libreoffice.org> | 2023-11-10 15:35:47 +0100 |
| commit | e890b0f0a90316b69f49e0e9d3cb2b1b4528084a (patch) | |
| tree | 275bac48a1217e2c03f0e7964e708abe7e23e873 | |
| parent | 2d5894cc9b2374db9b5d2335db2d3566513fe062 (diff) | |
Upgrade orcus to 0.19.2
Change-Id: I2cbf5f93c3b8b2235828affdef7309c3611b19b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159258
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 1 | ||||
| -rw-r--r-- | external/liborcus/liborcus_newline.patch.1 | 17 | ||||
| -rw-r--r-- | external/liborcus/windows-constants-hack.patch | 2 |
4 files changed, 3 insertions, 21 deletions
diff --git a/download.lst b/download.lst index 468e2e39f1ec..d4c3eed3b9c6 100644 --- a/download.lst +++ b/download.lst @@ -503,8 +503,8 @@ OPENSSL_TARBALL := openssl-3.0.11.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -ORCUS_SHA256SUM := 6c9a8c03e8187f2749a84f2786d86a88ae45c99ed3a2d5fea36ba556b40c342d -ORCUS_TARBALL := liborcus-0.19.1.tar.xz +ORCUS_SHA256SUM := 69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39 +ORCUS_TARBALL := liborcus-0.19.2.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 5968c7bb1845..3de24f0135d7 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -19,7 +19,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/rpath.patch.0 \ external/liborcus/gcc9.patch.0 \ external/liborcus/libtool.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 deleted file mode 100644 index 5b2038d5cc12..000000000000 --- a/external/liborcus/liborcus_newline.patch.1 +++ /dev/null @@ -1,17 +0,0 @@ -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 - -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100392 - ---- 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; diff --git a/external/liborcus/windows-constants-hack.patch b/external/liborcus/windows-constants-hack.patch index 68e57857826d..28cf0997a168 100644 --- a/external/liborcus/windows-constants-hack.patch +++ b/external/liborcus/windows-constants-hack.patch @@ -9,7 +9,7 @@ index ae571f5..539ce18 100644 -#include "constants.inl" +#define ORCUS_MAJOR_VERSION 0 +#define ORCUS_MINOR_VERSION 19 -+#define ORCUS_MICRO_VERSION 0 ++#define ORCUS_MICRO_VERSION 2 namespace orcus { |