[Libreoffice-commits] .: libwpd/libwpd.gcc460.patch libwpd/makefile.mk

Caolán McNamara caolan at kemper.freedesktop.org
Mon Jan 24 06:53:57 PST 2011


 libwpd/libwpd.gcc460.patch |   11 +++++++++++
 libwpd/makefile.mk         |    1 +
 2 files changed, 12 insertions(+)

New commits:
commit 86f2c0ab8a55b31214f8fc04d8606b43ad14095b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 24 10:40:37 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/libwpd/libwpd.gcc460.patch b/libwpd/libwpd.gcc460.patch
new file mode 100644
index 0000000..e5e41a0
--- /dev/null
+++ b/libwpd/libwpd.gcc460.patch
@@ -0,0 +1,11 @@
+--- misc/libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h	2011-01-24 09:50:48.131106590 +0000
++++ misc/build/libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h	2011-01-24 09:51:17.676174074 +0000
+@@ -37,7 +37,7 @@
+ 	~WP5GraphicsInformationPacket();
+ 	void _readContents(WPXInputStream *input, WPXEncryption *encryption, uint32_t dataSize);
+ 	const std::vector<WPXBinaryData *> &getImages() const { return m_images; }
+-	const WPXBinaryData *getImage( unsigned long imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return NULL; }
++	const WPXBinaryData *getImage( unsigned long imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return 0; }
+ 
+ private:
+ 	std::vector<WPXBinaryData *> m_images;
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index 6ea63b1..40b186d 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -43,6 +43,7 @@ TARGET=wpd
 
 TARFILE_NAME=libwpd-0.9.1
 TARFILE_MD5=5ff846847dab351604ad859e2fd4ed3c
+PATCH_FILES=libwpd.gcc460.patch
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
 


More information about the Libreoffice-commits mailing list