Update to 1.2.1

Changelog:
Version 1.2.1:
* Fix failure to start under GLib 2.48.
* Fix failure to start when config and user data dirs are missing.
* GNOME: Update mypaint.appdata.xml.
* Fix failure to start when no translations are present.
* Fix pure-black being duplicated in the colour history.
* Fix glitch stroke when Inking is exited & the default tool entered.
* OSX: fix exception if AppKit isn't installed.
* Fix mispositioned windows in multi-monitor setups.
* Windows: fix inability to paste more than the 1st copied image.
* Fix exception when pasting into a layer group.
* Fix incorrect numeric range check on x-axis tilts.
* Fix layers blinking when selected in layer-solo mode.
* Fix palette drag issues with GTK 3.19.8+.
* Fix exception in the colours tab of the background chooser dialog.
* Fix UI glitch: mark cloned layer as selected after duplicate.
* Fix a potential exception with the brush and colur history features.
* About box: report versions better un Windows.
* Make sure layer clones get selected immediately.
* Fix hypersensitive tab drags.
* Fix allelerator mapping sort order.
* Fix exceptions when loading a corrupt thumbnail during thumb updates.
* Fix GTK removing the main canvas widget.
* BrushManager: use UUIDs for device brush names, backwards-compatibly.
* Fix repeated pixbuflist redraws.
* Windows: drop support for floating windows till upstream support's OK.
* Wayland: remove references to cursors that don't exist.

Version 1.2.0:
* New intuitive Inking tool for smooth strokes.
* New Flood Fill tool.
* Automated backups of your working docs, with recovery on startup.
* Improved symmetry-setting and frame-setting modes.
* New workspace UI: two sidebars, with dockable tabbed panels.
* Smoother scrolling and panning.
* New brush pack.
* New brush and color history panel.
* New layer trimming command in frame options.
* Added layer groups.
* New layer modes: several masking modes added.
* Add display filters: greyscale, simulate dichromacy for trichromats.
* New color wheel options: Red/Yellow/Blue, Red-Green/Blue-Yellow.
* Uses dark theme variant by default.
* Clearer icons, prettier freehand cursors.
* Device prefs allow glitchy devices to be restricted.
* Eraser mode no longer changes the size of the brush.
* New vector layers, editable in an external app (Inkscape recommended).
* New fallback layer types: non-PNG image, data.
* More kinds of images now work as backgrounds.
* Improved Windows support
* Ported to GTK3.
* Accelerator map editor has moved to preferences.
* Many other bugfixes, translations, and code quality improvements.

7 files changed, 376 insertions, 304 deletions

diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 3cce054ec34..8dd1ce477df 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -1,19 +1,22 @@
-# $NetBSD: Makefile,v 1.32 2018/07/03 05:03:19 adam Exp $
+# $NetBSD: Makefile,v 1.33 2018/07/17 12:34:52 ryoon Exp $
 
-DISTNAME=	mypaint-1.1.0
-PKGREVISION=	6
+DISTNAME=	mypaint-1.2.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://download.gna.org/mypaint/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GITHUB:=mypaint/}
+EXTRACT_SUFX=	.tar.xz
+GITHUB_PROJECT=	mypaint
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://mypaint.org/
 COMMENT=	Fast and easy open-source graphics application for digital painters
 LICENSE=	gnu-gpl-v2
 
+CONFLICTS+=	libmypaint-[0-9]*
+
 BUILD_DEPENDS+=	scons-[0-9]*:../../devel/scons
