libwpd/UnpackedTarball_wpd.mk | 3 +
libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch | 65 ++++++++++++++++++++++++
2 files changed, 68 insertions(+)
New commits:
commit b45834bf6479e614353e6ff19b2883bac5b5370f
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Sep 12 23:12:15 2012 +0100
WaE: with DEBUG defined
Change-Id: I2bf950b8ac644c911050ce01282ac988167d28f9
diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk
index ab48207..68d7bf1 100644
--- a/libwpd/UnpackedTarball_wpd.mk
+++ b/libwpd/UnpackedTarball_wpd.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,wpd,\
libwpd/libwpd-0.9.4.patch \
libwpd/libwpd-0.9.4-warning.patch \
libwpd/libwpd-0.9.4-msvc-warning.patch \
+ libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch \
))
# libwpd/libwpd-0.9.4-warning.patch: see upstream
# <http://libwpd.git.sourceforge.net/git/gitweb.cgi?p=libwpd/libwpd;a=commit;
@@ -23,5 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,wpd,\
# <http://libwpd.git.sourceforge.net/git/gitweb.cgi?p=libwpd/libwpd;a=commit;
# h=fb3827aeb5de64ed84eb1140bae9e32e50ca5133> "MSVC warning C4310: cast
# truncates constant value"
+# libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch
+# mailed to Fridrich cause there's no apparent way to submit a patch
# vim: set noet sw=4 ts=4:
diff --git a/libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch
b/libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch
new file mode 100644
index 0000000..beb606b
--- /dev/null
+++ b/libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch
@@ -0,0 +1,65 @@
+--- foo/UnpackedTarball/wpd/src/lib/WP6BoxGroup.cpp 2012-09-12
23:00:03.552693060 +0100
++++ foo/UnpackedTarball/wpd/src/lib/WP6BoxGroup.cpp 2012-09-12
23:00:41.293089947 +0100
+@@ -188,7 +188,7 @@
+ {
+ long tmpEndOfData = readU16(input, encryption) +
input->tell();
+ #ifdef DEBUG
+- uint16_t tmpOverrideFlags = readU16(input, encryption);
++ tmpOverrideFlags = readU16(input, encryption);
+ #else
+ readU16(input, encryption);
+ #endif
+@@ -199,7 +199,7 @@
+ {
+ long tmpEndOfData = readU16(input, encryption) +
input->tell();
+ #ifdef DEBUG
+- uint16_t tmpOverrideFlags = readU16(input, encryption);
++ tmpOverrideFlags = readU16(input, encryption);
+ #else
+ readU16(input, encryption);
+ #endif
+@@ -210,7 +210,7 @@
+ {
+ long tmpEndOfData = readU16(input, encryption) +
input->tell();
+ #ifdef DEBUG
+- uint16_t tmpOverrideFlags = readU16(input, encryption);
++ tmpOverrideFlags = readU16(input, encryption);
+ #else
+ readU16(input, encryption);
+ #endif
+@@ -221,7 +221,7 @@
+ {
+ long tmpEndOfData = readU16(input, encryption) +
input->tell();
+ #ifdef DEBUG
+- uint16_t tmpOverrideFlags = readU16(input, encryption);
++ tmpOverrideFlags = readU16(input, encryption);
+ #else
+ readU16(input, encryption);
+ #endif
+@@ -232,7 +232,7 @@
+ {
+ long tmpEndOfData = readU16(input, encryption) +
input->tell();
+ #ifdef DEBUG
+- uint16_t tmpOverrideFlags = readU16(input, encryption);
++ tmpOverrideFlags = readU16(input, encryption);
+ #else
+ readU16(input, encryption);
+ #endif
+@@ -247,7 +247,7 @@
+ {
+ long tmpEndOfData = readU16(input, encryption) +
input->tell();
+ #ifdef DEBUG
+- uint16_t tmpOverrideFlags = readU16(input, encryption);
++ tmpOverrideFlags = readU16(input, encryption);
+ #else
+ readU16(input, encryption);
+ #endif
+@@ -258,7 +258,7 @@
+ {
+ long tmpEndOfData = readU16(input, encryption) +
input->tell();
+ #ifdef DEBUG
+- uint16_t tmpOverrideFlags = readU16(input, encryption);
++ tmpOverrideFlags = readU16(input, encryption);
+ #else
+ readU16(input, encryption);
+ #endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
