[Libreoffice-commits] core.git: configure.ac download.lst external/libwps writerperfect/qa writerperfect/source

[David Tardon]

 configure.ac                                                   |    2 
 download.lst                                                   |    4 -
 external/libwps/0001-add-missing-include.patch                 |   24 ----------
 external/libwps/Library_wps.mk                                 |    1 
 external/libwps/UnpackedTarball_libwps.mk                      |    1 
 writerperfect/qa/unit/WpftWriterFilterTest.cxx                 |    1 
 writerperfect/qa/unit/data/writer/libwps/pass/Word_5.0_DOS.doc |binary
 writerperfect/source/writer/MSWorksImportFilter.cxx            |    1 
 8 files changed, 6 insertions(+), 28 deletions(-)

New commits:
commit 4db6402917bb5aecfb2bfc5fcd093abbb79a8ed3
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Feb 15 09:29:24 2016 +0100

    upload libwps 0.4.3
    
    Change-Id: I4f147c3d55de86eb4bd56bb4c728df19c925b376
    Reviewed-on: https://gerrit.libreoffice.org/22366
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/configure.ac b/configure.ac
index bf96369..5895855 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7842,7 +7842,7 @@ dnl ===================================================================
 dnl Check for system libwps
 dnl ===================================================================
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.2])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.3])
 
 dnl ===================================================================
 dnl Check for system libwpg
diff --git a/download.lst b/download.lst
index 815fba0..7bf361b 100644
--- a/download.lst
+++ b/download.lst
@@ -156,8 +156,8 @@ export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
 export WPG_MD5SUM := dfd066658ec9d2fb2262417039a8a1c3
 export WPG_VERSION_MICRO := 1
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
-export WPS_MD5SUM := 8a6c55542ce80203dd6d3b1cba99d4e5
-export WPS_VERSION_MICRO := 2
+export WPS_MD5SUM := 027fb17fb9e43553aa6624dc18f830ac
+export WPS_VERSION_MICRO := 3
 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
deleted file mode 100644
index 9afe2aa..0000000
--- a/external/libwps/0001-add-missing-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/MSWrite.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-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 <cstring>
- 
- namespace MSWriteParserInternal
--- 
-2.1.4
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 337f862..79e5774 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_add_defs,wps,\
 $(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))
 
 $(eval $(call gb_Library_add_generated_exception_objects,wps,\
+	UnpackedTarball/libwps/src/lib/DosWord \
 	UnpackedTarball/libwps/src/lib/Lotus \
 	UnpackedTarball/libwps/src/lib/LotusGraph \
 	UnpackedTarball/libwps/src/lib/LotusSpreadsheet \
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 754bd59..8551ef9 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
-	external/libwps/0001-add-missing-include.patch \
 	$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
 ))
 
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 9e8bd02..99a6ab1 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -47,6 +47,7 @@ void WpftWriterFilterTest::test()
     };
     const writerperfect::test::WpftOptionalMap_t aWpsOptional
     {
+        {"Word_5.0_DOS.doc", REQUIRE_WPS_VERSION(0, 4, 3)},
         {"Write_3.1.wri", REQUIRE_WPS_VERSION(0, 4, 2)},
     };
 
diff --git a/writerperfect/qa/unit/data/writer/libwps/pass/Word_5.0_DOS.doc b/writerperfect/qa/unit/data/writer/libwps/pass/Word_5.0_DOS.doc
new file mode 100644
index 0000000..5e5e459
Binary files /dev/null and b/writerperfect/qa/unit/data/writer/libwps/pass/Word_5.0_DOS.doc differ
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 06d2474..b08ddb3 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -92,6 +92,7 @@ bool MSWorksImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OU
         }
         else
         {
+            // NOTE: this handles MS Word for DOS too ATM
             rTypeName = "writer_MS_Write";
         }
         return true;