download.lst | 4 +-
external/liborcus/0001-Missing-header-for-std-tolower.patch | 24 ------------
external/liborcus/UnpackedTarball_liborcus.mk | 1
3 files changed, 2 insertions(+), 27 deletions(-)
New commits:
commit 7dcb1592eb2783333437ff8ae4fef1f3dec10f70
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
AuthorDate: Tue Sep 18 17:50:39 2018 -0400
Commit: Kohei Yoshida <libreoff...@kohei.us>
CommitDate: Wed Sep 19 19:07:12 2018 +0200
Update orcus to 0.14.1.
Change-Id: I345d2655c1999ab319b92c6e8719c0eb9572000b
Reviewed-on: https://gerrit.libreoffice.org/60731
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <libreoff...@kohei.us>
diff --git a/download.lst b/download.lst
index 4129c6298cf5..01f56e61aec6 100644
--- a/download.lst
+++ b/download.lst
@@ -194,8 +194,8 @@ export OPENLDAP_SHA256SUM :=
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89
export OPENLDAP_TARBALL := openldap-2.4.45.tgz
export OPENSSL_SHA256SUM :=
50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00
export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
-export ORCUS_SHA256SUM :=
7bcfac3f4f490540292cfc87d3fde7b47eafa8450afa1e1a2c181d8293dcd4ef
-export ORCUS_TARBALL := liborcus-0.14.0.tar.gz
+export ORCUS_SHA256SUM :=
3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f
+export ORCUS_TARBALL := liborcus-0.14.1.tar.gz
export OWNCLOUD_ANDROID_LIB_SHA256SUM :=
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
export OWNCLOUD_ANDROID_LIB_TARBALL :=
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
export PAGEMAKER_SHA256SUM :=
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
diff --git a/external/liborcus/0001-Missing-header-for-std-tolower.patch
b/external/liborcus/0001-Missing-header-for-std-tolower.patch
deleted file mode 100644
index 2e00be92a872..000000000000
--- a/external/liborcus/0001-Missing-header-for-std-tolower.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3a6bb93a382b4d5f1463ee3fdd54cab7048ff996 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yosh...@gmail.com>
-Date: Fri, 31 Aug 2018 16:07:06 -0400
-Subject: [PATCH] Missing header for std::tolower.
-
----
- src/parser/sax_token_parser.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/parser/sax_token_parser.cpp b/src/parser/sax_token_parser.cpp
-index 9790b498..44ba5844 100644
---- a/src/parser/sax_token_parser.cpp
-+++ b/src/parser/sax_token_parser.cpp
-@@ -9,6 +9,7 @@
- #include "orcus/tokens.hpp"
-
- #include <mdds/sorted_string_map.hpp>
-+#include <cctype>
-
- namespace orcus {
-
---
-2.17.1
-
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index f637cc73db46..215bd4b8cc15 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/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
- external/liborcus/0001-Missing-header-for-std-tolower.patch \
))
ifeq ($(OS),WNT)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
