[Libreoffice-commits] core.git: download.lst external/libwpd

[David Tardon]

 download.lst                              |    6 ++--
 external/libwpd/ExternalProject_libwpd.mk |    4 ++
 external/libwpd/Library_wpd.mk            |    1 
 external/libwpd/UnpackedTarball_libwpd.mk |    1 
 external/libwpd/libwpd-tdf112269.patch.1  |   42 ------------------------------
 5 files changed, 7 insertions(+), 47 deletions(-)

New commits:
commit 196e1e6d8b9864a47ee02049c075c52027288ff3
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Sep 13 12:42:02 2017 +0200

    upload libwpd 0.10.2
    
    Change-Id: I7ee8557f5e8d4c66f0b839bfe5f4affb16095daa
    Reviewed-on: https://gerrit.libreoffice.org/42235
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/download.lst b/download.lst
index 37e1ab01e160..515a38d363e8 100644
--- a/download.lst
+++ b/download.lst
@@ -223,9 +223,9 @@ export UCPP_SHA256SUM := 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f
 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 export VISIO_SHA256SUM := b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e
 export VISIO_TARBALL := libvisio-0.1.5.tar.bz2
-export WPD_SHA256SUM := efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d
-export WPD_VERSION_MICRO := 1
-export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
+export WPD_SHA256SUM := 323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610
+export WPD_VERSION_MICRO := 2
+export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
 export WPG_SHA256SUM := 57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
 export WPG_VERSION_MICRO := 2
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
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)
- 				{