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

[David Tardon]

 configure.ac                                                     |    2 +-
 download.lst                                                     |    4 ++--
 writerperfect/qa/unit/WpftImpressFilterTest.cxx                  |    1 +
 writerperfect/qa/unit/WpftWriterFilterTest.cxx                   |    1 +
 writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key |binary
 writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages  |binary
 6 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit aa3d62173be3b0621f87e77f34c65e59825a1a40
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Apr 21 20:48:16 2018 +0200

    upload libetonyek 0.1.8
    
    Change-Id: Id7c15e4ee902016dec70e44cd2495ee17fd6d263
    Reviewed-on: https://gerrit.libreoffice.org/53291
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/configure.ac b/configure.ac
index f52b0b2b0310..d0240806303f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7855,7 +7855,7 @@ libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
 libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.13])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.7])
+libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
 
 libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
 
diff --git a/download.lst b/download.lst
index 9e0e21fc3a16..3e9e1be3aa15 100644
--- a/download.lst
+++ b/download.lst
@@ -39,9 +39,9 @@ export EPM_SHA256SUM := b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export EPUBGEN_SHA256SUM := 730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633
 export EPUBGEN_TARBALL := libepubgen-0.1.0.tar.bz2
-export ETONYEK_SHA256SUM := 8a70cc83a9ee031444f9c891609b1cc11e20e2d6b41ae02d17d8f1ca8a68c4f2
+export ETONYEK_SHA256SUM := 9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d
 export ETONYEK_VERSION_MICRO := 8
-export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO)-snapshot1.tar.xz
+export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
 export EXPAT_SHA256SUM := d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
 export EXPAT_TARBALL := expat-2.2.5.tar.bz2
 export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index 261085f97cdf..4156f394665a 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -31,6 +31,7 @@ WpftImpressFilterTest::WpftImpressFilterTest()
 void WpftImpressFilterTest::test()
 {
     const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
+        { "Keynote_1.key", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
         { "v2.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
         { "v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
         { "v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4) },
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 0ec335da6c00..8bc4c7cadbb3 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -35,6 +35,7 @@ void WpftWriterFilterTest::test()
     };
     const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
         { "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) },
+        { "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
     };
     const writerperfect::test::WpftOptionalMap_t aMWAWOptional{
         { "MaxWrite_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) },
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key
new file mode 100644
index 000000000000..f59ccfab0595
Binary files /dev/null and b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key differ
diff --git a/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages b/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages
new file mode 100644
index 000000000000..cd4438a34b45
Binary files /dev/null and b/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages differ