configure.in | 2 libwpd/UnpackedTarball_wpd.mk | 14 +-- libwpd/libwpd-0.9.5-ABI.patch | 22 ----- libwpd/libwpd-0.9.5-msc.patch | 171 ------------------------------------------ 4 files changed, 6 insertions(+), 203 deletions(-)
New commits: commit 21ab2c6d992ff555bbcd2e03add21a743348659b Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Tue Sep 25 05:42:03 2012 +0200 Uploading libwpd 0.9.6 release Change-Id: I71a27d94b2e7097c73b633498181e54c15e14deb diff --git a/configure.in b/configure.in index 02ad841..81f8fa3 100644 --- a/configure.in +++ b/configure.in @@ -6780,7 +6780,7 @@ elif test $_os = iOS; then else AC_MSG_RESULT([internal]) SYSTEM_LIBWPD=NO - WPD_TARBALL=9a48f87fe205a5418aaa1a564c51e992-libwpd-0.9.5.tar.bz2 + WPD_TARBALL=e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2 fi AC_SUBST(SYSTEM_LIBWPD) AC_SUBST(WPD_CFLAGS) diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk index 61f0ffa..24e589c 100644 --- a/libwpd/UnpackedTarball_wpd.mk +++ b/libwpd/UnpackedTarball_wpd.mk @@ -11,16 +11,12 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,wpd)) $(eval $(call gb_UnpackedTarball_set_tarball,wpd,$(WPD_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,wpd,0)) +# $(eval $(call gb_UnpackedTarball_set_patchlevel,wpd,0)) -wpd_patches := -# By mistake libwpd-0.9.5 changed ABI, change back -wpd_patches += libwpd-0.9.5-ABI.patch -# Link the static library against the dll runtime and not the static one -wpd_patches += libwpd-0.9.5-msc.patch +# wpd_patches := -$(eval $(call gb_UnpackedTarball_add_patches,wpd,\ - $(foreach patch,$(wpd_patches),libwpd/$(patch)) \ -)) +# $(eval $(call gb_UnpackedTarball_add_patches,wpd,\ +# $(foreach patch,$(wpd_patches),libwpd/$(patch)) \ +# )) # vim: set noet sw=4 ts=4: diff --git a/libwpd/libwpd-0.9.5-ABI.patch b/libwpd/libwpd-0.9.5-ABI.patch deleted file mode 100755 index 4998721..0000000 --- a/libwpd/libwpd-0.9.5-ABI.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/lib/WPXPropertyList.cpp 2012-09-24 11:55:06.000000000 +0200 -+++ src/lib/WPXPropertyList.cpp 2012-09-24 14:25:10.401619900 +0200 -@@ -171,7 +171,7 @@ - m_mapImpl->remove(name); - } - --WPXPropertyList &WPXPropertyList::operator=(const WPXPropertyList &propList) -+const WPXPropertyList &WPXPropertyList::operator=(const WPXPropertyList &propList) - { - WPXPropertyList tmp(propList); - std::swap(m_mapImpl, tmp.m_mapImpl); ---- src/lib/WPXPropertyList.h 2012-09-24 13:48:08.667113100 +0200 -+++ src/lib/WPXPropertyList.h 2012-09-24 14:25:10.401619900 +0200 -@@ -50,7 +50,7 @@ - - void remove(const char *name); - const WPXProperty *operator[](const char *name) const; -- WPXPropertyList &operator=(const WPXPropertyList &propList); -+ const WPXPropertyList &operator=(const WPXPropertyList &propList); - void clear(); - - class Iter diff --git a/libwpd/libwpd-0.9.5-msc.patch b/libwpd/libwpd-0.9.5-msc.patch deleted file mode 100644 index d417687..0000000 --- a/libwpd/libwpd-0.9.5-msc.patch +++ /dev/null @@ -1,171 +0,0 @@ ---- build/win32/libwpd.vcproj -+++ build/win32/libwpd.vcproj -@@ -42,7 +42,7 @@ - Optimization="0" - PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS" - BasicRuntimeChecks="3" -- RuntimeLibrary="1" -+ RuntimeLibrary="3" - RuntimeTypeInfo="true" - PrecompiledHeaderFile=".\Debug/libwpd.pch" - AssemblerListingLocation=".\Debug/" -@@ -115,7 +115,7 @@ - InlineFunctionExpansion="1" - PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" -- RuntimeLibrary="0" -+ RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - RuntimeTypeInfo="true" - PrecompiledHeaderFile=".\Release/libwpd.pch" ---- build/win32/libwpdstream.vcproj -+++ build/win32/libwpdstream.vcproj -@@ -43,7 +43,7 @@ - InlineFunctionExpansion="1" - PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE" - StringPooling="true" -- RuntimeLibrary="0" -+ RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile=".\Release/libwpdstream.pch" - AssemblerListingLocation=".\Release/" -@@ -114,7 +114,7 @@ - Optimization="0" - PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" -- RuntimeLibrary="1" -+ RuntimeLibrary="3" - PrecompiledHeaderFile=".\Debug/libwpdstream.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" -diff --git a/build/win32/wpd2html.vcproj b/build/win32/wpd2html.vcproj -index a41eef2..bdc44cc 100644 ---- build/win32/wpd2html.vcproj -+++ build/win32/wpd2html.vcproj -@@ -46,7 +46,7 @@ - Optimization="4" - AdditionalIncludeDirectories="..\..\src\lib" - PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE" -- RuntimeLibrary="0" -+ RuntimeLibrary="2" - PrecompiledHeaderFile=".\Release/wpd2html.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" -@@ -134,7 +134,7 @@ - AdditionalIncludeDirectories="..\..\src\lib" - PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE" - BasicRuntimeChecks="3" -- RuntimeLibrary="1" -+ RuntimeLibrary="3" - PrecompiledHeaderFile=".\Debug/wpd2html.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" -diff --git a/build/win32/wpd2raw.vcproj b/build/win32/wpd2raw.vcproj -index a41318a..9a057e5 100644 ---- build/win32/wpd2raw.vcproj -+++ build/win32/wpd2raw.vcproj -@@ -47,7 +47,7 @@ - Optimization="4" - AdditionalIncludeDirectories="..\..\src\lib" - PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE" -- RuntimeLibrary="0" -+ RuntimeLibrary="2" - PrecompiledHeaderFile=".\Release/wpd2raw.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" -@@ -136,7 +136,7 @@ - AdditionalIncludeDirectories="..\..\src\lib" - PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE" - BasicRuntimeChecks="3" -- RuntimeLibrary="1" -+ RuntimeLibrary="3" - PrecompiledHeaderFile=".\Debug/wpd2raw.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" -diff --git a/build/win32/wpd2text.vcproj b/build/win32/wpd2text.vcproj -index 8c02ed1..f4ae836 100644 ---- build/win32/wpd2text.vcproj -+++ build/win32/wpd2text.vcproj -@@ -47,7 +47,7 @@ - AdditionalIncludeDirectories="..\..\src\lib" - PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE" - BasicRuntimeChecks="3" -- RuntimeLibrary="1" -+ RuntimeLibrary="3" - PrecompiledHeaderFile=".\Debug/wpd2text.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" -@@ -136,7 +136,7 @@ - Optimization="4" - AdditionalIncludeDirectories="..\..\src\lib" - PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE" -- RuntimeLibrary="0" -+ RuntimeLibrary="2" - PrecompiledHeaderFile=".\Release/wpd2text.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" ---- src/lib/WP6BoxGroup.cpp -+++ src/lib/WP6BoxGroup.cpp -@@ -304,8 +304,8 @@ void WP6BoxGroup::parse(WP6Listener *listener) - if (!m_nativeHeight && gbsPacket) - m_nativeHeight = gbsPacket->getNativeHeight(); - -- std::vector<uint16_t> graphicsDataIds; -- std::vector<uint16_t>::iterator gdiIter; -+ std::vector<unsigned> graphicsDataIds; -+ std::vector<unsigned>::iterator gdiIter; - WP6SubDocument *subDocument = 0; - - // Get the box content -@@ -389,7 +389,7 @@ void WP6BoxGroup::parse(WP6Listener *listener) - if (tmpContentType == 0x03) - { - for (gdiIter = graphicsDataIds.begin(); gdiIter != graphicsDataIds.end(); gdiIter++) -- listener->insertGraphicsData((*gdiIter)); -+ listener->insertGraphicsData(((uint16_t)*gdiIter)); - } - if ((tmpContentType == 0x01) && (subDocument)) - { ---- src/lib/WP6BoxGroup.h -+++ src/lib/WP6BoxGroup.h -@@ -28,7 +28,6 @@ - #define WP6BOXGROUP_H - - #include "WP6VariableLengthGroup.h" --#include <vector> - #include "libwpd_internal.h" - - class WPXInputStream; ---- src/lib/WP6GraphicsFilenamePacket.cpp -+++ src/lib/WP6GraphicsFilenamePacket.cpp -@@ -50,4 +50,9 @@ void WP6GraphicsFilenamePacket::_readContents(WPXInputStream *input, WPXEncrypti - m_childIds.push_back(readU16(input, encryption)); - } - -+const std::vector<unsigned> WP6GraphicsFilenamePacket::getChildIds() const -+{ -+ return m_childIds; -+} -+ - /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ ---- src/lib/WP6GraphicsFilenamePacket.h -+++ src/lib/WP6GraphicsFilenamePacket.h -@@ -39,16 +39,12 @@ public: - ~WP6GraphicsFilenamePacket(); - void _readContents(WPXInputStream *input, WPXEncryption *encryption); - void parse(WP6Listener * /*listener */) const {} -- const std::vector<uint16_t> &getChildIds() const -- { -- return m_childIds; -- } -- -+ const std::vector<unsigned> getChildIds() const; - - private: - WP6GraphicsFilenamePacket(const WP6GraphicsFilenamePacket &); - WP6GraphicsFilenamePacket &operator=(const WP6GraphicsFilenamePacket &); -- std::vector<uint16_t> m_childIds; -+ std::vector<unsigned> m_childIds; - const uint8_t m_flags; - - };
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits