Uploading the new libwpd 0.9.5

Change-Id: I0949b85f7c2ffbb5c00cce24949b21cc616135db

7 files changed, 36 insertions, 375 deletions

diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index 9e2bd20943d4..138f7f0aaaa5 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -26,4 +26,14 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libw
 	src/lib/WPXStreamImplementation.h \
 ))
 
+$(eval $(call gb_Package_Package,libwpd,$(call gb_UnpackedTarball_get_dir,wpd)))
+
+$(eval $(call gb_Package_use_external_project,libwpd,libwpd))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.lib,build/win32/Release/libwpd-0.9.lib))
+else
+$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.a,src/lib/.libs/libwpd-0.9.a))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/libwpd/StaticLibrary_wpd.mk b/libwpd/StaticLibrary_wpd.mk
index 94642253ee9c..b9108c5a04b0 100644
--- a/libwpd/StaticLibrary_wpd.mk
+++ b/libwpd/StaticLibrary_wpd.mk
@@ -7,187 +7,35 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_StaticLibrary_StaticLibrary,wpdlib))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpd))
 
-$(eval $(call gb_StaticLibrary_use_unpacked,wpdlib,wpd))
+$(eval $(call gb_ExternalProject_use_unpacked,libwpd,wpd))
 
-$(eval $(call gb_StaticLibrary_use_package,wpdlib,libwpd_inc))
+$(eval $(call gb_ExternalProject_register_targets,libwpd,\
+	build \
+))
 
