calligra 2.8.2
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Wed, 7 May 2014 17:47:26 +0000 (12:47 -0500)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Wed, 7 May 2014 17:47:26 +0000 (12:47 -0500)
2.3.83-as-needed.patch
calligra.cygport

index 4df70b1a5cf920c618b423e15b8e02789bd108c9..1bf60714915a7ad23877ede7297552bb6bbe426b 100644 (file)
@@ -11,14 +11,3 @@ libmso is a static library and depends on other calligra shared libs
  
  kde4_add_executable(ppttoodp ppttoodpmain.cpp)
  target_link_libraries(ppttoodp ppttoodplib)
---- origsrc/calligra-2.3.83/filters/words/msword-odf/CMakeLists.txt    2011-10-22 02:39:33.000000000 -0500
-+++ src/calligra-2.3.83/filters/words/msword-odf/CMakeLists.txt        2011-11-02 21:19:04.641085800 -0500
-@@ -25,7 +25,7 @@ kde4_add_plugin(mswordodf_import ${mswor
- #TODO cause of NumberFormatParser we depend on msooxml. Fix that!
- #target_link_libraries(mswordodf_import kowv2 komain mso ${ZLIB_LIBRARIES})
--target_link_libraries(mswordodf_import kowv2 komain mso msooxml ${ZLIB_LIBRARIES})
-+target_link_libraries(mswordodf_import mso kowv2 komain msooxml ${ZLIB_LIBRARIES})
- install(TARGETS mswordodf_import  DESTINATION ${PLUGIN_INSTALL_DIR})
index 95187ce2bb3dab0f0912335e2a9b1e6bc9edd5d0..0cb10116cc85daa76f00c3ceda9b8764f09c9dfc 100644 (file)
@@ -1,7 +1,7 @@
 inherit kde4 python
 
 NAME="calligra"
-VERSION=2.7.5
+VERSION=2.8.2
 RELEASE=1
 CATEGORY="Office"
 SUMMARY="KDE integrated office suite"
@@ -20,7 +20,7 @@ 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"
 # the entire suite, except for -devel
-calligra_REQUIRES="calligra-flow calligra-plan calligra-stage calligra-sheets calligra-words calligra-tools karbon kexi krita"
+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/
@@ -35,94 +35,72 @@ calligra_data_CONTENTS="
 calligra_libs_REQUIRES="calligra-data"
 calligra_libs_SUMMARY="Calligra Suite libraries and common plugins"
 calligra_libs_CONTENTS="
+       --exclude=calligra_shape_spreadsheet*
        usr/bin/cygbasicflakes-*.dll
        usr/bin/cygcalligradb-*.dll
        usr/bin/cygcalligrakdchart-*.dll
        usr/bin/cygcalligrakdgantt-*.dll
-       usr/bin/cygchartshapelib-*.dll
        usr/bin/cygflake-*.dll
-       usr/bin/cygkformulalib-*.dll
+       usr/bin/cygkformula-*.dll
        usr/bin/cygkokross-*.dll
        usr/bin/cygkomain-*.dll
+       usr/bin/cygkomsooxml-*.dll
        usr/bin/cygkoodf-*.dll
+       usr/bin/cygkoodf2-*.dll
+       usr/bin/cygkoodfreader-*.dll
        usr/bin/cygkopageapp-*.dll
        usr/bin/cygkoplugin-*.dll
        usr/bin/cygkoproperty-*.dll
        usr/bin/cygkordf-*.dll
        usr/bin/cygkoreport-*.dll
        usr/bin/cygkotext-*.dll
+       usr/bin/cygkotextlayout-*.dll
+       usr/bin/cygkovectorimage-*.dll
        usr/bin/cygkowidgets-*.dll
        usr/bin/cygkowidgetutils-*.dll
        usr/bin/cygkowv2-*.dll
        usr/bin/cygkundo2-*.dll
-       usr/bin/cygmsooxml-*.dll
-       usr/bin/cygodftraverse-*.dll
        usr/bin/cygpigmentcms-*.dll
        usr/bin/cygRtfReader-*.dll
-       usr/bin/cygtextlayout-*.dll
-       usr/bin/cygvectorimage-*.dll
-       usr/lib/kde4/artistictextshape.dll
-       usr/lib/kde4/autocorrect.dll
-       usr/lib/kde4/basicflakesplugin.dll
+       usr/lib/kde4/calligra_docker_*.dll
+       usr/lib/kde4/calligra_semanticitem_*.dll
+       usr/lib/kde4/calligra_shape_*.dll
+       usr/lib/kde4/calligra_textediting_*.dll
+       usr/lib/kde4/calligra_textinlineobject_*.dll
+       usr/lib/kde4/calligra_tool_*.dll
        usr/lib/kde4/calligradocinfopropspage.dll
-       usr/lib/kde4/calligradockers.dll
        usr/lib/kde4/calligraimagethumbnail.dll
        usr/lib/kde4/calligrathumbnail.dll
-       usr/lib/kde4/changecase.dll
-       usr/lib/kde4/chartshape.dll
-       usr/lib/kde4/defaulttools.dll
-       usr/lib/kde4/formulashape.dll
        usr/lib/kde4/kolcmsengine.dll
        usr/lib/kde4/kopabackgroundtool.dll
        usr/lib/kde4/koreport_barcodeplugin.dll
        usr/lib/kde4/koreport_mapsplugin.dll
        usr/lib/kde4/koreport_webplugin.dll
-       usr/lib/kde4/musicshape.dll
-       usr/lib/kde4/pathshapes.dll
-       usr/lib/kde4/pictureshape.dll
-       usr/lib/kde4/pluginshape.dll
-       usr/lib/kde4/spellcheck.dll
-       usr/lib/kde4/textshape.dll
-       usr/lib/kde4/textvariables.dll
-       usr/lib/kde4/thesaurustool.dll
-       usr/lib/kde4/vectorshape.dll
-       usr/lib/kde4/videoshape.dll
        usr/share/doc/calligra-libs/
        usr/share/kde4/apps/formulashape/
        usr/share/kde4/apps/koproperty/
        usr/share/kde4/apps/musicshape/
-       usr/share/kde4/services/artistictextshape.desktop
-       usr/share/kde4/services/autocorrect.desktop
-       usr/share/kde4/services/basicflakesplugin.desktop
+       usr/share/kde4/services/calligra_docker_*.desktop
        usr/share/kde4/services/calligra_odg_thumbnail.desktop
+       usr/share/kde4/services/calligra_semanticitem_*.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/calligradockers.desktop
-       usr/share/kde4/services/changecase.desktop
-       usr/share/kde4/services/chartshape.desktop
-       usr/share/kde4/services/defaulttools.desktop
-       usr/share/kde4/services/formulashape.desktop
        usr/share/kde4/services/kformulapart.desktop
        usr/share/kde4/services/kolcmsengine.desktop
        usr/share/kde4/services/kopabackgroundtool.desktop
        usr/share/kde4/services/koreport_barcodeplugin.desktop
        usr/share/kde4/services/koreport_mapsplugin.desktop
        usr/share/kde4/services/koreport_webplugin.desktop
-       usr/share/kde4/services/musicshape.desktop
-       usr/share/kde4/services/pathshapes.desktop
-       usr/share/kde4/services/pictureshape.desktop
-       usr/share/kde4/services/pluginshape.desktop
-       usr/share/kde4/services/spellcheck.desktop
-       usr/share/kde4/services/textshape.desktop
-       usr/share/kde4/services/textvariables.desktop
-       usr/share/kde4/services/thesaurustool.desktop
-       usr/share/kde4/services/vectorshape.desktop
-       usr/share/kde4/services/videoshape.desktop
        usr/share/kde4/servicetypes/calligradb_driver.desktop
        usr/share/kde4/servicetypes/calligradocker.desktop
        usr/share/kde4/servicetypes/calligra_application.desktop
        usr/share/kde4/servicetypes/calligra_deferred_plugin.desktop
        usr/share/kde4/servicetypes/calligra_filter.desktop
        usr/share/kde4/servicetypes/calligra_part.desktop
+       usr/share/kde4/servicetypes/calligra_semanticitem.desktop
        usr/share/kde4/servicetypes/filtereffect.desktop
        usr/share/kde4/servicetypes/flake.desktop
        usr/share/kde4/servicetypes/flakedevice.desktop
@@ -139,27 +117,16 @@ calligra_libs_CONTENTS="
 "
 calligra_devel_SUMMARY="Calligra Suite libraries (development)"
 calligra_devel_CONTENTS="
-       --exclude=kis_*.h --exclude=krita_export.h --exclude=StatesRegistry.h
-       usr/include/kde4/*.cpp
-       usr/include/kde4/*.h
-       usr/include/kde4/changetracker/
-       usr/include/kde4/styles/
+       usr/include/kde4/calligra/
        usr/lib/libbasicflakes.dll.a
+       usr/lib/libcalligradb.dll.a
+       usr/lib/libcalligrakdchart.dll.a
+       usr/lib/libcalligrakdgantt.dll.a
        usr/lib/libflake.dll.a
-       usr/lib/libkokross.dll.a
-       usr/lib/libkomain.dll.a
-       usr/lib/libkoodf.dll.a
-       usr/lib/libkopageapp.dll.a
-       usr/lib/libkoplugin.dll.a
-       usr/lib/libkoproperty.dll.a
-       usr/lib/libkordf.dll.a
-       usr/lib/libkoreport.dll.a
-       usr/lib/libkotext.dll.a
-       usr/lib/libkowidgets.dll.a
-       usr/lib/libkowidgetutils.dll.a
+       usr/lib/libkformula.dll.a
+       usr/lib/libko*.dll.a
        usr/lib/libkundo2.dll.a
        usr/lib/libpigmentcms.dll.a
-       usr/lib/libtextlayout.dll.a
        usr/share/kde4/apps/cmake/
 "
 calligra_active_SUMMARY="Calligra Suite Active Plasma interface"
@@ -174,9 +141,10 @@ calligra_flow_CONTENTS="
        usr/bin/calligraflow.exe
        usr/bin/cygflowprivate-*.dll
        usr/bin/cygkdeinit4_calligraflow.dll
+       usr/lib/kde4/calligra_filter_vsdx2odg.dll
+       usr/lib/kde4/calligra_filter_wpg2odg.dll
        usr/lib/kde4/flowdockersplugin.dll
        usr/lib/kde4/flowpart.dll
-       usr/lib/kde4/vsdximport.dll
        usr/share/applications/kde4/flow.desktop
        usr/share/doc/calligra-flow/
        usr/share/icons/hicolor/*/apps/calligraflow.*
@@ -184,6 +152,8 @@ calligra_flow_CONTENTS="
        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/flow*
        usr/share/kde4/servicetypes/flow_dock.desktop
 "
@@ -194,6 +164,7 @@ calligra_plan_CONTENTS="
        usr/bin/cygkplato*-*.dll
        usr/bin/cygplan*-*.dll
        usr/bin/cygrcps_plan-*.dll
+       usr/lib/kde4/calligra_filter_*2plan.dll
        usr/lib/kde4/kplatorcpsscheduler.dll
        usr/lib/kde4/krossmoduleplan.dll
        usr/lib/kde4/plan*
@@ -208,9 +179,10 @@ 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/servicetypes/plan_schedulerplugin.desktop
+       usr/share/kde4/servicetypes/plan_*.desktop
        usr/share/mime/packages/calligra_planner_mpp.xml
 "
 calligra_sheets_SUMMARY="KDE spreadsheet program (aka KSpread)"
@@ -218,20 +190,16 @@ calligra_sheets_CONTENTS="
        etc/postinstall/
        usr/bin/*calligrasheets*
        usr/include/kde4/sheets/
-       usr/lib/kde4/applixspreadimport.dll
+       usr/lib/kde4/calligra_filter_*2kspread.dll
+       usr/lib/kde4/calligra_filter_*2ods.dll
+       usr/lib/kde4/calligra_filter_*2sheets.dll
+       usr/lib/kde4/calligra_filter_kspread2*.dll
+       usr/lib/kde4/calligra_filter_sheets2*.dll
+       usr/lib/kde4/calligra_shape_spreadsheet*.dll
        usr/lib/kde4/calligrasheetspart.dll
-       usr/lib/kde4/csvexport.dll
-       usr/lib/kde4/csvimport.dll
-       usr/lib/kde4/dbaseimport.dll
-       usr/lib/kde4/excelimporttodoc.dll
-       usr/lib/kde4/gnumeric*port.dll
        usr/lib/kde4/krossmodulesheets.dll
        usr/lib/kde4/kspread*
-       usr/lib/kde4/opencalc*port.dll
-       usr/lib/kde4/qproimport.dll
        usr/lib/kde4/sheetssolver.dll
-       usr/lib/kde4/spreadsheetshape*
-       usr/lib/kde4/xlsximport.dll
        usr/lib/libcalligrasheets*
        usr/share/applications/kde4/sheets.desktop
        usr/share/doc/calligra-sheets/
@@ -241,12 +209,16 @@ calligra_sheets_CONTENTS="
        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/spreadsheetshape*
-       usr/share/kde4/services/sheets_*.desktop
-       usr/share/kde4/services/sheetspart.desktop
-       usr/share/kde4/servicetypes/sheets_plugin.desktop
+       usr/share/kde4/services/sheets*.desktop
+       usr/share/kde4/servicetypes/sheets_*.desktop
        usr/share/templates/.source/SpreadSheet.ods
        usr/share/templates/SpreadSheet.desktop
 "
@@ -255,11 +227,10 @@ calligra_stage_CONTENTS="
        etc/postinstall/
        usr/bin/*calligrastage*
        usr/include/kde4/stage/
+       usr/lib/kde4/calligra_filter_*2odp.dll
        usr/lib/kde4/calligrastage*
        usr/lib/kde4/kprvariables.dll
        usr/lib/kde4/kpr_*
-       usr/lib/kde4/powerpointimport.dll
-       usr/lib/kde4/pptximport.dll
        usr/lib/libcalligrastageprivate.dll.a
        usr/share/applications/kde4/stage.desktop
        usr/share/doc/HTML/en/stage/
@@ -271,6 +242,7 @@ calligra_stage_CONTENTS="
        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/stage_*
@@ -294,21 +266,14 @@ calligra_words_CONTENTS="
        usr/bin/*calligrawords*
        usr/bin/cygwordsprivate-*.dll
        usr/include/kde4/words/
-       usr/lib/kde4/applixwordimport.dll
-       usr/lib/kde4/asciiexport.dll
-       usr/lib/kde4/asciiimport.dll
        usr/lib/kde4/authorpart.dll
-       usr/lib/kde4/docximport.dll
-       usr/lib/kde4/exportMobi.dll
-       usr/lib/kde4/exportepub2.dll
-       usr/lib/kde4/exporthtml.dll
-       usr/lib/kde4/mswordodf_import.dll
-       usr/lib/kde4/rtfimport.dll
+       usr/lib/kde4/calligra_filter_*2odt.dll
+       usr/lib/kde4/calligra_filter_*2words.dll
+       usr/lib/kde4/calligra_filter_odt2*.dll
        usr/lib/kde4/wordspart.dll
-       usr/lib/kde4/wpdimport.dll
-       usr/lib/kde4/wpsimport.dll
        usr/lib/libwordsprivate.dll.a
        usr/share/applications/kde4/author.desktop
+       usr/share/applications/kde4/calligrawords_ascii.desktop
        usr/share/applications/kde4/words.desktop
        usr/share/icons/hicolor/*/actions/tool_pagelayout.*
        usr/share/icons/hicolor/*/apps/calligraauthor.*
@@ -319,6 +284,9 @@ calligra_words_CONTENTS="
        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/words*
        usr/share/templates/.source/TextDocument.odt
        usr/share/templates/TextDocument.desktop
@@ -327,9 +295,7 @@ braindump_SUMMARY="KDE whiteboard application"
 braindump_CONTENTS="
        etc/postinstall/
        usr/bin/*braindump*
-       usr/include/kde4/StatesRegistry.h
-       usr/lib/kde4/stateshape.dll
-       usr/lib/kde4/webshape.dll
+       usr/lib/kde4/braindump*
        usr/lib/libbraindumpcore.dll.a
        usr/share/applications/kde4/braindump.desktop
        usr/share/icons/hicolor/*/actions/stateshape.*
@@ -337,25 +303,30 @@ braindump_CONTENTS="
        usr/share/icons/hicolor/*/apps/braindump.*
        usr/share/kde4/apps/braindump/
        usr/share/kde4/apps/stateshape/
-       usr/share/kde4/services/stateshape.desktop
-       usr/share/kde4/services/webshape.desktop
+       usr/share/kde4/services/braindump_*.desktop
        usr/share/kde4/servicetypes/braindump_extensions.desktop
 "
 karbon_SUMMARY="KDE SVG drawing application"
 karbon_CONTENTS="
        etc/postinstall/
        usr/bin/*karbon*
+       usr/lib/kde4/calligra_filter_karbon*.dll
+       usr/lib/kde4/calligra_filter_[^k]*2svg.dll
+       usr/lib/kde4/calligra_filter_svg2karbon.dll
+       usr/lib/kde4/calligra_filter_xfig2odg.dll
        usr/lib/kde4/karbon*
-       usr/lib/kde4/wmf*port.dll
-       usr/lib/kde4/wpgimport.dll
        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/karbon*
-       usr/share/kde4/servicetypes/karbon_module.desktop
+       usr/share/kde4/servicetypes/karbon_*
        usr/share/templates/.source/Illustration.odg
        usr/share/templates/Illustration.desktop
 "
@@ -384,11 +355,13 @@ kexi_CONTENTS="
 krita_SUMMARY="KDE layered pixel image editing program"
 krita_CONTENTS="
        etc/postinstall/
+       usr/bin/gmicparser.exe
        usr/bin/*krita*
-       usr/include/kde4/kis_*
-       usr/include/kde4/krita_export.h
+       usr/include/kde4/krita/
+       usr/lib/calligra/imports/org/krita/
        usr/lib/kde4/krita*
        usr/lib/libkrita*
+       usr/share/appdata/krita.appdata.xml
        usr/share/applications/kde4/krita*
        usr/share/color/icc/krita/
        usr/share/doc/krita/
@@ -408,6 +381,12 @@ okular_odp_CONTENTS="
        usr/share/kde4/services/libokularGenerator_odp.desktop
        usr/share/kde4/services/okularOdp.desktop
 "
+PKG_IGNORE="
+       usr/lib/kde4/*.dll.a
+       usr/lib/libRtfReader.dll.a
+       usr/lib/libflowprivate.dll.a
+       usr/lib/libkarbon*.dll.a
+"
 
 # active: not working
 CYGCMAKE_ARGS="-DIHAVEPATCHEDQT=YES -DBUILD_active=NO"
This page took 0.030367 seconds and 5 git commands to generate.