diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index 51190eadf151..bd16ea0eed61 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= krita -PORTVERSION= 3.1.2.1 -PORTREVISION= 8 +DISTVERSION= 3.3.3 CATEGORIES= graphics kde -MASTER_SITES= KDE/Attic/stable/${PORTNAME}/3.1.2 +MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} DIST_SUBDIR= KDE/${PORTNAME} MAINTAINER= kde@FreeBSD.org @@ -30,26 +29,27 @@ LIB_DEPENDS= libImath.so:graphics/ilmbase \ libxcb-util.so:x11/xcb-util USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ - eigen:3 gettext jpeg kde:5 + eigen:3 gettext jpeg kde:5 shared-mime-info USE_KDE= archive completion config coreaddons crash guiaddons i18n \ itemmodels itemviews kio service widgetsaddons windowsystem -USE_QT5= buildtools_build concurrent core dbus gui network printsupport \ - qmake_build quick svg testlib widgets x11extras xml +USE_QT5= concurrent core dbus gui multimedia network printsupport \ + quick svg testlib widgets x11extras xml \ + buildtools_build qmake_build USE_XORG= ice sm xcb xext xi OPTIONS_DEFINE= GMIC OPENEXR OPTIONS_DEFAULT= OPENEXR OPTIONS_SUB= yes -GMIC_DESC= Build the G'Mic plugin -GMIC_CMAKE_BOOL= WITH_GMIC +GMIC_DESC= Depend on the G'Mic plugin +GMIC_RUN_DEPENDS= gmic_krita_qt:graphics/gmic-qt OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR CONFLICTS_INSTALL= calligra-2* -PLIST_SUB+= SHLIB_VER=16.0.0 \ - SHLIB_SHVER=16 +PLIST_SUB= SHLIB_VER=18.0.0 \ + SHLIB_SHVER=18 .include diff --git a/graphics/krita/distinfo b/graphics/krita/distinfo index c08201e1552b..21e86d0c5cea 100644 --- a/graphics/krita/distinfo +++ b/graphics/krita/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488971301 -SHA256 (KDE/krita/krita-3.1.2.1.tar.gz) = 934ed82c3f4e55e7819b327c838ea2f307d3bf3d040722501378b01d76a3992d -SIZE (KDE/krita/krita-3.1.2.1.tar.gz) = 209242179 +TIMESTAMP = 1518208140 +SHA256 (KDE/krita/krita-3.3.3.tar.gz) = bec04e3392e9b311477c5c6a50e2201b43a3afda91d9b24a0fc8e3399585865d +SIZE (KDE/krita/krita-3.3.3.tar.gz) = 207582956 diff --git a/graphics/krita/files/patch-git_2f59d0d1 b/graphics/krita/files/patch-git_2f59d0d1 deleted file mode 100644 index da1c52045e18..000000000000 --- a/graphics/krita/files/patch-git_2f59d0d1 +++ /dev/null @@ -1,22 +0,0 @@ -From 2f59d0d1d91e3f79342c20d0df68aa9a51817e8d Mon Sep 17 00:00:00 2001 -From: Luca Beltrame -Date: Sat, 6 May 2017 16:00:21 +0200 -Subject: [PATCH] Drop QForeachContainer include and fix Qt 5.9 build - -It's not used anywhere. - -Acked by boud. ---- - libs/ui/KisResourceBundleManifest.cpp | 1 - - 1 file changed, 1 deletion(-) - ---- libs/ui/KisResourceBundleManifest.cpp -+++ libs/ui/KisResourceBundleManifest.cpp -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - - #include - #include diff --git a/graphics/krita/files/patch-plugins_extensions_CMakeLists.txt b/graphics/krita/files/patch-plugins_extensions_CMakeLists.txt deleted file mode 100644 index 33a53f894cf1..000000000000 --- a/graphics/krita/files/patch-plugins_extensions_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -Also allow gmic to be built when using clang... - ---- plugins/extensions/CMakeLists.txt.orig 2016-12-14 22:49:19 UTC -+++ plugins/extensions/CMakeLists.txt -@@ -20,7 +20,7 @@ add_subdirectory( waveletdecompose ) - # Allow to skip building GMIC plugin - option(WITH_GMIC "Build the G'Mic plugin" ON) - if(WITH_GMIC) --if (CMAKE_COMPILER_IS_GNUCC) -+if (CMAKE_COMPILER_IS_GNUCC OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) - add_subdirectory( gmic ) - endif() - endif() diff --git a/graphics/krita/pkg-plist b/graphics/krita/pkg-plist index e4d4af0a1be4..f660ffc8cde5 100644 --- a/graphics/krita/pkg-plist +++ b/graphics/krita/pkg-plist @@ -1,4 +1,3 @@ -%%GMIC%%bin/gmicparser bin/krita etc/xdg/kritarc lib/kritaplugins/krita_colorspaces_extensions.so @@ -20,6 +19,7 @@ lib/kritaplugins/kritabmpexport.so lib/kritaplugins/kritabmpimport.so lib/kritaplugins/kritabrushexport.so lib/kritaplugins/kritabrushimport.so +lib/kritaplugins/kritabuginfo.so lib/kritaplugins/kritachalkpaintop.so lib/kritaplugins/kritachanneldocker.so lib/kritaplugins/kritaclonesarray.so @@ -50,7 +50,6 @@ lib/kritaplugins/kritaexperimentpaintop.so lib/kritaplugins/kritaextensioncolorsfilters.so lib/kritaplugins/kritafastcolortransferfilter.so lib/kritaplugins/kritafilterop.so -%%GMIC%%lib/kritaplugins/kritagmic.so lib/kritaplugins/kritagradientmap.so lib/kritaplugins/kritagriddocker.so lib/kritaplugins/kritagridpaintop.so @@ -100,6 +99,7 @@ lib/kritaplugins/kritapresetdocker.so lib/kritaplugins/kritapresethistory.so lib/kritaplugins/kritapsdexport.so lib/kritaplugins/kritapsdimport.so +lib/kritaplugins/kritaqmic.so lib/kritaplugins/kritaqmlexport.so lib/kritaplugins/kritaraindropsfilter.so lib/kritaplugins/kritarandompickfilter.so @@ -108,6 +108,7 @@ lib/kritaplugins/kritarotateimage.so lib/kritaplugins/kritaroundcornersfilter.so lib/kritaplugins/kritaroundmarkerpaintop.so lib/kritaplugins/kritarulerassistanttool.so +lib/kritaplugins/kritaasccdl.so lib/kritaplugins/kritaselectiontools.so lib/kritaplugins/kritaseparatechannels.so lib/kritaplugins/kritashearimage.so @@ -125,6 +126,7 @@ lib/kritaplugins/kritatgaimport.so lib/kritaplugins/kritathreshold.so lib/kritaplugins/kritatiffexport.so lib/kritaplugins/kritatiffimport.so +lib/kritaplugins/kritatoolSmartPatch.so lib/kritaplugins/kritatoolcrop.so lib/kritaplugins/kritatooldyna.so lib/kritaplugins/kritatoollazybrush.so @@ -359,6 +361,8 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz %%DATADIR%%/brushes/D_Dust_Particles.gih %%DATADIR%%/brushes/D_Normal_dust.gbr %%DATADIR%%/brushes/F_Furr_fast.gbr +%%DATADIR%%/brushes/Flat_textured1.gih +%%DATADIR%%/brushes/Flat_textured2.gih %%DATADIR%%/brushes/G_Sparks.gih %%DATADIR%%/brushes/LJF_Foliage_Brush_01.gbr %%DATADIR%%/brushes/LJF_Foliage_Brush_02.gbr @@ -408,6 +412,9 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz %%DATADIR%%/brushes/R_Rake_small.gbr %%DATADIR%%/brushes/Real_Oil_2.gbr %%DATADIR%%/brushes/Real_oil_1.gbr +%%DATADIR%%/brushes/Rect_textured1.gih +%%DATADIR%%/brushes/Rect_textured2.gih +%%DATADIR%%/brushes/Rect_textured3.gih %%DATADIR%%/brushes/S_Smudge_Cheese.gbr %%DATADIR%%/brushes/S_splats_02.gih %%DATADIR%%/brushes/Sc_Scratch.gih @@ -442,6 +449,8 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz %%DATADIR%%/brushes/Z_Test-pressure.gih %%DATADIR%%/brushes/Z_Triangle_shape_1.gbr %%DATADIR%%/brushes/Z_Triangle_shape_2.gbr +%%DATADIR%%/brushes/oil_bristle.gbr +%%DATADIR%%/brushes/oil_knife.gbr %%DATADIR%%/brushes/rake_textured_01.gbr %%DATADIR%%/brushes/rake_textured_02.gbr %%DATADIR%%/brushes/texture-a.png @@ -472,8 +481,6 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz %%DATADIR%%/defaultpresets/spraybrush.kpp %%DATADIR%%/defaultpresets/tangentnormal.kpp %%DATADIR%%/dtd/krita.dtd -%%GMIC%%%%DATADIR%%/gmic/gimp_update169.gmic -%%GMIC%%%%DATADIR%%/gmic/gmic_def.gmic.blacklist %%DATADIR%%/gradients/BG-Krita2.ggr %%DATADIR%%/gradients/GPS-FG-Glare.ggr %%DATADIR%%/gradients/GPS-Fire-Blueish.ggr @@ -534,10 +541,13 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz %%DATADIR%%/paintoppresets/Basic_tip_soft.kpp %%DATADIR%%/paintoppresets/Basic_wet.kpp %%DATADIR%%/paintoppresets/Basic_wet_soft.kpp +%%DATADIR%%/paintoppresets/Blender_Blur.kpp %%DATADIR%%/paintoppresets/Block_basic.kpp %%DATADIR%%/paintoppresets/Block_bristles.kpp %%DATADIR%%/paintoppresets/Block_fuzzy.kpp %%DATADIR%%/paintoppresets/Block_mix_tilt.kpp +%%DATADIR%%/paintoppresets/Block_textured_1.kpp +%%DATADIR%%/paintoppresets/Block_textured_2.kpp %%DATADIR%%/paintoppresets/Block_tilt.kpp %%DATADIR%%/paintoppresets/Block_wet_tilt.kpp %%DATADIR%%/paintoppresets/Bristle_Details.kpp @@ -551,6 +561,8 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz %%DATADIR%%/paintoppresets/Bristles_mix.kpp %%DATADIR%%/paintoppresets/Bristles_textured.kpp %%DATADIR%%/paintoppresets/Bristles_wet.kpp +%%DATADIR%%/paintoppresets/Brush_dotted.kpp +%%DATADIR%%/paintoppresets/Brush_textured.kpp %%DATADIR%%/paintoppresets/Chalk_brush.kpp %%DATADIR%%/paintoppresets/Clone_tool.kpp %%DATADIR%%/paintoppresets/Curve_curvy.kpp @@ -589,6 +601,8 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz %%DATADIR%%/paintoppresets/Layout_oval.kpp %%DATADIR%%/paintoppresets/Layout_pen.kpp %%DATADIR%%/paintoppresets/Move_tool.kpp +%%DATADIR%%/paintoppresets/Oils_bristle.kpp +%%DATADIR%%/paintoppresets/Oils_knife.kpp %%DATADIR%%/paintoppresets/Pastel_texture_large.kpp %%DATADIR%%/paintoppresets/Pastel_texture_thin.kpp %%DATADIR%%/paintoppresets/Pencil_2B.kpp @@ -644,6 +658,7 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz %%DATADIR%%/paintoppresets/Texture_fuzzy.kpp %%DATADIR%%/paintoppresets/Texture_hair.kpp %%DATADIR%%/paintoppresets/Texture_leaves_fuzzy.kpp +%%DATADIR%%/paintoppresets/Textured_tilt.kpp %%DATADIR%%/paintoppresets/ink_precision_03.kpp %%DATADIR%%/paintoppresets/pixel1.kpp %%DATADIR%%/palettes/concept-cookie.gpl @@ -686,6 +701,7 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz %%DATADIR%%/patterns/23-dynamic-screentone-A.png %%DATADIR%%/patterns/24-dynamic-screentone-B.png %%DATADIR%%/patterns/25-dynamic-screentone-C.png +%%DATADIR%%/patterns/26_brush-marks.png %%DATADIR%%/patterns/Canvas_Hard.pat %%DATADIR%%/patterns/Canvas_covered.pat %%DATADIR%%/patterns/Canvas_small_01.pat @@ -864,10 +880,10 @@ share/icons/hicolor/scalable/apps/calligrakrita.svgz %%DATADIR%%/workspaces/Default.kws %%DATADIR%%/workspaces/Small_Vector.kws %%DATADIR%%/workspaces/VFX_Paint.kws +share/kritaplugins/buginfo.xmlgui share/kritaplugins/clonesarray.xmlgui share/kritaplugins/colorrange.xmlgui share/kritaplugins/colorspaceconversion.xmlgui -%%GMIC%%share/kritaplugins/gmic.xmlgui share/kritaplugins/histogram.xmlgui share/kritaplugins/imageseparate.xmlgui share/kritaplugins/imagesize.xmlgui