|
 |
cd68053 |
From 0b613b941c3ffbe432934269f8865bc1f9e59cde Mon Sep 17 00:00:00 2001
|
|
|
cd68053 |
From: rpm-build <rpm-build>
|
|
|
cd68053 |
Date: Tue, 27 Sep 2022 15:13:59 -0700
|
|
 |
d0c0791 |
Subject: [PATCH] disable libe-book support
|
|
|
d0c0791 |
|
|
|
d0c0791 |
---
|
|
|
d559f87 |
configure.ac | 3 ---
|
|
|
f311720 |
external/Module_external.mk | 1 -
|
|
|
f311720 |
filter/Configuration_filter.mk | 8 --------
|
|
|
f311720 |
writerperfect/Library_wpftwriter.mk | 2 --
|
|
 |
95946f1 |
writerperfect/qa/unit/WpftFilterFixture.hxx | 4 ----
|
|
|
f311720 |
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 -----
|
|
|
cd68053 |
writerperfect/source/writer/wpftwriter.component | 6 ------
|
|
|
cd68053 |
7 files changed, 29 deletions(-)
|
|
|
d0c0791 |
|
|
|
d0c0791 |
diff --git a/configure.ac b/configure.ac
|
|
|
cd68053 |
index 8babc85..e7733de 100644
|
|
|
d0c0791 |
--- a/configure.ac
|
|
|
d0c0791 |
+++ b/configure.ac
|
|
|
cd68053 |
@@ -9606,9 +9606,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
|
|
|
4ff3659 |
|
|
|
4ff3659 |
libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
|
|
|
d0c0791 |
|
|
|
e469249 |
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
|
|
|
e469249 |
-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
|
|
|
d0c0791 |
-
|
|
|
4ff3659 |
libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
|
|
|
4ff3659 |
|
|
|
4ff3659 |
libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
|
|
|
1a5ee85 |
diff --git a/external/Module_external.mk b/external/Module_external.mk
|
|
|
cd68053 |
index 366fff2..bc987d1 100644
|
|
|
1a5ee85 |
--- a/external/Module_external.mk
|
|
|
1a5ee85 |
+++ b/external/Module_external.mk
|
|
|
cd68053 |
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
|
|
|
1a5ee85 |
$(call gb_Helper_optional,CURL,curl) \
|
|
|
cd68053 |
$(call gb_Helper_optional,DRAGONBOX,dragonbox) \
|
|
|
95946f1 |
dtoa \
|
|
|
1a5ee85 |
- $(call gb_Helper_optional,EBOOK,libebook) \
|
|
|
1a5ee85 |
$(call gb_Helper_optional,EPM,epm) \
|
|
 |
