calligra 2.3.86
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Wed, 25 Jan 2012 20:34:34 +0000 (14:34 -0600)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Wed, 25 Jan 2012 20:34:34 +0000 (14:34 -0600)
2.3.83-find-libkcal.patch
2.3.86-z-muldefs.patch [new file with mode: 0644]
braindump.list
calligra-2.3.86-1.cygport [moved from calligra-2.3.84-1.cygport with 96% similarity]
calligra-libs.list
calligra-plan.list
calligra-stage.list
karbon.hint
krita.hint

index 78afa470f5ccfedb1422c281644fc13465622ea9..8ddcec7bf69958deafcfb9e9c95d0eb4d7a5f7e4 100644 (file)
@@ -1,7 +1,6 @@
 --- origsrc/calligra-2.3.83/plan/plugins/filters/icalendar/CMakeLists.txt      2011-10-22 02:39:34.000000000 -0500
 +++ src/calligra-2.3.83/plan/plugins/filters/icalendar/CMakeLists.txt  2011-11-02 16:48:07.519670600 -0500
-@@ -2,7 +2,7 @@
- add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+@@ -1,6 +1,6 @@
  
  ##TODO revision?
 -find_library(LIBKCAL_LIBRARY libkcal.so)
diff --git a/2.3.86-z-muldefs.patch b/2.3.86-z-muldefs.patch
new file mode 100644 (file)
index 0000000..fe12d9d
--- /dev/null
@@ -0,0 +1,11 @@
+--- origsrc/calligra-2.3.86/krita/plugins/colorspaces/ctlcs/CMakeLists.txt     2012-01-06 21:25:02.000000000 -0600
++++ src/calligra-2.3.86/krita/plugins/colorspaces/ctlcs/CMakeLists.txt 2012-01-25 13:53:18.333452900 -0600
+@@ -38,6 +38,8 @@ set( CTLCS_SRCS
+ kde4_add_plugin(krita_ctlcs_plugin ${CTLCS_SRCS})
++set_target_properties(krita_ctlcs_plugin PROPERTIES LINK_FLAGS -Wl,--allow-multiple-definition)
++
+ target_link_libraries(krita_ctlcs_plugin pigmentcms ${KDE4_KPARTS_LIBS} ${OPENEXR_LIBRARIES} ${OPENCTL_LDFLAGS})
+ install(TARGETS krita_ctlcs_plugin  DESTINATION ${PLUGIN_INSTALL_DIR})
index ddb7d2cb23bf41f8d00bbe4dc9b71bf3278b0bbd..4aaea432ece229525ba404cf678efdc74c25eeb0 100644 (file)
@@ -1,6 +1,6 @@
 etc/postinstall/
 usr/bin/braindump.exe
-usr/bin/cygbraindumpcore.dll
+usr/bin/cygbraindump*.dll
 usr/include/kde4/StatesRegistry.h
 usr/lib/kde4/stateshape.dll
 usr/lib/kde4/webshape.dll
@@ -8,6 +8,7 @@ usr/lib/libbraindumpcore.dll.a
 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/stateshape.desktop
similarity index 96%
rename from calligra-2.3.84-1.cygport
rename to calligra-2.3.86-1.cygport
index e79feda816b8181dded3acfa254efafe8d13d809..d129941421a239ab77596f9af03bccc85d1447e7 100644 (file)
@@ -10,6 +10,7 @@ PATCH_URI="
        2.3.83-find-libkcal.patch
        2.3.83-find-librcps.patch
        2.3.83-quickprint-exec.patch
+       2.3.86-z-muldefs.patch
 "
 
 PKG_NAMES="calligra-libs calligra-data calligra-devel calligra-flow
index 70224f00a683cfc6fdf1294529b3d21c38c6855e..bb98d5ac31043b47f135c7bd52ac78913b92cb8a 100644 (file)
@@ -58,6 +58,7 @@ usr/share/doc/calligra-libs/
 usr/share/kde4/apps/formulashape/
 usr/share/kde4/apps/koproperty/
 usr/share/kde4/apps/musicshape/
+usr/share/kde4/apps/pigmentcms/
 usr/share/kde4/apps/xsltfilter/
 usr/share/kde4/services/artistictextshape.desktop
 usr/share/kde4/services/autocorrect.desktop
index f9d2b13712c81b009a56008c7789b74232ec053a..8cc95af52e05c1ba143dc1ff9db21fc4d9d5a382 100644 (file)
@@ -27,86 +27,10 @@ usr/lib/librcps_plan.dll.a
 usr/share/applications/kde4/plan.desktop
 usr/share/applications/kde4/planwork.desktop
 usr/share/doc/calligra-plan/
-usr/share/icons/hicolor/128x128/apps/calligraplan.png
-usr/share/icons/hicolor/128x128/apps/planwork.png
-usr/share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.png
-usr/share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/16x16/apps/calligraplan.png
-usr/share/icons/hicolor/16x16/apps/planwork.png
-usr/share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/22x22/apps/calligraplan.png
-usr/share/icons/hicolor/22x22/apps/planwork.png
-usr/share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/32x32/apps/calligraplan.png
-usr/share/icons/hicolor/32x32/apps/planwork.png
-usr/share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/45x45/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/48x48/apps/calligraplan.png
-usr/share/icons/hicolor/48x48/apps/planwork.png
-usr/share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/64x64/apps/calligraplan.png
-usr/share/icons/hicolor/64x64/apps/planwork.png
-usr/share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.plan.png
-usr/share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/scalable/apps/calligraplan.svgz
-usr/share/icons/hicolor/scalable/apps/planwork.svgz
-usr/share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.plan.svgz
-usr/share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.plan.work.svgz
-usr/share/kde4/apps/plan/about/intro.html
-usr/share/kde4/apps/plan/about/main.html
-usr/share/kde4/apps/plan/about/plan.css
-usr/share/kde4/apps/plan/about/tips.html
-usr/share/kde4/apps/plan/about/top-left-plan.png
-usr/share/kde4/apps/plan/about/tutorial.html
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/accounts.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/gantt_chart.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/pert_chart.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/resource-calendar-child-insert.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/resource-calendar-insert.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/resource-group-new.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/resources.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/view-task-add.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/view-task-child-add.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/view-time-schedule-baselined-add.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/view-time-schedule-baselined-remove.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/view-time-schedule-baselined.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/view-time-schedule-calculus.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/view-time-schedule-child-insert.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/view-time-schedule-edit.png
-usr/share/kde4/apps/plan/icons/hicolor/22x22/actions/view-time-schedule-insert.png
-usr/share/kde4/apps/plan/icons/hicolor/32x32/actions/view-task.png
-usr/share/kde4/apps/plan/icons/hicolor/48x48/actions/template_timechart.png
-usr/share/kde4/apps/plan/icons/hicolor/scalable/actions/template_timechart.svgz
-usr/share/kde4/apps/plan/kpartplugins/scripting.rc
-usr/share/kde4/apps/plan/plan.rc
-usr/share/kde4/apps/plan/plan_readonly.rc
-usr/share/kde4/apps/plan/scripts/extensions/busyinfoclear.py
-usr/share/kde4/apps/plan/scripts/extensions/busyinfoexport.py
-usr/share/kde4/apps/plan/scripts/extensions/busyinfoimport.py
-usr/share/kde4/apps/plan/scripts/extensions/resourcesimport.py
-usr/share/kde4/apps/plan/scripts/samples/sample_busyinfocheck.py
-usr/share/kde4/apps/plan/scripts/samples/sample_project.py
-usr/share/kde4/apps/plan/scripts/scripts.rc
-usr/share/kde4/apps/plan/templates/Simple/.directory
-usr/share/kde4/apps/plan/templates/Simple/.source/8HourDay-40HourWeek.plant
-usr/share/kde4/apps/plan/templates/Simple/.source/Basicproject.plant
-usr/share/kde4/apps/plan/templates/Simple/.source/Plain.plant
-usr/share/kde4/apps/plan/templates/Simple/8HourDay-40HourWeek.desktop
-usr/share/kde4/apps/plan/templates/Simple/Basicproject.desktop
-usr/share/kde4/apps/plan/templates/Simple/Plain.desktop
-usr/share/kde4/apps/planwork/icons/hicolor/128x128/actions/template_empty.png
-usr/share/kde4/apps/planwork/icons/hicolor/16x16/actions/template_empty.png
-usr/share/kde4/apps/planwork/icons/hicolor/22x22/actions/template_empty.png
-usr/share/kde4/apps/planwork/icons/hicolor/32x32/actions/template_empty.png
-usr/share/kde4/apps/planwork/icons/hicolor/48x48/actions/template_empty.png
-usr/share/kde4/apps/planwork/icons/hicolor/64x64/actions/template_empty.png
-usr/share/kde4/apps/planwork/icons/hicolor/scalable/actions/template_empty.svgz
-usr/share/kde4/apps/planwork/planwork.rc
-usr/share/kde4/apps/planwork/planwork_mainwindow.rc
-usr/share/kde4/apps/planwork/planwork_readonly.rc
-usr/share/kde4/apps/planwork/templates/Simple/.directory
-usr/share/kde4/apps/planwork/templates/Simple/.source/Empty.planworkt
-usr/share/kde4/apps/planwork/templates/Simple/Empty.desktop
+usr/share/icons/hicolor/*/apps/calligraplan*
+usr/share/icons/hicolor/*/mimetypes/application-x-vnd.kde.plan.*
+usr/share/kde4/apps/plan/
+usr/share/kde4/apps/planwork/
 usr/share/kde4/config/planrc
 usr/share/kde4/config/planworkrc
 usr/share/kde4/config.kcfg/plansettings.kcfg
index ce787c72417a196b8645a507d646dd23635c690e..04a4a12bb1af8459b71a319d113c55c5f554aa8e 100644 (file)
@@ -11,6 +11,7 @@ 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/
 usr/share/doc/calligra-stage/
 usr/share/icons/hicolor/16x16/actions/black.png
 usr/share/icons/hicolor/16x16/actions/highlight.png
index f18f1e953beb14f4c523a114d166ed3e6e68fc12..51e7997bbfd923378a0cc9fc890a2ad09812e6d2 100644 (file)
@@ -1,5 +1,5 @@
 category: KDE Graphics
-requires: calligra-libs libgcc1 libkdecore5 libpoppler13 libQtCore4 libQtGui4 libQtXml4 libstdc++6 libwpd0.9_9 libwpg0.2_2 pstoedit
+requires: calligra-libs libgcc1 libkdecore5 libpoppler19 libQtCore4 libQtGui4 libQtXml4 libstdc++6 libwpd0.9_9 libwpg0.2_2 pstoedit
 external-source: calligra
 sdesc: "KDE SVG drawing application"
 ldesc: "Karbon is a vector-based drawing application for Calligra Suite. It 
index 756fac59a612e3b24ddff7fa8dea06f849132608..0e3b44ffa633ad7f303c41101a54dbcfed3f35ba 100644 (file)
@@ -1,5 +1,5 @@
 category: KDE Graphics
-requires: create calligra-libs libexiv2_11 libfftw3_3 libgcc1 libGL1 libGLEW1.5 libGLU1 libilmbase6 libjpeg8 libkdecore5 libkdcraw20 liblcms2_2 libopenjpeg2 libpng14 libpoppler-qt4_3 libQtCore4 libQtGui4 libQtOpenGL4 libQtSvg4 libQtXml4 libstdc++6 libtiff5 libX11_6
+requires: create calligra-libs libexiv2_11 libfftw3_3 libgcc1 libGL1 libGLEW1.7 libGLU1 libilmbase6 libjpeg8 libkdecore5 libkdcraw20 liblcms2_2 libOpenGTL0.8 libopenjpeg3 libpng14 libpoppler-qt4_3 libQtCore4 libQtGTL0.1 libQtGui4 libQtOpenGL4 libQtSvg4 libQtXml4 libstdc++6 libtiff5 libX11_6
 external-source: calligra
 sdesc: "KDE layered pixel image editing program"
 ldesc: "Krita is a painting and image editing application for Calligra Suite. 
This page took 0.030273 seconds and 5 git commands to generate.