Hey @ports, here is a bulk build fix and update patch for calligra.
- simple update to 2.9.7 - fix cmake/ninja problem with multiple generated rules. (noticed by naddy@ and sthen@) - less build noise with CMAKE_POLICY_DEFAULT_CMP0059 - cleanup WANTLIB Ok? Best regards, Rafael Index: Makefile =================================================================== RCS file: /cvs/ports/editors/calligra/Makefile,v retrieving revision 1.11 diff -u -p -u -p -r1.11 Makefile --- Makefile 12 Aug 2015 09:56:12 -0000 1.11 +++ Makefile 10 Sep 2015 15:54:01 -0000 @@ -2,7 +2,7 @@ COMMENT = K Desktop Environment, office suite HOMEPAGE = https://www.calligra-suite.org/ -DISTNAME = calligra-2.9.6 +DISTNAME = calligra-2.9.7 CATEGORIES = editors DIST_SUBDIR = kde @@ -87,8 +87,7 @@ WANTLIB += GL GLEW GLU Half ICE Iex IlmI WANTLIB += fontconfig WANTLIB += lib/qt4/QtDeclarative lib/qt4/QtWebKit lib/qt4/QtDBus WANTLIB += lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg lib/qt4/QtOpenGL -WANTLIB += lib/qt4/QtScript lib/qt4/QtXml -WANTLIB += lib/qt4/QtSql +WANTLIB += lib/qt4/QtScript lib/qt4/QtXml lib/qt4/QtSql WANTLIB += ${KDE4LIB}/akonadi-contact ${KDE4LIB}/akonadi-kde WANTLIB += ${KDE4LIB}/kabc ${KDE4LIB}/kactivities WANTLIB += ${KDE4LIB}/kcalcore ${KDE4LIB}/kcmutils ${KDE4LIB}/kdcraw @@ -107,7 +106,6 @@ WANTLIB += jpeg lcms2 mysqlclient openjp WANTLIB += qca2 soprano sqlite3 sybdb tiff WANTLIB += boost_system-mt curl ktexteditor gslcblas - # kexi needs headers in postgresql,{-main,-server} # kexi needs all db drivers to be present while building BUILD_DEPENDS = devel/boost \ @@ -119,7 +117,6 @@ BUILD_DEPENDS = devel/boost \ # kexi needs all db driver installed to run, # assuming sqlite3 is in base... - RUN_DEPENDS = databases/mariadb \ databases/postgresql,-main \ databases/postgresql,-server \ @@ -171,6 +168,8 @@ CONFIGURE_ARGS += -DWITH_Pstoedit:BOOL=O # XXX Silently ignore non-existent dependencies CONFIGURE_ARGS += -DCMAKE_POLICY_DEFAULT_CMP0046=OLD +# XXX Don't treat ``DEFINITIONS`` as a built-in directory property +CONFIGURE_ARGS += -DCMAKE_POLICY_DEFAULT_CMP0059=OLD # Running D-Bus daemon is required TEST_IS_INTERACTIVE = X11 Index: distinfo =================================================================== RCS file: /cvs/ports/editors/calligra/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo 12 Aug 2015 09:56:12 -0000 1.5 +++ distinfo 10 Sep 2015 15:54:01 -0000 @@ -1,2 +1,2 @@ -SHA256 (kde/calligra-2.9.6.tar.xz) = eFZBNxM+L0UGUIXfZs4qsxR4UXwQFjoGumkKLTqYoYQ= -SIZE (kde/calligra-2.9.6.tar.xz) = 194239580 +SHA256 (kde/calligra-2.9.7.tar.xz) = emQaFmlzn/VYCf1vLCLWc4Q6xB9k6C9cpss+YMfIJ4E= +SIZE (kde/calligra-2.9.7.tar.xz) = 194348264 Index: patches/patch-libs_pigment_tests_CMakeLists_txt =================================================================== RCS file: patches/patch-libs_pigment_tests_CMakeLists_txt diff -N patches/patch-libs_pigment_tests_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libs_pigment_tests_CMakeLists_txt 10 Sep 2015 15:54:01 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ + +fix ninja: multiple rules generate +cmake_order_depends_target_TestKoColorSpaceRegistry + +--- libs/pigment/tests/CMakeLists.txt.orig Tue Sep 8 20:27:17 2015 ++++ libs/pigment/tests/CMakeLists.txt Tue Sep 8 20:33:09 2015 +@@ -13,9 +13,9 @@ endif() + + set(TestKoColorSpaceRegistry_test_SRCS TestKoColorSpaceRegistry.cpp ) + +-kde4_add_unit_test(TestKoColorSpaceRegistry TESTNAME libs-pigment-TestKoColorSpaceRegistry ${TestKoColorSpaceRegistry_test_SRCS}) ++kde4_add_unit_test(libs-pigment-TestKoColorSpaceRegistry TESTNAME libs-pigment-TestKoColorSpaceRegistry ${TestKoColorSpaceRegistry_test_SRCS}) + +-target_link_libraries(TestKoColorSpaceRegistry ${KDE4_KDEUI_LIBS} pigmentcms ${QT_QTTEST_LIBRARY}) ++target_link_libraries(libs-pigment-TestKoColorSpaceRegistry ${KDE4_KDEUI_LIBS} pigmentcms ${QT_QTTEST_LIBRARY}) + + ########### next target ############### + Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/editors/calligra/pkg/PLIST,v retrieving revision 1.5 diff -u -p -u -p -r1.5 PLIST --- pkg/PLIST 12 Aug 2015 09:56:12 -0000 1.5 +++ pkg/PLIST 10 Sep 2015 15:54:01 -0000 @@ -85,7 +85,6 @@ include/kde4/calligra/KoDocumentRdf.h include/kde4/calligra/KoDocumentRdfBase.h include/kde4/calligra/KoDocumentRdfEditWidget.h include/kde4/calligra/KoDocumentResourceManager.h -include/kde4/calligra/KoDom.h include/kde4/calligra/KoDpi.h include/kde4/calligra/KoDrag.h include/kde4/calligra/KoDragOdfSaveHelper.h @@ -428,7 +427,8 @@ include/kde4/krita/kis_transform_worker. include/kde4/krita/kis_types.h include/kde4/krita/kis_ui_types.h include/kde4/krita/kis_warptransform_worker.h -include/kde4/krita/krita_export.h +include/kde4/krita/kritaimage_export.h +include/kde4/krita/kritaui_export.h include/kde4/sheets/ include/kde4/sheets/Cell.h include/kde4/sheets/CellStorage.h @@ -636,7 +636,6 @@ lib/kde4/keximigrate_pqxx.so lib/kde4/keximigrate_spreadsheet.so lib/kde4/keximigrate_sybase.so lib/kde4/keximigrate_txt.so -lib/kde4/kexirelationdesignshape.so lib/kde4/kformdesigner_containers.so lib/kde4/kformdesigner_kexidbwidgets.so lib/kde4/kformdesigner_mapbrowser.so @@ -719,6 +718,7 @@ lib/kde4/kritalutdocker.so lib/kde4/kritametadataeditor.so lib/kde4/kritamodifyselection.so lib/kde4/kritanoisefilter.so +lib/kde4/kritanormalize.so lib/kde4/kritaodgimport.so lib/kde4/kritaoffsetimage.so lib/kde4/kritaoilpaintfilter.so @@ -757,6 +757,7 @@ lib/kde4/kritasmalltilesfilter.so lib/kde4/kritasobelfilter.so lib/kde4/kritaspecificcolorselector.so lib/kde4/kritaspraypaintop.so +lib/kde4/kritatangentnormalpaintop.so lib/kde4/kritatasksetdocker.so lib/kde4/kritatgaexport.so lib/kde4/kritatgaimport.so @@ -6007,6 +6008,7 @@ share/apps/krita/defaultpresets/particle share/apps/krita/defaultpresets/sketchbrush.kpp share/apps/krita/defaultpresets/smudge.kpp share/apps/krita/defaultpresets/spraybrush.kpp +share/apps/krita/defaultpresets/tangentnormal.kpp share/apps/krita/dtd/ share/apps/krita/dtd/krita.dtd share/apps/krita/gmic/ @@ -6054,6 +6056,8 @@ share/apps/krita/images/krita-particle.p share/apps/krita/images/krita-sketch.png share/apps/krita/images/krita-spray.png share/apps/krita/images/krita-sumi.png +share/apps/krita/images/krita-tangentnormal-preview.png +share/apps/krita/images/krita-tangetnormal.png share/apps/krita/input/ share/apps/krita/input/kritadefault.profile share/apps/krita/krita.rc @@ -6175,6 +6179,11 @@ share/apps/krita/paintoppresets/Splat_we share/apps/krita/paintoppresets/Splatter_thin.kpp share/apps/krita/paintoppresets/Sponge_texture.kpp share/apps/krita/paintoppresets/Spray_splat.kpp +share/apps/krita/paintoppresets/Tangent_normal_basic.kpp +share/apps/krita/paintoppresets/Tangent_normal_drawing_angle.kpp +share/apps/krita/paintoppresets/Tangent_normal_hairy.kpp +share/apps/krita/paintoppresets/Tangent_normal_pixel.kpp +share/apps/krita/paintoppresets/Tangent_normal_y_inverted.kpp share/apps/krita/paintoppresets/Texture_fuzzy.kpp share/apps/krita/paintoppresets/Texture_hair.kpp share/apps/krita/paintoppresets/Texture_leaves_fuzzy.kpp @@ -6262,21 +6271,8 @@ share/apps/krita/patterns/generic_paper2 share/apps/krita/patterns/granite.pat share/apps/krita/patterns/hexacolBW__2.pat share/apps/krita/pics/ -share/apps/krita/pics/AboutKrita.png -share/apps/krita/pics/addlayer.png -share/apps/krita/pics/addtofolder.png share/apps/krita/pics/arrow-down.png share/apps/krita/pics/arrow-right.png -share/apps/krita/pics/arrow_east.png -share/apps/krita/pics/arrow_north.png -share/apps/krita/pics/arrow_north_east.png -share/apps/krita/pics/arrow_north_west.png -share/apps/krita/pics/arrow_south.png -share/apps/krita/pics/arrow_south_east.png -share/apps/krita/pics/arrow_south_west.png -share/apps/krita/pics/arrow_west.png -share/apps/krita/pics/arrowdown.png -share/apps/krita/pics/arrowupblr.png share/apps/krita/pics/broken-preset.png share/apps/krita/pics/color-picker_image_background.xpm share/apps/krita/pics/color-picker_image_foreground.xpm @@ -6288,18 +6284,68 @@ share/apps/krita/pics/cursor-triangle_le share/apps/krita/pics/cursor-triangle_righthanded.xpm share/apps/krita/pics/dark_addlayer.png share/apps/krita/pics/dark_addtofolder.png +share/apps/krita/pics/dark_application-exit.svg +share/apps/krita/pics/dark_application-pdf.svg +share/apps/krita/pics/dark_applications-system.svg +share/apps/krita/pics/dark_arrow-down.svg +share/apps/krita/pics/dark_arrow-left.svg +share/apps/krita/pics/dark_arrow-right.svg +share/apps/krita/pics/dark_arrow-up.svg +share/apps/krita/pics/dark_arrow_east.png +share/apps/krita/pics/dark_arrow_north.png +share/apps/krita/pics/dark_arrow_north_east.png +share/apps/krita/pics/dark_arrow_north_west.png +share/apps/krita/pics/dark_arrow_south.png +share/apps/krita/pics/dark_arrow_south_east.png +share/apps/krita/pics/dark_arrow_south_west.png +share/apps/krita/pics/dark_arrow_west.png share/apps/krita/pics/dark_arrowdown.png share/apps/krita/pics/dark_arrowupblr.png +share/apps/krita/pics/dark_bookmarks.svg share/apps/krita/pics/dark_calligraphy.png +share/apps/krita/pics/dark_configure-shortcuts.svg +share/apps/krita/pics/dark_configure-toolbars.svg +share/apps/krita/pics/dark_configure.svg share/apps/krita/pics/dark_deletelayer.png +share/apps/krita/pics/dark_dialog-cancel.svg +share/apps/krita/pics/dark_dialog-close.svg +share/apps/krita/pics/dark_dialog-ok.svg +share/apps/krita/pics/dark_dialog-warning.svg +share/apps/krita/pics/dark_document-edit.svg +share/apps/krita/pics/dark_document-export.svg +share/apps/krita/pics/dark_document-import.svg +share/apps/krita/pics/dark_document-new.svg +share/apps/krita/pics/dark_document-open-recent.svg +share/apps/krita/pics/dark_document-open.svg +share/apps/krita/pics/dark_document-print-preview.svg +share/apps/krita/pics/dark_document-print.svg +share/apps/krita/pics/dark_document-save-as.svg +share/apps/krita/pics/dark_document-save.svg +share/apps/krita/pics/dark_download.svg +share/apps/krita/pics/dark_draw-eraser.svg share/apps/krita/pics/dark_draw-text.png +share/apps/krita/pics/dark_drive-harddisk.svg share/apps/krita/pics/dark_duplicatelayer.png +share/apps/krita/pics/dark_edit-clear.svg +share/apps/krita/pics/dark_edit-copy.svg +share/apps/krita/pics/dark_edit-cut.svg +share/apps/krita/pics/dark_edit-delete.svg +share/apps/krita/pics/dark_edit-paste.svg +share/apps/krita/pics/dark_edit-redo.svg +share/apps/krita/pics/dark_edit-undo.svg +share/apps/krita/pics/dark_folder-documents.svg +share/apps/krita/pics/dark_folder-pictures.svg +share/apps/krita/pics/dark_folder.svg share/apps/krita/pics/dark_format-fill-color.png +share/apps/krita/pics/dark_format-list-unordered.svg +share/apps/krita/pics/dark_go-home.svg +share/apps/krita/pics/dark_help-contents.svg +share/apps/krita/pics/dark_im-user.svg +share/apps/krita/pics/dark_kde.svg share/apps/krita/pics/dark_krita_draw_path.png share/apps/krita/pics/dark_krita_tool_color_fill.png share/apps/krita/pics/dark_krita_tool_color_picker.png share/apps/krita/pics/dark_krita_tool_dyna.png -share/apps/krita/pics/dark_krita_tool_editpath.png share/apps/krita/pics/dark_krita_tool_ellipse.png share/apps/krita/pics/dark_krita_tool_freehand.png share/apps/krita/pics/dark_krita_tool_freehandvector.png @@ -6309,29 +6355,73 @@ share/apps/krita/pics/dark_krita_tool_li share/apps/krita/pics/dark_krita_tool_measure.png share/apps/krita/pics/dark_krita_tool_move.png share/apps/krita/pics/dark_krita_tool_multihand.png +share/apps/krita/pics/dark_krita_tool_polygon.png share/apps/krita/pics/dark_krita_tool_rectangle.png share/apps/krita/pics/dark_krita_tool_ruler_assistant.png share/apps/krita/pics/dark_krita_tool_transform.png +share/apps/krita/pics/dark_krita_tool_transform_recursive.png +share/apps/krita/pics/dark_layer-locked.png +share/apps/krita/pics/dark_layer-unlocked.png +share/apps/krita/pics/dark_layer-visible-off.svg +share/apps/krita/pics/dark_link.svg +share/apps/krita/pics/dark_list-add.svg +share/apps/krita/pics/dark_locked.svg +share/apps/krita/pics/dark_media-playback-start.svg +share/apps/krita/pics/dark_media-playback-stop.svg +share/apps/krita/pics/dark_media-record.svg +share/apps/krita/pics/dark_novisible.svg +share/apps/krita/pics/dark_object-locked.svg +share/apps/krita/pics/dark_object-rotate-left.svg +share/apps/krita/pics/dark_object-rotate-right.svg +share/apps/krita/pics/dark_object-unlocked.svg +share/apps/krita/pics/dark_ox16-action-object-align-horizontal-center-calligra.svg +share/apps/krita/pics/dark_ox16-action-object-align-horizontal-left-calligra.svg +share/apps/krita/pics/dark_ox16-action-object-align-horizontal-right-calligra.svg +share/apps/krita/pics/dark_ox16-action-object-align-vertical-bottom-calligra.svg +share/apps/krita/pics/dark_ox16-action-object-align-vertical-center-calligra.svg +share/apps/krita/pics/dark_ox16-action-object-align-vertical-top-calligra.svg +share/apps/krita/pics/dark_ox16-action-object-group-calligra.svg +share/apps/krita/pics/dark_ox16-action-object-order-back-calligra.svg +share/apps/krita/pics/dark_ox16-action-object-order-front-calligra.svg +share/apps/krita/pics/dark_ox16-action-object-order-lower-calligra.svg +share/apps/krita/pics/dark_ox16-action-object-order-raise-calligra.svg +share/apps/krita/pics/dark_ox16-action-object-ungroup-calligra.svg +share/apps/krita/pics/dark_paintop_settings_01.svg +share/apps/krita/pics/dark_paintop_settings_02.svg share/apps/krita/pics/dark_pattern.png share/apps/krita/pics/dark_polyline.png +share/apps/krita/pics/dark_preferences-desktop-color.svg +share/apps/krita/pics/dark_preferences-desktop-display.svg +share/apps/krita/pics/dark_preferences-desktop-locale.svg +share/apps/krita/pics/dark_process-stop.svg share/apps/krita/pics/dark_properties.png share/apps/krita/pics/dark_removefromfolder.png +share/apps/krita/pics/dark_select-all.svg +share/apps/krita/pics/dark_select-clear.svg share/apps/krita/pics/dark_select.png share/apps/krita/pics/dark_selection-mode_ants.png share/apps/krita/pics/dark_selection-mode_invisible.png share/apps/krita/pics/dark_selection-mode_mask.png -share/apps/krita/pics/dark_symmetry-horizontal.png -share/apps/krita/pics/dark_symmetry-vertical.png +share/apps/krita/pics/dark_stroke-cap-butt.svg +share/apps/krita/pics/dark_stroke-cap-round.svg +share/apps/krita/pics/dark_stroke-cap-square.svg +share/apps/krita/pics/dark_stroke-join-bevel.svg +share/apps/krita/pics/dark_stroke-join-miter.svg +share/apps/krita/pics/dark_stroke-join-round.svg +share/apps/krita/pics/dark_symmetry-horizontal.svg +share/apps/krita/pics/dark_symmetry-vertical.svg +share/apps/krita/pics/dark_system-help.svg share/apps/krita/pics/dark_tool_contiguous_selection.png share/apps/krita/pics/dark_tool_crop.png share/apps/krita/pics/dark_tool_elliptical_selection.png share/apps/krita/pics/dark_tool_outline_selection.png share/apps/krita/pics/dark_tool_path_selection.png share/apps/krita/pics/dark_tool_perspectivegrid.png -share/apps/krita/pics/dark_tool_polygon.png share/apps/krita/pics/dark_tool_polygonal_selection.png share/apps/krita/pics/dark_tool_rect_selection.png share/apps/krita/pics/dark_tool_similar_selection.png +share/apps/krita/pics/dark_tools-report-bug.svg +share/apps/krita/pics/dark_tools-wizard.svg share/apps/krita/pics/dark_transform_icons_cage.png share/apps/krita/pics/dark_transform_icons_liquify_erase.png share/apps/krita/pics/dark_transform_icons_liquify_main.png @@ -6344,13 +6434,28 @@ share/apps/krita/pics/dark_transform_ico share/apps/krita/pics/dark_transform_icons_penPressure.png share/apps/krita/pics/dark_transform_icons_perspective.png share/apps/krita/pics/dark_transform_icons_warp.png +share/apps/krita/pics/dark_transparency-disabled.png +share/apps/krita/pics/dark_transparency-enabled.png +share/apps/krita/pics/dark_trim-to-image.png +share/apps/krita/pics/dark_unlocked.svg +share/apps/krita/pics/dark_view-choose.svg +share/apps/krita/pics/dark_view-filter.svg +share/apps/krita/pics/dark_view-fullscreen.svg +share/apps/krita/pics/dark_view-grid.svg +share/apps/krita/pics/dark_view-list-details.svg +share/apps/krita/pics/dark_view-list-text.svg +share/apps/krita/pics/dark_view-preview.svg +share/apps/krita/pics/dark_view-refresh.svg +share/apps/krita/pics/dark_visible.svg +share/apps/krita/pics/dark_window-close.svg +share/apps/krita/pics/dark_window-new.svg +share/apps/krita/pics/dark_zoom-in.svg +share/apps/krita/pics/dark_zoom-original.svg +share/apps/krita/pics/dark_zoom-out.svg share/apps/krita/pics/delete.png -share/apps/krita/pics/deletelayer.png -share/apps/krita/pics/duplicatelayer.png -share/apps/krita/pics/eraser-toggle.png +share/apps/krita/pics/dirty-preset.svg share/apps/krita/pics/exposure-cursor-gesture.xpm share/apps/krita/pics/extended_color_selector.png -share/apps/krita/pics/folder.png share/apps/krita/pics/gamma-cursor-gesture.xpm share/apps/krita/pics/height.png share/apps/krita/pics/height_icon.png @@ -6360,39 +6465,74 @@ share/apps/krita/pics/icon-kritasketch-2 share/apps/krita/pics/kis_colselng_color_patches.png share/apps/krita/pics/kis_colselng_color_triangle.png share/apps/krita/pics/kis_colselng_my_paint_shade_selector.png -share/apps/krita/pics/krita_draw_path.png -share/apps/krita/pics/krita_tool_color_fill.png -share/apps/krita/pics/krita_tool_color_picker.png -share/apps/krita/pics/krita_tool_dyna.png -share/apps/krita/pics/krita_tool_ellipse.png -share/apps/krita/pics/krita_tool_freehandvector.png -share/apps/krita/pics/krita_tool_gradient.png -share/apps/krita/pics/krita_tool_grid.png -share/apps/krita/pics/krita_tool_line.png -share/apps/krita/pics/krita_tool_measure.png -share/apps/krita/pics/krita_tool_move.png -share/apps/krita/pics/krita_tool_multihand.png -share/apps/krita/pics/krita_tool_rectangle.png share/apps/krita/pics/krita_tool_ruler_assistant.png -share/apps/krita/pics/krita_tool_transform.png -share/apps/krita/pics/krita_tool_transform_recursive.png share/apps/krita/pics/landscape.png share/apps/krita/pics/layer-style-disabled.png share/apps/krita/pics/layer-style-enabled.png share/apps/krita/pics/light_addlayer.png share/apps/krita/pics/light_addtofolder.png +share/apps/krita/pics/light_application-exit.svg +share/apps/krita/pics/light_application-pdf.svg +share/apps/krita/pics/light_applications-system.svg +share/apps/krita/pics/light_arrow-down.svg +share/apps/krita/pics/light_arrow-left.svg +share/apps/krita/pics/light_arrow-right.svg +share/apps/krita/pics/light_arrow-up.svg +share/apps/krita/pics/light_arrow_east.png +share/apps/krita/pics/light_arrow_north.png +share/apps/krita/pics/light_arrow_north_east.png +share/apps/krita/pics/light_arrow_north_west.png +share/apps/krita/pics/light_arrow_south.png +share/apps/krita/pics/light_arrow_south_east.png +share/apps/krita/pics/light_arrow_south_west.png +share/apps/krita/pics/light_arrow_west.png share/apps/krita/pics/light_arrowdown.png share/apps/krita/pics/light_arrowupblr.png +share/apps/krita/pics/light_bookmarks.svg share/apps/krita/pics/light_calligraphy.png +share/apps/krita/pics/light_configure-shortcuts.svg +share/apps/krita/pics/light_configure-toolbars.svg +share/apps/krita/pics/light_configure.svg share/apps/krita/pics/light_deletelayer.png +share/apps/krita/pics/light_dialog-cancel.svg +share/apps/krita/pics/light_dialog-close.svg +share/apps/krita/pics/light_dialog-ok.svg +share/apps/krita/pics/light_dialog-warning.svg +share/apps/krita/pics/light_document-edit.svg +share/apps/krita/pics/light_document-export.svg +share/apps/krita/pics/light_document-import.svg +share/apps/krita/pics/light_document-new.svg +share/apps/krita/pics/light_document-open-recent.svg +share/apps/krita/pics/light_document-open.svg +share/apps/krita/pics/light_document-print-preview.svg +share/apps/krita/pics/light_document-print.svg +share/apps/krita/pics/light_document-save-as.svg +share/apps/krita/pics/light_document-save.svg +share/apps/krita/pics/light_download.svg +share/apps/krita/pics/light_draw-eraser.svg share/apps/krita/pics/light_draw-text.png +share/apps/krita/pics/light_drive-harddisk.svg share/apps/krita/pics/light_duplicatelayer.png +share/apps/krita/pics/light_edit-clear.svg +share/apps/krita/pics/light_edit-copy.svg +share/apps/krita/pics/light_edit-cut.svg +share/apps/krita/pics/light_edit-delete.svg +share/apps/krita/pics/light_edit-paste.svg +share/apps/krita/pics/light_edit-redo.svg +share/apps/krita/pics/light_edit-undo.svg +share/apps/krita/pics/light_folder-documents.svg +share/apps/krita/pics/light_folder-pictures.svg +share/apps/krita/pics/light_folder.svg share/apps/krita/pics/light_format-fill-color.png +share/apps/krita/pics/light_format-list-unordered.svg +share/apps/krita/pics/light_go-home.svg +share/apps/krita/pics/light_help-contents.svg +share/apps/krita/pics/light_im-user.svg +share/apps/krita/pics/light_kde.svg share/apps/krita/pics/light_krita_draw_path.png share/apps/krita/pics/light_krita_tool_color_fill.png share/apps/krita/pics/light_krita_tool_color_picker.png share/apps/krita/pics/light_krita_tool_dyna.png -share/apps/krita/pics/light_krita_tool_editpath.png share/apps/krita/pics/light_krita_tool_ellipse.png share/apps/krita/pics/light_krita_tool_freehand.png share/apps/krita/pics/light_krita_tool_freehandvector.png @@ -6402,19 +6542,62 @@ share/apps/krita/pics/light_krita_tool_l share/apps/krita/pics/light_krita_tool_measure.png share/apps/krita/pics/light_krita_tool_move.png share/apps/krita/pics/light_krita_tool_multihand.png +share/apps/krita/pics/light_krita_tool_polygon.png share/apps/krita/pics/light_krita_tool_rectangle.png share/apps/krita/pics/light_krita_tool_ruler_assistant.png share/apps/krita/pics/light_krita_tool_transform.png +share/apps/krita/pics/light_krita_tool_transform_recursive.png +share/apps/krita/pics/light_layer-locked.png +share/apps/krita/pics/light_layer-unlocked.png +share/apps/krita/pics/light_layer-visible-off.svg +share/apps/krita/pics/light_link.svg +share/apps/krita/pics/light_list-add.svg +share/apps/krita/pics/light_locked.svg +share/apps/krita/pics/light_media-playback-start.svg +share/apps/krita/pics/light_media-playback-stop.svg +share/apps/krita/pics/light_media-record.svg +share/apps/krita/pics/light_novisible.svg +share/apps/krita/pics/light_object-locked.svg +share/apps/krita/pics/light_object-rotate-left.svg +share/apps/krita/pics/light_object-rotate-right.svg +share/apps/krita/pics/light_object-unlocked.svg +share/apps/krita/pics/light_ox16-action-object-align-horizontal-center-calligra.svg +share/apps/krita/pics/light_ox16-action-object-align-horizontal-left-calligra.svg +share/apps/krita/pics/light_ox16-action-object-align-horizontal-right-calligra.svg +share/apps/krita/pics/light_ox16-action-object-align-vertical-bottom-calligra.svg +share/apps/krita/pics/light_ox16-action-object-align-vertical-center-calligra.svg +share/apps/krita/pics/light_ox16-action-object-align-vertical-top-calligra.svg +share/apps/krita/pics/light_ox16-action-object-group-calligra.svg +share/apps/krita/pics/light_ox16-action-object-order-back-calligra.svg +share/apps/krita/pics/light_ox16-action-object-order-front-calligra.svg +share/apps/krita/pics/light_ox16-action-object-order-lower-calligra.svg +share/apps/krita/pics/light_ox16-action-object-order-raise-calligra.svg +share/apps/krita/pics/light_ox16-action-object-ungroup-calligra.svg +share/apps/krita/pics/light_paintop_settings_01.svg +share/apps/krita/pics/light_paintop_settings_02.svg share/apps/krita/pics/light_pattern.png share/apps/krita/pics/light_polyline.png +share/apps/krita/pics/light_preferences-desktop-color.svg +share/apps/krita/pics/light_preferences-desktop-display.svg +share/apps/krita/pics/light_preferences-desktop-locale.svg +share/apps/krita/pics/light_process-stop.svg share/apps/krita/pics/light_properties.png share/apps/krita/pics/light_removefromfolder.png +share/apps/krita/pics/light_select-all.svg +share/apps/krita/pics/light_select-clear.svg share/apps/krita/pics/light_select.png share/apps/krita/pics/light_selection-mode_ants.png share/apps/krita/pics/light_selection-mode_invisible.png share/apps/krita/pics/light_selection-mode_mask.png -share/apps/krita/pics/light_symmetry-horizontal.png -share/apps/krita/pics/light_symmetry-vertical.png +share/apps/krita/pics/light_stroke-cap-butt.svg +share/apps/krita/pics/light_stroke-cap-round.svg +share/apps/krita/pics/light_stroke-cap-square.svg +share/apps/krita/pics/light_stroke-join-bevel.svg +share/apps/krita/pics/light_stroke-join-miter.svg +share/apps/krita/pics/light_stroke-join-round.svg +share/apps/krita/pics/light_symmetry-horizontal.svg +share/apps/krita/pics/light_symmetry-vertical.svg +share/apps/krita/pics/light_system-help.svg share/apps/krita/pics/light_tool_contiguous_selection.png share/apps/krita/pics/light_tool_crop.png share/apps/krita/pics/light_tool_elliptical_selection.png @@ -6425,6 +6608,8 @@ share/apps/krita/pics/light_tool_polygon share/apps/krita/pics/light_tool_polygonal_selection.png share/apps/krita/pics/light_tool_rect_selection.png share/apps/krita/pics/light_tool_similar_selection.png +share/apps/krita/pics/light_tools-report-bug.svg +share/apps/krita/pics/light_tools-wizard.svg share/apps/krita/pics/light_transform_icons_cage.png share/apps/krita/pics/light_transform_icons_liquify_erase.png share/apps/krita/pics/light_transform_icons_liquify_main.png @@ -6437,31 +6622,39 @@ share/apps/krita/pics/light_transform_ic share/apps/krita/pics/light_transform_icons_penPressure.png share/apps/krita/pics/light_transform_icons_perspective.png share/apps/krita/pics/light_transform_icons_warp.png +share/apps/krita/pics/light_transparency-disabled.png +share/apps/krita/pics/light_transparency-enabled.png +share/apps/krita/pics/light_trim-to-image.png +share/apps/krita/pics/light_unlocked.svg +share/apps/krita/pics/light_view-choose.svg +share/apps/krita/pics/light_view-filter.svg +share/apps/krita/pics/light_view-fullscreen.svg +share/apps/krita/pics/light_view-grid.svg +share/apps/krita/pics/light_view-list-details.svg +share/apps/krita/pics/light_view-list-text.svg +share/apps/krita/pics/light_view-preview.svg +share/apps/krita/pics/light_view-refresh.svg +share/apps/krita/pics/light_visible.svg +share/apps/krita/pics/light_window-close.svg +share/apps/krita/pics/light_window-new.svg +share/apps/krita/pics/light_zoom-in.svg +share/apps/krita/pics/light_zoom-original.svg +share/apps/krita/pics/light_zoom-out.svg share/apps/krita/pics/linked.png -share/apps/krita/pics/linked2.png share/apps/krita/pics/local_selection_active.png share/apps/krita/pics/local_selection_inactive.png -share/apps/krita/pics/locked.png share/apps/krita/pics/mirrorAxis-HorizontalMove.png share/apps/krita/pics/mirrorAxis-VerticalMove.png -share/apps/krita/pics/newlayer.png -share/apps/krita/pics/novisible.png +share/apps/krita/pics/novisible.svg share/apps/krita/pics/offset_horizontal.png share/apps/krita/pics/offset_vertical.png share/apps/krita/pics/onionA.png share/apps/krita/pics/onionB.png -share/apps/krita/pics/paintop_presets_disabled.png -share/apps/krita/pics/paintop_settings_01.png -share/apps/krita/pics/paintop_settings_02.png -share/apps/krita/pics/paintop_settings_disabled.png share/apps/krita/pics/passthrough-disabled.png share/apps/krita/pics/passthrough-enabled.png -share/apps/krita/pics/polyline.png share/apps/krita/pics/portrait.png share/apps/krita/pics/precise-pick-layer-icon.xpm share/apps/krita/pics/ratio_icon.png -share/apps/krita/pics/reload_preset.png -share/apps/krita/pics/removefromfolder.png share/apps/krita/pics/rotate_cursor.xpm share/apps/krita/pics/rotate_discrete.xpm share/apps/krita/pics/rotate_smooth.xpm @@ -6477,49 +6670,28 @@ share/apps/krita/pics/shear_horizontal.p share/apps/krita/pics/shear_vertical.png share/apps/krita/pics/sidebaricon.png share/apps/krita/pics/tablet.png -share/apps/krita/pics/tool_contiguous_selection.png share/apps/krita/pics/tool_contiguous_selection_cursor.png -share/apps/krita/pics/tool_crop.png share/apps/krita/pics/tool_crop_cursor.png share/apps/krita/pics/tool_ellipse_cursor.png -share/apps/krita/pics/tool_elliptical_selection.png share/apps/krita/pics/tool_elliptical_selection_cursor.png -share/apps/krita/pics/tool_eraser_selection.png share/apps/krita/pics/tool_eraser_selection_cursor.png share/apps/krita/pics/tool_fill_cursor.png share/apps/krita/pics/tool_freehand_cursor.png share/apps/krita/pics/tool_gradient_cursor.png share/apps/krita/pics/tool_line_cursor.png -share/apps/krita/pics/tool_outline_selection.png share/apps/krita/pics/tool_outline_selection_cursor.png -share/apps/krita/pics/tool_path_selection.png -share/apps/krita/pics/tool_perspectivegrid.png share/apps/krita/pics/tool_perspectivegrid_cursor.png -share/apps/krita/pics/tool_polygon.png share/apps/krita/pics/tool_polygon_cursor.png -share/apps/krita/pics/tool_polygonal_selection.png share/apps/krita/pics/tool_polygonal_selection_cursor.png share/apps/krita/pics/tool_polyline_cursor.png -share/apps/krita/pics/tool_rect_selection.png share/apps/krita/pics/tool_rectangle_cursor.png share/apps/krita/pics/tool_rectangular_selection_cursor.png share/apps/krita/pics/tool_screenshot.png -share/apps/krita/pics/tool_similar_selection.png share/apps/krita/pics/tool_similar_selection_cursor.png -share/apps/krita/pics/transparency-disabled.png -share/apps/krita/pics/transparency-enabled.png share/apps/krita/pics/transparency-locked.png share/apps/krita/pics/transparency-unlocked.png share/apps/krita/pics/unlinked.png -share/apps/krita/pics/unlocked.png -share/apps/krita/pics/visible.png -share/apps/krita/pics/white128-krita.png -share/apps/krita/pics/white16-krita.png -share/apps/krita/pics/white22-krita.png -share/apps/krita/pics/white256-krita.png -share/apps/krita/pics/white32-krita.png -share/apps/krita/pics/white48-krita.png -share/apps/krita/pics/white64-krita.png +share/apps/krita/pics/visible.svg share/apps/krita/pics/width.png share/apps/krita/pics/width_icon.png share/apps/krita/pics/workspace-chooser.png @@ -7197,55 +7369,96 @@ share/calligraactive/qml/Toolbars.qml share/color/ share/color/icc/ share/color/icc/krita/ +share/color/icc/krita/ACES-elle-V2-g10.icc +share/color/icc/krita/ACES-elle-V2-g22.icc +share/color/icc/krita/ACES-elle-V2-labl.icc +share/color/icc/krita/ACES-elle-V2-srgbtrc.icc +share/color/icc/krita/ACES-elle-V4-g10.icc +share/color/icc/krita/ACES-elle-V4-g22.icc +share/color/icc/krita/ACES-elle-V4-labl.icc +share/color/icc/krita/ACES-elle-V4-srgbtrc.icc +share/color/icc/krita/ACEScg-elle-V2-g10.icc +share/color/icc/krita/ACEScg-elle-V2-labl.icc +share/color/icc/krita/ACEScg-elle-V2-srgbtrc.icc +share/color/icc/krita/ACEScg-elle-V4-g10.icc +share/color/icc/krita/ACEScg-elle-V4-labl.icc +share/color/icc/krita/ACEScg-elle-V4-srgbtrc.icc share/color/icc/krita/AllColorsRGB-elle-V2-g10.icc +share/color/icc/krita/AllColorsRGB-elle-V2-labl.icc share/color/icc/krita/AllColorsRGB-elle-V2-srgbtrc.icc share/color/icc/krita/AllColorsRGB-elle-V4-g10.icc +share/color/icc/krita/AllColorsRGB-elle-V4-labl.icc share/color/icc/krita/AllColorsRGB-elle-V4-srgbtrc.icc share/color/icc/krita/CIERGB-elle-V2-g10.icc share/color/icc/krita/CIERGB-elle-V2-g22.icc +share/color/icc/krita/CIERGB-elle-V2-labl.icc share/color/icc/krita/CIERGB-elle-V2-srgbtrc.icc share/color/icc/krita/CIERGB-elle-V4-g10.icc share/color/icc/krita/CIERGB-elle-V4-g22.icc +share/color/icc/krita/CIERGB-elle-V4-labl.icc share/color/icc/krita/CIERGB-elle-V4-srgbtrc.icc share/color/icc/krita/CMakeLists.txt share/color/icc/krita/ClayRGB-elle-V2-g10.icc share/color/icc/krita/ClayRGB-elle-V2-g22.icc +share/color/icc/krita/ClayRGB-elle-V2-labl.icc share/color/icc/krita/ClayRGB-elle-V2-srgbtrc.icc share/color/icc/krita/ClayRGB-elle-V4-g10.icc share/color/icc/krita/ClayRGB-elle-V4-g22.icc +share/color/icc/krita/ClayRGB-elle-V4-labl.icc share/color/icc/krita/ClayRGB-elle-V4-srgbtrc.icc share/color/icc/krita/Gray-D50-elle-V2-g10.icc share/color/icc/krita/Gray-D50-elle-V2-g18.icc share/color/icc/krita/Gray-D50-elle-V2-g22.icc +share/color/icc/krita/Gray-D50-elle-V2-labl.icc +share/color/icc/krita/Gray-D50-elle-V2-rec709.icc share/color/icc/krita/Gray-D50-elle-V2-srgbtrc.icc share/color/icc/krita/Gray-D50-elle-V4-g10.icc share/color/icc/krita/Gray-D50-elle-V4-g18.icc share/color/icc/krita/Gray-D50-elle-V4-g22.icc +share/color/icc/krita/Gray-D50-elle-V4-labl.icc +share/color/icc/krita/Gray-D50-elle-V4-rec709.icc share/color/icc/krita/Gray-D50-elle-V4-srgbtrc.icc share/color/icc/krita/IdentityRGB-elle-V2-g10.icc +share/color/icc/krita/IdentityRGB-elle-V2-labl.icc share/color/icc/krita/IdentityRGB-elle-V2-srgbtrc.icc share/color/icc/krita/IdentityRGB-elle-V4-g10.icc +share/color/icc/krita/IdentityRGB-elle-V4-labl.icc share/color/icc/krita/IdentityRGB-elle-V4-srgbtrc.icc share/color/icc/krita/Lab-D50-Identity-elle-V2.icc share/color/icc/krita/Lab-D50-Identity-elle-V4.icc share/color/icc/krita/LargeRGB-elle-V2-g10.icc share/color/icc/krita/LargeRGB-elle-V2-g18.icc +share/color/icc/krita/LargeRGB-elle-V2-labl.icc share/color/icc/krita/LargeRGB-elle-V2-srgbtrc.icc share/color/icc/krita/LargeRGB-elle-V4-g10.icc share/color/icc/krita/LargeRGB-elle-V4-g18.icc +share/color/icc/krita/LargeRGB-elle-V4-labl.icc share/color/icc/krita/LargeRGB-elle-V4-srgbtrc.icc share/color/icc/krita/README +share/color/icc/krita/Rec2020-elle-V2-g10.icc +share/color/icc/krita/Rec2020-elle-V2-labl.icc +share/color/icc/krita/Rec2020-elle-V2-rec709.icc +share/color/icc/krita/Rec2020-elle-V2-srgbtrc.icc +share/color/icc/krita/Rec2020-elle-V4-g10.icc +share/color/icc/krita/Rec2020-elle-V4-labl.icc +share/color/icc/krita/Rec2020-elle-V4-rec709.icc +share/color/icc/krita/Rec2020-elle-V4-srgbtrc.icc share/color/icc/krita/WideRGB-elle-V2-g10.icc share/color/icc/krita/WideRGB-elle-V2-g22.icc +share/color/icc/krita/WideRGB-elle-V2-labl.icc share/color/icc/krita/WideRGB-elle-V2-srgbtrc.icc share/color/icc/krita/WideRGB-elle-V4-g10.icc share/color/icc/krita/WideRGB-elle-V4-g22.icc +share/color/icc/krita/WideRGB-elle-V4-labl.icc share/color/icc/krita/WideRGB-elle-V4-srgbtrc.icc +share/color/icc/krita/XYZ-D50-Identity-elle-V4.icc share/color/icc/krita/cmyk.icm share/color/icc/krita/krita25_lcms-builtin-sRGB_g100-truegamma.icc share/color/icc/krita/sRGB-elle-V2-g10.icc +share/color/icc/krita/sRGB-elle-V2-labl.icc share/color/icc/krita/sRGB-elle-V2-srgbtrc.icc share/color/icc/krita/sRGB-elle-V4-g10.icc +share/color/icc/krita/sRGB-elle-V4-labl.icc share/color/icc/krita/sRGB-elle-V4-srgbtrc.icc share/color/icc/krita/scRGB.icm share/config.kcfg/plansettings.kcfg @@ -7669,7 +7882,6 @@ share/kde4/services/calligra/keximigrate share/kde4/services/calligra/keximigrate_txt.desktop share/kde4/services/calligra/keximigrationhandler.desktop share/kde4/services/calligra/kexiqueryhandler.desktop -share/kde4/services/calligra/kexirelationdesignshape.desktop share/kde4/services/calligra/kexireporthandler.desktop share/kde4/services/calligra/kexiscripthandler.desktop share/kde4/services/calligra/kexitablehandler.desktop @@ -7780,6 +7992,7 @@ share/kde4/services/calligra/kritalevelf share/kde4/services/calligra/kritametadataeditor.desktop share/kde4/services/calligra/kritamodifyselection.desktop share/kde4/services/calligra/kritanoisefilter.desktop +share/kde4/services/calligra/kritanormalize.desktop share/kde4/services/calligra/kritaoffsetimage.desktop share/kde4/services/calligra/kritaoilpaintfilter.desktop share/kde4/services/calligra/kritaparticlepaintop.desktop @@ -7800,6 +8013,7 @@ share/kde4/services/calligra/kritasketch share/kde4/services/calligra/kritasmalltilesfilter.desktop share/kde4/services/calligra/kritasobelfilter.desktop share/kde4/services/calligra/kritaspraypaintop.desktop +share/kde4/services/calligra/kritatangentnormalpaintop.desktop share/kde4/services/calligra/kritatoolcrop.desktop share/kde4/services/calligra/kritatooldyna.desktop share/kde4/services/calligra/kritatoolgrid.desktop
