From kde-commits  Sun Apr 05 03:33:05 2015
From: Inge Wallin <inge () lysator ! liu ! se>
Date: Sun, 05 Apr 2015 03:33:05 +0000
To: kde-commits
Subject: [calligra/frameworks] /: Readd FILTER_WMF_TO_SVG to the build.
Message-Id: <E1YebJ3-0004AK-5z () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=142820484610030

Git commit 3bbc86f96f23d5ec00cdb3454fb972495e0217bf by Inge Wallin.
Committed on 05/04/2015 at 03:32.
Pushed by ingwa into branch 'frameworks'.

Readd FILTER_WMF_TO_SVG to the build.

M  +1    -1    CalligraProducts.cmake
M  +3    -5    filters/karbon/wmf/CMakeLists.txt
M  +2    -2    filters/karbon/wmf/WmfImport.cpp

http://commits.kde.org/calligra/3bbc86f96f23d5ec00cdb3454fb972495e0217bf

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 10a9095..5c8f317 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -189,7 +189,7 @@ calligra_define_product(FILTER_KARBON_TO_IMAGE "Karbon =
image export filter" UNPO
 calligra_define_product(FILTER_KARBON_TO_SVG "Karbon SVG export filter" UN=
PORTED  REQUIRES APP_KARBON)
 calligra_define_product(FILTER_SVG_TO_KARBON "Karbon SVG import filter" UN=
PORTED  REQUIRES APP_KARBON)
 calligra_define_product(FILTER_KARBON_TO_WMF "Karbon WMF export filter" UN=
PORTED  REQUIRES APP_KARBON)
-calligra_define_product(FILTER_WMF_TO_SVG "WMF to SVG filter" UNPORTED  RE=
QUIRES LIB_KOVECTORIMAGE LIB_CALLIGRA)
+calligra_define_product(FILTER_WMF_TO_SVG "WMF to SVG filter" REQUIRES LIB=
_KOVECTORIMAGE LIB_CALLIGRA)
 calligra_define_product(FILTER_KARBON1X_TO_KARBON "Karbon 1.x import filte=
r"  REQUIRES APP_KARBON)
 =

 # meta apps
diff --git a/filters/karbon/wmf/CMakeLists.txt b/filters/karbon/wmf/CMakeLi=
sts.txt
index 9d9c6e1..21bdc5d 100644
--- a/filters/karbon/wmf/CMakeLists.txt
+++ b/filters/karbon/wmf/CMakeLists.txt
@@ -10,14 +10,12 @@ set(wmf2svg_PART_SRCS
 )
 =

 add_library(calligra_filter_wmf2svg MODULE ${wmf2svg_PART_SRCS})
-
 target_link_libraries(calligra_filter_wmf2svg kovectorimage komain koodf)
 =

-install(TARGETS calligra_filter_wmf2svg
-        DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_wmf2svg DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
+kcoreaddons_desktop_to_json(calligra_filter_wmf2svg calligra_filter_wmf2sv=
g.desktop)
 =

-install(FILES  calligra_filter_wmf2svg.desktop
-        DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+#install(FILES  calligra_filter_wmf2svg.desktop DESTINATION ${SERVICES_INS=
TALL_DIR}/calligra)
 =

 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
     install(FILES  karbon_wmf_thumbnail.desktop DESTINATION ${SERVICES_INS=
TALL_DIR})
diff --git a/filters/karbon/wmf/WmfImport.cpp b/filters/karbon/wmf/WmfImpor=
t.cpp
index df51e9f..087a209 100644
--- a/filters/karbon/wmf/WmfImport.cpp
+++ b/filters/karbon/wmf/WmfImport.cpp
@@ -30,8 +30,8 @@ DESCRIPTION
 =

 #include <QFile>
 =

-K_PLUGIN_FACTORY(WMFImportFactory, registerPlugin<WMFImport>();)
-K_EXPORT_PLUGIN(WMFImportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(WMFImportFactory, "calligra_filter_wmf2svg.json=
",
+			   registerPlugin<WMFImport>();)
 =

 =

 WMFImport::WMFImport(QObject *parent, const QVariantList&) :