summaryrefslogtreecommitdiff
path: root/converters/libwpd/patches
diff options
context:
space:
mode:
Diffstat (limited to 'converters/libwpd/patches')
-rw-r--r--converters/libwpd/patches/patch-aa20
-rw-r--r--converters/libwpd/patches/patch-src_lib_WPXStreamImplementation.cpp15
-rw-r--r--converters/libwpd/patches/patch-src_lib_wp6graphicsfilenamepacket_cpp16
3 files changed, 0 insertions, 51 deletions
diff --git a/converters/libwpd/patches/patch-aa b/converters/libwpd/patches/patch-aa
deleted file mode 100644
index a249e61c1a4..00000000000
--- a/converters/libwpd/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/03/18 20:41:50 rillig Exp $
-
-NetBSD 3.0 is missing the extern "C" around the definition of
-vsnprintf() in <stdio.h>. In NetBSD 4.99.4, it is fixed.
-
---- src/lib/WPXString.cpp.orig 2007-03-04 10:44:21.000000000 +0100
-+++ src/lib/WPXString.cpp 2007-03-18 21:29:54.000000000 +0100
-@@ -24,6 +24,12 @@
- * Corel Corporation or Corel Corporation Limited."
- */
-
-+#if defined(__NetBSD__)
-+extern "C" {
-+#include <stdio.h>
-+}
-+#endif
-+
- #include "WPXString.h"
- #include "libwpd_internal.h"
-
diff --git a/converters/libwpd/patches/patch-src_lib_WPXStreamImplementation.cpp b/converters/libwpd/patches/patch-src_lib_WPXStreamImplementation.cpp
deleted file mode 100644
index 69103156560..00000000000
--- a/converters/libwpd/patches/patch-src_lib_WPXStreamImplementation.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_lib_WPXStreamImplementation.cpp,v 1.2 2011/08/04 23:35:43 wiz Exp $
-
-http://bugzilla.abisource.com/show_bug.cgi?id=13127
-
---- src/lib/WPXStreamImplementation.cpp.orig 2011-02-04 19:44:52.000000000 +0000
-+++ src/lib/WPXStreamImplementation.cpp
-@@ -397,7 +397,7 @@ bool WPXStringStream::isOLEStream()
- WPXInputStream* WPXStringStream::getDocumentOLEStream(const char * name)
- {
- if (!d->buffer.good())
-- return false;
-+ return NULL;
-
- Storage *tmpStorage = new Storage( d->buffer );
- Stream tmpStream( tmpStorage, name );
diff --git a/converters/libwpd/patches/patch-src_lib_wp6graphicsfilenamepacket_cpp b/converters/libwpd/patches/patch-src_lib_wp6graphicsfilenamepacket_cpp
deleted file mode 100644
index 25f183db22e..00000000000
--- a/converters/libwpd/patches/patch-src_lib_wp6graphicsfilenamepacket_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_lib_wp6graphicsfilenamepacket_cpp,v 1.2 2011/08/04 23:35:43 wiz Exp $
-
-Fix bug, caught by clang.
-http://bugzilla.abisource.com/show_bug.cgi?id=13128
-
---- src/lib/WP6GraphicsFilenamePacket.cpp~ 2010-08-26 11:35:21.000000000 +0000
-+++ src/lib/WP6GraphicsFilenamePacket.cpp
-@@ -42,7 +42,7 @@ WP6GraphicsFilenamePacket::~WP6GraphicsF
-
- void WP6GraphicsFilenamePacket::_readContents(WPXInputStream *input, WPXEncryption *encryption)
- {
-- if ((m_flags && 0x01) == 0x00)
-+ if ((m_flags & 0x01) == 0x00)
- return;
- uint16_t tmpNumChildIds = readU16(input, encryption);
- for (uint16_t i = 0; i < tmpNumChildIds; i++)