calligra 2.9.2
authorYaakov Selkowitz <yselkowi@redhat.com>
Thu, 23 Apr 2015 06:39:42 +0000 (01:39 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Thu, 23 Apr 2015 06:39:42 +0000 (01:39 -0500)
2.3.83-as-needed.patch [deleted file]
2.3.83-cygwin-ctype.patch [deleted file]
2.9.2-as-needed.patch [new file with mode: 0644]
2.9.2-cygwin-gmic.patch [new file with mode: 0644]
2.9.2-cygwin-postgresql.patch [new file with mode: 0644]
calligra.cygport

diff --git a/2.3.83-as-needed.patch b/2.3.83-as-needed.patch
deleted file mode 100644 (file)
index 1bf6071..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-libmso is a static library and depends on other calligra shared libs
-
---- origsrc/calligra-2.3.83/filters/stage/powerpoint/CMakeLists.txt    2011-10-22 02:39:33.000000000 -0500
-+++ src/calligra-2.3.83/filters/stage/powerpoint/CMakeLists.txt        2011-11-02 16:53:33.109838700 -0500
-@@ -7,7 +7,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
- endif("${CMAKE_CXX_COMPILER_ID}" MATCHES "SunPro")
- kde4_add_library(ppttoodplib STATIC PptToOdp.cpp ParsedPresentation.cpp DateTimeFormat.cpp pptstyle.cpp)
--target_link_libraries(ppttoodplib koodf mso ${ZLIB_LIBRARIES})
-+target_link_libraries(ppttoodplib mso koodf ${ZLIB_LIBRARIES})
- kde4_add_executable(ppttoodp ppttoodpmain.cpp)
- target_link_libraries(ppttoodp ppttoodplib)
diff --git a/2.3.83-cygwin-ctype.patch b/2.3.83-cygwin-ctype.patch
deleted file mode 100644 (file)
index 1142335..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- origsrc/calligra-2.3.83/krita/image/kis_painter.cc 2011-10-22 02:39:33.000000000 -0500
-+++ src/calligra-2.3.83/krita/image/kis_painter.cc     2011-11-02 16:54:09.101500800 -0500
-@@ -65,6 +65,10 @@
- #include "kis_paintop_registry.h"
- #include "kis_perspective_math.h"
-+#ifdef __CYGWIN__
-+#undef _C
-+#endif
-+
- // Maximum distance from a Bezier control point to the line through the start
- // and end points for the curve to be considered flat.
- #define BEZIER_FLATNESS_THRESHOLD 0.5
diff --git a/2.9.2-as-needed.patch b/2.9.2-as-needed.patch
new file mode 100644 (file)
index 0000000..b82691a
--- /dev/null
@@ -0,0 +1,24 @@
+libmso is a static library and depends on other calligra shared libs
+
+--- origsrc/calligra-2.9.2/filters/stage/powerpoint/CMakeLists.txt     2015-04-22 11:24:06.508124400 -0500
++++ src/calligra-2.9.2/filters/stage/powerpoint/CMakeLists.txt 2015-04-21 17:56:43.099525000 -0500
+@@ -14,7 +14,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
+ endif()
+ kde4_add_library(ppttoodplib STATIC PptToOdp.cpp ParsedPresentation.cpp DateTimeFormat.cpp pptstyle.cpp)
+-target_link_libraries(ppttoodplib koodf mso ${ZLIB_LIBRARIES})
++target_link_libraries(ppttoodplib mso koodf ${ZLIB_LIBRARIES})
+ kde4_add_executable(ppttoodp ppttoodpmain.cpp)
+ target_link_libraries(ppttoodp ppttoodplib)
+--- origsrc/calligra-2.9.2/filters/words/msword-odf/CMakeLists.txt     2015-04-01 08:43:09.000000000 -0500
++++ src/calligra-2.9.2/filters/words/msword-odf/CMakeLists.txt 2015-04-22 10:46:11.670756700 -0500
+@@ -25,7 +25,7 @@ kde4_add_plugin(calligra_filter_doc2odt
+ #TODO cause of NumberFormatParser we depend on komsooxml. Fix that!
+ #target_link_libraries(calligra_filter_doc2odt kowv2 komain mso ${ZLIB_LIBRARIES})
+-target_link_libraries(calligra_filter_doc2odt kowv2 komain mso komsooxml ${ZLIB_LIBRARIES})
++target_link_libraries(calligra_filter_doc2odt mso kowv2 komain komsooxml ${ZLIB_LIBRARIES})
+ install(TARGETS calligra_filter_doc2odt  DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/2.9.2-cygwin-gmic.patch b/2.9.2-cygwin-gmic.patch
new file mode 100644 (file)
index 0000000..de5a44f
--- /dev/null
@@ -0,0 +1,12 @@
+--- origsrc/calligra-2.9.2/krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h  2015-04-01 08:27:04.000000000 -0500
++++ src/calligra-2.9.2/krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h      2015-04-22 00:05:19.418440800 -0500
+@@ -37388,6 +37388,9 @@ namespace cimg_library_suffixed {
+             if (is_axes) { if (visible_cursor) { disp.hide_mouse(); visible_cursor = false; }}
+             else { if (!visible_cursor) { disp.show_mouse(); visible_cursor = true; }}
+             const int d = (depth()>1)?depth():0;
++#undef _X
++#undef _Y
++#undef _Z
+             int
+               _X = (int)X, _Y = (int)Y, _Z = (int)Z,
+               w = disp.width(), W = width() + d,
diff --git a/2.9.2-cygwin-postgresql.patch b/2.9.2-cygwin-postgresql.patch
new file mode 100644 (file)
index 0000000..14415aa
--- /dev/null
@@ -0,0 +1,21 @@
+postgresql headers include a #define rename(x, y) which conflicts with a
+single arg rename() function declaration in Qt headers
+
+--- origsrc/calligra-2.9.2/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp 2015-04-01 08:27:01.000000000 -0500
++++ src/calligra-2.9.2/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp     2015-04-22 09:35:46.965287200 -0500
+@@ -17,7 +17,6 @@
+  * Boston, MA 02110-1301, USA.
+ */
+-#include "pqxxconnection.h"
+ #include <QVariant>
+ #include <QFile>
+ #include <kdebug.h>
+@@ -25,6 +24,7 @@
+ #include <db/global.h>
+ #include <klocale.h>
+ #include <string>
++#include "pqxxconnection.h"
+ #include "pqxxpreparedstatement.h"
+ #include "pqxxconnection_p.h"
+ using namespace KexiDB;
index ce4dd5d3d51c2fe90f5142333ee39a3944fdb0d0..98e4ffe380d6354aa6bc0082c33e6efcad8c6132 100644 (file)
@@ -1,30 +1,30 @@
 inherit kde4 python
 
 NAME="calligra"
-VERSION=2.8.7
+VERSION=2.9.2
 RELEASE=1
 CATEGORY="Office"
 SUMMARY="KDE integrated office suite"
 HOMEPAGE="http://www.calligra-suite.org/"
 SRC_URI="mirror://kde/stable/calligra-${VERSION}/calligra-${VERSION}.tar.xz"
-
 PATCH_URI="
-       2.3.83-as-needed.patch
-       2.3.83-cygwin-ctype.patch
+       http://pkgs.fedoraproject.org/cgit/calligra.git/plain/fix_csv_import.patch
+       2.9.2-as-needed.patch
        2.3.83-find-librcps.patch
        2.8.7-qml-module.patch
+       2.9.2-cygwin-gmic.patch
+       2.9.2-cygwin-postgresql.patch
 "
 
 PKG_NAMES="calligra-libs calligra-data calligra-devel calligra-flow
           calligra-plan calligra-sheets calligra-stage calligra-tools
-          calligra-words braindump karbon kexi krita okular-odp"
+          calligra-words braindump karbon kexi krita okular-calligra"
 # the entire suite, except for -devel
 calligra_REQUIRES="calligra-flow calligra-plan calligra-stage calligra-sheets calligra-words calligra-tools braindump karbon kexi krita"
 calligra_data_SUMMARY="Calligra Suite (common data)"
 calligra_data_CONTENTS="
        etc/postinstall/
        usr/share/applications/kde4/calligra.desktop
-       usr/share/color/icc/pigment/
        usr/share/doc/HTML/en/calligra/
        usr/share/doc/calligra/
        usr/share/icons/oxygen/
@@ -46,11 +46,12 @@ calligra_libs_CONTENTS="
        usr/bin/cygkformdesigner-*.dll
        usr/bin/cygkformula-*.dll
        usr/bin/cygko*-*.dll
-       usr/bin/cygkrita*-*.dll
+       usr/bin/cygkrita*.dll
        usr/bin/cygkundo2-*.dll
        usr/bin/cygRtfReader-*.dll
        usr/bin/cygwordsprivate-*.dll
        usr/bin/cygpigmentcms-*.dll
+       usr/lib/calligra/imports/org/calligra/CalligraComponents
        usr/lib/kde4/calligra_docker_*.dll
        usr/lib/kde4/calligra_shape_*.dll
        usr/lib/kde4/calligra_textediting_*.dll
@@ -66,16 +67,16 @@ calligra_libs_CONTENTS="
        usr/share/kde4/apps/formulashape/
        usr/share/kde4/apps/koproperty/
        usr/share/kde4/apps/musicshape/
-       usr/share/kde4/services/calligra_docker_*.desktop
        usr/share/kde4/services/calligra_odg_thumbnail.desktop
-       usr/share/kde4/services/calligra_shape_*.desktop
-       usr/share/kde4/services/calligra_textediting_*.desktop
-       usr/share/kde4/services/calligra_textinlineobject_*.desktop
-       usr/share/kde4/services/calligra_tool_*.desktop
-       usr/share/kde4/services/calligradocinfopropspage.desktop
-       usr/share/kde4/services/kformulapart.desktop
-       usr/share/kde4/services/kolcmsengine.desktop
-       usr/share/kde4/services/kopabackgroundtool.desktop
+       usr/share/kde4/services/calligra/calligra_docker_*.desktop
+       usr/share/kde4/services/calligra/calligra_shape_*.desktop
+       usr/share/kde4/services/calligra/calligra_textediting_*.desktop
+       usr/share/kde4/services/calligra/calligra_textinlineobject_*.desktop
+       usr/share/kde4/services/calligra/calligra_tool_*.desktop
+       usr/share/kde4/services/calligra/calligradocinfopropspage.desktop
+       usr/share/kde4/services/calligra/kformulapart.desktop
+       usr/share/kde4/services/calligra/kolcmsengine.desktop
+       usr/share/kde4/services/calligra/kopabackgroundtool.desktop
        usr/share/kde4/services/calligra/koreport_*plugin.desktop
        usr/share/kde4/servicetypes/calligradb_driver.desktop
        usr/share/kde4/servicetypes/calligradocker.desktop
@@ -89,6 +90,7 @@ calligra_libs_CONTENTS="
        usr/share/kde4/servicetypes/flakeshape.desktop
        usr/share/kde4/servicetypes/flaketool.desktop
        usr/share/kde4/servicetypes/inlinetextobject.desktop
+       usr/share/kde4/servicetypes/kopa_tool.desktop
        usr/share/kde4/servicetypes/koreport_itemplugin.desktop
        usr/share/kde4/servicetypes/pigment.desktop
        usr/share/kde4/servicetypes/pigmentextension.desktop
@@ -100,12 +102,10 @@ calligra_libs_CONTENTS="
 calligra_devel_SUMMARY="Calligra Suite libraries (development)"
 calligra_devel_CONTENTS="
        usr/include/kde4/calligra/
-       usr/include/kde4/kexi/
        usr/include/kde4/krita/
        usr/include/kde4/sheets/
        usr/include/kde4/stage/
        usr/include/kde4/words/
-       usr/include/kde4/KoPABackgroundTool.h
        usr/lib/libbasicflakes.dll.a
        usr/lib/libcalligradb.dll.a
        usr/lib/libcalligrakdchart.dll.a
@@ -126,9 +126,16 @@ calligra_devel_CONTENTS="
 calligra_active_SUMMARY="Calligra Suite Active Plasma interface"
 calligra_active_CONTENTS="
        usr/bin/calligraactive.exe
-       usr/share/applications/calligraactive.desktop
+       usr/share/applications/kde4/calligraactive.desktop
        usr/share/calligraactive/
 "
+calligra_gemini_CONTENTS="
+       usr/bin/calligragemini*
+       usr/lib/calligra/imports/Calligra/Gemini/
+       usr/share/applications/kde4/calligragemini.desktop
+       usr/share/icons/hicolor/*/apps/calligragemini.*
+       usr/share/kde4/apps/calligragemini/
+"
 calligra_flow_SUMMARY="KDE diagram and flowchart editor (aka Kivio)"
 calligra_flow_CONTENTS="
        etc/postinstall/
@@ -139,15 +146,17 @@ calligra_flow_CONTENTS="
        usr/lib/kde4/calligra_filter_wpg2odg.dll
        usr/lib/kde4/flowdockersplugin.dll
        usr/lib/kde4/flowpart.dll
+       usr/share/appdata/flow.appdata.xml
        usr/share/applications/kde4/flow.desktop
        usr/share/doc/calligra-flow/
        usr/share/icons/hicolor/*/apps/calligraflow.*
        usr/share/kde4/apps/flow/
        usr/share/kde4/config/flowrc
        usr/share/kde4/config/flow_stencils.knsrc
-       usr/share/kde4/services/ServiceMenus/flow_print.desktop
-       usr/share/kde4/services/calligra_filter_vsdx2odg.desktop
-       usr/share/kde4/services/calligra_filter_wpg2odg.desktop
+       usr/share/kde4/services/ServiceMenus/calligra/flow_print.desktop
+       usr/share/kde4/services/calligra/calligra_filter_vsdx2odg.desktop
+       usr/share/kde4/services/calligra/calligra_filter_wpg2odg.desktop
+       usr/share/kde4/services/calligra/flow*
        usr/share/kde4/services/flow*
        usr/share/kde4/servicetypes/flow_dock.desktop
 "
@@ -166,6 +175,7 @@ calligra_plan_CONTENTS="
        usr/lib/libkplato*
        usr/lib/libplan*
        usr/lib/librcps_plan.dll.a
+       usr/share/appdata/plan.appdata.xml
        usr/share/applications/kde4/plan*
        usr/share/doc/calligra-plan/
        usr/share/icons/hicolor/*/apps/calligraplan*
@@ -174,9 +184,9 @@ calligra_plan_CONTENTS="
        usr/share/kde4/apps/plan*/
        usr/share/kde4/config/plan*
        usr/share/kde4/config.kcfg/plan*
-       usr/share/kde4/services/calligra_filter_*2plan.desktop
-       usr/share/kde4/services/krossmoduleplan.desktop
-       usr/share/kde4/services/plan*
+       usr/share/kde4/services/calligra/calligra_filter_*2plan.desktop
+       usr/share/kde4/services/calligra/krossmoduleplan.desktop
+       usr/share/kde4/services/calligra/plan*
        usr/share/kde4/servicetypes/plan_*.desktop
        usr/share/mime/packages/calligra_planner_mpp.xml
 "
@@ -195,6 +205,7 @@ calligra_sheets_CONTENTS="
        usr/lib/kde4/krossmodulesheets.dll
        usr/lib/kde4/kspread*
        usr/lib/kde4/sheetssolver.dll
+       usr/share/appdata/sheets.appdata.xml
        usr/share/applications/kde4/sheets.desktop
        usr/share/doc/calligra-sheets/
        usr/share/doc/HTML/en/sheets/
@@ -202,15 +213,16 @@ calligra_sheets_CONTENTS="
        usr/share/kde4/apps/sheets/
        usr/share/kde4/config/sheetsrc
        usr/share/kde4/config.kcfg/sheets.kcfg
-       usr/share/kde4/services/ServiceMenus/sheets_print.desktop
-       usr/share/kde4/services/calligra_filter_*2kspread.desktop
-       usr/share/kde4/services/calligra_filter_*2ods.desktop
-       usr/share/kde4/services/calligra_filter_*2sheets.desktop
-       usr/share/kde4/services/calligra_filter_kspread2*.desktop
-       usr/share/kde4/services/calligra_filter_sheets2*.desktop
-       usr/share/kde4/services/calligra_shape_spreadsheet*.desktop
-       usr/share/kde4/services/krossmodulesheets.desktop
-       usr/share/kde4/services/kspread*
+       usr/share/kde4/services/ServiceMenus/calligra/sheets_print.desktop
+       usr/share/kde4/services/calligra/calligra_filter_*2kspread.desktop
+       usr/share/kde4/services/calligra/calligra_filter_*2ods.desktop
+       usr/share/kde4/services/calligra/calligra_filter_*2sheets.desktop
+       usr/share/kde4/services/calligra/calligra_filter_kspread2*.desktop
+       usr/share/kde4/services/calligra/calligra_filter_sheets2*.desktop
+       usr/share/kde4/services/calligra/calligra_shape_spreadsheet*.desktop
+       usr/share/kde4/services/calligra/krossmodulesheets.desktop
+       usr/share/kde4/services/calligra/kspread*
+       usr/share/kde4/services/calligra/sheets*.desktop
        usr/share/kde4/services/sheets*.desktop
        usr/share/kde4/servicetypes/sheets_*.desktop
        usr/share/templates/.source/SpreadSheet.ods
@@ -225,6 +237,7 @@ calligra_stage_CONTENTS="
        usr/lib/kde4/calligrastage*
        usr/lib/kde4/kprvariables.dll
        usr/lib/kde4/kpr_*
+       usr/share/appdata/stage.appdata.xml
        usr/share/applications/kde4/stage.desktop
        usr/share/doc/HTML/en/stage/
        usr/share/doc/calligra-stage/
@@ -234,13 +247,14 @@ calligra_stage_CONTENTS="
        usr/share/icons/hicolor/*/apps/calligrastage.*
        usr/share/kde4/apps/stage/
        usr/share/kde4/config/stagerc
-       usr/share/kde4/services/ServiceMenus/stage_print.desktop
-       usr/share/kde4/services/calligra_filter_*2odp.desktop
-       usr/share/kde4/services/calligrastage*
-       usr/share/kde4/services/kpr*
+       usr/share/kde4/services/ServiceMenus/calligra/stage_print.desktop
+       usr/share/kde4/services/calligra/calligra_filter_*2odp.desktop
+       usr/share/kde4/services/calligra/calligrastage*
+       usr/share/kde4/services/calligra/kpr*
+       usr/share/kde4/services/calligra/stagepart.desktop
        usr/share/kde4/services/stage_*
-       usr/share/kde4/services/stagepart.desktop
        usr/share/kde4/servicetypes/kpr_*
+       usr/share/mime/packages/x-iwork-keynote-sffkey.xml
        usr/share/templates/.source/Presentation.odp
        usr/share/templates/Presentation.desktop
 "
@@ -264,6 +278,7 @@ calligra_words_CONTENTS="
        usr/lib/kde4/calligra_filter_*2words.dll
        usr/lib/kde4/calligra_filter_odt2*.dll
        usr/lib/kde4/wordspart.dll
+       usr/share/appdata/words.appdata.xml
        usr/share/applications/kde4/author.desktop
        usr/share/applications/kde4/calligrawords_ascii.desktop
        usr/share/applications/kde4/words.desktop
@@ -274,12 +289,15 @@ calligra_words_CONTENTS="
        usr/share/kde4/apps/words/
        usr/share/kde4/config/authorrc
        usr/share/kde4/config/wordsrc
-       usr/share/kde4/services/ServiceMenus/words_print.desktop
-       usr/share/kde4/services/authorpart.desktop
-       usr/share/kde4/services/calligra_filter_*2odt.desktop
-       usr/share/kde4/services/calligra_filter_*2words.desktop
-       usr/share/kde4/services/calligra_filter_odt2*.desktop
+       usr/share/kde4/services/ServiceMenus/calligra/words_print.desktop
+       usr/share/kde4/services/calligra/authorpart.desktop
+       usr/share/kde4/services/calligra/calligra_filter_*2odt.desktop
+       usr/share/kde4/services/calligra/calligra_filter_*2words.desktop
+       usr/share/kde4/services/calligra/calligra_filter_odt2*.desktop
+       usr/share/kde4/services/calligra/words*
+       usr/share/kde4/services/calligra_filter_odt2wiki.desktop
        usr/share/kde4/services/words*
+       usr/share/mime/packages/wiki-format.xml
        usr/share/templates/.source/TextDocument.odt
        usr/share/templates/TextDocument.desktop
 "
@@ -289,13 +307,14 @@ braindump_CONTENTS="
        usr/bin/braindump.exe
        usr/bin/cygbraindumpcore-*.dll
        usr/lib/kde4/braindump*
+       usr/share/appdata/braindump.appdata.xml
        usr/share/applications/kde4/braindump.desktop
        usr/share/icons/hicolor/*/actions/stateshape.*
        usr/share/icons/hicolor/*/actions/statetool.*
        usr/share/icons/hicolor/*/apps/braindump.*
        usr/share/kde4/apps/braindump/
        usr/share/kde4/apps/stateshape/
-       usr/share/kde4/services/braindump_*.desktop
+       usr/share/kde4/services/calligra/braindump_*.desktop
        usr/share/kde4/servicetypes/braindump_extensions.desktop
 "
 karbon_SUMMARY="KDE SVG drawing application"
@@ -309,16 +328,18 @@ karbon_CONTENTS="
        usr/lib/kde4/calligra_filter_svg2karbon.dll
        usr/lib/kde4/calligra_filter_xfig2odg.dll
        usr/lib/kde4/karbon*
+       usr/share/appdata/karbon.appdata.xml
        usr/share/applications/kde4/karbon.desktop
        usr/share/doc/karbon/
        usr/share/icons/hicolor/*/apps/calligrakarbon.*
        usr/share/kde4/apps/karbon/
        usr/share/kde4/config/karbonrc
-       usr/share/kde4/services/ServiceMenus/karbon_print.desktop
-       usr/share/kde4/services/calligra_filter_karbon*.desktop
-       usr/share/kde4/services/calligra_filter_[^k]*2svg*.desktop
-       usr/share/kde4/services/calligra_filter_svg*2karbon.desktop
-       usr/share/kde4/services/calligra_filter_xfig2odg.desktop
+       usr/share/kde4/services/ServiceMenus/calligra/karbon_print.desktop
+       usr/share/kde4/services/calligra/calligra_filter_karbon*.desktop
+       usr/share/kde4/services/calligra/calligra_filter_[^k]*2svg*.desktop
+       usr/share/kde4/services/calligra/calligra_filter_svg*2karbon.desktop
+       usr/share/kde4/services/calligra/calligra_filter_xfig2odg.desktop
+       usr/share/kde4/services/calligra/karbon*
        usr/share/kde4/services/karbon*
        usr/share/kde4/servicetypes/karbon_*
        usr/share/templates/.source/Illustration.odg
@@ -331,6 +352,7 @@ kexi_CONTENTS="
        usr/lib/kde4/kexi*
        usr/lib/kde4/kformdesigner_*
        usr/lib/kde4/krossmodulekexidb.dll
+       usr/share/appdata/kexi.appdata.xml
        usr/share/applications/kde4/kexi.desktop
        usr/share/doc/HTML/en/kexi/
        usr/share/doc/kexi/
@@ -345,33 +367,43 @@ kexi_CONTENTS="
 krita_SUMMARY="KDE layered pixel image editing program"
 krita_CONTENTS="
        etc/postinstall/
-       usr/bin/cygkdeinit4_krita.dll
-       usr/bin/cygkritasketchlib.dll
        usr/bin/gmicparser.exe
        usr/bin/krita*.exe
        usr/lib/calligra/imports/org/krita/
        usr/lib/kde4/krita*
+       usr/lib/kde4/plugins/imageformats/kimg_kra.dll
+       usr/lib/kde4/plugins/imageformats/kimg_ora.dll
        usr/share/appdata/krita.appdata.xml
        usr/share/applications/kde4/krita*
        usr/share/color/icc/krita/
        usr/share/doc/krita/
        usr/share/icons/hicolor/*/apps/calligrakrita.*
+       usr/share/icons/hicolor/*/apps/kritasketch.*
        usr/share/kde4/apps/krita*/
        usr/share/kde4/apps/color-schemes/Krita*
        usr/share/kde4/config/krita*
-       usr/share/kde4/services/ServiceMenus/krita_print.desktop
+       usr/share/kde4/services/ServiceMenus/calligra/krita_print.desktop
+       usr/share/kde4/services/calligra/krita*
        usr/share/kde4/services/krita*
+       usr/share/kde4/services/qimageioplugins/kra.desktop
+       usr/share/kde4/services/qimageioplugins/ora.desktop
        usr/share/kde4/servicetypes/krita*
        usr/share/mime/packages/krita*.xml
 "
-okular_odp_SUMMARY="Okular OpenDocument Presentation plugin"
-okular_odp_CONTENTS="
-       usr/lib/kde4/okularGenerator_odp.dll
-       usr/share/applications/kde4/okularApplication_odp.desktop
-       usr/share/kde4/services/libokularGenerator_odp.desktop
-       usr/share/kde4/services/okularOdp.desktop
+okular_calligra_SUMMARY="Okular office document format plugins"
+okular_calligra_OBSOLETES="okular-odp"
+okular_calligra_CONTENTS="
+       usr/lib/kde4/okularGenerator_*.dll
+       usr/share/applications/kde4/okularApplication_*.desktop
+       usr/share/kde4/services/calligra/libokularGenerator_*.desktop
+       usr/share/kde4/services/calligra/okular*.desktop
+       usr/share/kde4/services/libokularGenerator_*.desktop
+       usr/share/kde4/services/okular*.desktop
 "
+# active, gemini: not working
 PKG_IGNORE="
+       ${calligra_active_CONTENTS}
+       ${calligra_gemini_CONTENTS}
        usr/lib/kde4/*.dll.a
        usr/lib/libRtfReader.dll.a
        usr/lib/libbraindumpcore.dll.a
@@ -379,5 +411,4 @@ PKG_IGNORE="
        usr/lib/libkarbon*.dll.a
 "
 
-# active: not working
-CYGCMAKE_ARGS="-DIHAVEPATCHEDQT=YES -DBUILD_active=NO"
+CYGCMAKE_ARGS="-DIHAVEPATCHEDQT=YES"
This page took 0.032669 seconds and 5 git commands to generate.