-DEPENDS+=	${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
-DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 USE_LANGUAGES=	c c++
 
@@ -33,9 +36,13 @@ LDFLAGS+=	-lintl
 REPLACE_BASH=			brushes/label-brush-mypaint.sh
 
 do-build:
+	${LN} -sf ${PREFIX}/bin/swig2.0 \
+		${BUILDLINK_DIR}/bin/swig
 	cd ${WRKSRC} && cd ${BUILD_DIRS} && \
 		${SETENV} ${MAKE_ENV} \
-		${LOCALBASE}/bin/scons prefix=${DESTDIR}${PREFIX}
+		${LOCALBASE}/bin/scons \
+			prefix=${DESTDIR}${PREFIX} \
+			enable_profiling=False
 
 do-install:
 	cd ${WRKSRC} && cd ${INSTALL_DIRS} && \
@@ -48,8 +55,8 @@ do-install:
 .include "../../devel/swig2/buildlink3.mk"
 .include "../../textproc/json-c/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/py-gobject/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../devel/py-gobject3-common/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mypaint/PLIST b/graphics/mypaint/PLIST
index 7ae68ac85ed..44abc0c37c9 100644
--- a/graphics/mypaint/PLIST
+++ b/graphics/mypaint/PLIST
@@ -1,273 +1,277 @@
-@comment $NetBSD: PLIST,v 1.3 2015/03/15 04:51:31 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/07/17 12:34:52 ryoon Exp $
 bin/mypaint
+bin/mypaint-ora-thumbnailer
 include/libmypaint/glib/mypaint-brush.h
+include/libmypaint/glib/mypaint-gegl-glib.h
 include/libmypaint/mypaint-brush-settings-gen.h
 include/libmypaint/mypaint-brush-settings.h
 include/libmypaint/mypaint-brush.h
 include/libmypaint/mypaint-config.h
 include/libmypaint/mypaint-fixed-tiled-surface.h
 include/libmypaint/mypaint-glib-compat.h
+include/libmypaint/mypaint-rectangle.h
 include/libmypaint/mypaint-surface.h
 include/libmypaint/mypaint-tiled-surface.h
 lib/libmypaint.a
 lib/mypaint/_mypaintlib.so
 lib/pkgconfig/libmypaint.pc
+share/appdata/mypaint.appdata.xml
 share/applications/mypaint.desktop
-share/icons/hicolor/16x16/actions/brush-blend-mode-eraser.png
-share/icons/hicolor/16x16/actions/brush-blend-mode-normal.png
-share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-alpha-lock.png
-share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-colorize.png
-share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-eraser.png
-share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-normal.png
-share/icons/hicolor/16x16/actions/mypaint-brush-blend-modes.png
-share/icons/hicolor/16x16/actions/mypaint-brush-mods-active.png
-share/icons/hicolor/16x16/actions/mypaint-brush-mods-inactive.png
-share/icons/hicolor/16x16/actions/mypaint-frame.png
-share/icons/hicolor/16x16/actions/mypaint-layer-duplicate.png
-share/icons/hicolor/16x16/actions/mypaint-line-mode-ellipse.png
-share/icons/hicolor/16x16/actions/mypaint-line-mode-freehand.png
-share/icons/hicolor/16x16/actions/mypaint-line-mode-sequence.png
-share/icons/hicolor/16x16/actions/mypaint-line-mode-straight.png
-share/icons/hicolor/16x16/actions/mypaint-line-mode.png
-share/icons/hicolor/16x16/actions/mypaint-move.png
-share/icons/hicolor/16x16/actions/mypaint-symmetry.png
-share/icons/hicolor/16x16/actions/mypaint-tool-brush.png
+share/icons/hicolor/16x16/actions/mypaint-tool-color-palette.png
 share/icons/hicolor/16x16/actions/mypaint-tool-color-rgb.png
-share/icons/hicolor/16x16/actions/mypaint-tool-color-triangle.png
 share/icons/hicolor/16x16/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/16x16/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/16x16/actions/mypaint-tool-hcywheel.png
 share/icons/hicolor/16x16/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/16x16/actions/mypaint-tool-hsvsquare.png
 share/icons/hicolor/16x16/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/16x16/actions/mypaint-tool-hue-wheel.png
-share/icons/hicolor/16x16/actions/mypaint-tool-layers.png
-share/icons/hicolor/16x16/actions/mypaint-tool-move-layer.png
-share/icons/hicolor/16x16/actions/mypaint-tool-paint-color.png
-share/icons/hicolor/16x16/actions/mypaint-tool-scratchpad.png
-share/icons/hicolor/16x16/actions/mypaint-view-100.png
-share/icons/hicolor/16x16/actions/mypaint-view-fit.png
-share/icons/hicolor/16x16/actions/mypaint-view-mirror-horizontal.png
-share/icons/hicolor/16x16/actions/mypaint-view-mirror-vertical.png
-share/icons/hicolor/16x16/actions/mypaint-view-pan.png
-share/icons/hicolor/16x16/actions/mypaint-view-rotate-anticlockwise.png
-share/icons/hicolor/16x16/actions/mypaint-view-rotate-clockwise.png
-share/icons/hicolor/16x16/actions/mypaint-view-rotate.png
-share/icons/hicolor/16x16/actions/mypaint-view-zoom-less.png
-share/icons/hicolor/16x16/actions/mypaint-view-zoom-more.png
-share/icons/hicolor/16x16/actions/mypaint-view-zoom.png
+share/icons/hicolor/16x16/actions/mypaint-tool-rings-color-changer.png
+share/icons/hicolor/16x16/actions/mypaint-tool-wash-color-changer.png
 share/icons/hicolor/16x16/apps/mypaint.png
-share/icons/hicolor/22x22/actions/brush-blend-mode-eraser.png
-share/icons/hicolor/22x22/actions/brush-blend-mode-normal.png
-share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-alpha-lock.png
-share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-colorize.png
-share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-eraser.png
-share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-normal.png
-share/icons/hicolor/22x22/actions/mypaint-brush-blend-modes.png
-share/icons/hicolor/22x22/actions/mypaint-brush-mods-active.png
-share/icons/hicolor/22x22/actions/mypaint-brush-mods-inactive.png
-share/icons/hicolor/22x22/actions/mypaint-frame.png
-share/icons/hicolor/22x22/actions/mypaint-line-mode-ellipse.png
-share/icons/hicolor/22x22/actions/mypaint-line-mode-freehand.png
-share/icons/hicolor/22x22/actions/mypaint-line-mode-sequence.png
-share/icons/hicolor/22x22/actions/mypaint-line-mode-straight.png
-share/icons/hicolor/22x22/actions/mypaint-line-mode.png
-share/icons/hicolor/22x22/actions/mypaint-move.png
-share/icons/hicolor/22x22/actions/mypaint-symmetry.png
-share/icons/hicolor/22x22/actions/mypaint-tool-brush.png
+share/icons/hicolor/22x22/actions/mypaint-tool-color-palette.png
 share/icons/hicolor/22x22/actions/mypaint-tool-color-rgb.png
-share/icons/hicolor/22x22/actions/mypaint-tool-color-triangle.png
 share/icons/hicolor/22x22/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/22x22/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/22x22/actions/mypaint-tool-hcywheel.png
 share/icons/hicolor/22x22/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/22x22/actions/mypaint-tool-hsvsquare.png
 share/icons/hicolor/22x22/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/22x22/actions/mypaint-tool-hue-wheel.png
-share/icons/hicolor/22x22/actions/mypaint-tool-layers.png
-share/icons/hicolor/22x22/actions/mypaint-tool-move-layer.png
-share/icons/hicolor/22x22/actions/mypaint-tool-paint-color.png
-share/icons/hicolor/22x22/actions/mypaint-tool-scratchpad.png
-share/icons/hicolor/22x22/actions/mypaint-view-100.png
-share/icons/hicolor/22x22/actions/mypaint-view-fit.png
-share/icons/hicolor/22x22/actions/mypaint-view-mirror-horizontal.png
-share/icons/hicolor/22x22/actions/mypaint-view-mirror-vertical.png
-share/icons/hicolor/22x22/actions/mypaint-view-pan.png
-share/icons/hicolor/22x22/actions/mypaint-view-rotate-anticlockwise.png
-share/icons/hicolor/22x22/actions/mypaint-view-rotate-clockwise.png
-share/icons/hicolor/22x22/actions/mypaint-view-rotate.png
-share/icons/hicolor/22x22/actions/mypaint-view-zoom-less.png
-share/icons/hicolor/22x22/actions/mypaint-view-zoom-more.png
-share/icons/hicolor/22x22/actions/mypaint-view-zoom.png
+share/icons/hicolor/22x22/actions/mypaint-tool-rings-color-changer.png
+share/icons/hicolor/22x22/actions/mypaint-tool-wash-color-changer.png
 share/icons/hicolor/22x22/apps/mypaint.png
-share/icons/hicolor/24x24/actions/brush-blend-mode-eraser.png
-share/icons/hicolor/24x24/actions/brush-blend-mode-normal.png
-share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-alpha-lock.png
-share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-colorize.png
-share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-eraser.png
-share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-normal.png
-share/icons/hicolor/24x24/actions/mypaint-brush-blend-modes.png
-share/icons/hicolor/24x24/actions/mypaint-brush-mods-active.png
-share/icons/hicolor/24x24/actions/mypaint-brush-mods-inactive.png
-share/icons/hicolor/24x24/actions/mypaint-frame.png
-share/icons/hicolor/24x24/actions/mypaint-line-mode-ellipse.png
-share/icons/hicolor/24x24/actions/mypaint-line-mode-freehand.png
-share/icons/hicolor/24x24/actions/mypaint-line-mode-sequence.png
-share/icons/hicolor/24x24/actions/mypaint-line-mode-straight.png
-share/icons/hicolor/24x24/actions/mypaint-line-mode.png
-share/icons/hicolor/24x24/actions/mypaint-move.png
-share/icons/hicolor/24x24/actions/mypaint-symmetry.png
-share/icons/hicolor/24x24/actions/mypaint-tool-brush.png
+share/icons/hicolor/24x24/actions/mypaint-add-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-brush-blend-modes-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-brush-stroke-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-brush-tip-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-colorize-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-colors-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-compositing-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-document-properties-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-down-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-edit-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-eraser-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-expander-collapsed-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-expander-expanded-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-fill-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-frame-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-layer-move-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-layer-vector-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-layers-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-left-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-lock-alpha-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-object-move-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-paint-over-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-painting-context-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-pick-color-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-remove-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-right-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-scrap-next-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-scrap-prev-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-scrap-save-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-scratchpad-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-stroke-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-symmetry-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-target-brush-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-target-layer-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-target-stroke-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-tool-color-palette.png
 share/icons/hicolor/24x24/actions/mypaint-tool-color-rgb.png
-share/icons/hicolor/24x24/actions/mypaint-tool-color-triangle.png
 share/icons/hicolor/24x24/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/24x24/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/24x24/actions/mypaint-tool-hcywheel.png
 share/icons/hicolor/24x24/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/24x24/actions/mypaint-tool-hsvsquare.png
 share/icons/hicolor/24x24/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/24x24/actions/mypaint-tool-hue-wheel.png
-share/icons/hicolor/24x24/actions/mypaint-tool-layers.png
-share/icons/hicolor/24x24/actions/mypaint-tool-move-layer.png
-share/icons/hicolor/24x24/actions/mypaint-tool-paint-color.png
-share/icons/hicolor/24x24/actions/mypaint-tool-scratchpad.png
-share/icons/hicolor/24x24/actions/mypaint-view-100.png
-share/icons/hicolor/24x24/actions/mypaint-view-fit.png
-share/icons/hicolor/24x24/actions/mypaint-view-mirror-horizontal.png
-share/icons/hicolor/24x24/actions/mypaint-view-mirror-vertical.png
-share/icons/hicolor/24x24/actions/mypaint-view-pan.png
-share/icons/hicolor/24x24/actions/mypaint-view-rotate-anticlockwise.png
-share/icons/hicolor/24x24/actions/mypaint-view-rotate-clockwise.png
-share/icons/hicolor/24x24/actions/mypaint-view-rotate.png
-share/icons/hicolor/24x24/actions/mypaint-view-zoom-less.png
-share/icons/hicolor/24x24/actions/mypaint-view-zoom-more.png
-share/icons/hicolor/24x24/actions/mypaint-view-zoom.png
+share/icons/hicolor/24x24/actions/mypaint-tool-inking-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-tool-rings-color-changer.png
+share/icons/hicolor/24x24/actions/mypaint-tool-wash-color-changer.png
+share/icons/hicolor/24x24/actions/mypaint-up-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-100-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-fit-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-mirror-horizontal-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-mirror-vertical-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-pan-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-rotate-anticlockwise-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-rotate-clockwise-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-rotate-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-zoom-less-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-zoom-more-symbolic.svg
+share/icons/hicolor/24x24/actions/mypaint-view-zoom-symbolic.svg
 share/icons/hicolor/24x24/apps/mypaint.png
-share/icons/hicolor/32x32/actions/brush-blend-mode-eraser.png
-share/icons/hicolor/32x32/actions/brush-blend-mode-normal.png
-share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-alpha-lock.png
-share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-colorize.png
-share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-eraser.png
-share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-normal.png
-share/icons/hicolor/32x32/actions/mypaint-brush-blend-modes.png
-share/icons/hicolor/32x32/actions/mypaint-brush-mods-active.png
-share/icons/hicolor/32x32/actions/mypaint-brush-mods-inactive.png
-share/icons/hicolor/32x32/actions/mypaint-frame.png
-share/icons/hicolor/32x32/actions/mypaint-line-mode-ellipse.png
-share/icons/hicolor/32x32/actions/mypaint-line-mode-freehand.png
-share/icons/hicolor/32x32/actions/mypaint-line-mode-sequence.png
-share/icons/hicolor/32x32/actions/mypaint-line-mode-straight.png
-share/icons/hicolor/32x32/actions/mypaint-line-mode.png
-share/icons/hicolor/32x32/actions/mypaint-move.png
-share/icons/hicolor/32x32/actions/mypaint-symmetry.png
-share/icons/hicolor/32x32/actions/mypaint-tool-brush.png
+share/icons/hicolor/256x256/apps/mypaint.png
+share/icons/hicolor/32x32/actions/mypaint-tool-color-palette.png
 share/icons/hicolor/32x32/actions/mypaint-tool-color-rgb.png
-share/icons/hicolor/32x32/actions/mypaint-tool-color-triangle.png
 share/icons/hicolor/32x32/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/32x32/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/32x32/actions/mypaint-tool-hcywheel.png
 share/icons/hicolor/32x32/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/32x32/actions/mypaint-tool-hsvsquare.png
 share/icons/hicolor/32x32/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/32x32/actions/mypaint-tool-hue-wheel.png
-share/icons/hicolor/32x32/actions/mypaint-tool-layers.png
-share/icons/hicolor/32x32/actions/mypaint-tool-move-layer.png
-share/icons/hicolor/32x32/actions/mypaint-tool-paint-color.png
-share/icons/hicolor/32x32/actions/mypaint-tool-scratchpad.png
-share/icons/hicolor/32x32/actions/mypaint-view-100.png
-share/icons/hicolor/32x32/actions/mypaint-view-fit.png
-share/icons/hicolor/32x32/actions/mypaint-view-mirror-horizontal.png
-share/icons/hicolor/32x32/actions/mypaint-view-mirror-vertical.png
-share/icons/hicolor/32x32/actions/mypaint-view-pan.png
-share/icons/hicolor/32x32/actions/mypaint-view-rotate-anticlockwise.png
-share/icons/hicolor/32x32/actions/mypaint-view-rotate-clockwise.png
-share/icons/hicolor/32x32/actions/mypaint-view-rotate.png
-share/icons/hicolor/32x32/actions/mypaint-view-zoom-less.png
-share/icons/hicolor/32x32/actions/mypaint-view-zoom-more.png
-share/icons/hicolor/32x32/actions/mypaint-view-zoom.png
+share/icons/hicolor/32x32/actions/mypaint-tool-rings-color-changer.png
+share/icons/hicolor/32x32/actions/mypaint-tool-wash-color-changer.png
 share/icons/hicolor/32x32/apps/mypaint.png
-share/icons/hicolor/48x48/actions/brush-blend-mode-normal.png
-share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-alpha-lock.png
-share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-colorize.png
-share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-eraser.png
-share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-normal.png
-share/icons/hicolor/48x48/actions/mypaint-brush-blend-modes.png
-share/icons/hicolor/48x48/actions/mypaint-brush-mods-active.png
-share/icons/hicolor/48x48/actions/mypaint-brush-mods-inactive.png
-share/icons/hicolor/48x48/actions/mypaint-frame.png
-share/icons/hicolor/48x48/actions/mypaint-line-mode-ellipse.png
-share/icons/hicolor/48x48/actions/mypaint-line-mode-freehand.png
-share/icons/hicolor/48x48/actions/mypaint-line-mode-sequence.png
-share/icons/hicolor/48x48/actions/mypaint-line-mode-straight.png
-share/icons/hicolor/48x48/actions/mypaint-line-mode.png
-share/icons/hicolor/48x48/actions/mypaint-move.png
-share/icons/hicolor/48x48/actions/mypaint-symmetry.png
-share/icons/hicolor/48x48/actions/mypaint-tool-brush.png
+share/icons/hicolor/48x48/actions/mypaint-tool-color-palette.png
 share/icons/hicolor/48x48/actions/mypaint-tool-color-rgb.png
-share/icons/hicolor/48x48/actions/mypaint-tool-color-triangle.png
 share/icons/hicolor/48x48/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/48x48/actions/mypaint-tool-crossed-bowl-color-changer.png
 share/icons/hicolor/48x48/actions/mypaint-tool-hcywheel.png
 share/icons/hicolor/48x48/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/48x48/actions/mypaint-tool-hsvsquare.png
 share/icons/hicolor/48x48/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/48x48/actions/mypaint-tool-hue-wheel.png
-share/icons/hicolor/48x48/actions/mypaint-tool-layers.png
-share/icons/hicolor/48x48/actions/mypaint-tool-move-layer.png
-share/icons/hicolor/48x48/actions/mypaint-tool-paint-color.png
-share/icons/hicolor/48x48/actions/mypaint-tool-scratchpad.png
-share/icons/hicolor/48x48/actions/mypaint-view-100.png
-share/icons/hicolor/48x48/actions/mypaint-view-fit.png
-share/icons/hicolor/48x48/actions/mypaint-view-mirror-horizontal.png
-share/icons/hicolor/48x48/actions/mypaint-view-mirror-vertical.png
-share/icons/hicolor/48x48/actions/mypaint-view-pan.png
-share/icons/hicolor/48x48/actions/mypaint-view-rotate-anticlockwise.png
-share/icons/hicolor/48x48/actions/mypaint-view-rotate-clockwise.png
-share/icons/hicolor/48x48/actions/mypaint-view-rotate.png
-share/icons/hicolor/48x48/actions/mypaint-view-zoom-less.png
-share/icons/hicolor/48x48/actions/mypaint-view-zoom-more.png
-share/icons/hicolor/48x48/actions/mypaint-view-zoom.png
+share/icons/hicolor/48x48/actions/mypaint-tool-rings-color-changer.png
+share/icons/hicolor/48x48/actions/mypaint-tool-wash-color-changer.png
 share/icons/hicolor/48x48/apps/mypaint.png
-share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-alpha-lock.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-colorize.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-eraser.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-normal.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-blend-modes.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-mods-active.svg
-share/icons/hicolor/scalable/actions/mypaint-brush-mods-inactive.svg
-share/icons/hicolor/scalable/actions/mypaint-frame.svg
-share/icons/hicolor/scalable/actions/mypaint-line-mode-ellipse.svg
-share/icons/hicolor/scalable/actions/mypaint-line-mode-freehand.svg
-share/icons/hicolor/scalable/actions/mypaint-line-mode-sequence.svg
-share/icons/hicolor/scalable/actions/mypaint-line-mode-straight.svg
-share/icons/hicolor/scalable/actions/mypaint-line-mode.svg
-share/icons/hicolor/scalable/actions/mypaint-move.svg
+share/icons/hicolor/512x512/apps/mypaint.png
+share/icons/hicolor/scalable/actions/mypaint-about-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-add-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-bookmark-new-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-blend-modes-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-stroke-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-tip-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-brushes-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-clear-all-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-close-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-colorize-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-colors-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-compositing-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-copy-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-cut-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-delete-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-export-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-new-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-open-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-properties-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-revert-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-save-as-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-document-save-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-down-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-duplicate-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-edit-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-ellipse-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-eraser-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-expander-collapsed-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-expander-expanded-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-file-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-fill-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-frame-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-freehand-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-fullscreen-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-globe-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-help-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-history-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-info-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-above-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-below-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-clone-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-delete-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-fallback-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-group-new-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-group-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-lower-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-merge-down-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-move-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-new-below-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-new-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-painting-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-raise-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layer-vector-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-layers-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-left-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-line-sequence-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-lines-and-curves-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-lock-alpha-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-normal-paint-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-hidden-insensitive-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-hidden-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-locked-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-move-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-unlocked-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-visible-insensitive-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-object-visible-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-ok-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-options-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-paint-over-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-painting-context-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-paste-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-pick-color-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-quit-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-redo-ltr-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-redo-rtl-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-remove-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-right-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-run-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-scrap-next-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-scrap-prev-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-scrap-save-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-scratchpad-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-stroke-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-symmetry-symbolic.svg
 share/icons/hicolor/scalable/actions/mypaint-symmetry.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-brush.svg
+share/icons/hicolor/scalable/actions/mypaint-tab-options-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-target-brush-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-target-layer-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-target-stroke-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-target-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-color-palette.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-color-rgb.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-color-triangle.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-component-sliders.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-hcywheel.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-hsvcube.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-hsvwheel.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-hue-wheel.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-layers.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-move-layer.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-paint-color.svg
-share/icons/hicolor/scalable/actions/mypaint-tool-scratchpad.svg
-share/icons/hicolor/scalable/actions/mypaint-view-100.svg
-share/icons/hicolor/scalable/actions/mypaint-view-fit.svg
-share/icons/hicolor/scalable/actions/mypaint-view-mirror-horizontal.svg
-share/icons/hicolor/scalable/actions/mypaint-view-mirror-vertical.svg
-share/icons/hicolor/scalable/actions/mypaint-view-pan.svg
-share/icons/hicolor/scalable/actions/mypaint-view-rotate-anticlockwise.svg
-share/icons/hicolor/scalable/actions/mypaint-view-rotate-clockwise.svg
-share/icons/hicolor/scalable/actions/mypaint-view-rotate.svg
-share/icons/hicolor/scalable/actions/mypaint-view-zoom-less.svg
-share/icons/hicolor/scalable/actions/mypaint-view-zoom-more.svg
-share/icons/hicolor/scalable/actions/mypaint-view-zoom.svg
-share/icons/hicolor/scalable/apps/mypaint.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-inking-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-trash-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-undo-ltr-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-undo-rtl-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-unfullscreen-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-up-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-100-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-fit-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-mirror-horizontal-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-mirror-vertical-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-pan-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-rotate-anticlockwise-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-rotate-clockwise-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-rotate-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-zoom-less-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-zoom-more-symbolic.svg
+share/icons/hicolor/scalable/actions/mypaint-view-zoom-symbolic.svg
+share/libmypaint/__init__.py
+share/libmypaint/brushsettings.json
+share/libmypaint/brushsettings.py
+share/libmypaint/generate.py
+share/locale/ar_AR/LC_MESSAGES/libmypaint.mo
+share/locale/brx/LC_MESSAGES/mypaint.mo
+share/locale/ca/LC_MESSAGES/libmypaint.mo
+share/locale/ca/LC_MESSAGES/mypaint.mo
 share/locale/cs/LC_MESSAGES/libmypaint.mo
 share/locale/cs/LC_MESSAGES/mypaint.mo
+share/locale/da/LC_MESSAGES/libmypaint.mo
+share/locale/da/LC_MESSAGES/mypaint.mo
 share/locale/de/LC_MESSAGES/libmypaint.mo
 share/locale/de/LC_MESSAGES/mypaint.mo
+share/locale/el/LC_MESSAGES/mypaint.mo
 share/locale/en_CA/LC_MESSAGES/libmypaint.mo
 share/locale/en_CA/LC_MESSAGES/mypaint.mo
+share/locale/en_GB/LC_MESSAGES/libmypaint.mo
 share/locale/en_GB/LC_MESSAGES/mypaint.mo
 share/locale/es/LC_MESSAGES/libmypaint.mo
 share/locale/es/LC_MESSAGES/mypaint.mo
+share/locale/fa/LC_MESSAGES/libmypaint.mo
+share/locale/fa/LC_MESSAGES/mypaint.mo
+share/locale/fi/LC_MESSAGES/libmypaint.mo
 share/locale/fr/LC_MESSAGES/libmypaint.mo
 share/locale/fr/LC_MESSAGES/mypaint.mo
+share/locale/he/LC_MESSAGES/libmypaint.mo
+share/locale/he/LC_MESSAGES/mypaint.mo
 share/locale/hu/LC_MESSAGES/libmypaint.mo
 share/locale/hu/LC_MESSAGES/mypaint.mo
 share/locale/id/LC_MESSAGES/libmypaint.mo
@@ -290,10 +294,16 @@ share/locale/ro/LC_MESSAGES/libmypaint.mo
 share/locale/ro/LC_MESSAGES/mypaint.mo
 share/locale/ru/LC_MESSAGES/libmypaint.mo
 share/locale/ru/LC_MESSAGES/mypaint.mo
+share/locale/sc/LC_MESSAGES/libmypaint.mo
+share/locale/sk/LC_MESSAGES/libmypaint.mo
+share/locale/sk/LC_MESSAGES/mypaint.mo
 share/locale/sl/LC_MESSAGES/libmypaint.mo
 share/locale/sl/LC_MESSAGES/mypaint.mo
+share/locale/sr@cyrillic/LC_MESSAGES/mypaint.mo
 share/locale/sv/LC_MESSAGES/libmypaint.mo
 share/locale/sv/LC_MESSAGES/mypaint.mo
+share/locale/tr/LC_MESSAGES/libmypaint.mo
+share/locale/tr/LC_MESSAGES/mypaint.mo
 share/locale/uk/LC_MESSAGES/libmypaint.mo
 share/locale/uk/LC_MESSAGES/mypaint.mo
 share/locale/zh_CN/LC_MESSAGES/libmypaint.mo
@@ -311,7 +321,7 @@ share/mypaint/backgrounds/10_soft_yellow.png
 share/mypaint/backgrounds/11_weak_blue.png
 share/mypaint/backgrounds/50_comicthumbs.png
 share/mypaint/backgrounds/50_storyboard-template.png
-share/mypaint/backgrounds/README
+share/mypaint/backgrounds/README.md
 share/mypaint/backgrounds/canvas1_1.png
 share/mypaint/backgrounds/canvas1_2.png
 share/mypaint/backgrounds/canvas1_3.png
@@ -319,7 +329,6 @@ share/mypaint/backgrounds/canvas2_1.png
 share/mypaint/backgrounds/canvas3_1.png
 share/mypaint/backgrounds/canvas3_2.png
 share/mypaint/backgrounds/canvas3_3.png
-share/mypaint/backgrounds/default.png
 share/mypaint/backgrounds/mrmamurk/MrMamurk_readme.txt
 share/mypaint/backgrounds/mrmamurk/mamurk_a_1.png
 share/mypaint/backgrounds/mrmamurk/mamurk_a_2.png
@@ -597,6 +606,47 @@ share/mypaint/brushes/experimental/subtle_pencil.myb
 share/mypaint/brushes/experimental/subtle_pencil_prev.png
 share/mypaint/brushes/experimental/track.myb
 share/mypaint/brushes/experimental/track_prev.png
+share/mypaint/brushes/kaerhon_v1/Airbrush_a.myb
+share/mypaint/brushes/kaerhon_v1/Airbrush_a_prev.png
+share/mypaint/brushes/kaerhon_v1/Dirty_Transparent_sk.myb
+share/mypaint/brushes/kaerhon_v1/Dirty_Transparent_sk_prev.png
+share/mypaint/brushes/kaerhon_v1/ReadMe.txt
+share/mypaint/brushes/kaerhon_v1/Sketcher2_sk.myb
+share/mypaint/brushes/kaerhon_v1/Sketcher2_sk_prev.png
+share/mypaint/brushes/kaerhon_v1/Smear_sm.myb
+share/mypaint/brushes/kaerhon_v1/Smear_sm_prev.png
+share/mypaint/brushes/kaerhon_v1/airbruch_press_a.myb
+share/mypaint/brushes/kaerhon_v1/airbruch_press_a_prev.png
+share/mypaint/brushes/kaerhon_v1/airsmudge_a.myb
+share/mypaint/brushes/kaerhon_v1/airsmudge_a_prev.png
+share/mypaint/brushes/kaerhon_v1/airsmudgeultimate_sk.myb
+share/mypaint/brushes/kaerhon_v1/airsmudgeultimate_sk_prev.png
+share/mypaint/brushes/kaerhon_v1/classic_sk.myb
+share/mypaint/brushes/kaerhon_v1/classic_sk_prev.png
+share/mypaint/brushes/kaerhon_v1/classicroundblock_static_c.myb
+share/mypaint/brushes/kaerhon_v1/classicroundblock_static_c_prev.png
+share/mypaint/brushes/kaerhon_v1/extreme_round_l.myb
+share/mypaint/brushes/kaerhon_v1/extreme_round_l_prev.png
+share/mypaint/brushes/kaerhon_v1/fill_c.myb
+share/mypaint/brushes/kaerhon_v1/fill_c_prev.png
+share/mypaint/brushes/kaerhon_v1/flat_bar_l.myb
+share/mypaint/brushes/kaerhon_v1/flat_bar_l_prev.png
+share/mypaint/brushes/kaerhon_v1/ink-slowline_s.myb
+share/mypaint/brushes/kaerhon_v1/ink-slowline_s_prev.png
+share/mypaint/brushes/kaerhon_v1/ink_slow_s.myb
+share/mypaint/brushes/kaerhon_v1/ink_slow_s_prev.png
+share/mypaint/brushes/kaerhon_v1/inkster_l.myb
+share/mypaint/brushes/kaerhon_v1/inkster_l_prev.png
+share/mypaint/brushes/kaerhon_v1/paint_barrr_sm.myb
+share/mypaint/brushes/kaerhon_v1/paint_barrr_sm_prev.png
+share/mypaint/brushes/kaerhon_v1/paint_radius_2_sm.myb
+share/mypaint/brushes/kaerhon_v1/paint_radius_2_sm_prev.png
+share/mypaint/brushes/kaerhon_v1/paint_sm.myb
+share/mypaint/brushes/kaerhon_v1/paint_sm_prev.png
+share/mypaint/brushes/kaerhon_v1/smudge_ink(0.7)_sm.myb
+share/mypaint/brushes/kaerhon_v1/smudge_ink(0.7)_sm_prev.png
+share/mypaint/brushes/kaerhon_v1/wet_paint_sm.myb
+share/mypaint/brushes/kaerhon_v1/wet_paint_sm_prev.png
 share/mypaint/brushes/label-brush-mypaint.sh
 share/mypaint/brushes/order.conf
 share/mypaint/brushes/prev-template.xcf.gz
@@ -726,66 +776,86 @@ share/mypaint/brushes/tanda/watercolor-02-paint.myb
 share/mypaint/brushes/tanda/watercolor-02-paint_prev.png
 share/mypaint/brushes/tanda/watercolor-02-water.myb
 share/mypaint/brushes/tanda/watercolor-02-water_prev.png
-share/mypaint/brushlib/__init__.py
-share/mypaint/brushlib/brushsettings.json
-share/mypaint/brushlib/brushsettings.py
-share/mypaint/brushlib/generate.py
 share/mypaint/gui/__init__.py
+share/mypaint/gui/accelmap.py
 share/mypaint/gui/application.py
+share/mypaint/gui/autorecover.glade
+share/mypaint/gui/autorecover.py
 share/mypaint/gui/backgroundwindow.py
-share/mypaint/gui/brushcreationwidget.py
+share/mypaint/gui/brushcolor.py
+share/mypaint/gui/brusheditor.glade
+share/mypaint/gui/brusheditor.py
+share/mypaint/gui/brushiconeditor.py
 share/mypaint/gui/brushmanager.py
 share/mypaint/gui/brushmodifier.py
 share/mypaint/gui/brushselectionwindow.py
-share/mypaint/gui/brushsettingswindow.py
+share/mypaint/gui/builderhacks.py
 share/mypaint/gui/buttonmap.py
-share/mypaint/gui/canvasevent.py
 share/mypaint/gui/colorpicker.py
+share/mypaint/gui/colorpreview.py
 share/mypaint/gui/colors/__init__.py
 share/mypaint/gui/colors/adjbases.py
 share/mypaint/gui/colors/bases.py
+share/mypaint/gui/colors/changers.py
 share/mypaint/gui/colors/combined.py
-share/mypaint/gui/colors/geom.py
 share/mypaint/gui/colors/hcywheel.py
 share/mypaint/gui/colors/hsvcube.py
-share/mypaint/gui/colors/hsvtriangle.py
+share/mypaint/gui/colors/hsvsquare.py
 share/mypaint/gui/colors/hsvwheel.py
-share/mypaint/gui/colors/palette.py
 share/mypaint/gui/colors/paletteview.py
-share/mypaint/gui/colors/picker.py
 share/mypaint/gui/colors/sliders.py
-share/mypaint/gui/colors/uicolor.py
 share/mypaint/gui/colors/uimisc.py
 share/mypaint/gui/colors/util.py
-share/mypaint/gui/colorselectionwindow.py
-share/mypaint/gui/colorwindow.py
+share/mypaint/gui/colortools.py
 share/mypaint/gui/cursor.py
 share/mypaint/gui/curve.py
+share/mypaint/gui/device.py
 share/mypaint/gui/dialogs.py
+share/mypaint/gui/displayfilter.py
 share/mypaint/gui/document.py
+share/mypaint/gui/drawutils.py
 share/mypaint/gui/drawwindow.py
-share/mypaint/gui/dropdownpanel.py
-share/mypaint/gui/elastic.py
+share/mypaint/gui/externalapp.py
+share/mypaint/gui/factoryaction.py
 share/mypaint/gui/filehandling.py
+share/mypaint/gui/fill.py
+share/mypaint/gui/footer.py
 share/mypaint/gui/framewindow.py
-share/mypaint/gui/functionwindow.py
+share/mypaint/gui/freehand.py
+share/mypaint/gui/gtk2compat.py
 share/mypaint/gui/gtkexcepthook.py
+share/mypaint/gui/history.py
 share/mypaint/gui/historypopup.py
+share/mypaint/gui/inktool.glade
+share/mypaint/gui/inktool.py
 share/mypaint/gui/inputtestwindow.py
 share/mypaint/gui/keyboard.py
+share/mypaint/gui/layermanip.py
+share/mypaint/gui/layermodes.py
+share/mypaint/gui/layers.py
 share/mypaint/gui/layerswindow.py
-share/mypaint/gui/layout.py
+share/mypaint/gui/layerswindow.xml
 share/mypaint/gui/linemode.py
 share/mypaint/gui/main.py
 share/mypaint/gui/menu.xml
-share/mypaint/gui/mypaint.xml
+share/mypaint/gui/meta.py
+share/mypaint/gui/mode.py
+share/mypaint/gui/mypaint.glade
+share/mypaint/gui/objfactory.py
+share/mypaint/gui/optionspanel.py
 share/mypaint/gui/overlays.py
+share/mypaint/gui/picker.py
 share/mypaint/gui/pixbuflist.py
+share/mypaint/gui/preferenceswindow.glade
 share/mypaint/gui/preferenceswindow.py
-share/mypaint/gui/pygtkcompat.py
+share/mypaint/gui/previewwindow.py
+share/mypaint/gui/profiling.py
+share/mypaint/gui/quickchoice.py
+share/mypaint/gui/resources.xml
 share/mypaint/gui/scratchwindow.py
 share/mypaint/gui/spinbox.py
 share/mypaint/gui/stategroup.py
+share/mypaint/gui/style.py
 share/mypaint/gui/symmetry.py
 share/mypaint/gui/tileddrawwidget.py
 share/mypaint/gui/toolbar-blendmodes.xml
@@ -793,29 +863,53 @@ share/mypaint/gui/toolbar-edit.xml
 share/mypaint/gui/toolbar-file.xml
 share/mypaint/gui/toolbar-linemodes.xml
 share/mypaint/gui/toolbar-scrap.xml
-share/mypaint/gui/toolbar-subwindows.xml
 share/mypaint/gui/toolbar-view-manips.xml
 share/mypaint/gui/toolbar-view-modes.xml
 share/mypaint/gui/toolbar-view-resets.xml
 share/mypaint/gui/toolbar.py
 share/mypaint/gui/toolbar.xml
+share/mypaint/gui/topbar.py
+share/mypaint/gui/uicolor.py
+share/mypaint/gui/viewmanip.py
 share/mypaint/gui/widgets.py
 share/mypaint/gui/windowing.py
+share/mypaint/gui/workspace.py
 share/mypaint/lib/__init__.py
-share/mypaint/lib/backgroundsurface.py
+share/mypaint/lib/alg.py
+share/mypaint/lib/autosave.py
 share/mypaint/lib/brush.py
 share/mypaint/lib/brushes_migrate_json.py
+share/mypaint/lib/cache.py
+share/mypaint/lib/color.py
 share/mypaint/lib/command.py
 share/mypaint/lib/document.py
+share/mypaint/lib/errors.py
+share/mypaint/lib/fileutils.py
+share/mypaint/lib/gettext.py
+share/mypaint/lib/gichecks.py
+share/mypaint/lib/glib.py
 share/mypaint/lib/helpers.py
+share/mypaint/lib/i18n.py
 share/mypaint/lib/idletask.py
-share/mypaint/lib/layer.py
+share/mypaint/lib/layer/__init__.py
+share/mypaint/lib/layer/core.py
+share/mypaint/lib/layer/data.py
+share/mypaint/lib/layer/error.py
+share/mypaint/lib/layer/group.py
+share/mypaint/lib/layer/test.py
+share/mypaint/lib/layer/tree.py
+share/mypaint/lib/meta.py
+share/mypaint/lib/modes.py
 share/mypaint/lib/mypaintlib.py
+share/mypaint/lib/observable.py
+share/mypaint/lib/palette.py
+share/mypaint/lib/pixbuf.py
 share/mypaint/lib/pixbufsurface.py
-share/mypaint/lib/scratchpad_palette.py
 share/mypaint/lib/stroke.py
 share/mypaint/lib/strokemap.py
+share/mypaint/lib/surface.py
 share/mypaint/lib/tiledsurface.py
+share/mypaint/lib/xml.py
 share/mypaint/palettes/All_color_choice.gpl
 share/mypaint/palettes/Browns_And_Yellows.gpl
 share/mypaint/palettes/Classic_4.gpl
@@ -836,6 +930,7 @@ share/mypaint/palettes/Warm_Colors.gpl
 share/mypaint/palettes/Watercolor.gpl
 share/mypaint/palettes/Zenburn.gpl
 share/mypaint/pixmaps/crosshair_closed.png
+share/mypaint/pixmaps/cursor_add.png
 share/mypaint/pixmaps/cursor_arrow.png
 share/mypaint/pixmaps/cursor_arrow_forbidden.png
 share/mypaint/pixmaps/cursor_color_picker.png
@@ -849,11 +944,9 @@ share/mypaint/pixmaps/cursor_move_ne_sw.png
 share/mypaint/pixmaps/cursor_move_nw_se.png
 share/mypaint/pixmaps/cursor_move_w_e.png
 share/mypaint/pixmaps/cursor_pencil.png
-share/mypaint/pixmaps/eye_closed.png
-share/mypaint/pixmaps/eye_open.png
+share/mypaint/pixmaps/cursor_remove.png
 share/mypaint/pixmaps/layer_duplicate.png
 share/mypaint/pixmaps/layers.png
-share/mypaint/pixmaps/lock_closed.png
-share/mypaint/pixmaps/lock_open.png
 share/mypaint/pixmaps/mypaint_logo.png
 share/mypaint/pixmaps/plus.png
+share/thumbnailers/mypaint-ora.thumbnailer
diff --git a/graphics/mypaint/distinfo b/graphics/mypaint/distinfo
index 5f886aa5a56..746c5ac0b4e 100644
--- a/graphics/mypaint/distinfo
+++ b/graphics/mypaint/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 21:34:10 agc Exp $
+$NetBSD: distinfo,v 1.9 2018/07/17 12:34:52 ryoon Exp $
 
-SHA1 (mypaint-1.1.0.tar.bz2) = 9e4f0bc2cee6c369f1a40d7c24435b7c26cc3795
-RMD160 (mypaint-1.1.0.tar.bz2) = c34aaf96c66fd62117379b6f2553645c94501fae
-SHA512 (mypaint-1.1.0.tar.bz2) = a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9
-Size (mypaint-1.1.0.tar.bz2) = 37416388 bytes
-SHA1 (patch-SConscript) = a1027dc48d9ccde6e8c273e7b28611bc9338534c
-SHA1 (patch-SConstruct) = 11111493804031c54b62f36b7eb290fae49d3630
-SHA1 (patch-brushlib_SConscript) = afab91876d916f5497017b3a4280d9d26afd280b
-SHA1 (patch-lib_SConscript) = 4f476bb0daf8bbb21a6a11cf1acc662c023f4140
+SHA1 (mypaint-1.2.1.tar.xz) = 89456062e477cff1acb357d0407827f08a479d33
+RMD160 (mypaint-1.2.1.tar.xz) = fd57a9df4ad1900c52c0b4979231a0074a2f57be
+SHA512 (mypaint-1.2.1.tar.xz) = 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
+Size (mypaint-1.2.1.tar.xz) = 37897196 bytes
+SHA1 (patch-SConscript) = b640d6084797c12c5418387c821f4786bcc426e1
+SHA1 (patch-SConstruct) = f903a23506e35ad18202996ade4ad8afdd70af0f
 SHA1 (patch-lib_colorchanger__crossed__bowl.hpp) = b64b8695fe8b787df94ddc588a714b991954084b
diff --git a/graphics/mypaint/patches/patch-SConscript b/graphics/mypaint/patches/patch-SConscript
index 5efd09cd5b3..8bedef1cc25 100644
--- a/graphics/mypaint/patches/patch-SConscript
+++ b/graphics/mypaint/patches/patch-SConscript
@@ -1,13 +1,13 @@
-$NetBSD: patch-SConscript,v 1.1 2015/03/15 04:51:31 ryoon Exp $
+$NetBSD: patch-SConscript,v 1.2 2018/07/17 12:34:52 ryoon Exp $
 
---- SConscript.orig	2012-12-31 17:03:38.000000000 +0000
+--- SConscript.orig	2017-01-21 17:51:52.000000000 +0000
 +++ SConscript
-@@ -19,7 +19,7 @@ except OSError:
- 
- def burn_python_version(target, source, env):
-     # make sure we run the python version that we built the extension modules for
--    s =  '#!/usr/bin/env ' + env['python_binary'] + '\n'
-+    s =  '#! @PYTHONBIN@' + '\n'
-     s += 5*'#\n'
-     s += '# DO NOT EDIT - edit %s instead\n' % source[0]
-     s += 5*'#\n'
+@@ -45,7 +45,7 @@ def burn_versions(env, target, source):
+         import lib.meta
+         relinfo_script = lib.meta._get_release_info_script(gitprefix="git")
+         header = "\n".join([
+-            "#!/usr/bin/env {python_binary}",
++            "#! @PYTHONBIN@",
+             "#",
+             "# ***DO NOT EDIT THIS FILE***: edit {source} instead.",
+             "#",
diff --git a/graphics/mypaint/patches/patch-SConstruct b/graphics/mypaint/patches/patch-SConstruct
index f712afa4f87..5f9214bab24 100644
--- a/graphics/mypaint/patches/patch-SConstruct
+++ b/graphics/mypaint/patches/patch-SConstruct
@@ -1,27 +1,27 @@
-$NetBSD: patch-SConstruct,v 1.3 2015/03/15 04:51:31 ryoon Exp $
+$NetBSD: patch-SConstruct,v 1.4 2018/07/17 12:34:52 ryoon Exp $
 
 * Set python interpreter
 * From http://dev.gentoo.org/~vapier/scons-blows.txt, to respect LDFLAGS
 
---- SConstruct.orig	2012-12-31 17:03:38.000000000 +0000
+--- SConstruct.orig	2017-01-21 17:51:52.000000000 +0000
 +++ SConstruct
 @@ -1,4 +1,5 @@
  import os, sys
 +import SCons.Util
  from os.path import join, basename
  from SCons.Script.SConscript import SConsEnvironment
- 
-@@ -39,7 +40,7 @@ opts.Add('python_config', 'python-config
- 
- tools = ['default', 'textfile']
+ import SCons.Util
+@@ -63,7 +64,7 @@ elif sys.platform == "win32":
+     # patch with a suitable options switch.
+     tools.append("mingw")
  
 -env = Environment(ENV=os.environ, options=opts, tools=tools)
 +env = Environment(ENV=os.environ, options=opts, tools=tools, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
- print('building for %r (use scons python_binary=xxx to change)' % env['python_binary'])
- print('using %r (use scons python_config=xxx to change)' % env['python_config'])
- if sys.platform == "win32":
-@@ -47,9 +48,9 @@ if sys.platform == "win32":
-     env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts)
+ 
+ Help(opts.GenerateHelpText(env))
+ 
+@@ -95,9 +96,9 @@ if "$CCFLAGS" in env['CXXCOM']:
+ 
  opts.Update(env)
  
 -env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
@@ -31,9 +31,9 @@ $NetBSD: patch-SConstruct,v 1.3 2015/03/15 04:51:31 ryoon Exp $
 +env.Append(CCFLAGS=['-Wall'])
 +env.Append(CFLAGS=['-std=c99'])
  
- # Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008)
- env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
-@@ -67,6 +68,9 @@ else:
+ env['GEGL_VERSION'] = 0.3
+ 
+@@ -118,6 +119,9 @@ else:
  if env['enable_profiling'] or env['debug']:
      env.Append(CCFLAGS='-g')
  
@@ -42,4 +42,4 @@ $NetBSD: patch-SConstruct,v 1.3 2015/03/15 04:51:31 ryoon Exp $
 +
  #env.Append(CCFLAGS='-fno-inline', LINKFLAGS='-fno-inline')
  
- # Look up libraries dependencies relative to the library
+ if sys.platform == "darwin":
diff --git a/graphics/mypaint/patches/patch-brushlib_SConscript b/graphics/mypaint/patches/patch-brushlib_SConscript
deleted file mode 100644
index 4ddbd6403be..00000000000
--- a/graphics/mypaint/patches/patch-brushlib_SConscript
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-brushlib_SConscript,v 1.1 2015/03/15 04:51:31 ryoon Exp $
-
---- brushlib/SConscript.orig	2012-12-31 17:03:38.000000000 +0000
-+++ brushlib/SConscript
-@@ -73,7 +73,7 @@ if env['enable_docs']:
- 
- env.Append(CPPPATH='./')
- 
--pkg_deps = ['json']
-+pkg_deps = ['json-c']
- libs = ['m']
- linkflags = []
- 
diff --git a/graphics/mypaint/patches/patch-lib_SConscript b/graphics/mypaint/patches/patch-lib_SConscript
deleted file mode 100644
index dc5f509d7d6..00000000000
--- a/graphics/mypaint/patches/patch-lib_SConscript
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_SConscript,v 1.2 2015/03/15 04:51:31 ryoon Exp $
-
---- lib/SConscript.orig	2012-12-31 17:03:38.000000000 +0000
-+++ lib/SConscript
-@@ -18,7 +18,7 @@ env = mypaintlib_env
- # I have given up. Scons just can't get the dependencies right with those
- # code generators. Let's give scons a "normal" c++ project to dependency-scan.
- swig_opts = '-DHAVE_GEGL' if env['enable_gegl'] else ''
--if env.Execute('swig -o mypaintlib_wrap.cpp -noproxydel -python -c++ %s mypaintlib.i' % swig_opts):
-+if env.Execute('swig2.0 -o mypaintlib_wrap.cpp -noproxydel -python -c++ %s mypaintlib.i' % swig_opts):
-     Exit(1)
- env.Clean('.', 'mypaintlib_wrap.cpp')
- env.Clean('.', 'mypaintlib.py')