-$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,wpdlib,cpp))
+ifeq ($(OS)$(COM),WNTMSC)
 
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpdlib,\
-	UnpackedTarball/wpd/src/lib/libwpd_internal \
-	UnpackedTarball/wpd/src/lib/libwpd_math \
-	UnpackedTarball/wpd/src/lib/WP1BottomMarginGroup \
-	UnpackedTarball/wpd/src/lib/WP1CenterTextGroup \
-	UnpackedTarball/wpd/src/lib/WP1ContentListener \
-	UnpackedTarball/wpd/src/lib/WP1ExtendedCharacterGroup \
-	UnpackedTarball/wpd/src/lib/WP1FileStructure \
-	UnpackedTarball/wpd/src/lib/WP1FixedLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP1FlushRightGroup \
-	UnpackedTarball/wpd/src/lib/WP1FontIdGroup \
-	UnpackedTarball/wpd/src/lib/WP1FootnoteEndnoteGroup \
-	UnpackedTarball/wpd/src/lib/WP1HeaderFooterGroup \
-	UnpackedTarball/wpd/src/lib/WP1Heuristics \
-	UnpackedTarball/wpd/src/lib/WP1JustificationGroup \
-	UnpackedTarball/wpd/src/lib/WP1LeftIndentGroup \
-	UnpackedTarball/wpd/src/lib/WP1LeftRightIndentGroup \
-	UnpackedTarball/wpd/src/lib/WP1Listener \
-	UnpackedTarball/wpd/src/lib/WP1MarginReleaseGroup \
-	UnpackedTarball/wpd/src/lib/WP1MarginResetGroup \
-	UnpackedTarball/wpd/src/lib/WP1Parser \
-	UnpackedTarball/wpd/src/lib/WP1Part \
-	UnpackedTarball/wpd/src/lib/WP1PictureGroup \
-	UnpackedTarball/wpd/src/lib/WP1PointSizeGroup \
-	UnpackedTarball/wpd/src/lib/WP1SetTabsGroup \
-	UnpackedTarball/wpd/src/lib/WP1SpacingResetGroup \
-	UnpackedTarball/wpd/src/lib/WP1StylesListener \
-	UnpackedTarball/wpd/src/lib/WP1SubDocument \
-	UnpackedTarball/wpd/src/lib/WP1SuppressPageCharacteristicsGroup \
-	UnpackedTarball/wpd/src/lib/WP1TopMarginGroup \
-	UnpackedTarball/wpd/src/lib/WP1UnsupportedFixedLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP1UnsupportedVariableLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP1VariableLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP3AttributeGroup \
-	UnpackedTarball/wpd/src/lib/WP3ContentListener \
-	UnpackedTarball/wpd/src/lib/WP3DefinitionGroup \
-	UnpackedTarball/wpd/src/lib/WP3DisplayGroup \
-	UnpackedTarball/wpd/src/lib/WP3DoubleByteScriptCharacterGroup \
-	UnpackedTarball/wpd/src/lib/WP3EndOfLinePageGroup \
-	UnpackedTarball/wpd/src/lib/WP3ExtendedCharacterGroup \
-	UnpackedTarball/wpd/src/lib/WP3FileStructure \
-	UnpackedTarball/wpd/src/lib/WP3FixedLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP3FontGroup \
-	UnpackedTarball/wpd/src/lib/WP3FootnoteEndnoteGroup \
-	UnpackedTarball/wpd/src/lib/WP3Header \
-	UnpackedTarball/wpd/src/lib/WP3HeaderFooterGroup \
-	UnpackedTarball/wpd/src/lib/WP3IndentGroup \
-	UnpackedTarball/wpd/src/lib/WP3Listener \
-	UnpackedTarball/wpd/src/lib/WP3MiscellaneousGroup \
-	UnpackedTarball/wpd/src/lib/WP3PageFormatGroup \
-	UnpackedTarball/wpd/src/lib/WP3Parser \
-	UnpackedTarball/wpd/src/lib/WP3Part \
-	UnpackedTarball/wpd/src/lib/WP3Resource \
-	UnpackedTarball/wpd/src/lib/WP3ResourceFork \
-	UnpackedTarball/wpd/src/lib/WP3SingleByteFunction \
-	UnpackedTarball/wpd/src/lib/WP3StylesListener \
-	UnpackedTarball/wpd/src/lib/WP3SubDocument \
-	UnpackedTarball/wpd/src/lib/WP3TabGroup \
-	UnpackedTarball/wpd/src/lib/WP3TablesGroup \
-	UnpackedTarball/wpd/src/lib/WP3UndoGroup \
-	UnpackedTarball/wpd/src/lib/WP3UnsupportedFixedLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP3UnsupportedVariableLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP3VariableLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP3WindowGroup \
-	UnpackedTarball/wpd/src/lib/WP42ContentListener \
-	UnpackedTarball/wpd/src/lib/WP42DefineColumnsGroup \
-	UnpackedTarball/wpd/src/lib/WP42ExtendedCharacterGroup \
-	UnpackedTarball/wpd/src/lib/WP42FileStructure \
-	UnpackedTarball/wpd/src/lib/WP42HeaderFooterGroup \
-	UnpackedTarball/wpd/src/lib/WP42Heuristics \
-	UnpackedTarball/wpd/src/lib/WP42Listener \
-	UnpackedTarball/wpd/src/lib/WP42MarginResetGroup \
-	UnpackedTarball/wpd/src/lib/WP42MultiByteFunctionGroup \
-	UnpackedTarball/wpd/src/lib/WP42Parser \
-	UnpackedTarball/wpd/src/lib/WP42Part \
-	UnpackedTarball/wpd/src/lib/WP42StylesListener \
-	UnpackedTarball/wpd/src/lib/WP42SubDocument \
-	UnpackedTarball/wpd/src/lib/WP42SuppressPageCharacteristicsGroup \
-	UnpackedTarball/wpd/src/lib/WP42UnsupportedMultiByteFunctionGroup \
-	UnpackedTarball/wpd/src/lib/WP5AttributeGroup \
-	UnpackedTarball/wpd/src/lib/WP5BoxGroup \
-	UnpackedTarball/wpd/src/lib/WP5ContentListener \
-	UnpackedTarball/wpd/src/lib/WP5DefinitionGroup \
-	UnpackedTarball/wpd/src/lib/WP5ExtendedCharacterGroup \
-	UnpackedTarball/wpd/src/lib/WP5FileStructure \
-	UnpackedTarball/wpd/src/lib/WP5FixedLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP5FontGroup \
-	UnpackedTarball/wpd/src/lib/WP5FontNameStringPoolPacket \
-	UnpackedTarball/wpd/src/lib/WP5FootnoteEndnoteGroup \
-	UnpackedTarball/wpd/src/lib/WP5GeneralPacketData \
-	UnpackedTarball/wpd/src/lib/WP5GeneralPacketIndex \
-	UnpackedTarball/wpd/src/lib/WP5GraphicsInformationPacket \
-	UnpackedTarball/wpd/src/lib/WP5Header \
-	UnpackedTarball/wpd/src/lib/WP5HeaderFooterGroup \
-	UnpackedTarball/wpd/src/lib/WP5IndentGroup \
-	UnpackedTarball/wpd/src/lib/WP5Listener \
-	UnpackedTarball/wpd/src/lib/WP5ListFontsUsedPacket \
-	UnpackedTarball/wpd/src/lib/WP5PageFormatGroup \
-	UnpackedTarball/wpd/src/lib/WP5Parser \
-	UnpackedTarball/wpd/src/lib/WP5Part \
-	UnpackedTarball/wpd/src/lib/WP5PrefixData \
-	UnpackedTarball/wpd/src/lib/WP5SingleByteFunction \
-	UnpackedTarball/wpd/src/lib/WP5SpecialHeaderIndex \
-	UnpackedTarball/wpd/src/lib/WP5StylesListener \
-	UnpackedTarball/wpd/src/lib/WP5SubDocument \
-	UnpackedTarball/wpd/src/lib/WP5TabGroup \
-	UnpackedTarball/wpd/src/lib/WP5TableEOLGroup \
-	UnpackedTarball/wpd/src/lib/WP5TableEOPGroup \
-	UnpackedTarball/wpd/src/lib/WP5UnsupportedFixedLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP5UnsupportedVariableLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP5VariableLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP60Header \
-	UnpackedTarball/wpd/src/lib/WP61Header \
-	UnpackedTarball/wpd/src/lib/WP6AttributeGroup \
-	UnpackedTarball/wpd/src/lib/WP6BoxGroup \
-	UnpackedTarball/wpd/src/lib/WP6CharacterGroup \
-	UnpackedTarball/wpd/src/lib/WP6ColumnGroup \
-	UnpackedTarball/wpd/src/lib/WP6CommentAnnotationPacket \
-	UnpackedTarball/wpd/src/lib/WP6ContentListener \
-	UnpackedTarball/wpd/src/lib/WP6DefaultInitialFontPacket \
-	UnpackedTarball/wpd/src/lib/WP6DisplayNumberReferenceGroup \
-	UnpackedTarball/wpd/src/lib/WP6EOLGroup \
-	UnpackedTarball/wpd/src/lib/WP6ExtendedCharacterGroup \
-	UnpackedTarball/wpd/src/lib/WP6ExtendedDocumentSummaryPacket \
-	UnpackedTarball/wpd/src/lib/WP6FileStructure \
-	UnpackedTarball/wpd/src/lib/WP6FillStylePacket \
-	UnpackedTarball/wpd/src/lib/WP6FixedLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP6FontDescriptorPacket \
-	UnpackedTarball/wpd/src/lib/WP6FootnoteEndnoteGroup \
-	UnpackedTarball/wpd/src/lib/WP6GeneralTextPacket \
-	UnpackedTarball/wpd/src/lib/WP6GraphicsBoxStylePacket \
-	UnpackedTarball/wpd/src/lib/WP6GraphicsCachedFileDataPacket \
-	UnpackedTarball/wpd/src/lib/WP6GraphicsFilenamePacket \
-	UnpackedTarball/wpd/src/lib/WP6Header \
-	UnpackedTarball/wpd/src/lib/WP6HeaderFooterGroup \
-	UnpackedTarball/wpd/src/lib/WP6HighlightGroup \
-	UnpackedTarball/wpd/src/lib/WP6Listener \
-	UnpackedTarball/wpd/src/lib/WP6NumberingMethodGroup \
-	UnpackedTarball/wpd/src/lib/WP6OutlineStylePacket \
-	UnpackedTarball/wpd/src/lib/WP6PageGroup \
-	UnpackedTarball/wpd/src/lib/WP6ParagraphGroup \
-	UnpackedTarball/wpd/src/lib/WP6Parser \
-	UnpackedTarball/wpd/src/lib/WP6Part \
-	UnpackedTarball/wpd/src/lib/WP6PrefixData \
-	UnpackedTarball/wpd/src/lib/WP6PrefixDataPacket \
-	UnpackedTarball/wpd/src/lib/WP6PrefixIndice \
-	UnpackedTarball/wpd/src/lib/WP6SetNumberGroup \
-	UnpackedTarball/wpd/src/lib/WP6SingleByteFunction \
-	UnpackedTarball/wpd/src/lib/WP6StyleGroup \
-	UnpackedTarball/wpd/src/lib/WP6StylesListener \
-	UnpackedTarball/wpd/src/lib/WP6SubDocument \
-	UnpackedTarball/wpd/src/lib/WP6TabGroup \
-	UnpackedTarball/wpd/src/lib/WP6TableStylePacket \
-	UnpackedTarball/wpd/src/lib/WP6UndoGroup \
-	UnpackedTarball/wpd/src/lib/WP6UnsupportedFixedLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP6UnsupportedVariableLengthGroup \
-	UnpackedTarball/wpd/src/lib/WP6VariableLengthGroup \
-	UnpackedTarball/wpd/src/lib/WPDocument \
-	UnpackedTarball/wpd/src/lib/WPXBinaryData \
-	UnpackedTarball/wpd/src/lib/WPXContentListener \
-	UnpackedTarball/wpd/src/lib/WPXEncryption \
-	UnpackedTarball/wpd/src/lib/WPXHeader \
-	UnpackedTarball/wpd/src/lib/WPXListener \
-	UnpackedTarball/wpd/src/lib/WPXMemoryStream \
-	UnpackedTarball/wpd/src/lib/WPXPageSpan \
-	UnpackedTarball/wpd/src/lib/WPXParser \
-	UnpackedTarball/wpd/src/lib/WPXProperty \
-	UnpackedTarball/wpd/src/lib/WPXPropertyList \
-	UnpackedTarball/wpd/src/lib/WPXPropertyListVector \
-	UnpackedTarball/wpd/src/lib/WPXString \
-	UnpackedTarball/wpd/src/lib/WPXStylesListener \
-	UnpackedTarball/wpd/src/lib/WPXSubDocument \
-	UnpackedTarball/wpd/src/lib/WPXTable \
-))
+$(call gb_ExternalProject_get_state_target,libwpd,build) :
+	cd $(EXTERNAL_WORKDIR)/build/win32 \
+	&& $(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj "Release|Win32" \
+	&& touch $@
+
+else
+
+$(call gb_ExternalProject_get_state_target,libwpd,build) :
+	cd $(EXTERNAL_WORKDIR) \
+	&& ./configure \
+		--with-pic \
+		--enable-static \
+		--disable-shared \
+		--without-stream \
+		--without-docs \
+		--disable-debug \
+	&& $(GNUMAKE) \
+	&& touch $@
+
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk
index 68d7bf1dfe87..d47f502c4c04 100644
--- a/libwpd/UnpackedTarball_wpd.mk
+++ b/libwpd/UnpackedTarball_wpd.mk
@@ -11,20 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,wpd))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,wpd,$(WPD_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,wpd,\
-	libwpd/libwpd-0.9.4.patch \
-	libwpd/libwpd-0.9.4-warning.patch \
-	libwpd/libwpd-0.9.4-msvc-warning.patch \
-	libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch \
-))
-# libwpd/libwpd-0.9.4-warning.patch: see upstream
-#  <http://libwpd.git.sourceforge.net/git/gitweb.cgi?p=libwpd/libwpd;a=commit;
-#  h=ca59d3ce82d1695e381255912ce1b60e826b2ca6> "-Werror,-Wunused-private-field"
-# libwpd/libwpd-0.9.4-msvc-warning.patch: see upstream
-#  <http://libwpd.git.sourceforge.net/git/gitweb.cgi?p=libwpd/libwpd;a=commit;
-#  h=fb3827aeb5de64ed84eb1140bae9e32e50ca5133> "MSVC warning C4310: cast
-#  truncates constant value"
-# libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch
-#  mailed to Fridrich cause there's no apparent way to submit a patch
-
 # vim: set noet sw=4 ts=4:
