diff --git a/0001-disable-libe-book-support.patch b/0001-disable-libe-book-support.patch index dcf1beb..dfb95ea 100644 --- a/0001-disable-libe-book-support.patch +++ b/0001-disable-libe-book-support.patch @@ -1,24 +1,24 @@ -From d5a09cb1c8f61e2cfc60d8a1dfe57c1ed0a45cdc Mon Sep 17 00:00:00 2001 +From 613af296887aede8f5b0fa6f94f7fb2781403ef2 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 21 Aug 2014 16:10:51 +0200 Subject: [PATCH] disable libe-book support Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4 --- - configure.ac | 6 ------ + configure.ac | 3 --- external/Module_external.mk | 1 - filter/Configuration_filter.mk | 8 -------- writerperfect/Library_wpftwriter.mk | 2 -- - writerperfect/qa/unit/WpftImportTestBase.hxx | 3 --- + writerperfect/qa/unit/WpftFilterFixture.hxx | 3 --- writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 ----- writerperfect/source/writer/wpftwriter.component | 5 ----- - 7 files changed, 30 deletions(-) + 7 files changed, 27 deletions(-) diff --git a/configure.ac b/configure.ac -index 5ec9ae6..7aed2ed 100644 +index ac8dbc5..bb08d21 100644 --- a/configure.ac +++ b/configure.ac -@@ -7796,9 +7796,6 @@ AS_IF([test "$COM" = "MSC"], +@@ -7696,9 +7696,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5]) libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) @@ -29,22 +29,22 @@ index 5ec9ae6..7aed2ed 100644 libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0]) diff --git a/external/Module_external.mk b/external/Module_external.mk -index 55fce1f..2f53503 100644 +index 590e216..8f19768 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk -@@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ +@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,CPPUNIT,cppunit) \ $(call gb_Helper_optional,CT2N,ct2n) \ $(call gb_Helper_optional,CURL,curl) \ - $(call gb_Helper_optional,EBOOK,libebook) \ $(call gb_Helper_optional,EPM,epm) \ $(call gb_Helper_optional,EPOXY,epoxy) \ - $(call gb_Helper_optional,ETONYEK,libetonyek) \ + $(call gb_Helper_optional,EPUBGEN,libepubgen) \ diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk -index 5dd20f7..d3dc749 100644 +index 7b39020..588fa01 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk -@@ -345,10 +345,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu +@@ -346,10 +346,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu writer_OOXML \ writer_OOXML_Template \ writer_layout_dump_xml \ @@ -55,7 +55,7 @@ index 5dd20f7..d3dc749 100644 writer_ApplePages \ MWAW_Text_Document \ Palm_Text_Document \ -@@ -390,10 +386,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters +@@ -394,10 +390,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters OOXML_Text \ OOXML_Text_Template \ writer_layout_dump \ @@ -67,30 +67,30 @@ index 5dd20f7..d3dc749 100644 MWAW_Text_Document \ Palm_Text_Document \ diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk -index 9ec43c4..48cbd52 100644 +index bf605e7..54a702e 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk -@@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ +@@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ $(eval $(call gb_Library_use_externals,wpftwriter,\ abw \ boost_headers \ - ebook \ + epubgen \ etonyek \ icu_headers \ - icui18n \ -@@ -65,7 +64,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\ +@@ -67,7 +66,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\ $(eval $(call gb_Library_add_exception_objects,wpftwriter,\ writerperfect/source/writer/AbiWordImportFilter \ - writerperfect/source/writer/EBookImportFilter \ - writerperfect/source/writer/MSWorksImportFilter \ - writerperfect/source/writer/MWAWImportFilter \ - writerperfect/source/writer/PagesImportFilter \ + writerperfect/source/writer/EPUBExportDialog \ + writerperfect/source/writer/EPUBExportFilter \ + writerperfect/source/writer/EPUBExportUIComponent \ diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx -index ce70172..d73d435 100644 +index 14ad4ea..63aff41 100644 --- a/writerperfect/qa/unit/WpftFilterFixture.hxx +++ b/writerperfect/qa/unit/WpftFilterFixture.hxx -@@ -29,9 +29,6 @@ +@@ -27,9 +27,6 @@ ((minor) > (req_minor) \ || ((minor) == (req_minor) && ((micro) >= (req_micro))))) @@ -101,7 +101,7 @@ index ce70172..d73d435 100644 REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro) diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx -index 99a6ab1..7de2c18 100644 +index 515a2b8..3180a99 100644 --- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx +++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx @@ -31,10 +31,6 @@ WpftWriterFilterTest::WpftWriterFilterTest() @@ -115,7 +115,7 @@ index 99a6ab1..7de2c18 100644 const writerperfect::test::WpftOptionalMap_t aEtonyekOptional { {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)}, -@@ -52,7 +48,6 @@ void WpftWriterFilterTest::test() +@@ -58,7 +54,6 @@ void WpftWriterFilterTest::test() }; doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/"); @@ -124,7 +124,7 @@ index 99a6ab1..7de2c18 100644 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); diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component -index 4c5f37f..d815802 100644 +index 8ab4366..2720023 100644 --- a/writerperfect/source/writer/wpftwriter.component +++ b/writerperfect/source/writer/wpftwriter.component @@ -38,11 +38,6 @@ @@ -140,5 +140,5 @@ index 4c5f37f..d815802 100644 constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation"> -- -2.9.3 +2.14.1