[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/frameworks] /: Readd the Words epub2 filter to the build.
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2015-04-03 22:43:49
Message-ID: E1YeAJZ-0002Jt-Ec () scm ! kde ! org
[Download RAW message or body]

Git commit 4281ed16af587a472b82e3cd2b9c73a0687536e6 by Inge Wallin.
Committed on 03/04/2015 at 22:43.
Pushed by ingwa into branch 'frameworks'.

Readd the Words epub2 filter to the build.

M  +1    -1    CalligraProducts.cmake
M  +2    -3    filters/words/epub/CMakeLists.txt
M  +4    -2    filters/words/epub/exportepub2.cpp

http://commits.kde.org/calligra/4281ed16af587a472b82e3cd2b9c73a0687536e6

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 4b50d8d..0bdef92 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -173,7 +173,7 @@ calligra_define_product(FILTER_ASCII_TO_WORDS "Words AS=
CII import filter" UNPORT
 calligra_define_product(FILTER_ODT_TO_ASCII "ODT to ASCII filter" REQUIRES=
 LIB_KOODFREADER LIB_CALLIGRA)
 calligra_define_product(FILTER_RTF_TO_ODT "RTF to ODT filter" UNPORTED  RE=
QUIRES LIB_CALLIGRA)
 calligra_define_product(FILTER_ODT_TO_MOBI "Mobi export filter" UNPORTED  =
REQUIRES LIB_CALLIGRA)
-calligra_define_product(FILTER_ODT_TO_EPUB2 "ODT Epub2 export filter" UNPO=
RTED  REQUIRES LIB_KOVECTORIMAGE LIB_CALLIGRA)
+calligra_define_product(FILTER_ODT_TO_EPUB2 "ODT Epub2 export filter" REQU=
IRES LIB_KOVECTORIMAGE LIB_CALLIGRA)
 calligra_define_product(FILTER_ODT_TO_HTML "ODT HTML export filter" REQUIR=
ES LIB_KOVECTORIMAGE LIB_CALLIGRA)
 calligra_define_product(FILTER_ODT_TO_WIKI "ODT Wiki export filter" UNPORT=
ED  REQUIRES LIB_KOODFREADER LIB_KOODF2 LIB_CALLIGRA)
 =

diff --git a/filters/words/epub/CMakeLists.txt b/filters/words/epub/CMakeLi=
sts.txt
index c8c1635..912c452 100644
--- a/filters/words/epub/CMakeLists.txt
+++ b/filters/words/epub/CMakeLists.txt
@@ -18,10 +18,10 @@ set(odt2epub2_PART_SRCS
 =

 add_library(calligra_filter_odt2epub2 MODULE ${odt2epub2_PART_SRCS})
 =

-target_link_libraries(calligra_filter_odt2epub2 kovectorimage komain)
+target_link_libraries(calligra_filter_odt2epub2 kovectorimage komain Qt5::=
Svg)
 =

 install(TARGETS calligra_filter_odt2epub2  DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
-install( FILES  calligra_filter_odt2epub2.desktop  DESTINATION ${SERVICES_=
INSTALL_DIR}/calligra)
+kcoreaddons_desktop_to_json(calligra_filter_odt2epub2 calligra_filter_odt2=
epub2.desktop)
 =

 endif()
 =

@@ -43,7 +43,6 @@ target_link_libraries(calligra_filter_odt2html kovectorim=
age komain Qt5::Svg)
 =

 install(TARGETS calligra_filter_odt2html  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 kcoreaddons_desktop_to_json(calligra_filter_odt2html calligra_filter_odt2h=
tml.desktop)
-install( PROGRAMS  calligra_filter_odt2html.desktop  DESTINATION ${XDG_APP=
S_INSTALL_DIR})
 =

 endif()
 =

diff --git a/filters/words/epub/exportepub2.cpp b/filters/words/epub/export=
epub2.cpp
index 7a78dca..5aa5242 100644
--- a/filters/words/epub/exportepub2.cpp
+++ b/filters/words/epub/exportepub2.cpp
@@ -54,9 +54,11 @@
 #include "SvmPainterBackend.h"
 =

 =

-K_PLUGIN_FACTORY(ExportEpub2Factory, registerPlugin<ExportEpub2>();)
-K_EXPORT_PLUGIN(ExportEpub2Factory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(ExportEpub2Factory, "calligra_filter_odt2epub2.=
json",
+			   registerPlugin<ExportEpub2>();)
 =

+// Needed to instantiate the plugin factory.
+#include "exportepub2.moc"
 =

 ExportEpub2::ExportEpub2(QObject *parent, const QVariantList&)
     : KoFilter(parent)
[prev in list] [next in list] [prev in thread] [next in thread]