libreoffice/0001-disable-libe-book-support.patch

146 lines
6.2 KiB
Diff
Raw Normal View History

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