[Libreoffice-commits] .: libwps/libwps-0.2.6.patch libwps/makefile.mk ooo.lst.in

[Fridrich Strba]

 libwps/libwps-0.2.6.patch |   27 ---------------------------
 libwps/makefile.mk        |    7 ++-----
 ooo.lst.in                |    2 +-
 3 files changed, 3 insertions(+), 33 deletions(-)

New commits:
commit dea03edc8a74c565b1332a192fced582f0a497ea
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu May 31 14:38:23 2012 +0200

    Uploading new libwps 0.2.7
    
    Change-Id: I453b4c230a41500f59b1caa7e5567f80185b973a

diff --git a/libwps/libwps-0.2.6.patch b/libwps/libwps-0.2.6.patch
deleted file mode 100644
index 761fe57..0000000
--- 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 0449611..cea290e 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
diff --git a/ooo.lst.in b/ooo.lst.in
index de264a8..4a91986 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -82,7 +82,7 @@ b99fb620b1324b4ce79ee6998b507146-JLanguageTool-1.4.0.tar.bz2
 71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
 c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
-6f0d48db6e8a96d4c0eafb029ccc07b6-libwps-0.2.6.tar.bz2
+d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz