diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-05-14 08:47:44 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-05-14 08:48:24 +0200 |
commit | 6afc233cd44a959f25ceaff4eb8bd5bf07731341 (patch) | |
tree | 86eed0bd4695af55ec485c8d03e198f4a0e96e48 /libwps | |
parent | dd49c193de9c4515335ad4a29778ceff225e3c38 (diff) |
Fix libwps debug build
Change-Id: I6482b0c1844578f67129e74ae64b981100924b90
Diffstat (limited to 'libwps')
-rw-r--r-- | libwps/libwps-0.2.6.patch | 27 | ||||
-rw-r--r-- | libwps/makefile.mk | 3 |
2 files changed, 30 insertions, 0 deletions
diff --git a/libwps/libwps-0.2.6.patch b/libwps/libwps-0.2.6.patch new file mode 100644 index 000000000000..761fe576e5d7 --- /dev/null +++ b/libwps/libwps-0.2.6.patch @@ -0,0 +1,27 @@ +--- misc/libwps-0.2.6/src/lib/WPS4.cpp 2012-05-13 23:10:44.000000000 +0200 ++++ misc/build/libwps-0.2.6/src/lib/WPS4.cpp 2012-05-14 08:44:20.720435146 +0200 +@@ -827,9 +827,9 @@ + { + std::bitset<8> b(s[i]); + r.append(b.to_string()); +- char buf[20]; +- sprintf(buf, "(%02u,0x%02x) ", (uint8_t)s[i],(uint8_t)s[i]); +- r.append(buf); ++ WPXString buf; ++ buf.sprintf("(%02u,0x%02x) ", (uint8_t)s[i],(uint8_t)s[i]); ++ r.append(buf.cstr()); + } + return r; + } +--- misc/libwps-0.2.6/src/lib/libwps_internal.h 2012-05-13 23:10:44.000000000 +0200 ++++ misc/build/libwps-0.2.6/src/lib/libwps_internal.h 2012-05-14 08:43:38.321547822 +0200 +@@ -25,6 +25,9 @@ + #include <libwpd-stream/libwpd-stream.h> + #include <libwpd/libwpd.h> + #include <string> ++#ifdef DEBUG ++#include <stdio.h> ++#endif + + #if defined(_MSC_VER) || defined(__DJGPP__) + typedef signed char int8_t; diff --git a/libwps/makefile.mk b/libwps/makefile.mk index dfd8662b6d73..044961158919 100644 --- a/libwps/makefile.mk +++ b/libwps/makefile.mk @@ -52,6 +52,9 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream TARFILE_NAME=libwps-0.2.6 TARFILE_MD5=6f0d48db6e8a96d4c0eafb029ccc07b6 +PATCH_FILES=\ + $(TARFILE_NAME).patch + BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src/lib |