diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-09-24 14:40:02 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-09-24 14:40:14 +0200 |
| commit | 76d100d3bd78a10886a971c122da496e1a1b2c9e (patch) | |
| tree | 27bee6ba64ccb785ea775b4abc864b6df708aedd /libwpd | |
| parent | 5e21ad82ef769b944927b498a196ec82476e17e8 (diff) | |
Reverting libwpd 0.9.5 to 0.9.4 ABI
Change-Id: I7056c68f87c88086ef8024b8284a734823e2f808
Diffstat (limited to 'libwpd')
| -rw-r--r-- | libwpd/UnpackedTarball_wpd.mk | 10 | ||||
| -rwxr-xr-x | libwpd/libwpd-0.9.5-ABI.patch | 22 |
2 files changed, 32 insertions, 0 deletions
diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk index d47f502c4c04..238394886f06 100644 --- a/libwpd/UnpackedTarball_wpd.mk +++ b/libwpd/UnpackedTarball_wpd.mk @@ -11,4 +11,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,wpd)) $(eval $(call gb_UnpackedTarball_set_tarball,wpd,$(WPD_TARBALL))) +$(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 + +$(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 new file mode 100755 index 000000000000..49987217b90e --- /dev/null +++ b/libwpd/libwpd-0.9.5-ABI.patch @@ -0,0 +1,22 @@ +--- 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 |