[Libreoffice-commits] .: libwpd/libwpd-0.9.5-ABI.patch libwpd/UnpackedTarball_wpd.mk

[Libreoffice Gerrit user]

 libwpd/UnpackedTarball_wpd.mk |   10 ++++++++++
 libwpd/libwpd-0.9.5-ABI.patch |   22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

New commits:
commit 76d100d3bd78a10886a971c122da496e1a1b2c9e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Sep 24 14:40:02 2012 +0200

    Reverting libwpd 0.9.5 to 0.9.4 ABI
    
    Change-Id: I7056c68f87c88086ef8024b8284a734823e2f808

diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk
index d47f502..2383948 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 0000000..4998721
--- /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