mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not require newest libe-book for build

Browse Source 
Change-Id: I4be3de970eabf00fd73b466adc15b6a84528a2d1
This commit is contained in:
David Tardon 2015-12-17 15:44:43 +01:00
parent 36b087f8b0
commit 22d0a7bf86
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config_host/config_writerperfect.h.in
View File

@ -12,6 +12,10 @@
* version. * version.
*/ */
#undef EBOOK_VERSION_MAJOR
#undef EBOOK_VERSION_MINOR
#undef EBOOK_VERSION_MICRO
#undef ETONYEK_VERSION_MAJOR #undef ETONYEK_VERSION_MAJOR
#undef ETONYEK_VERSION_MINOR #undef ETONYEK_VERSION_MINOR
#undef ETONYEK_VERSION_MICRO #undef ETONYEK_VERSION_MICRO

3
configure.ac
View File

@ -7702,7 +7702,8 @@ libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${
dnl =================================================================== dnl ===================================================================
dnl Check for system libe-book dnl Check for system libe-book
dnl =================================================================== dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1 >= 0.1.1]) libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
dnl =================================================================== dnl ===================================================================
dnl Check for system libetonyek dnl Check for system libetonyek

3
writerperfect/qa/unit/WpftImportTestBase.hxx
View File

@ -29,6 +29,9 @@
((minor) > (req_minor) \ ((minor) > (req_minor) \
|| ((minor) == (req_minor) && ((micro) >= (req_micro))))) || ((minor) == (req_minor) && ((micro) >= (req_micro)))))
#define REQUIRE_EBOOK_VERSION(major, minor, micro) \
REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, micro)
#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \ #define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro) REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro)

8
writerperfect/qa/unit/WpftWriterFilterTest.cxx
View File

@ -31,6 +31,10 @@ WpftWriterFilterTest::WpftWriterFilterTest()
void WpftWriterFilterTest::test() void WpftWriterFilterTest::test()
{ {
const writerperfect::test::WpftOptionalMap_t aEBookOptional
{
{"FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1)},
};
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
{ {
{"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)}, {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
@ -47,8 +51,8 @@ void WpftWriterFilterTest::test()
}; };
doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/"); doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/");
doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/"); doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/"); doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional); doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional);
doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional); doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional);
doTest("com.sun.star.comp.Writer.WordPerfectImportFilter", "/writerperfect/qa/unit/data/writer/libwpd/"); doTest("com.sun.star.comp.Writer.WordPerfectImportFilter", "/writerperfect/qa/unit/data/writer/libwpd/");