diff --git a/libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch b/libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch
deleted file mode 100644
index beb606be351a..000000000000
--- a/libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- foo/UnpackedTarball/wpd/src/lib/WP6BoxGroup.cpp	2012-09-12 23:00:03.552693060 +0100
-+++ foo/UnpackedTarball/wpd/src/lib/WP6BoxGroup.cpp	2012-09-12 23:00:41.293089947 +0100
-@@ -188,7 +188,7 @@
- 		{
- 			long tmpEndOfData = readU16(input, encryption) + input->tell();
- #ifdef DEBUG
--			uint16_t tmpOverrideFlags = readU16(input, encryption);
-+			tmpOverrideFlags = readU16(input, encryption);
- #else
- 			readU16(input, encryption);
- #endif
-@@ -199,7 +199,7 @@
- 		{
- 			long tmpEndOfData = readU16(input, encryption) + input->tell();
- #ifdef DEBUG
--			uint16_t tmpOverrideFlags = readU16(input, encryption);
-+			tmpOverrideFlags = readU16(input, encryption);
- #else
- 			readU16(input, encryption);
- #endif
-@@ -210,7 +210,7 @@
- 		{
- 			long tmpEndOfData = readU16(input, encryption) + input->tell();
- #ifdef DEBUG
--			uint16_t tmpOverrideFlags = readU16(input, encryption);
-+			tmpOverrideFlags = readU16(input, encryption);
- #else
- 			readU16(input, encryption);
- #endif
-@@ -221,7 +221,7 @@
- 		{
- 			long tmpEndOfData = readU16(input, encryption) + input->tell();
- #ifdef DEBUG
--			uint16_t tmpOverrideFlags = readU16(input, encryption);
-+			tmpOverrideFlags = readU16(input, encryption);
- #else
- 			readU16(input, encryption);
- #endif
-@@ -232,7 +232,7 @@
- 		{
- 			long tmpEndOfData = readU16(input, encryption) + input->tell();
- #ifdef DEBUG
--			uint16_t tmpOverrideFlags = readU16(input, encryption);
-+			tmpOverrideFlags = readU16(input, encryption);
- #else
- 			readU16(input, encryption);
- #endif
-@@ -247,7 +247,7 @@
- 		{
- 			long tmpEndOfData = readU16(input, encryption) + input->tell();
- #ifdef DEBUG
--			uint16_t tmpOverrideFlags = readU16(input, encryption);
-+			tmpOverrideFlags = readU16(input, encryption);
- #else
- 			readU16(input, encryption);
- #endif
-@@ -258,7 +258,7 @@
- 		{
- 			long tmpEndOfData = readU16(input, encryption) + input->tell();
- #ifdef DEBUG
--			uint16_t tmpOverrideFlags = readU16(input, encryption);
-+			tmpOverrideFlags = readU16(input, encryption);
- #else
- 			readU16(input, encryption);
- #endif
diff --git a/libwpd/libwpd-0.9.4-msvc-warning.patch b/libwpd/libwpd-0.9.4-msvc-warning.patch
deleted file mode 100644
index ebe29c748b8f..000000000000
--- a/libwpd/libwpd-0.9.4-msvc-warning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-MSVC warning C4310: cast truncates constant value
-
-diff -ru foo/UnpackedTarball/wpd/src/lib/WP3PageFormatGroup.cpp wpd_fix/src/lib/WP3PageFormatGroup.cpp
---- foo/UnpackedTarball/wpd/src/lib/WP3PageFormatGroup.cpp	2011-10-28 15:37:47.000000000 +0200
-+++ foo/UnpackedTarball/wpd_fix/src/lib/WP3PageFormatGroup.cpp	2012-09-10 15:09:06.222400000 +0200
-@@ -56,6 +56,7 @@
- {
- 	// this group can contain different kinds of data, thus we need to read
- 	// the contents accordingly
-+	uint8_t tmpTmp = 0xff;
- 	int8_t tmpTabType = 0;
- 	double tmpTabPosition = 0.0;
- 	WPXTabStop tmpTabStop = WPXTabStop();
-@@ -93,8 +94,9 @@
- 
- 		m_isRelative = (readU8(input, encryption) & 0x01);
- 
--		while ((tmpTabType = (int8_t)readU8(input, encryption))  != (int8_t)0xff)
-+		while ((tmpTmp = readU8(input, encryption)) != 0xff)
- 		{
-+			tmpTabType = (int8_t) tmpTmp;
- 			if (input->atEOS())
- 				throw FileException();
- 			tmpTabPosition = fixedPointToDouble(readU32(input, encryption, true)) / 72.0;
diff --git a/libwpd/libwpd-0.9.4-warning.patch b/libwpd/libwpd-0.9.4-warning.patch
deleted file mode 100644
index d588e418f087..000000000000
--- a/libwpd/libwpd-0.9.4-warning.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- misc/libwpd-0.9.4/src/lib/WP6ContentListener.h
-+++ misc/build/libwpd-0.9.4/src/lib/WP6ContentListener.h
-@@ -53,7 +53,7 @@ const int STATE_MEMORY = 3;
- class WP6StyleStateSequence
- {
- public:
--	WP6StyleStateSequence() : m_stateSequence(), m_currentState(), m_previousState()
-+	WP6StyleStateSequence() : m_stateSequence()
- 	{
- 		clear();
- 	}
-@@ -64,11 +64,11 @@ public:
- 	}
- 	WP6StyleState getCurrentState() const
- 	{
--		return m_stateSequence[0]; /*currentState;*/
-+		return m_stateSequence[0];
- 	}
- 	WP6StyleState getPreviousState() const
- 	{
--		return m_stateSequence[1]; /*m_previousState;*/
-+		return m_stateSequence[1];
- 	}
- 	void clear()
- 	{
-@@ -78,8 +78,6 @@ public:
- 
- private:
- 	std::vector<WP6StyleState> m_stateSequence;
--	WP6StyleState m_currentState;
--	WP6StyleState m_previousState;
- };
- 
- typedef struct _WP6ContentParsingState WP6ContentParsingState;
---- misc/libwpd-0.9.4/src/lib/WP6OutlineStylePacket.cpp
-+++ misc/build/libwpd-0.9.4/src/lib/WP6OutlineStylePacket.cpp
-@@ -31,7 +31,6 @@
- WP6OutlineStylePacket::WP6OutlineStylePacket(WPXInputStream *input, WPXEncryption *encryption, int /* id */, uint32_t dataOffset, uint32_t dataSize) :
- 	WP6PrefixDataPacket(input, encryption),
- 	m_numPIDs(0),
--	m_nonDeletableInfoSize(0),
- 	m_outlineHash(0),
- 	m_outlineFlags(0),
- 	m_tabBehaviourFlag(0)
---- misc/libwpd-0.9.4/src/lib/WP6OutlineStylePacket.h
-+++ misc/build/libwpd-0.9.4/src/lib/WP6OutlineStylePacket.h
-@@ -40,7 +40,6 @@ public:
- 
- private:
- 	uint16_t m_numPIDs;
--	uint16_t m_nonDeletableInfoSize;
- 	uint16_t m_outlineHash;
- 	uint8_t m_numberingMethods[WP6_NUM_LIST_LEVELS];
- 	uint8_t m_outlineFlags;
---- misc/libwpd-0.9.4/src/lib/WP6PageGroup.cpp
-+++ misc/build/libwpd-0.9.4/src/lib/WP6PageGroup.cpp
-@@ -33,7 +33,6 @@
- WP6PageGroup::WP6PageGroup(WPXInputStream *input, WPXEncryption *encryption) :
- 	WP6VariableLengthGroup(),
- 	m_margin(0),
--	m_marginType(0),
- 	m_suppressedCode(0),
- 	m_pageNumberTypefaceDesc(0),
- 	m_pageNumberUseFlag(0x00),
---- misc/libwpd-0.9.4/src/lib/WP6PageGroup.h
-+++ misc/build/libwpd-0.9.4/src/lib/WP6PageGroup.h
-@@ -40,7 +40,6 @@ public:
- private:
- 	// variables needed for subgroup 0 and 1 (Left/Right Margin Set)
- 	uint16_t m_margin;
--	uint8_t m_marginType;
- 	// variables needed for subgroup 2 (suppress page characteristics)
- 	uint8_t m_suppressedCode;
- 	// variables needed for subgroup 3 (page number position)
diff --git a/libwpd/libwpd-0.9.4.patch b/libwpd/libwpd-0.9.4.patch
deleted file mode 100644
index e7892be1aaef..000000000000
--- a/libwpd/libwpd-0.9.4.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- misc/libwpd-0.9.4/src/lib/WPXBinaryData.cpp	2011-10-28 15:37:48.000000000 +0200
-+++ misc/build/libwpd-0.9.4/src/lib/WPXBinaryData.cpp	2012-06-09 00:02:43.293981048 +0200
-@@ -174,7 +174,14 @@
- const WPXInputStream *WPXBinaryData::getDataStream() const
- {
- 	if (m_binaryDataImpl->m_stream)
-+	{
- 		delete (m_binaryDataImpl->m_stream);
--	return ((m_binaryDataImpl->m_stream) = new WPXMemoryInputStream(&(m_binaryDataImpl->m_buf[0]), m_binaryDataImpl->m_buf.size()));
-+		m_binaryDataImpl->m_stream = 0;
-+	}
-+	if (m_binaryDataImpl->m_buf.empty())
-+		return 0;
-+	m_binaryDataImpl->m_stream = new WPXMemoryInputStream(&(m_binaryDataImpl->m_buf[0]), m_binaryDataImpl->m_buf.size());
-+	return m_binaryDataImpl->m_stream;
- }
-+
- /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */