diff options
| author | David Tardon <dtardon@redhat.com> | 2017-09-13 12:42:02 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-09-14 18:48:10 +0200 |
| commit | 196e1e6d8b9864a47ee02049c075c52027288ff3 (patch) | |
| tree | e96e416e7dbdb46d15ba622f095c1c80b0b1b44a /external/libwpd | |
| parent | 0b1c92bde2be59dffdfd801b2dbb8d9a68f68526 (diff) | |
upload libwpd 0.10.2
Change-Id: I7ee8557f5e8d4c66f0b839bfe5f4affb16095daa
Reviewed-on: https://gerrit.libreoffice.org/42235
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/libwpd')
| -rw-r--r-- | external/libwpd/ExternalProject_libwpd.mk | 4 | ||||
| -rw-r--r-- | external/libwpd/Library_wpd.mk | 1 | ||||
| -rw-r--r-- | external/libwpd/UnpackedTarball_libwpd.mk | 1 | ||||
| -rw-r--r-- | external/libwpd/libwpd-tdf112269.patch.1 | 42 |
4 files changed, 4 insertions, 44 deletions
diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index f1b7cdf18cb1..d7eea6dc4355 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libwpd,\ )) $(eval $(call gb_ExternalProject_use_externals,libwpd,\ + boost_headers \ revenge \ )) @@ -30,11 +31,12 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : --without-docs \ --disable-tools \ --disable-debug \ + --disable-werror \ $(if $(filter MACOSX,$(OS)), \ - --disable-werror \ --prefix=/@.__________________________________________________OOO) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))") \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ diff --git a/external/libwpd/Library_wpd.mk b/external/libwpd/Library_wpd.mk index 3668e71bbf78..62285858468f 100644 --- a/external/libwpd/Library_wpd.mk +++ b/external/libwpd/Library_wpd.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Library_Library,wpd)) $(eval $(call gb_Library_use_unpacked,wpd,libwpd)) $(eval $(call gb_Library_use_externals,wpd,\ + boost_headers \ revenge \ )) diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk index 599b75acc046..f8907bd20c7a 100644 --- a/external/libwpd/UnpackedTarball_libwpd.mk +++ b/external/libwpd/UnpackedTarball_libwpd.mk @@ -16,7 +16,6 @@ $(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 deleted file mode 100644 index bc79ab0eaccd..000000000000 --- a/external/libwpd/libwpd-tdf112269.patch.1 +++ /dev/null @@ -1,42 +0,0 @@ ---- 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) - { |