external/curl/ExternalProject_curl.mk | 14 ++-
external/curl/UnpackedTarball_curl.mk | 1
external/curl/curl-msvc-disable-protocols.patch.1 | 24 +++++
external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 | 25 +++++
external/libmwaw/UnpackedTarball_libmwaw.mk | 1
external/libwpd/UnpackedTarball_libwpd.mk | 1
external/libwpd/libwpd-tdf112269.patch.1 | 42
++++++++++
7 files changed, 103 insertions(+), 5 deletions(-)
New commits:
commit f4c63f8491d442af32063eca90e7b537a09bf1a9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Sep 7 13:37:30 2017 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Aug 10 13:34:43 2018 +0200
Resolves: tdf#112269 libwpd fix
Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1
Reviewed-on: https://gerrit.libreoffice.org/42056
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
(cherry picked from commit 05da1c67e49a2d758799db735a826c4d292fea44)
diff --git a/external/libwpd/UnpackedTarball_libwpd.mk
b/external/libwpd/UnpackedTarball_libwpd.mk
index 7fb7c3b2181d..495824d804b5 100644
--- a/external/libwpd/UnpackedTarball_libwpd.mk
+++ b/external/libwpd/UnpackedTarball_libwpd.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwpd,0))
$(eval $(call gb_UnpackedTarball_add_patches,libwpd,\
external/libwpd/libwpd-vs2013.patch.1 \
$(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \
+ external/libwpd/libwpd-tdf112269.patch.1 \
))
ifneq ($(OS),MACOSX)
diff --git a/external/libwpd/libwpd-tdf112269.patch.1
b/external/libwpd/libwpd-tdf112269.patch.1
new file mode 100644
index 000000000000..bc79ab0eaccd
--- /dev/null
+++ b/external/libwpd/libwpd-tdf112269.patch.1
@@ -0,0 +1,42 @@
+--- libwpd/src/lib/WP5StylesListener.cpp
++++ libwpd/src/lib/WP5StylesListener.cpp
+@@ -85,8 +85,9 @@
+ m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
+ m_currentPage.setPageSpan(1);
+
+- for (std::vector<WPXHeaderFooter>::const_iterator HFiter =
(m_nextPage.getHeaderFooterList()).begin();
+- HFiter != (m_nextPage.getHeaderFooterList()).end();
++HFiter)
++ std::vector<WPXHeaderFooter> headerFooterList =
m_nextPage.getHeaderFooterList();
++ for (std::vector<WPXHeaderFooter>::const_iterator HFiter =
headerFooterList.begin();
++ HFiter != headerFooterList.end(); ++HFiter)
+ {
+ if ((*HFiter).getOccurrence() != NEVER)
+ {
+--- libwpd/src/lib/WP42StylesListener.cpp
++++ libwpd/src/lib/WP42StylesListener.cpp
+@@ -84,8 +84,9 @@
+ m_currentPage = WPXPageSpan(m_pageList.back(), 0.0,
0.0);
+ m_currentPage.setPageSpan(1);
+
+- for (std::vector<WPXHeaderFooter>::const_iterator
HFiter = (m_nextPage.getHeaderFooterList()).begin();
+- HFiter !=
(m_nextPage.getHeaderFooterList()).end(); ++HFiter)
++ std::vector<WPXHeaderFooter> headerFooterList =
m_nextPage.getHeaderFooterList();
++ for (std::vector<WPXHeaderFooter>::const_iterator
HFiter = headerFooterList.begin();
++ HFiter != headerFooterList.end(); ++HFiter)
+ {
+ if ((*HFiter).getOccurrence() != NEVER)
+ {
+--- libwpd/src/lib/WP1StylesListener.cpp
++++ libwpd/src/lib/WP1StylesListener.cpp
+@@ -83,8 +83,9 @@
+ m_currentPage = WPXPageSpan(m_pageList.back(), 0.0,
0.0);
+ m_currentPage.setPageSpan(1);
+
+- for (std::vector<WPXHeaderFooter>::const_iterator
HFiter = (m_nextPage.getHeaderFooterList()).begin();
+- HFiter !=
(m_nextPage.getHeaderFooterList()).end(); ++HFiter)
++ std::vector<WPXHeaderFooter> headerFooterList =
m_nextPage.getHeaderFooterList();
++ for (std::vector<WPXHeaderFooter>::const_iterator
HFiter = headerFooterList.begin();
++ HFiter != headerFooterList.end(); ++HFiter)
+ {
+ if ((*HFiter).getOccurrence() != NEVER)
+ {
commit 28aa34a6087c9bf2033c14354d9d5346302d46df
Author: David Tardon <dtar...@redhat.com>
AuthorDate: Thu Jun 15 13:17:40 2017 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Aug 10 13:34:43 2018 +0200
use correct size
(cherry picked from commit d1ae31a1fc49ec7a68b2a07c5e5e97d95b346ca9)
Change-Id: I620ada9b209bb2084eccaa81385beb6306d6a3d0
Reviewed-on: https://gerrit.libreoffice.org/38827
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 54e7b46718bf2f47c7f55a93cfbb23681429ffc6)
diff --git a/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1
b/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1
new file mode 100644
index 000000000000..9be6a007b85d
--- /dev/null
+++ b/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1
@@ -0,0 +1,25 @@
+From 68b3b74569881248bfb6cbb4266177cc253b292f Mon Sep 17 00:00:00 2001
+From: David Tardon <dtar...@redhat.com>
+Date: Sat, 8 Apr 2017 14:03:29 +0200
+Subject: [PATCH] ofz#1037 resize vector correctly
+
+---
+ src/lib/MsWrd1Parser.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/MsWrd1Parser.cxx b/src/lib/MsWrd1Parser.cxx
+index 63547e6..3626064 100644
+--- a/src/lib/MsWrd1Parser.cxx
++++ b/src/lib/MsWrd1Parser.cxx
+@@ -902,7 +902,7 @@ bool MsWrd1Parser::readFootnoteCorrespondance(MWAWVec2i
limits)
+ int id = fIt++->second;
+ fPos[1] = fIt==footnoteMap.end() ? m_state->m_eot : fIt->first;
+ if (id >= int(m_state->m_footnotesList.size()))
+- m_state->m_footnotesList.resize(size_t(id),0);
++ m_state->m_footnotesList.resize(size_t(id)+1,0);
+ m_state->m_footnotesList[size_t(id)]=fPos;
+ }
+ ascii().addDelimiter(input->tell(),'|');
+--
+2.13.0
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 2adf7ffad639..068a7a241dea 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -37,6 +37,7 @@ endif
$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1
\
+ external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 \
))
# vim: set noet sw=4 ts=4:
commit 1dcb5efeae069f0737a44e00e21307c298b78963
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Mon Jul 9 12:33:33 2018 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Aug 10 13:34:43 2018 +0200
curl: in 7.52.1, the parameter is documented as --with-libidn2,
but actually it is --with-libidn (it's consistent in later versions).
Change-Id: Ib24767974173e4c737fc10d9420e6dbad3440239
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index 831b57088dd6..122cac82a525 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -47,6 +47,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--with-nss$(if $(SYSTEM_NSS),,="$(call
gb_UnpackedTarball_get_dir,nss)/dist/out")) \
--without-ssl --without-gnutls --without-polarssl
--without-cyassl --without-axtls \
--enable-ftp --enable-http --enable-ipv6 \
+ --without-libidn \
--without-libidn2 --without-libpsl --without-librtmp \
--without-libssh2 --without-metalink --without-nghttp2 \
--disable-ares \
commit 56fa15cc9cbe74ce4a176a8c741a4ca333495ab4
Author: Michael Stahl <mst...@redhat.com>
AuthorDate: Wed Aug 9 16:52:18 2017 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Aug 10 13:34:43 2018 +0200
curl: disable protocols nobody needs in MSVC build
These are disabled via configure on other platforms.
Change-Id: I4e27865396f3817ceb5645ab8589c21fdaa5afab
(cherry picked from commit 152a1d279cbc81e7b5f076a2c4b20c12c6929ce6)
diff --git a/external/curl/UnpackedTarball_curl.mk
b/external/curl/UnpackedTarball_curl.mk
index f9f3a8bf6016..1179153959a5 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-msvc.patch.1 \
+ external/curl/curl-msvc-disable-protocols.patch.1 \
external/curl/curl-msvc-schannel.patch.1 \
external/curl/curl-7.26.0_mingw.patch \
external/curl/curl-7.26.0_win-proxy.patch \
diff --git a/external/curl/curl-msvc-disable-protocols.patch.1
b/external/curl/curl-msvc-disable-protocols.patch.1
new file mode 100644
index 000000000000..38ff5ccb5ac0
--- /dev/null
+++ b/external/curl/curl-msvc-disable-protocols.patch.1
@@ -0,0 +1,24 @@
+disable protocols nobody needs in MSVC build
+
+--- curl/lib/config-win32.h.orig 2017-08-09 16:43:29.464000000 +0200
++++ curl/lib/config-win32.h 2017-08-09 16:47:38.549200000 +0200
+@@ -733,4 +733,19 @@
+ # define ENABLE_IPV6 1
+ #endif
+
++#define CURL_DISABLE_DICT 1
++#define CURL_DISABLE_FILE 1
++//#undef CURL_DISABLE_FTP
++#define CURL_DISABLE_GOPHER 1
++//#undef CURL_DISABLE_HTTP
++#define CURL_DISABLE_IMAP 1
++#define CURL_DISABLE_LDAP 1
++#define CURL_DISABLE_LDAPS 1
++#define CURL_DISABLE_POP3 1
++#define CURL_DISABLE_RTSP 1
++#define CURL_DISABLE_SMB 1
++#define CURL_DISABLE_SMTP 1
++#define CURL_DISABLE_TELNET 1
++#define CURL_DISABLE_TFTP 1
++
+ #endif /* HEADER_CURL_CONFIG_WIN32_H */
commit 4c31a77396cb9540908cae58a0aad91221c8cfa0
Author: Michael Stahl <mst...@redhat.com>
AuthorDate: Wed Aug 9 17:14:11 2017 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Aug 10 13:34:43 2018 +0200
curl: disable more unnecessary stuff
Only HTTP and FTP should be required.
Add --without-libpsl --disable-ares --disable-rtsp --disable-smb,
and --without-libidn was replaced with --without-libidn2.
Change-Id: Icf6afc8bff4cc7ad7a5a95b0c3f9a345a7cf67a3
(cherry picked from commit 9fd26734d3cbbd9b58f4b08058a75063632f57d1)
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index d1ddf7f81fdf..831b57088dd6 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -46,11 +46,14 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--with-darwinssl,\
--with-nss$(if $(SYSTEM_NSS),,="$(call
gb_UnpackedTarball_get_dir,nss)/dist/out")) \
--without-ssl --without-gnutls --without-polarssl
--without-cyassl --without-axtls \
- --without-libidn --enable-ftp --enable-ipv6
--enable-http --disable-gopher \
- --disable-file --disable-ldap --disable-telnet
--disable-dict --without-libssh2 \
- --without-librtmp --disable-ldaps --disable-tftp
--disable-pop3 \
- --disable-imap --disable-smtp --disable-manual
--without-metalink \
- --without-nghttp2 \
+ --enable-ftp --enable-http --enable-ipv6 \
+ --without-libidn2 --without-libpsl --without-librtmp \
+ --without-libssh2 --without-metalink --without-nghttp2 \
+ --disable-ares \
+ --disable-dict --disable-file --disable-gopher
--disable-imap \
+ --disable-ldap --disable-ldaps --disable-manual
--disable-pop3 \
+ --disable-rtsp --disable-smb --disable-smtp
--disable-telnet \
+ --disable-tftp \
$(if $(filter LINUX,$(OS)),--without-ca-bundle
--without-ca-path) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(filter
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
