summaryrefslogtreecommitdiff
path: root/libwps
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2012-05-31 14:38:23 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-05-31 14:46:36 +0200
commitdea03edc8a74c565b1332a192fced582f0a497ea (patch)
tree429de06d7772d46effd29d972f806c2f94d302c1 /libwps
parentb54499c33323000cab5e779a512c69c8fc8af626 (diff)
Uploading new libwps 0.2.7
Change-Id: I453b4c230a41500f59b1caa7e5567f80185b973a
Diffstat (limited to 'libwps')
-rw-r--r--libwps/libwps-0.2.6.patch27
-rw-r--r--libwps/makefile.mk7
2 files changed, 2 insertions, 32 deletions
diff --git a/libwps/libwps-0.2.6.patch b/libwps/libwps-0.2.6.patch
deleted file mode 100644
index 761fe576e5d7..000000000000
--- a/libwps/libwps-0.2.6.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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 044961158919..cea290effc2f 100644
--- a/libwps/makefile.mk
+++ b/libwps/makefile.mk
@@ -49,11 +49,8 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
.ENDIF
-TARFILE_NAME=libwps-0.2.6
-TARFILE_MD5=6f0d48db6e8a96d4c0eafb029ccc07b6
-
-PATCH_FILES=\
- $(TARFILE_NAME).patch
+TARFILE_NAME=libwps-0.2.7
+TARFILE_MD5=d197bd6211669a2fa4ca648faf04bcb1
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src/lib