[Libreoffice-commits] core.git: download.lst external/libwps

[Sean Young]

 download.lst                                                         |    4 -
 external/libwps/0001-add-missing-include.patch                       |   30 ++++-----
 external/libwps/0001-error-atoi-was-not-declared-in-this-scope.patch |   33 ----------
 external/libwps/Library_wps.mk                                       |    1 
 external/libwps/UnpackedTarball_libwps.mk                            |    1 
 5 files changed, 18 insertions(+), 51 deletions(-)

New commits:
commit 7bbb14d6d617dcfd199d429b0cb964e372ed0c08
Author: Sean Young <sean at mess.org>
Date:   Mon Oct 5 11:56:42 2015 +0100

    libwps: new version 0.4.2
    
    Change-Id: Iefebbca7c67d7685213a96de15e3d448bf4162d6
    Reviewed-on: https://gerrit.libreoffice.org/19181
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/download.lst b/download.lst
index 4e329cf..6862cbf 100644
--- a/download.lst
+++ b/download.lst
@@ -151,8 +151,8 @@ export WPD_MD5SUM := 0773d79a1f240ef9f4f20242b13c5bb7
 export WPD_TARBALL := libwpd-0.10.0.tar.bz2
 export WPG_MD5SUM := 17da9770cb8b317b7633f9807b32b71a
 export WPG_TARBALL := libwpg-0.3.0.tar.bz2
-export WPS_MD5SUM := b510da17dabf97864f821a71f1fe9025
-export WPS_VERSION_MICRO := 1
+export WPS_MD5SUM := 8a6c55542ce80203dd6d3b1cba99d4e5
+export WPS_VERSION_MICRO := 2
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40
diff --git a/external/libwps/0001-add-missing-include.patch b/external/libwps/0001-add-missing-include.patch
index 842bcf5..9afe2aa 100644
--- a/external/libwps/0001-add-missing-include.patch
+++ b/external/libwps/0001-add-missing-include.patch
@@ -1,24 +1,24 @@
-From bc6f0f3a006123a89d1321038edeb75f2fd67c6f Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Sun, 30 Aug 2015 11:21:29 +0200
+From 53c03b23520005aac0fb9b3036a200d63c7a8f06 Mon Sep 17 00:00:00 2001
+From: Sean Young <sean at mess.org>
+Date: Tue, 6 Oct 2015 09:16:11 +0100
 Subject: [PATCH] add missing include
 
 ---
- src/lib/WPS8.cpp | 1 +
+ src/lib/MSWrite.cpp | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/src/lib/WPS8.cpp b/src/lib/WPS8.cpp
-index 04c1e57..8d39fa8 100644
---- a/src/lib/WPS8.cpp
-+++ b/src/lib/WPS8.cpp
-@@ -19,6 +19,7 @@
-  * applicable instead of those above.
-  */
+diff --git a/src/lib/MSWrite.cpp b/src/lib/MSWrite.cpp
+index 2bc2511..ab5fdd6 100644
+--- a/src/lib/MSWrite.cpp
++++ b/src/lib/MSWrite.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include "MSWrite.h"
  
 +#include <algorithm>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
+ #include <cstring>
+ 
+ namespace MSWriteParserInternal
 -- 
-2.4.3
+2.1.4
 
diff --git a/external/libwps/0001-error-atoi-was-not-declared-in-this-scope.patch b/external/libwps/0001-error-atoi-was-not-declared-in-this-scope.patch
deleted file mode 100644
index 0ebf066..0000000
--- a/external/libwps/0001-error-atoi-was-not-declared-in-this-scope.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From de94f4f83973df18a0cea257656c9cdc0fdd214b Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Mon, 31 Aug 2015 12:19:53 +0200
-Subject: [PATCH] error: 'atoi' was not declared in this scope
-
----
- src/lib/WPSOLEParser.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/WPSOLEParser.cpp b/src/lib/WPSOLEParser.cpp
-index 9a57341..ac564b4 100644
---- a/src/lib/WPSOLEParser.cpp
-+++ b/src/lib/WPSOLEParser.cpp
-@@ -64,6 +64,7 @@
-  * ------------------------------------------------------------
-  */
- 
-+#include <cstdlib>
- #include <cstring>
- #include <map>
- #include <sstream>
-@@ -296,7 +297,7 @@ bool WPSOLEParser::parse(RVNGInputStreamPtr file)
- 				std::string::size_type idP = pos-1;
- 				while (idP >=1 && dir[idP-1] >= '0' && dir[idP-1] <= '9')
- 					idP--;
--				int val = atoi(dir.substr(idP, idP-pos).c_str());
-+				int val = std::atoi(dir.substr(idP, idP-pos).c_str());
- 				if (id[0] == -1) id[0] = val;
- 				else
- 				{
--- 
-2.4.3
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 2af5340..337f862 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
 	UnpackedTarball/libwps/src/lib/LotusGraph \
 	UnpackedTarball/libwps/src/lib/LotusSpreadsheet \
 	UnpackedTarball/libwps/src/lib/LotusStyleManager \
+	UnpackedTarball/libwps/src/lib/MSWrite \
 	UnpackedTarball/libwps/src/lib/Quattro \
 	UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \
 	UnpackedTarball/libwps/src/lib/WKS4 \
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index ab31b8d..5fad6b6 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
 	external/libwps/0001-add-missing-include.patch \
-	external/libwps/0001-error-atoi-was-not-declared-in-this-scope.patch \
 	$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
 ))