2126889 |
$(call gb_Helper_optional,EPOXY,epoxy) \
|
|
|
d559f87 |
$(call gb_Helper_optional,EPUBGEN,libepubgen) \
|
|
|
f5c2428 |
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
|
|
|
cd68053 |
index a58b839..526b447 100644
|
|
|
f5c2428 |
--- a/filter/Configuration_filter.mk
|
|
|
f5c2428 |
+++ b/filter/Configuration_filter.mk
|
|
|
cd68053 |
@@ -359,10 +359,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
|
|
|
f5c2428 |
writer_OOXML_Template \
|
|
|
f5c2428 |
writer_layout_dump_xml \
|
|
|
cd68053 |
writer_indexing_export_xml \
|
|
|
f5c2428 |
- writer_BroadBand_eBook \
|
|
|
f5c2428 |
- writer_FictionBook_2 \
|
|
|
f5c2428 |
- writer_PalmDoc \
|
|
|
f5c2428 |
- writer_Plucker_eBook \
|
|
|
a7b857d |
writer_ApplePages \
|
|
|
e469249 |
MWAW_Text_Document \
|
|
|
e469249 |
Palm_Text_Document \
|
|
|
cd68053 |
@@ -409,10 +405,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
|
|
|
f5c2428 |
OOXML_Text_Template \
|
|
|
f5c2428 |
writer_layout_dump \
|
|
|
cd68053 |
writer_indexing_export \
|
|
|
f5c2428 |
- BroadBand_eBook \
|
|
|
f5c2428 |
- FictionBook_2 \
|
|
|
f5c2428 |
- PalmDoc \
|
|
|
f5c2428 |
- Plucker_eBook \
|
|
|
a7b857d |
ApplePages \
|
|
|
e469249 |
MWAW_Text_Document \
|
|
|
e469249 |
Palm_Text_Document \
|
|
|
d0c0791 |
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
|
|
|
cd68053 |
index 840a86f..70a8933 100644
|
|
|
d0c0791 |
--- a/writerperfect/Library_wpftwriter.mk
|
|
|
d0c0791 |
+++ b/writerperfect/Library_wpftwriter.mk
|
|
|
cd68053 |
@@ -64,7 +64,6 @@ endif
|
|
|
d0c0791 |
$(eval $(call gb_Library_use_externals,wpftwriter,\
|
|
|
d0c0791 |
abw \
|
|
|
d0c0791 |
boost_headers \
|
|
|
d0c0791 |
- ebook \
|
|
|
cd68053 |
$(if $(ENABLE_WASM_STRIP_SWEXPORTS),,etonyek) \
|
|
|
4ff3659 |
icu_headers \
|
|
|
cd68053 |
icui18n \
|
|
|
cd68053 |
@@ -93,7 +92,6 @@ endif
|
|
|
cd68053 |
ifneq ($(ENABLE_WASM_STRIP_SWEXPORTS),TRUE)
|
|
|
d0c0791 |
$(eval $(call gb_Library_add_exception_objects,wpftwriter,\
|
|
|
d0c0791 |
writerperfect/source/writer/AbiWordImportFilter \
|
|
|
d0c0791 |
- writerperfect/source/writer/EBookImportFilter \
|
|
|
cd68053 |
writerperfect/source/writer/MSWorksImportFilter \
|
|
|
cd68053 |
writerperfect/source/writer/MWAWImportFilter \
|
|
|
cd68053 |
writerperfect/source/writer/PagesImportFilter \
|
|
|
8038f81 |
diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx
|
|
|
cd68053 |
index 2fdd6a2..dbdd672 100644
|
|
|
8038f81 |
--- a/writerperfect/qa/unit/WpftFilterFixture.hxx
|
|
|
8038f81 |
+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx
|
|
|
cd68053 |
@@ -25,10 +25,6 @@
|
|
|
95946f1 |
|| ((major) == (req_major) \
|
|
|
95946f1 |
&& ((minor) > (req_minor) || ((minor) == (req_minor) && ((micro) >= (req_micro)))))
|
|
|
1c6b9e3 |
|
|
|
95946f1 |
-#define REQUIRE_EBOOK_VERSION(major, minor, micro) \
|
|
|
95946f1 |
- REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, \
|
|
|
95946f1 |
- micro)
|
|
|
1c6b9e3 |
-
|
|
|
95946f1 |
#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
|
|
|
95946f1 |
REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, \
|
|
|
95946f1 |
minor, micro)
|
|
|
f5c2428 |
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
|
|
cd68053 |
index 78d24dc..39924f9 100644
|
|
|
f5c2428 |
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
|
|
f5c2428 |
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
|
|
95946f1 |
@@ -30,9 +30,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
|
|
|
1c6b9e3 |
|
|
|
1c6b9e3 |
void WpftWriterFilterTest::test()
|
|
|
1c6b9e3 |
{
|
|
|
95946f1 |
- const writerperfect::test::WpftOptionalMap_t aEBookOptional{
|
|
|
95946f1 |
- { "FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1) },
|
|
|
1c6b9e3 |
- };
|
|
|
95946f1 |
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
|
|
|
95946f1 |
{ "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) },
|
|
|
95946f1 |
{ "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
|
|
|
cd68053 |
@@ -59,8 +56,6 @@ void WpftWriterFilterTest::test()
|
|
|
e469249 |
|
|
|
95946f1 |
doTest("com.sun.star.comp.Writer.AbiWordImportFilter",
|
|
|
cd68053 |
u"/writerperfect/qa/unit/data/writer/libabw/");
|
|
|
95946f1 |
- doTest("org.libreoffice.comp.Writer.EBookImportFilter",
|
|
|
cd68053 |
- u"/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
|
|
|
95946f1 |
doTest("com.sun.star.comp.Writer.MSWorksImportFilter",
|
|
|
cd68053 |
u"/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
|
|
|
95946f1 |
doTest("com.sun.star.comp.Writer.MWAWImportFilter",
|
|
|
07cdfb9 |
diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
|
|
|
cd68053 |
index 176d487..0c89217 100644
|
|
|
07cdfb9 |
--- a/writerperfect/source/writer/wpftwriter.component
|
|
|
07cdfb9 |
+++ b/writerperfect/source/writer/wpftwriter.component
|
|
|
cd68053 |
@@ -42,12 +42,6 @@
|
|
|
07cdfb9 |
<service name="com.sun.star.document.ImportFilter"/>
|
|
|
cd68053 |
<optional/>
|
|
|
07cdfb9 |
</implementation>
|
|
|
f311720 |
-
|
|
|
f311720 |
- constructor="org_libreoffice_comp_Writer_EBookImportFilter_get_implementation">
|
|
|
07cdfb9 |
- <service name="com.sun.star.document.ExtendedTypeDetection"/>
|
|
|
07cdfb9 |
- <service name="com.sun.star.document.ImportFilter"/>
|
|
|
cd68053 |
- <optional/>
|
|
|
07cdfb9 |
- </implementation>
|
|
|
f311720 |
|
|
|
f311720 |
constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation">
|
|
|
a7b857d |
<service name="com.sun.star.document.ExtendedTypeDetection"/>
|
|
|
d0c0791 |
--
|
|
|
cd68053 |
2.31.1
|
|
|
d0c0791 |
|