On Sat Aug 19, 2017 at 11:30:23AM +0200, Rafael Sadowski wrote:
> Hi All,
>
> Here is a diff to update krita to 4.2.0. All patches are gone because one
^^^^^
3.2.0 :-D
> of the main reasons is that krita switch to the new G’Mic-qt plugin
> integration.
>
> curl is no more linking but it's fetch at configuration so I decided
> to add as b/r depends.
>
> Tested on amd64
>
> OK? Comments?
>
*ping* for 3.2.1. Tested with CMake 3.9 on amd64.
OK? Comments?
RafaelSadowski
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/krita/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile 27 Jul 2017 09:55:45 -0000 1.3
+++ Makefile 27 Aug 2017 13:53:50 -0000
@@ -2,13 +2,12 @@
COMMENT = advanced drawing and image manipulation
-VERSION = 3.1.4
+VERSION = 3.2.1
DISTNAME = krita-${VERSION}
-REVISION = 0
SHARED_LIBS += kritabasicflakes 0.0 # 16.0
SHARED_LIBS += kritacolord 0.0 # 16.0
-SHARED_LIBS += kritaflake 0.0 # 16.0
+SHARED_LIBS += kritaflake 1.0 # 16.0
SHARED_LIBS += kritaodf 0.0 # 16.0
SHARED_LIBS += kritapigment 0.0 # 16.0
SHARED_LIBS += kritaplugin 0.0 # 16.0
@@ -16,10 +15,10 @@ SHARED_LIBS += kritastore
SHARED_LIBS += kritatext 0.0 # 16.0
SHARED_LIBS += kritatextlayout 0.0 # 16.0
SHARED_LIBS += kritaundo2 0.0 # 16.0
-SHARED_LIBS += kritavectorimage 0.0 # 16.0
+SHARED_LIBS += kritavectorimage 1.0 # 16.0
SHARED_LIBS += kritaversion 0.0 # 16.0
SHARED_LIBS += kritawidgets 0.0 # 16.0
-SHARED_LIBS += kritawidgetutils 0.0 # 16.0
+SHARED_LIBS += kritawidgetutils 1.0 # 16.0
# XXX Version numbers from editors/calligra 2.x port
SHARED_LIBS += kritapsd 1.0 # 14.0
SHARED_LIBS += kritacolor 1.0 # 14.0
@@ -27,7 +26,7 @@ SHARED_LIBS += kritaglobal
SHARED_LIBS += kritaimage 51.0 # 0.0
SHARED_LIBS += kritalibbrush 51.0 # 0.0
SHARED_LIBS += kritalibpaintop 51.0 # 0.0
-SHARED_LIBS += kritaui 51.0 # 0.0
+SHARED_LIBS += kritaui 52.0 # 0.0
CATEGORIES = graphics
DPB_PROPERTIES = parallel
@@ -39,15 +38,15 @@ MAINTAINER = Rafael Sadowski <rsadowski@
# GPLv2+, LGPLv2+ and GNU FDLv1.2
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += Half ICE Iex IlmImf IlmThread Imath KF5Archive KF5Completion
-WANTLIB += KF5ConfigCore KF5ConfigGui KF5CoreAddons KF5Crash KF5GuiAddons
-WANTLIB += KF5I18n KF5ItemViews KF5KIOCore KF5Service KF5WidgetsAddons
-WANTLIB += KF5WindowSystem OpenColorIO Qt5Concurrent Qt5Core Qt5DBus
-WANTLIB += Qt5Gui Qt5Multimedia Qt5Network Qt5PrintSupport Qt5Svg
-WANTLIB += Qt5Widgets Qt5X11Extras Qt5Xml SM X11 Xext Xi boost_system-mt
-WANTLIB += c curl exiv2 fftw3 gsl gslcblas jpeg lcms2 m png poppler-qt5
-WANTLIB += pthread raw tiff xcb xcb-util z
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} Half ICE Iex IlmImf IlmThread Imath
+WANTLIB += KF5Archive KF5Completion KF5ConfigCore KF5ConfigGui
+WANTLIB += KF5CoreAddons KF5Crash KF5GuiAddons KF5I18n KF5ItemViews
+WANTLIB += KF5KIOCore KF5Service KF5WidgetsAddons KF5WindowSystem
+WANTLIB += OpenColorIO Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
+WANTLIB += Qt5Network Qt5PrintSupport Qt5Svg Qt5Widgets Qt5X11Extras
+WANTLIB += Qt5Xml SM X11 Xext Xi boost_system-mt c exiv2 fftw3
+WANTLIB += gsl gslcblas jpeg lcms2 m png poppler-qt5 raw tiff
+WANTLIB += xcb xcb-util z
MASTER_SITES = ${MASTER_SITE_KDE:=stable/krita/${VERSION}/}
EXTRACT_SUFX = .tar.gz
@@ -56,6 +55,7 @@ MODULES = devel/kf5
RUN_DEPENDS += devel/desktop-file-utils \
devel/gettext \
+ net/curl \
x11/gtk+3,-guic
LIB_DEPENDS += graphics/jpeg \
@@ -66,7 +66,6 @@ LIB_DEPENDS += graphics/jpeg \
graphics/opencolorio \
graphics/openexr \
graphics/libraw \
- net/curl \
math/fftw3 \
print/poppler,,-qt5 \
devel/boost \
@@ -87,6 +86,7 @@ LIB_DEPENDS += graphics/jpeg \
x11/qt5/qtmultimedia
BUILD_DEPENDS += math/eigen3 \
+ net/curl \
devel/kf5/kdoctools \
devel/kf5/kitemmodels \
devel/gettext-tools
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/krita/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 1 Jun 2017 16:36:52 -0000 1.1.1.1
+++ distinfo 27 Aug 2017 13:53:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (krita-3.1.4.tar.gz) = dBg3sNEq+nldu8pF1e/HiWbzBB2/siomjBAcfcI+gqo=
-SIZE (krita-3.1.4.tar.gz) = 209778186
+SHA256 (krita-3.2.1.tar.gz) = 7wbO5nfXWGHtyg4fglvKQv9ZtyAK64J+FvjR+17xTjk=
+SIZE (krita-3.2.1.tar.gz) = 207014866
Index: patches/patch-libs_ui_KisResourceBundleManifest_cpp
===================================================================
RCS file: patches/patch-libs_ui_KisResourceBundleManifest_cpp
diff -N patches/patch-libs_ui_KisResourceBundleManifest_cpp
--- patches/patch-libs_ui_KisResourceBundleManifest_cpp 18 Jul 2017 11:00:41
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-libs_ui_KisResourceBundleManifest_cpp,v 1.1 2017/07/18
11:00:41 zhuk Exp $
-Fix build with Qt 5.9.
-
-Index: libs/ui/KisResourceBundleManifest.cpp
---- libs/ui/KisResourceBundleManifest.cpp.orig
-+++ libs/ui/KisResourceBundleManifest.cpp
-@@ -22,7 +22,6 @@
- #include <QDomElement>
- #include <QDomNode>
- #include <QDomNodeList>
--#include <QForeachContainer>
-
- #include <KoXmlNS.h>
- #include <KoXmlReader.h>
Index: patches/patch-plugins_extensions_CMakeLists_txt
===================================================================
RCS file: patches/patch-plugins_extensions_CMakeLists_txt
diff -N patches/patch-plugins_extensions_CMakeLists_txt
--- patches/patch-plugins_extensions_CMakeLists_txt 4 Jun 2017 18:06:28
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-plugins_extensions_CMakeLists_txt,v 1.1 2017/06/04 18:06:28
espie Exp $
-clang is happy building this
-
-Index: plugins/extensions/CMakeLists.txt
---- plugins/extensions/CMakeLists.txt.orig
-+++ plugins/extensions/CMakeLists.txt
-@@ -19,7 +19,5 @@ 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)
- add_subdirectory( gmic )
--endif()
- endif()
Index: patches/patch-plugins_extensions_gmic_3rdparty_gmic_CImg_h
===================================================================
RCS file: patches/patch-plugins_extensions_gmic_3rdparty_gmic_CImg_h
diff -N patches/patch-plugins_extensions_gmic_3rdparty_gmic_CImg_h
--- patches/patch-plugins_extensions_gmic_3rdparty_gmic_CImg_h 1 Jun 2017
16:36:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,70 +0,0 @@
-$OpenBSD: patch-plugins_extensions_gmic_3rdparty_gmic_CImg_h,v 1.1.1.1
2017/06/01 16:36:52 rsadowski Exp $
-
-Variables starting by underscore ("_") sign are reserved and should not be used
-in applications.
-
-Index: plugins/extensions/gmic/3rdparty/gmic/CImg.h
---- plugins/extensions/gmic/3rdparty/gmic/CImg.h.orig
-+++ plugins/extensions/gmic/3rdparty/gmic/CImg.h
-@@ -43386,21 +43386,21 @@ namespace cimg_library_suffixed {
- else { if (!visible_cursor) { disp.show_mouse(); visible_cursor =
true; }}
- const int d = (depth()>1)?depth():0;
- int
-- _X = (int)X, _Y = (int)Y, _Z = (int)Z,
-+ uniX = (int)X, uniY = (int)Y, uniZ = (int)Z,
- w = disp.width(), W = width() + d,
- h = disp.height(), H = height() + d,
-- _xp = (int)(_X*(float)w/W), xp = _xp +
((int)(_xp*(float)W/w)!=_X?1:0),
-- _yp = (int)(_Y*(float)h/H), yp = _yp +
((int)(_yp*(float)H/h)!=_Y?1:0),
-- _xn = (int)((_X + 1.0f)*w/W - 1), xn = _xn + ((int)((_xn +
1.0f)*W/w)!=_X + 1?1:0),
-- _yn = (int)((_Y + 1.0f)*h/H - 1), yn = _yn + ((int)((_yn +
1.0f)*H/h)!=_Y + 1?1:0),
-- _zxp = (int)((_Z + width())*(float)w/W), zxp = _zxp +
((int)(_zxp*(float)W/w)!=_Z + width()?1:0),
-- _zyp = (int)((_Z + height())*(float)h/H), zyp = _zyp +
((int)(_zyp*(float)H/h)!=_Z + height()?1:0),
-- _zxn = (int)((_Z + width() + 1.0f)*w/W - 1),
-- zxn = _zxn + ((int)((_zxn + 1.0f)*W/w)!=_Z + width() +
1?1:0),
-- _zyn = (int)((_Z + height() + 1.0f)*h/H - 1),
-- zyn = _zyn + ((int)((_zyn + 1.0f)*H/h)!=_Z + height()
+ 1?1:0),
-- _xM = (int)(width()*(float)w/W - 1), xM = _xM + ((int)((_xM +
1.0f)*W/w)!=width()?1:0),
-- _yM = (int)(height()*(float)h/H - 1), yM = _yM + ((int)((_yM +
1.0f)*H/h)!=height()?1:0),
-+ unixp = (int)(uniX*(float)w/W), xp = unixp +
((int)(unixp*(float)W/w)!=uniX?1:0),
-+ uniyp = (int)(uniY*(float)h/H), yp = uniyp +
((int)(uniyp*(float)H/h)!=uniY?1:0),
-+ unixn = (int)((uniX + 1.0f)*w/W - 1), xn = unixn +
((int)((unixn + 1.0f)*W/w)!=uniX + 1?1:0),
-+ uniyn = (int)((uniY + 1.0f)*h/H - 1), yn = uniyn +
((int)((uniyn + 1.0f)*H/h)!=uniY + 1?1:0),
-+ unizxp = (int)((uniZ + width())*(float)w/W), zxp = unizxp +
((int)(unizxp*(float)W/w)!=uniZ + width()?1:0),
-+ unizyp = (int)((uniZ + height())*(float)h/H), zyp = unizyp +
((int)(unizyp*(float)H/h)!=uniZ + height()?1:0),
-+ unizxn = (int)((uniZ + width() + 1.0f)*w/W - 1),
-+ zxn = unizxn + ((int)((unizxn + 1.0f)*W/w)!=uniZ +
width() + 1?1:0),
-+ unizyn = (int)((uniZ + height() + 1.0f)*h/H - 1),
-+ zyn = unizyn + ((int)((unizyn + 1.0f)*H/h)!=uniZ +
height() + 1?1:0),
-+ unixM = (int)(width()*(float)w/W - 1), xM = unixM +
((int)((unixM + 1.0f)*W/w)!=width()?1:0),
-+ uniyM = (int)(height()*(float)h/H - 1), yM = uniyM +
((int)((uniyM + 1.0f)*H/h)!=height()?1:0),
- xc = (xp + xn)/2,
- yc = (yp + yn)/2,
- zxc = (zxp + zxn)/2,
-@@ -43438,16 +43438,16 @@ namespace cimg_library_suffixed {
- // Draw selection.
- if (phase) {
- const int
-- _xp0 = (int)(X0*(float)w/W), xp0 = _xp0 +
((int)(_xp0*(float)W/w)!=X0?1:0),
-- _yp0 = (int)(Y0*(float)h/H), yp0 = _yp0 +
((int)(_yp0*(float)H/h)!=Y0?1:0),
-- _xn0 = (int)((X0 + 1.0f)*w/W - 1), xn0 = _xn0 + ((int)((_xn0
+ 1.0f)*W/w)!=X0 + 1?1:0),
-- _yn0 = (int)((Y0 + 1.0f)*h/H - 1), yn0 = _yn0 + ((int)((_yn0
+ 1.0f)*H/h)!=Y0 + 1?1:0),
-- _zxp0 = (int)((Z0 + width())*(float)w/W), zxp0 = _zxp0 +
((int)(_zxp0*(float)W/w)!=Z0 + width()?1:0),
-- _zyp0 = (int)((Z0 + height())*(float)h/H), zyp0 = _zyp0 +
((int)(_zyp0*(float)H/h)!=Z0 + height()?1:0),
-- _zxn0 = (int)((Z0 + width() + 1.0f)*w/W - 1),
-- zxn0 = _zxn0 + ((int)((_zxn0 + 1.0f)*W/w)!=Z0 + width() +
1?1:0),
-- _zyn0 = (int)((Z0 + height() + 1.0f)*h/H - 1),
-- zyn0 = _zyn0 + ((int)((_zyn0 + 1.0f)*H/h)!=Z0 + height() +
1?1:0),
-+ unixp0 = (int)(X0*(float)w/W), xp0 = unixp0 +
((int)(unixp0*(float)W/w)!=X0?1:0),
-+ uniyp0 = (int)(Y0*(float)h/H), yp0 = uniyp0 +
((int)(uniyp0*(float)H/h)!=Y0?1:0),
-+ unixn0 = (int)((X0 + 1.0f)*w/W - 1), xn0 = unixn0 +
((int)((unixn0 + 1.0f)*W/w)!=X0 + 1?1:0),
-+ uniyn0 = (int)((Y0 + 1.0f)*h/H - 1), yn0 = uniyn0 +
((int)((uniyn0 + 1.0f)*H/h)!=Y0 + 1?1:0),
-+ unizxp0 = (int)((Z0 + width())*(float)w/W), zxp0 = unizxp0 +
((int)(unizxp0*(float)W/w)!=Z0 + width()?1:0),
-+ unizyp0 = (int)((Z0 + height())*(float)h/H), zyp0 = unizyp0 +
((int)(unizyp0*(float)H/h)!=Z0 + height()?1:0),
-+ unizxn0 = (int)((Z0 + width() + 1.0f)*w/W - 1),
-+ zxn0 = unizxn0 + ((int)((unizxn0 + 1.0f)*W/w)!=Z0 + width() +
1?1:0),
-+ unizyn0 = (int)((Z0 + height() + 1.0f)*h/H - 1),
-+ zyn0 = unizyn0 + ((int)((unizyn0 + 1.0f)*H/h)!=Z0 + height()
+ 1?1:0),
- xc0 = (xp0 + xn0)/2,
- yc0 = (yp0 + yn0)/2,
- zxc0 = (zxp0 + zxn0)/2,
Index: patches/patch-plugins_tools_basictools_kis_tool_colorpicker_cc
===================================================================
RCS file: patches/patch-plugins_tools_basictools_kis_tool_colorpicker_cc
diff -N patches/patch-plugins_tools_basictools_kis_tool_colorpicker_cc
--- patches/patch-plugins_tools_basictools_kis_tool_colorpicker_cc 1 Jun
2017 16:36:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-$OpenBSD: patch-plugins_tools_basictools_kis_tool_colorpicker_cc,v 1.1.1.1
2017/06/01 16:36:52 rsadowski Exp $
-
-XXX Compiler threading support is not turned on in our boost
-
-Index: plugins/tools/basictools/kis_tool_colorpicker.cc
---- plugins/tools/basictools/kis_tool_colorpicker.cc.orig
-+++ plugins/tools/basictools/kis_tool_colorpicker.cc
-@@ -21,8 +21,6 @@
- #include "kis_tool_colorpicker.h"
- #include <string.h>
-
--#include <boost/thread/locks.hpp>
--
- #include <QPoint>
- #include <QLayout>
- #include <QCheckBox>
-@@ -57,7 +55,10 @@
- #include "kis_wrapped_rect.h"
- #include "kis_tool_utils.h"
-
-+#include <thread>
-+#include <mutex>
-
-+
- namespace
- {
- // The location of the sample all visible layers in the combobox
-@@ -114,7 +115,7 @@ void KisToolColorPicker::pickColor(const QPointF& pos)
- }
-
-
-- QScopedPointer<boost::lock_guard<KisImage> > imageLocker;
-+ QScopedPointer<std::lock_guard<KisImage> > imageLocker;
-
- KisPaintDeviceSP dev;
-
-@@ -123,7 +124,7 @@ void KisToolColorPicker::pickColor(const QPointF& pos)
- dev = currentNode()->projection();
- }
- else {
-- imageLocker.reset(new boost::lock_guard<KisImage>(*currentImage()));
-+ imageLocker.reset(new std::lock_guard<KisImage>(*currentImage()));
- dev = currentImage()->projection();
- }
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/krita/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 1 Jun 2017 16:36:52 -0000 1.1.1.1
+++ pkg/PLIST 27 Aug 2017 13:53:50 -0000
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/06/01 16:36:52 rsadowski Exp $
@conflict calligra-<=2.9.11
-@bin bin/gmicparser
@bin bin/krita
lib/kritaplugins/
lib/kritaplugins/krita_colorspaces_extensions.so
@@ -22,6 +21,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
@@ -52,7 +52,6 @@ lib/kritaplugins/kritaexrimport.so
lib/kritaplugins/kritaextensioncolorsfilters.so
lib/kritaplugins/kritafastcolortransferfilter.so
lib/kritaplugins/kritafilterop.so
-lib/kritaplugins/kritagmic.so
lib/kritaplugins/kritagradientmap.so
lib/kritaplugins/kritagriddocker.so
lib/kritaplugins/kritagridpaintop.so
@@ -102,6 +101,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
@@ -127,6 +127,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
@@ -330,6 +331,8 @@ share/krita/brushes/D_Dust_1.gbr
share/krita/brushes/D_Dust_Particles.gih
share/krita/brushes/D_Normal_dust.gbr
share/krita/brushes/F_Furr_fast.gbr
+share/krita/brushes/Flat_textured1.gih
+share/krita/brushes/Flat_textured2.gih
share/krita/brushes/G_Sparks.gih
share/krita/brushes/LJF_Foliage_Brush_01.gbr
share/krita/brushes/LJF_Foliage_Brush_02.gbr
@@ -379,6 +382,9 @@ share/krita/brushes/R_Rake4.gbr
share/krita/brushes/R_Rake_small.gbr
share/krita/brushes/Real_Oil_2.gbr
share/krita/brushes/Real_oil_1.gbr
+share/krita/brushes/Rect_textured1.gih
+share/krita/brushes/Rect_textured2.gih
+share/krita/brushes/Rect_textured3.gih
share/krita/brushes/S_Smudge_Cheese.gbr
share/krita/brushes/S_splats_02.gih
share/krita/brushes/Sc_Scratch.gih
@@ -413,6 +419,8 @@ share/krita/brushes/Z_Pixel__4_pix__45a.
share/krita/brushes/Z_Test-pressure.gih
share/krita/brushes/Z_Triangle_shape_1.gbr
share/krita/brushes/Z_Triangle_shape_2.gbr
+share/krita/brushes/oil_bristle.gbr
+share/krita/brushes/oil_knife.gbr
share/krita/brushes/rake_textured_01.gbr
share/krita/brushes/rake_textured_02.gbr
share/krita/brushes/texture-a.png
@@ -446,9 +454,6 @@ share/krita/defaultpresets/spraybrush.kp
share/krita/defaultpresets/tangentnormal.kpp
share/krita/dtd/
share/krita/dtd/krita.dtd
-share/krita/gmic/
-share/krita/gmic/gimp_update169.gmic
-share/krita/gmic/gmic_def.gmic.blacklist
share/krita/gradients/
share/krita/gradients/BG-Krita2.ggr
share/krita/gradients/GPS-FG-Glare.ggr
@@ -515,10 +520,13 @@ share/krita/paintoppresets/Basic_tip_gau
share/krita/paintoppresets/Basic_tip_soft.kpp
share/krita/paintoppresets/Basic_wet.kpp
share/krita/paintoppresets/Basic_wet_soft.kpp
+share/krita/paintoppresets/Blender_Blur.kpp
share/krita/paintoppresets/Block_basic.kpp
share/krita/paintoppresets/Block_bristles.kpp
share/krita/paintoppresets/Block_fuzzy.kpp
share/krita/paintoppresets/Block_mix_tilt.kpp
+share/krita/paintoppresets/Block_textured_1.kpp
+share/krita/paintoppresets/Block_textured_2.kpp
share/krita/paintoppresets/Block_tilt.kpp
share/krita/paintoppresets/Block_wet_tilt.kpp
share/krita/paintoppresets/Bristle_Details.kpp
@@ -532,6 +540,8 @@ share/krita/paintoppresets/Bristles_hair
share/krita/paintoppresets/Bristles_mix.kpp
share/krita/paintoppresets/Bristles_textured.kpp
share/krita/paintoppresets/Bristles_wet.kpp
+share/krita/paintoppresets/Brush_dotted.kpp
+share/krita/paintoppresets/Brush_textured.kpp
share/krita/paintoppresets/Chalk_brush.kpp
share/krita/paintoppresets/Clone_tool.kpp
share/krita/paintoppresets/Curve_curvy.kpp
@@ -570,6 +580,8 @@ share/krita/paintoppresets/Layout_circle
share/krita/paintoppresets/Layout_oval.kpp
share/krita/paintoppresets/Layout_pen.kpp
share/krita/paintoppresets/Move_tool.kpp
+share/krita/paintoppresets/Oils_bristle.kpp
+share/krita/paintoppresets/Oils_knife.kpp
share/krita/paintoppresets/Pastel_texture_large.kpp
share/krita/paintoppresets/Pastel_texture_thin.kpp
share/krita/paintoppresets/Pencil_2B.kpp
@@ -625,6 +637,7 @@ share/krita/paintoppresets/Tangent_norma
share/krita/paintoppresets/Texture_fuzzy.kpp
share/krita/paintoppresets/Texture_hair.kpp
share/krita/paintoppresets/Texture_leaves_fuzzy.kpp
+share/krita/paintoppresets/Textured_tilt.kpp
share/krita/paintoppresets/ink_precision_03.kpp
share/krita/paintoppresets/pixel1.kpp
share/krita/palettes/
@@ -669,6 +682,7 @@ share/krita/patterns/22_texture-reptile.
share/krita/patterns/23-dynamic-screentone-A.png
share/krita/patterns/24-dynamic-screentone-B.png
share/krita/patterns/25-dynamic-screentone-C.png
+share/krita/patterns/26_brush-marks.png
share/krita/patterns/Canvas_Hard.pat
share/krita/patterns/Canvas_covered.pat
share/krita/patterns/Canvas_small_01.pat
@@ -865,10 +879,10 @@ share/krita/workspaces/Default.kws
share/krita/workspaces/Small_Vector.kws
share/krita/workspaces/VFX_Paint.kws
share/kritaplugins/
+share/kritaplugins/buginfo.xmlgui
share/kritaplugins/clonesarray.xmlgui
share/kritaplugins/colorrange.xmlgui
share/kritaplugins/colorspaceconversion.xmlgui
-share/kritaplugins/gmic.xmlgui
share/kritaplugins/histogram.xmlgui
share/kritaplugins/imageseparate.xmlgui
share/kritaplugins/imagesize.xmlgui
