Attachment #170011 for bug #209297

View | Details | Raw Unified | Return to bug 209297
Collapse All | Expand All




# $FreeBSD: head/graphics/mypaint/Makefile 414046 2016-04-26 12:29:31Z jbeich $

PORTNAME=	mypaint
PORTVERSION=	1.2.0
DISTVERSION=	1.1.0
PORTREVISION=	6
CATEGORIES=	graphics
MASTER_SITES=	https://github.com/mypaint/mypaint/releases/download/${PORTVERSION:S/^/v/}/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Fast painting/scribbling program

LICENSE=	GPLv2+ ISCL
LICENSE_COMB=	multi
LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
LICENSE_FILE_ISCL=	${WRKSRC}/brushlib/COPYING
LICENSE_FILE_MIT=	${WRKSRC}/COPYING.cursors

BUILD_DEPENDS=	swig13>0:devel/swig13 \
		${PYNUMPY}
		${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf
LIB_DEPENDS=	libjson-c.so:devel/json-c \
		liblcms2.so:graphics/lcms2
RUN_DEPENDS=	${PYNUMPY}

		protoc:devel/protobuf

USE_GITHUB=	yes
USE_GNOME=	glib20 pygtk2
MAKE_ARGS=	prefix="${PREFIX}"
# XXX gcc-c++11-lib to fix runtime issues with old -lgcc_s and Clang
USES=		compiler:gcc-c++11-lib desktop-file-utils gettext localbase \
		pkgconfig python:2 scons tar:xz
USE_CSTD=	c99
USE_GNOME=	gtk30 pygobject3 librsvg2:run
MAKE_ARGS=	prefix=${PREFIX} \
		enable_profiling=False \
		use_sharedlib=True \
		python_binary="${PYTHON_CMD}" \
		python_config="${PYTHON_CMD}-config"
INSTALL_TARGET=	${STAGEDIR} --install-sandbox=${STAGEDIR}
USE_LDCONFIG=	yes
INSTALLS_ICONS=	yes

OPTIONS_DEFINE=		GEGL
OPTIONS_SUB=		yes

GEGL_DESC=		Graph based image processing framework support
GEGL_LIB_DEPENDS=	libgegl-0.3.so:graphics/gegl3
GEGL_MAKE_ARGS=		enable_gegl=True

post-install:
	(cd ${WRKSRC}/brushlib && ${INSTALL_LIB} libmypaint*.so \
		${STAGEDIR}${PREFIX}/lib)
pre-install:
	@${RM} -rf ${WRKSRC}/sandbox 2>/dev/null || ${TRUE}
	@(cd ${WRKSRC} && ${DO_MAKE_BUILD} --install-sandbox=pre-stage)

do-install:
.for d in . po brushlib brushlib/po
	(cd ${WRKSRC}/${d}/pre-stage && ${PAX} -rw . ${STAGEDIR})
.endfor
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mypaint/_mypaintlib.so

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)graphics/mypaint/distinfo (-2 / +2 lines)
1	SHA256 (mypaint-mypaint-v1.1.0_GH0.tar.gz) = 59d8323c60423c9a15e02ff93e406d25a7919df3af826089f0cf7f1124c9dbd1	1	SHA256 (mypaint-1.2.0.tar.xz) = cdab33dd0c146cf678c97bcdd44e561f97a0aec40421b8c6785a74b33b9728e2
2	SIZE (mypaint-mypaint-v1.1.0_GH0.tar.gz) = 37871920	2	SIZE (mypaint-1.2.0.tar.xz) = 37895196




--- SConstruct.orig	2016-01-15 19:42:54 UTC
+++ SConstruct
@@ -95,14 +95,14 @@ if "$CCFLAGS" in env['CXXCOM']:
 
 tools = ['default', 'textfile']
 
-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 +47,9 @@ if sys.platform == "win32":
     env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts)
 opts.Update(env)
 
-env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
-env.Append(CCFLAGS='-Wall')
-env.Append(CFLAGS='-std=c99')
+#env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
+#env.Append(CCFLAGS='-Wall')
+#env.Append(CFLAGS='-std=c99')
 
 env['GEGL_VERSION'] = 0.3
 
 # Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008)
-env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
+#env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
 
 if env.get('CPPDEFINES'):
     # make sure assertions are enabled
@@ -113,7 +113,7 @@ if env['debug']:
     env.Append(CCFLAGS='-O0', LINKFLAGS='-O0')
 else:
     # Overridable defaults
-    env.Prepend(CCFLAGS='-O3', LINKFLAGS='-O3')
+    env.Prepend(CCFLAGS='', LINKFLAGS='')
 
 if env['enable_profiling'] or env['debug']:
     env.Append(CCFLAGS='-g')




--- brushlib/SConscript.orig	2016-01-15 19:42:55 UTC
+++ brushlib/SConscript
@@ -52,7 +52,7 @@ def create_pkgconfig_files(env, pkgconfi
     }
     pc_file = env.Substfile('%s.pc' % pkgconfig_name,
                             "pkgconfig.pc.in", SUBST_DICT=pkg_info)

 
     return pc_file
 
@@ -163,7 +163,6 @@ if env['enable_introspection']:
     install_perms(env, '$prefix/share/gir-1.0', gir)
     install_perms(env, '$prefix/lib/girepository-1.0', typelib)
 
-install_perms(env, '$prefix/lib/', brushlib)
 install_perms(env, '$prefix/include/libmypaint', Glob("./mypaint-*.h"))
 install_perms(env, '$prefix/include/libmypaint/glib', Glob("./glib/mypaint-*.h"))
 install_perms(env, "$prefix/share/libmypaint", Glob("./*.py"))
@@ -183,7 +182,6 @@ if env['enable_gegl']:
     lib_builder = gegl_env.SharedLibrary if env['use_sharedlib'] else gegl_env.StaticPicLibrary
     brushlib_gegl = lib_builder('./mypaint-gegl', Glob("./gegl/*.c"))
 
-    install_perms(env, '$prefix/lib/', brushlib_gegl)
     install_perms(env, '$prefix/include/libmypaint-gegl', Glob("./gegl/mypaint-gegl-*.h"))
@@ -73,7 +74,7 @@ if env['enable_docs']:
 
 env.Append(CPPPATH='./')
 
-pkg_deps = ['json']
+pkg_deps = ['json-c']
 libs = ['m']
 linkflags = []
 
     create_pkgconfig_files(env, 'libmypaint-gegl', brushlib_version, 'MyPaint brush engine library, with GEGL integration',




--- brushlib/SConstruct.orig	2016-01-15 19:42:55 UTC
+++ brushlib/SConstruct
@@ -57,14 +57,14 @@ if os.environ.has_key('LDFLAGS'):
 
 opts.Update(env)
 
-env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
-env.Append(CCFLAGS='-Wall -Wstrict-prototypes -Werror')
-env.Append(CFLAGS='-std=c99')
+#env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
+#env.Append(CCFLAGS='-Wall -Wstrict-prototypes -Werror')
+#env.Append(CFLAGS='-std=c99')
 
 env['GEGL_VERSION'] = 0.3
 
 # Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008)
-env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
+#env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
 
 if env.get('CPPDEFINES'):
     # make sure assertions are enabled
@@ -75,7 +75,7 @@ if env['debug']:
     env.Append(CCFLAGS='-O0', LINKFLAGS='-O0')
 else:
     # Overridable defaults
-    env.Prepend(CCFLAGS='-O3', LINKFLAGS='-O3')
+    env.Prepend(CCFLAGS='', LINKFLAGS='')
 
 if env['enable_profiling'] or env['debug']:
     env.Append(CCFLAGS='-g')




--- brushlib/tests/SConscript.orig	2016-01-15 19:42:55 UTC
+++ brushlib/tests/SConscript
@@ -15,11 +15,11 @@ tests_sources = [fn for fn in os.listdir
 tests_sources = [fn for fn in os.listdir("./") if is_test(fn) and is_csource(fn)]
 testlib_sources = [fn for fn in os.listdir("./") if not is_test(fn) and is_csource(fn)]
 
 testlib_env.Append(LIBS=['mypaint'])
-if sys.platform == 'win32':
+if sys.platform == 'win32' or sys.platform.startswith("freebsd"):
     testlib_env.Append(LIBS=['intl'])
 elif sys.platform == "msys" and os.environ.get("MSYSTEM") != "MSYS":
     testlib_env.Append(LIBS=['intl'])
-testlib_env.Append(CPPPATH=['../'], LIBPATH=['../'])
+testlib_env.Prepend(CPPPATH=['../'], LIBPATH=['../'])
 
 if testlib_env['enable_gperftools']:
     parse_pkg_config(testlib_env, "libprofiler")




--- lib/glib.py.orig	2016-01-15 19:42:55 UTC
+++ lib/glib.py
@@ -1,5 +1,5 @@
 # This file is part of MyPaint.
-# Copyright (C) 2015 by Andrew Chadwick <a.t.chadwick@gmail.com>
+# Copyright (C) 2015-2016 by the MyPaint Development Team.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,11 +19,12 @@ unicode, and may not even be UTF-8). Thi
 ## Imports
 
 import sys
-from logging import getLogger
-logger = getLogger(__name__)
+import logging
 
 from gi.repository import GLib
 
+logger = logging.getLogger(__name__)
+
 
 ## File path getter functions
 
@@ -35,7 +36,6 @@ def filename_to_unicode(opsysstring):
     :returns: the converted filename
     :rtype: unicode
 
-    >>> from gi.repository import GLib
     >>> filename_to_unicode('/ascii/only/path')
     u'/ascii/only/path'
     >>> filename_to_unicode(None) is None
@@ -54,7 +54,12 @@ def filename_to_unicode(opsysstring):
     # Other systems are dependent in opaque ways on the environment.
     if not isinstance(opsysstring, str):
         raise TypeError("Argument must be bytes")
-    ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0)
+    # This function's annotation seems to vary quite a bit.
+    # See https://github.com/mypaint/mypaint/issues/634
+    try:
+        ustring, _, _ = GLib.filename_to_utf8(opsysstring, -1)
+    except TypeError:
+        ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0)
     if ustring is None:
         raise UnicodeDecodeError(
             "GLib failed to convert %r to a UTF-8 string. "




--- mypaint.py.orig	2012-12-31 16:35:54 UTC
+++ mypaint.py
@@ -172,11 +172,6 @@ if __name__ == '__main__':
     print "DEBUG: localepath: ", localepath
     print "DEBUG: localepath_brushlib: ", localepath_brushlib
 
-    # Low-level bindtextdomain, required for GtkBuilder stuff.
-    locale.bindtextdomain("mypaint", localepath)
-    locale.bindtextdomain("libmypaint", localepath_brushlib)
-    locale.textdomain("mypaint")
-
     # Python gettext module.
     # See http://docs.python.org/release/2.7/library/locale.html
     gettext.bindtextdomain("mypaint", localepath)




#!/bin/sh

if [ "$2" = "POST-INSTALL" ]; then
	pygtk_check_file="%%LOCALBASE%%/share/examples/py-gtk/Makefile"

	if [ -e "$pygtk_check_file" ]; then
		if ! grep -q numpy "$pygtk_check_file"; then
			message="Dependent x11-toolkits/py-gtk2 port was built with NUMPY option disabled, but mypaint requires it to be enabled. Please rebuild x11-toolkits/py-gtk2 WITH_NUMPY, instead mypaint won't run"
		fi
	else
		message="Note that dependent x11-toolkits/py-gtk2 port should be build with NUMPY option enabled"
	fi

	if [ -n "$message" ]; then
		echo "======================================================================"
		echo
		echo $message | fmt -w 70
		echo
		echo "======================================================================"
	fi
fi

Lines 1-272 Link Here

(-)graphics/mypaint/pkg-plist (-233 / +330 lines)
1	bin/mypaint	1	bin/mypaint
		2	bin/mypaint-ora-thumbnailer
2	include/libmypaint/glib/mypaint-brush.h	3	include/libmypaint/glib/mypaint-brush.h
		4	include/libmypaint/glib/mypaint-gegl-glib.h
3	include/libmypaint/mypaint-brush-settings-gen.h	5	include/libmypaint/mypaint-brush-settings-gen.h
4	include/libmypaint/mypaint-brush-settings.h	6	include/libmypaint/mypaint-brush-settings.h
5	include/libmypaint/mypaint-brush.h	7	include/libmypaint/mypaint-brush.h
6	include/libmypaint/mypaint-config.h	8	include/libmypaint/mypaint-config.h
7	include/libmypaint/mypaint-fixed-tiled-surface.h	9	include/libmypaint/mypaint-fixed-tiled-surface.h
8	include/libmypaint/mypaint-glib-compat.h	10	include/libmypaint/mypaint-glib-compat.h
		11	include/libmypaint/mypaint-rectangle.h
9	include/libmypaint/mypaint-surface.h	12	include/libmypaint/mypaint-surface.h
10	include/libmypaint/mypaint-tiled-surface.h	13	include/libmypaint/mypaint-tiled-surface.h
11	lib/libmypaint.a	14	%%GEGL%%include/libmypaint-gegl/mypaint-gegl-surface.h
		15	lib/libmypaint.so
		16	%%GEGL%%lib/libmypaint-gegl.so
		17	lib/libmypaint-tests.so
12	lib/mypaint/_mypaintlib.so	18	lib/mypaint/_mypaintlib.so
13	libdata/pkgconfig/libmypaint.pc	19	libdata/pkgconfig/libmypaint.pc
		20	%%GEGL%%libdata/pkgconfig/libmypaint-gegl.pc
		21	share/appdata/mypaint.appdata.xml
14	share/applications/mypaint.desktop	22	share/applications/mypaint.desktop
15	share/icons/hicolor/16x16/actions/brush-blend-mode-eraser.png	23	share/icons/hicolor/16x16/actions/mypaint-tool-color-palette.png
16	share/icons/hicolor/16x16/actions/brush-blend-mode-normal.png
17	share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-alpha-lock.png
18	share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-colorize.png
19	share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-eraser.png
20	share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-normal.png
21	share/icons/hicolor/16x16/actions/mypaint-brush-blend-modes.png
22	share/icons/hicolor/16x16/actions/mypaint-brush-mods-active.png
23	share/icons/hicolor/16x16/actions/mypaint-brush-mods-inactive.png
24	share/icons/hicolor/16x16/actions/mypaint-frame.png
25	share/icons/hicolor/16x16/actions/mypaint-layer-duplicate.png
26	share/icons/hicolor/16x16/actions/mypaint-line-mode-ellipse.png
27	share/icons/hicolor/16x16/actions/mypaint-line-mode-freehand.png
28	share/icons/hicolor/16x16/actions/mypaint-line-mode-sequence.png
29	share/icons/hicolor/16x16/actions/mypaint-line-mode-straight.png
30	share/icons/hicolor/16x16/actions/mypaint-line-mode.png
31	share/icons/hicolor/16x16/actions/mypaint-move.png
32	share/icons/hicolor/16x16/actions/mypaint-symmetry.png
33	share/icons/hicolor/16x16/actions/mypaint-tool-brush.png
34	share/icons/hicolor/16x16/actions/mypaint-tool-color-rgb.png	24	share/icons/hicolor/16x16/actions/mypaint-tool-color-rgb.png
35	share/icons/hicolor/16x16/actions/mypaint-tool-color-triangle.png
36	share/icons/hicolor/16x16/actions/mypaint-tool-component-sliders.png	25	share/icons/hicolor/16x16/actions/mypaint-tool-component-sliders.png
		26	share/icons/hicolor/16x16/actions/mypaint-tool-crossed-bowl-color-changer.png
37	share/icons/hicolor/16x16/actions/mypaint-tool-hcywheel.png	27	share/icons/hicolor/16x16/actions/mypaint-tool-hcywheel.png
38	share/icons/hicolor/16x16/actions/mypaint-tool-hsvcube.png	28	share/icons/hicolor/16x16/actions/mypaint-tool-hsvcube.png
		29	share/icons/hicolor/16x16/actions/mypaint-tool-hsvsquare.png
39	share/icons/hicolor/16x16/actions/mypaint-tool-hsvwheel.png	30	share/icons/hicolor/16x16/actions/mypaint-tool-hsvwheel.png
40	share/icons/hicolor/16x16/actions/mypaint-tool-hue-wheel.png	31	share/icons/hicolor/16x16/actions/mypaint-tool-hue-wheel.png
41	share/icons/hicolor/16x16/actions/mypaint-tool-layers.png	32	share/icons/hicolor/16x16/actions/mypaint-tool-rings-color-changer.png
42	share/icons/hicolor/16x16/actions/mypaint-tool-move-layer.png	33	share/icons/hicolor/16x16/actions/mypaint-tool-wash-color-changer.png
43	share/icons/hicolor/16x16/actions/mypaint-tool-paint-color.png
44	share/icons/hicolor/16x16/actions/mypaint-tool-scratchpad.png
45	share/icons/hicolor/16x16/actions/mypaint-view-100.png
46	share/icons/hicolor/16x16/actions/mypaint-view-fit.png
47	share/icons/hicolor/16x16/actions/mypaint-view-mirror-horizontal.png
48	share/icons/hicolor/16x16/actions/mypaint-view-mirror-vertical.png
49	share/icons/hicolor/16x16/actions/mypaint-view-pan.png
50	share/icons/hicolor/16x16/actions/mypaint-view-rotate-anticlockwise.png
51	share/icons/hicolor/16x16/actions/mypaint-view-rotate-clockwise.png
52	share/icons/hicolor/16x16/actions/mypaint-view-rotate.png
53	share/icons/hicolor/16x16/actions/mypaint-view-zoom-less.png
54	share/icons/hicolor/16x16/actions/mypaint-view-zoom-more.png
55	share/icons/hicolor/16x16/actions/mypaint-view-zoom.png
56	share/icons/hicolor/16x16/apps/mypaint.png	34	share/icons/hicolor/16x16/apps/mypaint.png
57	share/icons/hicolor/22x22/actions/brush-blend-mode-eraser.png	35	share/icons/hicolor/22x22/actions/mypaint-tool-color-palette.png
58	share/icons/hicolor/22x22/actions/brush-blend-mode-normal.png
59	share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-alpha-lock.png
60	share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-colorize.png
61	share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-eraser.png
62	share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-normal.png
63	share/icons/hicolor/22x22/actions/mypaint-brush-blend-modes.png
64	share/icons/hicolor/22x22/actions/mypaint-brush-mods-active.png
65	share/icons/hicolor/22x22/actions/mypaint-brush-mods-inactive.png
66	share/icons/hicolor/22x22/actions/mypaint-frame.png
67	share/icons/hicolor/22x22/actions/mypaint-line-mode-ellipse.png
68	share/icons/hicolor/22x22/actions/mypaint-line-mode-freehand.png
69	share/icons/hicolor/22x22/actions/mypaint-line-mode-sequence.png
70	share/icons/hicolor/22x22/actions/mypaint-line-mode-straight.png
71	share/icons/hicolor/22x22/actions/mypaint-line-mode.png
72	share/icons/hicolor/22x22/actions/mypaint-move.png
73	share/icons/hicolor/22x22/actions/mypaint-symmetry.png
74	share/icons/hicolor/22x22/actions/mypaint-tool-brush.png
75	share/icons/hicolor/22x22/actions/mypaint-tool-color-rgb.png	36	share/icons/hicolor/22x22/actions/mypaint-tool-color-rgb.png
76	share/icons/hicolor/22x22/actions/mypaint-tool-color-triangle.png
77	share/icons/hicolor/22x22/actions/mypaint-tool-component-sliders.png	37	share/icons/hicolor/22x22/actions/mypaint-tool-component-sliders.png
		38	share/icons/hicolor/22x22/actions/mypaint-tool-crossed-bowl-color-changer.png
78	share/icons/hicolor/22x22/actions/mypaint-tool-hcywheel.png	39	share/icons/hicolor/22x22/actions/mypaint-tool-hcywheel.png
79	share/icons/hicolor/22x22/actions/mypaint-tool-hsvcube.png	40	share/icons/hicolor/22x22/actions/mypaint-tool-hsvcube.png
		41	share/icons/hicolor/22x22/actions/mypaint-tool-hsvsquare.png
80	share/icons/hicolor/22x22/actions/mypaint-tool-hsvwheel.png	42	share/icons/hicolor/22x22/actions/mypaint-tool-hsvwheel.png
81	share/icons/hicolor/22x22/actions/mypaint-tool-hue-wheel.png	43	share/icons/hicolor/22x22/actions/mypaint-tool-hue-wheel.png
82	share/icons/hicolor/22x22/actions/mypaint-tool-layers.png	44	share/icons/hicolor/22x22/actions/mypaint-tool-rings-color-changer.png
83	share/icons/hicolor/22x22/actions/mypaint-tool-move-layer.png	45	share/icons/hicolor/22x22/actions/mypaint-tool-wash-color-changer.png
84	share/icons/hicolor/22x22/actions/mypaint-tool-paint-color.png
85	share/icons/hicolor/22x22/actions/mypaint-tool-scratchpad.png
86	share/icons/hicolor/22x22/actions/mypaint-view-100.png
87	share/icons/hicolor/22x22/actions/mypaint-view-fit.png
88	share/icons/hicolor/22x22/actions/mypaint-view-mirror-horizontal.png
89	share/icons/hicolor/22x22/actions/mypaint-view-mirror-vertical.png
90	share/icons/hicolor/22x22/actions/mypaint-view-pan.png
91	share/icons/hicolor/22x22/actions/mypaint-view-rotate-anticlockwise.png
92	share/icons/hicolor/22x22/actions/mypaint-view-rotate-clockwise.png
93	share/icons/hicolor/22x22/actions/mypaint-view-rotate.png
94	share/icons/hicolor/22x22/actions/mypaint-view-zoom-less.png
95	share/icons/hicolor/22x22/actions/mypaint-view-zoom-more.png
96	share/icons/hicolor/22x22/actions/mypaint-view-zoom.png
97	share/icons/hicolor/22x22/apps/mypaint.png	46	share/icons/hicolor/22x22/apps/mypaint.png
98	share/icons/hicolor/24x24/actions/brush-blend-mode-eraser.png	47	share/icons/hicolor/24x24/actions/mypaint-add-symbolic.svg
99	share/icons/hicolor/24x24/actions/brush-blend-mode-normal.png	48	share/icons/hicolor/24x24/actions/mypaint-brush-blend-modes-symbolic.svg
100	share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-alpha-lock.png	49	share/icons/hicolor/24x24/actions/mypaint-brush-stroke-symbolic.svg
101	share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-colorize.png	50	share/icons/hicolor/24x24/actions/mypaint-brush-tip-symbolic.svg
102	share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-eraser.png	51	share/icons/hicolor/24x24/actions/mypaint-colorize-symbolic.svg
103	share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-normal.png	52	share/icons/hicolor/24x24/actions/mypaint-colors-symbolic.svg
104	share/icons/hicolor/24x24/actions/mypaint-brush-blend-modes.png	53	share/icons/hicolor/24x24/actions/mypaint-compositing-symbolic.svg
105	share/icons/hicolor/24x24/actions/mypaint-brush-mods-active.png	54	share/icons/hicolor/24x24/actions/mypaint-document-properties-symbolic.svg
106	share/icons/hicolor/24x24/actions/mypaint-brush-mods-inactive.png	55	share/icons/hicolor/24x24/actions/mypaint-down-symbolic.svg
107	share/icons/hicolor/24x24/actions/mypaint-frame.png	56	share/icons/hicolor/24x24/actions/mypaint-edit-symbolic.svg
108	share/icons/hicolor/24x24/actions/mypaint-line-mode-ellipse.png	57	share/icons/hicolor/24x24/actions/mypaint-eraser-symbolic.svg
109	share/icons/hicolor/24x24/actions/mypaint-line-mode-freehand.png	58	share/icons/hicolor/24x24/actions/mypaint-expander-collapsed-symbolic.svg
110	share/icons/hicolor/24x24/actions/mypaint-line-mode-sequence.png	59	share/icons/hicolor/24x24/actions/mypaint-expander-expanded-symbolic.svg
111	share/icons/hicolor/24x24/actions/mypaint-line-mode-straight.png	60	share/icons/hicolor/24x24/actions/mypaint-fill-symbolic.svg
112	share/icons/hicolor/24x24/actions/mypaint-line-mode.png	61	share/icons/hicolor/24x24/actions/mypaint-frame-symbolic.svg
113	share/icons/hicolor/24x24/actions/mypaint-move.png	62	share/icons/hicolor/24x24/actions/mypaint-layer-move-symbolic.svg
114	share/icons/hicolor/24x24/actions/mypaint-symmetry.png	63	share/icons/hicolor/24x24/actions/mypaint-layer-vector-symbolic.svg
115	share/icons/hicolor/24x24/actions/mypaint-tool-brush.png	64	share/icons/hicolor/24x24/actions/mypaint-layers-symbolic.svg
		65	share/icons/hicolor/24x24/actions/mypaint-left-symbolic.svg
		66	share/icons/hicolor/24x24/actions/mypaint-lock-alpha-symbolic.svg
		67	share/icons/hicolor/24x24/actions/mypaint-object-move-symbolic.svg
		68	share/icons/hicolor/24x24/actions/mypaint-paint-over-symbolic.svg
		69	share/icons/hicolor/24x24/actions/mypaint-painting-context-symbolic.svg
		70	share/icons/hicolor/24x24/actions/mypaint-pick-color-symbolic.svg
		71	share/icons/hicolor/24x24/actions/mypaint-remove-symbolic.svg
		72	share/icons/hicolor/24x24/actions/mypaint-right-symbolic.svg
		73	share/icons/hicolor/24x24/actions/mypaint-scrap-next-symbolic.svg
		74	share/icons/hicolor/24x24/actions/mypaint-scrap-prev-symbolic.svg
		75	share/icons/hicolor/24x24/actions/mypaint-scrap-save-symbolic.svg
		76	share/icons/hicolor/24x24/actions/mypaint-scratchpad-symbolic.svg
		77	share/icons/hicolor/24x24/actions/mypaint-stroke-symbolic.svg
		78	share/icons/hicolor/24x24/actions/mypaint-symmetry-symbolic.svg
		79	share/icons/hicolor/24x24/actions/mypaint-target-brush-symbolic.svg
		80	share/icons/hicolor/24x24/actions/mypaint-target-layer-symbolic.svg
		81	share/icons/hicolor/24x24/actions/mypaint-target-stroke-symbolic.svg
		82	share/icons/hicolor/24x24/actions/mypaint-tool-color-palette.png
116	share/icons/hicolor/24x24/actions/mypaint-tool-color-rgb.png	83	share/icons/hicolor/24x24/actions/mypaint-tool-color-rgb.png
117	share/icons/hicolor/24x24/actions/mypaint-tool-color-triangle.png
118	share/icons/hicolor/24x24/actions/mypaint-tool-component-sliders.png	84	share/icons/hicolor/24x24/actions/mypaint-tool-component-sliders.png
		85	share/icons/hicolor/24x24/actions/mypaint-tool-crossed-bowl-color-changer.png
119	share/icons/hicolor/24x24/actions/mypaint-tool-hcywheel.png	86	share/icons/hicolor/24x24/actions/mypaint-tool-hcywheel.png
120	share/icons/hicolor/24x24/actions/mypaint-tool-hsvcube.png	87	share/icons/hicolor/24x24/actions/mypaint-tool-hsvcube.png
		88	share/icons/hicolor/24x24/actions/mypaint-tool-hsvsquare.png
121	share/icons/hicolor/24x24/actions/mypaint-tool-hsvwheel.png	89	share/icons/hicolor/24x24/actions/mypaint-tool-hsvwheel.png
122	share/icons/hicolor/24x24/actions/mypaint-tool-hue-wheel.png	90	share/icons/hicolor/24x24/actions/mypaint-tool-hue-wheel.png
123	share/icons/hicolor/24x24/actions/mypaint-tool-layers.png	91	share/icons/hicolor/24x24/actions/mypaint-tool-inking-symbolic.svg
124	share/icons/hicolor/24x24/actions/mypaint-tool-move-layer.png	92	share/icons/hicolor/24x24/actions/mypaint-tool-rings-color-changer.png
125	share/icons/hicolor/24x24/actions/mypaint-tool-paint-color.png	93	share/icons/hicolor/24x24/actions/mypaint-tool-wash-color-changer.png
126	share/icons/hicolor/24x24/actions/mypaint-tool-scratchpad.png	94	share/icons/hicolor/24x24/actions/mypaint-up-symbolic.svg
127	share/icons/hicolor/24x24/actions/mypaint-view-100.png	95	share/icons/hicolor/24x24/actions/mypaint-view-100-symbolic.svg
128	share/icons/hicolor/24x24/actions/mypaint-view-fit.png	96	share/icons/hicolor/24x24/actions/mypaint-view-fit-symbolic.svg
129	share/icons/hicolor/24x24/actions/mypaint-view-mirror-horizontal.png	97	share/icons/hicolor/24x24/actions/mypaint-view-mirror-horizontal-symbolic.svg
130	share/icons/hicolor/24x24/actions/mypaint-view-mirror-vertical.png	98	share/icons/hicolor/24x24/actions/mypaint-view-mirror-vertical-symbolic.svg
131	share/icons/hicolor/24x24/actions/mypaint-view-pan.png	99	share/icons/hicolor/24x24/actions/mypaint-view-pan-symbolic.svg
132	share/icons/hicolor/24x24/actions/mypaint-view-rotate-anticlockwise.png	100	share/icons/hicolor/24x24/actions/mypaint-view-rotate-anticlockwise-symbolic.svg
133	share/icons/hicolor/24x24/actions/mypaint-view-rotate-clockwise.png	101	share/icons/hicolor/24x24/actions/mypaint-view-rotate-clockwise-symbolic.svg
134	share/icons/hicolor/24x24/actions/mypaint-view-rotate.png	102	share/icons/hicolor/24x24/actions/mypaint-view-rotate-symbolic.svg
135	share/icons/hicolor/24x24/actions/mypaint-view-zoom-less.png	103	share/icons/hicolor/24x24/actions/mypaint-view-symbolic.svg
136	share/icons/hicolor/24x24/actions/mypaint-view-zoom-more.png	104	share/icons/hicolor/24x24/actions/mypaint-view-zoom-less-symbolic.svg
137	share/icons/hicolor/24x24/actions/mypaint-view-zoom.png	105	share/icons/hicolor/24x24/actions/mypaint-view-zoom-more-symbolic.svg
		106	share/icons/hicolor/24x24/actions/mypaint-view-zoom-symbolic.svg
138	share/icons/hicolor/24x24/apps/mypaint.png	107	share/icons/hicolor/24x24/apps/mypaint.png
139	share/icons/hicolor/32x32/actions/brush-blend-mode-eraser.png	108	share/icons/hicolor/256x256/apps/mypaint.png
140	share/icons/hicolor/32x32/actions/brush-blend-mode-normal.png	109	share/icons/hicolor/32x32/actions/mypaint-tool-color-palette.png
141	share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-alpha-lock.png
142	share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-colorize.png
143	share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-eraser.png
144	share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-normal.png
145	share/icons/hicolor/32x32/actions/mypaint-brush-blend-modes.png
146	share/icons/hicolor/32x32/actions/mypaint-brush-mods-active.png
147	share/icons/hicolor/32x32/actions/mypaint-brush-mods-inactive.png
148	share/icons/hicolor/32x32/actions/mypaint-frame.png
149	share/icons/hicolor/32x32/actions/mypaint-line-mode-ellipse.png
150	share/icons/hicolor/32x32/actions/mypaint-line-mode-freehand.png
151	share/icons/hicolor/32x32/actions/mypaint-line-mode-sequence.png
152	share/icons/hicolor/32x32/actions/mypaint-line-mode-straight.png
153	share/icons/hicolor/32x32/actions/mypaint-line-mode.png
154	share/icons/hicolor/32x32/actions/mypaint-move.png
155	share/icons/hicolor/32x32/actions/mypaint-symmetry.png
156	share/icons/hicolor/32x32/actions/mypaint-tool-brush.png
157	share/icons/hicolor/32x32/actions/mypaint-tool-color-rgb.png	110	share/icons/hicolor/32x32/actions/mypaint-tool-color-rgb.png
158	share/icons/hicolor/32x32/actions/mypaint-tool-color-triangle.png
159	share/icons/hicolor/32x32/actions/mypaint-tool-component-sliders.png	111	share/icons/hicolor/32x32/actions/mypaint-tool-component-sliders.png
		112	share/icons/hicolor/32x32/actions/mypaint-tool-crossed-bowl-color-changer.png
160	share/icons/hicolor/32x32/actions/mypaint-tool-hcywheel.png	113	share/icons/hicolor/32x32/actions/mypaint-tool-hcywheel.png
161	share/icons/hicolor/32x32/actions/mypaint-tool-hsvcube.png	114	share/icons/hicolor/32x32/actions/mypaint-tool-hsvcube.png
		115	share/icons/hicolor/32x32/actions/mypaint-tool-hsvsquare.png
162	share/icons/hicolor/32x32/actions/mypaint-tool-hsvwheel.png	116	share/icons/hicolor/32x32/actions/mypaint-tool-hsvwheel.png
163	share/icons/hicolor/32x32/actions/mypaint-tool-hue-wheel.png	117	share/icons/hicolor/32x32/actions/mypaint-tool-hue-wheel.png
164	share/icons/hicolor/32x32/actions/mypaint-tool-layers.png	118	share/icons/hicolor/32x32/actions/mypaint-tool-rings-color-changer.png
165	share/icons/hicolor/32x32/actions/mypaint-tool-move-layer.png	119	share/icons/hicolor/32x32/actions/mypaint-tool-wash-color-changer.png
166	share/icons/hicolor/32x32/actions/mypaint-tool-paint-color.png
167	share/icons/hicolor/32x32/actions/mypaint-tool-scratchpad.png
168	share/icons/hicolor/32x32/actions/mypaint-view-100.png
169	share/icons/hicolor/32x32/actions/mypaint-view-fit.png
170	share/icons/hicolor/32x32/actions/mypaint-view-mirror-horizontal.png
171	share/icons/hicolor/32x32/actions/mypaint-view-mirror-vertical.png
172	share/icons/hicolor/32x32/actions/mypaint-view-pan.png
173	share/icons/hicolor/32x32/actions/mypaint-view-rotate-anticlockwise.png
174	share/icons/hicolor/32x32/actions/mypaint-view-rotate-clockwise.png
175	share/icons/hicolor/32x32/actions/mypaint-view-rotate.png
176	share/icons/hicolor/32x32/actions/mypaint-view-zoom-less.png
177	share/icons/hicolor/32x32/actions/mypaint-view-zoom-more.png
178	share/icons/hicolor/32x32/actions/mypaint-view-zoom.png
179	share/icons/hicolor/32x32/apps/mypaint.png	120	share/icons/hicolor/32x32/apps/mypaint.png
180	share/icons/hicolor/48x48/actions/brush-blend-mode-normal.png	121	share/icons/hicolor/48x48/actions/mypaint-tool-color-palette.png
181	share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-alpha-lock.png
182	share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-colorize.png
183	share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-eraser.png
184	share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-normal.png
185	share/icons/hicolor/48x48/actions/mypaint-brush-blend-modes.png
186	share/icons/hicolor/48x48/actions/mypaint-brush-mods-active.png
187	share/icons/hicolor/48x48/actions/mypaint-brush-mods-inactive.png
188	share/icons/hicolor/48x48/actions/mypaint-frame.png
189	share/icons/hicolor/48x48/actions/mypaint-line-mode-ellipse.png
190	share/icons/hicolor/48x48/actions/mypaint-line-mode-freehand.png
191	share/icons/hicolor/48x48/actions/mypaint-line-mode-sequence.png
192	share/icons/hicolor/48x48/actions/mypaint-line-mode-straight.png
193	share/icons/hicolor/48x48/actions/mypaint-line-mode.png
194	share/icons/hicolor/48x48/actions/mypaint-move.png
195	share/icons/hicolor/48x48/actions/mypaint-symmetry.png
196	share/icons/hicolor/48x48/actions/mypaint-tool-brush.png
197	share/icons/hicolor/48x48/actions/mypaint-tool-color-rgb.png	122	share/icons/hicolor/48x48/actions/mypaint-tool-color-rgb.png
198	share/icons/hicolor/48x48/actions/mypaint-tool-color-triangle.png
199	share/icons/hicolor/48x48/actions/mypaint-tool-component-sliders.png	123	share/icons/hicolor/48x48/actions/mypaint-tool-component-sliders.png
		124	share/icons/hicolor/48x48/actions/mypaint-tool-crossed-bowl-color-changer.png
200	share/icons/hicolor/48x48/actions/mypaint-tool-hcywheel.png	125	share/icons/hicolor/48x48/actions/mypaint-tool-hcywheel.png
201	share/icons/hicolor/48x48/actions/mypaint-tool-hsvcube.png	126	share/icons/hicolor/48x48/actions/mypaint-tool-hsvcube.png
		127	share/icons/hicolor/48x48/actions/mypaint-tool-hsvsquare.png
202	share/icons/hicolor/48x48/actions/mypaint-tool-hsvwheel.png	128	share/icons/hicolor/48x48/actions/mypaint-tool-hsvwheel.png
203	share/icons/hicolor/48x48/actions/mypaint-tool-hue-wheel.png	129	share/icons/hicolor/48x48/actions/mypaint-tool-hue-wheel.png
204	share/icons/hicolor/48x48/actions/mypaint-tool-layers.png	130	share/icons/hicolor/48x48/actions/mypaint-tool-rings-color-changer.png
205	share/icons/hicolor/48x48/actions/mypaint-tool-move-layer.png	131	share/icons/hicolor/48x48/actions/mypaint-tool-wash-color-changer.png
206	share/icons/hicolor/48x48/actions/mypaint-tool-paint-color.png
207	share/icons/hicolor/48x48/actions/mypaint-tool-scratchpad.png
208	share/icons/hicolor/48x48/actions/mypaint-view-100.png
209	share/icons/hicolor/48x48/actions/mypaint-view-fit.png
210	share/icons/hicolor/48x48/actions/mypaint-view-mirror-horizontal.png
211	share/icons/hicolor/48x48/actions/mypaint-view-mirror-vertical.png
212	share/icons/hicolor/48x48/actions/mypaint-view-pan.png
213	share/icons/hicolor/48x48/actions/mypaint-view-rotate-anticlockwise.png
214	share/icons/hicolor/48x48/actions/mypaint-view-rotate-clockwise.png
215	share/icons/hicolor/48x48/actions/mypaint-view-rotate.png
216	share/icons/hicolor/48x48/actions/mypaint-view-zoom-less.png
217	share/icons/hicolor/48x48/actions/mypaint-view-zoom-more.png
218	share/icons/hicolor/48x48/actions/mypaint-view-zoom.png
219	share/icons/hicolor/48x48/apps/mypaint.png	132	share/icons/hicolor/48x48/apps/mypaint.png
220	share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-alpha-lock.svg	133	share/icons/hicolor/512x512/apps/mypaint.png
221	share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-colorize.svg	134	share/icons/hicolor/scalable/actions/mypaint-about-symbolic.svg
222	share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-eraser.svg	135	share/icons/hicolor/scalable/actions/mypaint-add-symbolic.svg
223	share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-normal.svg	136	share/icons/hicolor/scalable/actions/mypaint-bookmark-new-symbolic.svg
224	share/icons/hicolor/scalable/actions/mypaint-brush-blend-modes.svg	137	share/icons/hicolor/scalable/actions/mypaint-brush-blend-modes-symbolic.svg
225	share/icons/hicolor/scalable/actions/mypaint-brush-mods-active.svg	138	share/icons/hicolor/scalable/actions/mypaint-brush-stroke-symbolic.svg
226	share/icons/hicolor/scalable/actions/mypaint-brush-mods-inactive.svg	139	share/icons/hicolor/scalable/actions/mypaint-brush-symbolic.svg
227	share/icons/hicolor/scalable/actions/mypaint-frame.svg	140	share/icons/hicolor/scalable/actions/mypaint-brush-tip-symbolic.svg
228	share/icons/hicolor/scalable/actions/mypaint-line-mode-ellipse.svg	141	share/icons/hicolor/scalable/actions/mypaint-brushes-symbolic.svg
229	share/icons/hicolor/scalable/actions/mypaint-line-mode-freehand.svg	142	share/icons/hicolor/scalable/actions/mypaint-clear-all-symbolic.svg
230	share/icons/hicolor/scalable/actions/mypaint-line-mode-sequence.svg	143	share/icons/hicolor/scalable/actions/mypaint-close-symbolic.svg
231	share/icons/hicolor/scalable/actions/mypaint-line-mode-straight.svg	144	share/icons/hicolor/scalable/actions/mypaint-colorize-symbolic.svg
232	share/icons/hicolor/scalable/actions/mypaint-line-mode.svg	145	share/icons/hicolor/scalable/actions/mypaint-colors-symbolic.svg
233	share/icons/hicolor/scalable/actions/mypaint-move.svg	146	share/icons/hicolor/scalable/actions/mypaint-compositing-symbolic.svg
		147	share/icons/hicolor/scalable/actions/mypaint-copy-symbolic.svg
		148	share/icons/hicolor/scalable/actions/mypaint-cut-symbolic.svg
		149	share/icons/hicolor/scalable/actions/mypaint-delete-symbolic.svg
		150	share/icons/hicolor/scalable/actions/mypaint-document-export-symbolic.svg
		151	share/icons/hicolor/scalable/actions/mypaint-document-new-symbolic.svg
		152	share/icons/hicolor/scalable/actions/mypaint-document-open-symbolic.svg
		153	share/icons/hicolor/scalable/actions/mypaint-document-properties-symbolic.svg
		154	share/icons/hicolor/scalable/actions/mypaint-document-revert-symbolic.svg
		155	share/icons/hicolor/scalable/actions/mypaint-document-save-as-symbolic.svg
		156	share/icons/hicolor/scalable/actions/mypaint-document-save-symbolic.svg
		157	share/icons/hicolor/scalable/actions/mypaint-down-symbolic.svg
		158	share/icons/hicolor/scalable/actions/mypaint-duplicate-symbolic.svg
		159	share/icons/hicolor/scalable/actions/mypaint-edit-symbolic.svg
		160	share/icons/hicolor/scalable/actions/mypaint-ellipse-symbolic.svg
		161	share/icons/hicolor/scalable/actions/mypaint-eraser-symbolic.svg
		162	share/icons/hicolor/scalable/actions/mypaint-expander-collapsed-symbolic.svg
		163	share/icons/hicolor/scalable/actions/mypaint-expander-expanded-symbolic.svg
		164	share/icons/hicolor/scalable/actions/mypaint-file-symbolic.svg
		165	share/icons/hicolor/scalable/actions/mypaint-fill-symbolic.svg
		166	share/icons/hicolor/scalable/actions/mypaint-frame-symbolic.svg
		167	share/icons/hicolor/scalable/actions/mypaint-freehand-symbolic.svg
		168	share/icons/hicolor/scalable/actions/mypaint-fullscreen-symbolic.svg
		169	share/icons/hicolor/scalable/actions/mypaint-globe-symbolic.svg
		170	share/icons/hicolor/scalable/actions/mypaint-help-symbolic.svg
		171	share/icons/hicolor/scalable/actions/mypaint-history-symbolic.svg
		172	share/icons/hicolor/scalable/actions/mypaint-info-symbolic.svg
		173	share/icons/hicolor/scalable/actions/mypaint-layer-above-symbolic.svg
		174	share/icons/hicolor/scalable/actions/mypaint-layer-below-symbolic.svg
		175	share/icons/hicolor/scalable/actions/mypaint-layer-clone-symbolic.svg
		176	share/icons/hicolor/scalable/actions/mypaint-layer-delete-symbolic.svg
		177	share/icons/hicolor/scalable/actions/mypaint-layer-fallback-symbolic.svg
		178	share/icons/hicolor/scalable/actions/mypaint-layer-group-new-symbolic.svg
		179	share/icons/hicolor/scalable/actions/mypaint-layer-group-symbolic.svg
		180	share/icons/hicolor/scalable/actions/mypaint-layer-lower-symbolic.svg
		181	share/icons/hicolor/scalable/actions/mypaint-layer-merge-down-symbolic.svg
		182	share/icons/hicolor/scalable/actions/mypaint-layer-move-symbolic.svg
		183	share/icons/hicolor/scalable/actions/mypaint-layer-new-below-symbolic.svg
		184	share/icons/hicolor/scalable/actions/mypaint-layer-new-symbolic.svg
		185	share/icons/hicolor/scalable/actions/mypaint-layer-painting-symbolic.svg
		186	share/icons/hicolor/scalable/actions/mypaint-layer-raise-symbolic.svg
		187	share/icons/hicolor/scalable/actions/mypaint-layer-vector-symbolic.svg
		188	share/icons/hicolor/scalable/actions/mypaint-layers-symbolic.svg
		189	share/icons/hicolor/scalable/actions/mypaint-left-symbolic.svg
		190	share/icons/hicolor/scalable/actions/mypaint-line-sequence-symbolic.svg
		191	share/icons/hicolor/scalable/actions/mypaint-lines-and-curves-symbolic.svg
		192	share/icons/hicolor/scalable/actions/mypaint-lock-alpha-symbolic.svg
		193	share/icons/hicolor/scalable/actions/mypaint-normal-paint-symbolic.svg
		194	share/icons/hicolor/scalable/actions/mypaint-object-hidden-insensitive-symbolic.svg
		195	share/icons/hicolor/scalable/actions/mypaint-object-hidden-symbolic.svg
		196	share/icons/hicolor/scalable/actions/mypaint-object-locked-symbolic.svg
		197	share/icons/hicolor/scalable/actions/mypaint-object-move-symbolic.svg
		198	share/icons/hicolor/scalable/actions/mypaint-object-unlocked-symbolic.svg
		199	share/icons/hicolor/scalable/actions/mypaint-object-visible-insensitive-symbolic.svg
		200	share/icons/hicolor/scalable/actions/mypaint-object-visible-symbolic.svg
		201	share/icons/hicolor/scalable/actions/mypaint-ok-symbolic.svg
		202	share/icons/hicolor/scalable/actions/mypaint-options-symbolic.svg
		203	share/icons/hicolor/scalable/actions/mypaint-paint-over-symbolic.svg
		204	share/icons/hicolor/scalable/actions/mypaint-painting-context-symbolic.svg
		205	share/icons/hicolor/scalable/actions/mypaint-paste-symbolic.svg
		206	share/icons/hicolor/scalable/actions/mypaint-pick-color-symbolic.svg
		207	share/icons/hicolor/scalable/actions/mypaint-quit-symbolic.svg
		208	share/icons/hicolor/scalable/actions/mypaint-redo-ltr-symbolic.svg
		209	share/icons/hicolor/scalable/actions/mypaint-redo-rtl-symbolic.svg
		210	share/icons/hicolor/scalable/actions/mypaint-remove-symbolic.svg
211	share/icons/hicolor/scalable/actions/mypaint-right-symbolic.svg
212	share/icons/hicolor/scalable/actions/mypaint-run-symbolic.svg
213	share/icons/hicolor/scalable/actions/mypaint-scrap-next-symbolic.svg
214	share/icons/hicolor/scalable/actions/mypaint-scrap-prev-symbolic.svg
215	share/icons/hicolor/scalable/actions/mypaint-scrap-save-symbolic.svg
216	share/icons/hicolor/scalable/actions/mypaint-scratchpad-symbolic.svg
217	share/icons/hicolor/scalable/actions/mypaint-stroke-symbolic.svg
218	share/icons/hicolor/scalable/actions/mypaint-symmetry-symbolic.svg
234	share/icons/hicolor/scalable/actions/mypaint-symmetry.svg	219	share/icons/hicolor/scalable/actions/mypaint-symmetry.svg
235	share/icons/hicolor/scalable/actions/mypaint-tool-brush.svg	220	share/icons/hicolor/scalable/actions/mypaint-tab-options-symbolic.svg
		221	share/icons/hicolor/scalable/actions/mypaint-target-brush-symbolic.svg
		222	share/icons/hicolor/scalable/actions/mypaint-target-layer-symbolic.svg
		223	share/icons/hicolor/scalable/actions/mypaint-target-stroke-symbolic.svg
		224	share/icons/hicolor/scalable/actions/mypaint-target-symbolic.svg
		225	share/icons/hicolor/scalable/actions/mypaint-tool-color-palette.svg
236	share/icons/hicolor/scalable/actions/mypaint-tool-color-rgb.svg	226	share/icons/hicolor/scalable/actions/mypaint-tool-color-rgb.svg
237	share/icons/hicolor/scalable/actions/mypaint-tool-color-triangle.svg
238	share/icons/hicolor/scalable/actions/mypaint-tool-component-sliders.svg	227	share/icons/hicolor/scalable/actions/mypaint-tool-component-sliders.svg
239	share/icons/hicolor/scalable/actions/mypaint-tool-hcywheel.svg	228	share/icons/hicolor/scalable/actions/mypaint-tool-hcywheel.svg
240	share/icons/hicolor/scalable/actions/mypaint-tool-hsvcube.svg	229	share/icons/hicolor/scalable/actions/mypaint-tool-hsvcube.svg
241	share/icons/hicolor/scalable/actions/mypaint-tool-hsvwheel.svg	230	share/icons/hicolor/scalable/actions/mypaint-tool-hsvwheel.svg
242	share/icons/hicolor/scalable/actions/mypaint-tool-hue-wheel.svg	231	share/icons/hicolor/scalable/actions/mypaint-tool-hue-wheel.svg
243	share/icons/hicolor/scalable/actions/mypaint-tool-layers.svg	232	share/icons/hicolor/scalable/actions/mypaint-tool-inking-symbolic.svg
244	share/icons/hicolor/scalable/actions/mypaint-tool-move-layer.svg	233	share/icons/hicolor/scalable/actions/mypaint-trash-symbolic.svg
245	share/icons/hicolor/scalable/actions/mypaint-tool-paint-color.svg	234	share/icons/hicolor/scalable/actions/mypaint-undo-ltr-symbolic.svg
246	share/icons/hicolor/scalable/actions/mypaint-tool-scratchpad.svg	235	share/icons/hicolor/scalable/actions/mypaint-undo-rtl-symbolic.svg
247	share/icons/hicolor/scalable/actions/mypaint-view-100.svg	236	share/icons/hicolor/scalable/actions/mypaint-unfullscreen-symbolic.svg
248	share/icons/hicolor/scalable/actions/mypaint-view-fit.svg	237	share/icons/hicolor/scalable/actions/mypaint-up-symbolic.svg
249	share/icons/hicolor/scalable/actions/mypaint-view-mirror-horizontal.svg	238	share/icons/hicolor/scalable/actions/mypaint-view-100-symbolic.svg
250	share/icons/hicolor/scalable/actions/mypaint-view-mirror-vertical.svg	239	share/icons/hicolor/scalable/actions/mypaint-view-fit-symbolic.svg
251	share/icons/hicolor/scalable/actions/mypaint-view-pan.svg	240	share/icons/hicolor/scalable/actions/mypaint-view-mirror-horizontal-symbolic.svg
252	share/icons/hicolor/scalable/actions/mypaint-view-rotate-anticlockwise.svg	241	share/icons/hicolor/scalable/actions/mypaint-view-mirror-vertical-symbolic.svg
253	share/icons/hicolor/scalable/actions/mypaint-view-rotate-clockwise.svg	242	share/icons/hicolor/scalable/actions/mypaint-view-pan-symbolic.svg
254	share/icons/hicolor/scalable/actions/mypaint-view-rotate.svg	243	share/icons/hicolor/scalable/actions/mypaint-view-rotate-anticlockwise-symbolic.svg
255	share/icons/hicolor/scalable/actions/mypaint-view-zoom-less.svg	244	share/icons/hicolor/scalable/actions/mypaint-view-rotate-clockwise-symbolic.svg
256	share/icons/hicolor/scalable/actions/mypaint-view-zoom-more.svg	245	share/icons/hicolor/scalable/actions/mypaint-view-rotate-symbolic.svg
257	share/icons/hicolor/scalable/actions/mypaint-view-zoom.svg	246	share/icons/hicolor/scalable/actions/mypaint-view-symbolic.svg
258	share/icons/hicolor/scalable/apps/mypaint.svg	247	share/icons/hicolor/scalable/actions/mypaint-view-zoom-less-symbolic.svg
		248	share/icons/hicolor/scalable/actions/mypaint-view-zoom-more-symbolic.svg
		249	share/icons/hicolor/scalable/actions/mypaint-view-zoom-symbolic.svg
		250	share/libmypaint/__init__.py
		251	share/libmypaint/brushsettings.json
		252	share/libmypaint/brushsettings.py
		253	share/libmypaint/generate.py
		254	share/locale/ar_AR/LC_MESSAGES/libmypaint.mo
		255	share/locale/brx/LC_MESSAGES/mypaint.mo
		256	share/locale/ca/LC_MESSAGES/libmypaint.mo
		257	share/locale/ca/LC_MESSAGES/mypaint.mo
259	share/locale/cs/LC_MESSAGES/libmypaint.mo	258	share/locale/cs/LC_MESSAGES/libmypaint.mo
260	share/locale/cs/LC_MESSAGES/mypaint.mo	259	share/locale/cs/LC_MESSAGES/mypaint.mo
		260	share/locale/da/LC_MESSAGES/libmypaint.mo
		261	share/locale/da/LC_MESSAGES/mypaint.mo
261	share/locale/de/LC_MESSAGES/libmypaint.mo	262	share/locale/de/LC_MESSAGES/libmypaint.mo
262	share/locale/de/LC_MESSAGES/mypaint.mo	263	share/locale/de/LC_MESSAGES/mypaint.mo
		264	share/locale/el/LC_MESSAGES/mypaint.mo
263	share/locale/en_CA/LC_MESSAGES/libmypaint.mo	265	share/locale/en_CA/LC_MESSAGES/libmypaint.mo
264	share/locale/en_CA/LC_MESSAGES/mypaint.mo	266	share/locale/en_CA/LC_MESSAGES/mypaint.mo
		267	share/locale/en_GB/LC_MESSAGES/libmypaint.mo
265	share/locale/en_GB/LC_MESSAGES/mypaint.mo	268	share/locale/en_GB/LC_MESSAGES/mypaint.mo
266	share/locale/es/LC_MESSAGES/libmypaint.mo	269	share/locale/es/LC_MESSAGES/libmypaint.mo
267	share/locale/es/LC_MESSAGES/mypaint.mo	270	share/locale/es/LC_MESSAGES/mypaint.mo
		271	share/locale/fa/LC_MESSAGES/libmypaint.mo
		272	share/locale/fa/LC_MESSAGES/mypaint.mo
		273	share/locale/fi/LC_MESSAGES/libmypaint.mo
268	share/locale/fr/LC_MESSAGES/libmypaint.mo	274	share/locale/fr/LC_MESSAGES/libmypaint.mo
269	share/locale/fr/LC_MESSAGES/mypaint.mo	275	share/locale/fr/LC_MESSAGES/mypaint.mo
		276	share/locale/he/LC_MESSAGES/libmypaint.mo
		277	share/locale/he/LC_MESSAGES/mypaint.mo
270	share/locale/hu/LC_MESSAGES/libmypaint.mo	278	share/locale/hu/LC_MESSAGES/libmypaint.mo
271	share/locale/hu/LC_MESSAGES/mypaint.mo	279	share/locale/hu/LC_MESSAGES/mypaint.mo
272	share/locale/id/LC_MESSAGES/libmypaint.mo	280	share/locale/id/LC_MESSAGES/libmypaint.mo
Lines 289-298 Link Here
289	share/locale/ro/LC_MESSAGES/mypaint.mo	297	share/locale/ro/LC_MESSAGES/mypaint.mo
290	share/locale/ru/LC_MESSAGES/libmypaint.mo	298	share/locale/ru/LC_MESSAGES/libmypaint.mo
291	share/locale/ru/LC_MESSAGES/mypaint.mo	299	share/locale/ru/LC_MESSAGES/mypaint.mo
		300	share/locale/sc/LC_MESSAGES/libmypaint.mo
		301	share/locale/sk/LC_MESSAGES/libmypaint.mo
		302	share/locale/sk/LC_MESSAGES/mypaint.mo
292	share/locale/sl/LC_MESSAGES/libmypaint.mo	303	share/locale/sl/LC_MESSAGES/libmypaint.mo
293	share/locale/sl/LC_MESSAGES/mypaint.mo	304	share/locale/sl/LC_MESSAGES/mypaint.mo
		305	share/locale/sr@cyrillic/LC_MESSAGES/mypaint.mo
294	share/locale/sv/LC_MESSAGES/libmypaint.mo	306	share/locale/sv/LC_MESSAGES/libmypaint.mo
295	share/locale/sv/LC_MESSAGES/mypaint.mo	307	share/locale/sv/LC_MESSAGES/mypaint.mo
		308	share/locale/tr/LC_MESSAGES/libmypaint.mo
		309	share/locale/tr/LC_MESSAGES/mypaint.mo
296	share/locale/uk/LC_MESSAGES/libmypaint.mo	310	share/locale/uk/LC_MESSAGES/libmypaint.mo
297	share/locale/uk/LC_MESSAGES/mypaint.mo	311	share/locale/uk/LC_MESSAGES/mypaint.mo
298	share/locale/zh_CN/LC_MESSAGES/libmypaint.mo	312	share/locale/zh_CN/LC_MESSAGES/libmypaint.mo
Lines 310-316 Link Here
310	%%DATADIR%%/backgrounds/11_weak_blue.png	324	%%DATADIR%%/backgrounds/11_weak_blue.png
311	%%DATADIR%%/backgrounds/50_comicthumbs.png	325	%%DATADIR%%/backgrounds/50_comicthumbs.png
312	%%DATADIR%%/backgrounds/50_storyboard-template.png	326	%%DATADIR%%/backgrounds/50_storyboard-template.png
313	%%DATADIR%%/backgrounds/README	327	%%DATADIR%%/backgrounds/README.md
314	%%DATADIR%%/backgrounds/canvas1_1.png	328	%%DATADIR%%/backgrounds/canvas1_1.png
315	%%DATADIR%%/backgrounds/canvas1_2.png	329	%%DATADIR%%/backgrounds/canvas1_2.png
316	%%DATADIR%%/backgrounds/canvas1_3.png	330	%%DATADIR%%/backgrounds/canvas1_3.png
Lines 318-324 Link Here
318	%%DATADIR%%/backgrounds/canvas3_1.png	332	%%DATADIR%%/backgrounds/canvas3_1.png
319	%%DATADIR%%/backgrounds/canvas3_2.png	333	%%DATADIR%%/backgrounds/canvas3_2.png
320	%%DATADIR%%/backgrounds/canvas3_3.png	334	%%DATADIR%%/backgrounds/canvas3_3.png
321	%%DATADIR%%/backgrounds/default.png
322	%%DATADIR%%/backgrounds/mrmamurk/MrMamurk_readme.txt	335	%%DATADIR%%/backgrounds/mrmamurk/MrMamurk_readme.txt
323	%%DATADIR%%/backgrounds/mrmamurk/mamurk_a_1.png	336	%%DATADIR%%/backgrounds/mrmamurk/mamurk_a_1.png
324	%%DATADIR%%/backgrounds/mrmamurk/mamurk_a_2.png	337	%%DATADIR%%/backgrounds/mrmamurk/mamurk_a_2.png
Lines 596-601 Link Here
596	%%DATADIR%%/brushes/experimental/subtle_pencil_prev.png	609	%%DATADIR%%/brushes/experimental/subtle_pencil_prev.png
597	%%DATADIR%%/brushes/experimental/track.myb	610	%%DATADIR%%/brushes/experimental/track.myb
598	%%DATADIR%%/brushes/experimental/track_prev.png	611	%%DATADIR%%/brushes/experimental/track_prev.png
		612	%%DATADIR%%/brushes/kaerhon_v1/Airbrush_a.myb
		613	%%DATADIR%%/brushes/kaerhon_v1/Airbrush_a_prev.png
		614	%%DATADIR%%/brushes/kaerhon_v1/Dirty_Transparent_sk.myb
		615	%%DATADIR%%/brushes/kaerhon_v1/Dirty_Transparent_sk_prev.png
		616	%%DATADIR%%/brushes/kaerhon_v1/ReadMe.txt
		617	%%DATADIR%%/brushes/kaerhon_v1/Sketcher2_sk.myb
		618	%%DATADIR%%/brushes/kaerhon_v1/Sketcher2_sk_prev.png
		619	%%DATADIR%%/brushes/kaerhon_v1/Smear_sm.myb
		620	%%DATADIR%%/brushes/kaerhon_v1/Smear_sm_prev.png
		621	%%DATADIR%%/brushes/kaerhon_v1/airbruch_press_a.myb
		622	%%DATADIR%%/brushes/kaerhon_v1/airbruch_press_a_prev.png
		623	%%DATADIR%%/brushes/kaerhon_v1/airsmudge_a.myb
		624	%%DATADIR%%/brushes/kaerhon_v1/airsmudge_a_prev.png
		625	%%DATADIR%%/brushes/kaerhon_v1/airsmudgeultimate_sk.myb
		626	%%DATADIR%%/brushes/kaerhon_v1/airsmudgeultimate_sk_prev.png
		627	%%DATADIR%%/brushes/kaerhon_v1/classic_sk.myb
		628	%%DATADIR%%/brushes/kaerhon_v1/classic_sk_prev.png
		629	%%DATADIR%%/brushes/kaerhon_v1/classicroundblock_static_c.myb
		630	%%DATADIR%%/brushes/kaerhon_v1/classicroundblock_static_c_prev.png
		631	%%DATADIR%%/brushes/kaerhon_v1/extreme_round_l.myb
		632	%%DATADIR%%/brushes/kaerhon_v1/extreme_round_l_prev.png
		633	%%DATADIR%%/brushes/kaerhon_v1/fill_c.myb
		634	%%DATADIR%%/brushes/kaerhon_v1/fill_c_prev.png
		635	%%DATADIR%%/brushes/kaerhon_v1/flat_bar_l.myb
		636	%%DATADIR%%/brushes/kaerhon_v1/flat_bar_l_prev.png
		637	%%DATADIR%%/brushes/kaerhon_v1/ink-slowline_s.myb
		638	%%DATADIR%%/brushes/kaerhon_v1/ink-slowline_s_prev.png
		639	%%DATADIR%%/brushes/kaerhon_v1/ink_slow_s.myb
		640	%%DATADIR%%/brushes/kaerhon_v1/ink_slow_s_prev.png
		641	%%DATADIR%%/brushes/kaerhon_v1/inkster_l.myb
		642	%%DATADIR%%/brushes/kaerhon_v1/inkster_l_prev.png
		643	%%DATADIR%%/brushes/kaerhon_v1/paint_barrr_sm.myb
		644	%%DATADIR%%/brushes/kaerhon_v1/paint_barrr_sm_prev.png
		645	%%DATADIR%%/brushes/kaerhon_v1/paint_radius_2_sm.myb
		646	%%DATADIR%%/brushes/kaerhon_v1/paint_radius_2_sm_prev.png
		647	%%DATADIR%%/brushes/kaerhon_v1/paint_sm.myb
		648	%%DATADIR%%/brushes/kaerhon_v1/paint_sm_prev.png
		649	%%DATADIR%%/brushes/kaerhon_v1/smudge_ink(0.7)_sm.myb
		650	%%DATADIR%%/brushes/kaerhon_v1/smudge_ink(0.7)_sm_prev.png
		651	%%DATADIR%%/brushes/kaerhon_v1/wet_paint_sm.myb
		652	%%DATADIR%%/brushes/kaerhon_v1/wet_paint_sm_prev.png
599	%%DATADIR%%/brushes/label-brush-mypaint.sh	653	%%DATADIR%%/brushes/label-brush-mypaint.sh
600	%%DATADIR%%/brushes/order.conf	654	%%DATADIR%%/brushes/order.conf
601	%%DATADIR%%/brushes/prev-template.xcf.gz	655	%%DATADIR%%/brushes/prev-template.xcf.gz
Lines 725-790 Link Here
725	%%DATADIR%%/brushes/tanda/watercolor-02-paint_prev.png	779	%%DATADIR%%/brushes/tanda/watercolor-02-paint_prev.png
726	%%DATADIR%%/brushes/tanda/watercolor-02-water.myb	780	%%DATADIR%%/brushes/tanda/watercolor-02-water.myb
727	%%DATADIR%%/brushes/tanda/watercolor-02-water_prev.png	781	%%DATADIR%%/brushes/tanda/watercolor-02-water_prev.png
728	%%DATADIR%%/brushlib/__init__.py
729	%%DATADIR%%/brushlib/brushsettings.json
730	%%DATADIR%%/brushlib/brushsettings.py
731	%%DATADIR%%/brushlib/generate.py
732	%%DATADIR%%/gui/__init__.py	782	%%DATADIR%%/gui/__init__.py
		783	%%DATADIR%%/gui/accelmap.py
733	%%DATADIR%%/gui/application.py	784	%%DATADIR%%/gui/application.py
		785	%%DATADIR%%/gui/autorecover.glade
		786	%%DATADIR%%/gui/autorecover.py
734	%%DATADIR%%/gui/backgroundwindow.py	787	%%DATADIR%%/gui/backgroundwindow.py
735	%%DATADIR%%/gui/brushcreationwidget.py	788	%%DATADIR%%/gui/brushcolor.py
		789	%%DATADIR%%/gui/brusheditor.glade
		790	%%DATADIR%%/gui/brusheditor.py
		791	%%DATADIR%%/gui/brushiconeditor.py
736	%%DATADIR%%/gui/brushmanager.py	792	%%DATADIR%%/gui/brushmanager.py
737	%%DATADIR%%/gui/brushmodifier.py	793	%%DATADIR%%/gui/brushmodifier.py
738	%%DATADIR%%/gui/brushselectionwindow.py	794	%%DATADIR%%/gui/brushselectionwindow.py
739	%%DATADIR%%/gui/brushsettingswindow.py	795	%%DATADIR%%/gui/builderhacks.py
740	%%DATADIR%%/gui/buttonmap.py	796	%%DATADIR%%/gui/buttonmap.py
741	%%DATADIR%%/gui/canvasevent.py
742	%%DATADIR%%/gui/colorpicker.py	797	%%DATADIR%%/gui/colorpicker.py
		798	%%DATADIR%%/gui/colorpreview.py
743	%%DATADIR%%/gui/colors/__init__.py	799	%%DATADIR%%/gui/colors/__init__.py
744	%%DATADIR%%/gui/colors/adjbases.py	800	%%DATADIR%%/gui/colors/adjbases.py
745	%%DATADIR%%/gui/colors/bases.py	801	%%DATADIR%%/gui/colors/bases.py
		802	%%DATADIR%%/gui/colors/changers.py
746	%%DATADIR%%/gui/colors/combined.py	803	%%DATADIR%%/gui/colors/combined.py
747	%%DATADIR%%/gui/colors/geom.py
748	%%DATADIR%%/gui/colors/hcywheel.py	804	%%DATADIR%%/gui/colors/hcywheel.py
749	%%DATADIR%%/gui/colors/hsvcube.py	805	%%DATADIR%%/gui/colors/hsvcube.py
750	%%DATADIR%%/gui/colors/hsvtriangle.py	806	%%DATADIR%%/gui/colors/hsvsquare.py
751	%%DATADIR%%/gui/colors/hsvwheel.py	807	%%DATADIR%%/gui/colors/hsvwheel.py
752	%%DATADIR%%/gui/colors/palette.py
753	%%DATADIR%%/gui/colors/paletteview.py	808	%%DATADIR%%/gui/colors/paletteview.py
754	%%DATADIR%%/gui/colors/picker.py
755	%%DATADIR%%/gui/colors/sliders.py	809	%%DATADIR%%/gui/colors/sliders.py
756	%%DATADIR%%/gui/colors/uicolor.py
757	%%DATADIR%%/gui/colors/uimisc.py	810	%%DATADIR%%/gui/colors/uimisc.py
758	%%DATADIR%%/gui/colors/util.py	811	%%DATADIR%%/gui/colors/util.py
759	%%DATADIR%%/gui/colorselectionwindow.py	812	%%DATADIR%%/gui/colortools.py
760	%%DATADIR%%/gui/colorwindow.py
761	%%DATADIR%%/gui/cursor.py	813	%%DATADIR%%/gui/cursor.py
762	%%DATADIR%%/gui/curve.py	814	%%DATADIR%%/gui/curve.py
		815	%%DATADIR%%/gui/device.py
763	%%DATADIR%%/gui/dialogs.py	816	%%DATADIR%%/gui/dialogs.py
		817	%%DATADIR%%/gui/displayfilter.py
764	%%DATADIR%%/gui/document.py	818	%%DATADIR%%/gui/document.py
		819	%%DATADIR%%/gui/drawutils.py
765	%%DATADIR%%/gui/drawwindow.py	820	%%DATADIR%%/gui/drawwindow.py
766	%%DATADIR%%/gui/dropdownpanel.py	821	%%DATADIR%%/gui/externalapp.py
767	%%DATADIR%%/gui/elastic.py	822	%%DATADIR%%/gui/factoryaction.py
768	%%DATADIR%%/gui/filehandling.py	823	%%DATADIR%%/gui/filehandling.py
		824	%%DATADIR%%/gui/fill.py
		825	%%DATADIR%%/gui/footer.py
769	%%DATADIR%%/gui/framewindow.py	826	%%DATADIR%%/gui/framewindow.py
770	%%DATADIR%%/gui/functionwindow.py	827	%%DATADIR%%/gui/freehand.py
		828	%%DATADIR%%/gui/gtk2compat.py
771	%%DATADIR%%/gui/gtkexcepthook.py	829	%%DATADIR%%/gui/gtkexcepthook.py
		830	%%DATADIR%%/gui/history.py
772	%%DATADIR%%/gui/historypopup.py	831	%%DATADIR%%/gui/historypopup.py
		832	%%DATADIR%%/gui/inktool.glade
		833	%%DATADIR%%/gui/inktool.py
773	%%DATADIR%%/gui/inputtestwindow.py	834	%%DATADIR%%/gui/inputtestwindow.py
774	%%DATADIR%%/gui/keyboard.py	835	%%DATADIR%%/gui/keyboard.py
		836	%%DATADIR%%/gui/layermanip.py
		837	%%DATADIR%%/gui/layermodes.py
		838	%%DATADIR%%/gui/layers.py
775	%%DATADIR%%/gui/layerswindow.py	839	%%DATADIR%%/gui/layerswindow.py
776	%%DATADIR%%/gui/layout.py	840	%%DATADIR%%/gui/layerswindow.xml
777	%%DATADIR%%/gui/linemode.py	841	%%DATADIR%%/gui/linemode.py
778	%%DATADIR%%/gui/main.py	842	%%DATADIR%%/gui/main.py
779	%%DATADIR%%/gui/menu.xml	843	%%DATADIR%%/gui/menu.xml
780	%%DATADIR%%/gui/mypaint.xml	844	%%DATADIR%%/gui/meta.py
		845	%%DATADIR%%/gui/mode.py
		846	%%DATADIR%%/gui/mypaint.glade
		847	%%DATADIR%%/gui/objfactory.py
		848	%%DATADIR%%/gui/optionspanel.py
781	%%DATADIR%%/gui/overlays.py	849	%%DATADIR%%/gui/overlays.py
		850	%%DATADIR%%/gui/picker.py
782	%%DATADIR%%/gui/pixbuflist.py	851	%%DATADIR%%/gui/pixbuflist.py
		852	%%DATADIR%%/gui/preferenceswindow.glade
783	%%DATADIR%%/gui/preferenceswindow.py	853	%%DATADIR%%/gui/preferenceswindow.py
784	%%DATADIR%%/gui/pygtkcompat.py	854	%%DATADIR%%/gui/previewwindow.py
		855	%%DATADIR%%/gui/profiling.py
		856	%%DATADIR%%/gui/quickchoice.py
		857	%%DATADIR%%/gui/resources.xml
785	%%DATADIR%%/gui/scratchwindow.py	858	%%DATADIR%%/gui/scratchwindow.py
786	%%DATADIR%%/gui/spinbox.py	859	%%DATADIR%%/gui/spinbox.py
787	%%DATADIR%%/gui/stategroup.py	860	%%DATADIR%%/gui/stategroup.py
		861	%%DATADIR%%/gui/style.py
788	%%DATADIR%%/gui/symmetry.py	862	%%DATADIR%%/gui/symmetry.py
789	%%DATADIR%%/gui/tileddrawwidget.py	863	%%DATADIR%%/gui/tileddrawwidget.py
790	%%DATADIR%%/gui/toolbar-blendmodes.xml	864	%%DATADIR%%/gui/toolbar-blendmodes.xml
Lines 792-820 Link Here
792	%%DATADIR%%/gui/toolbar-file.xml	866	%%DATADIR%%/gui/toolbar-file.xml
793	%%DATADIR%%/gui/toolbar-linemodes.xml	867	%%DATADIR%%/gui/toolbar-linemodes.xml
794	%%DATADIR%%/gui/toolbar-scrap.xml	868	%%DATADIR%%/gui/toolbar-scrap.xml
795	%%DATADIR%%/gui/toolbar-subwindows.xml
796	%%DATADIR%%/gui/toolbar-view-manips.xml	869	%%DATADIR%%/gui/toolbar-view-manips.xml
797	%%DATADIR%%/gui/toolbar-view-modes.xml	870	%%DATADIR%%/gui/toolbar-view-modes.xml
798	%%DATADIR%%/gui/toolbar-view-resets.xml	871	%%DATADIR%%/gui/toolbar-view-resets.xml
799	%%DATADIR%%/gui/toolbar.py	872	%%DATADIR%%/gui/toolbar.py
800	%%DATADIR%%/gui/toolbar.xml	873	%%DATADIR%%/gui/toolbar.xml
		874	%%DATADIR%%/gui/topbar.py
		875	%%DATADIR%%/gui/uicolor.py
		876	%%DATADIR%%/gui/viewmanip.py
801	%%DATADIR%%/gui/widgets.py	877	%%DATADIR%%/gui/widgets.py
802	%%DATADIR%%/gui/windowing.py	878	%%DATADIR%%/gui/windowing.py
		879	%%DATADIR%%/gui/workspace.py
803	%%DATADIR%%/lib/__init__.py	880	%%DATADIR%%/lib/__init__.py
804	%%DATADIR%%/lib/backgroundsurface.py	881	%%DATADIR%%/lib/alg.py
		882	%%DATADIR%%/lib/autosave.py
805	%%DATADIR%%/lib/brush.py	883	%%DATADIR%%/lib/brush.py
806	%%DATADIR%%/lib/brushes_migrate_json.py	884	%%DATADIR%%/lib/brushes_migrate_json.py
		885	%%DATADIR%%/lib/cache.py
		886	%%DATADIR%%/lib/color.py
807	%%DATADIR%%/lib/command.py	887	%%DATADIR%%/lib/command.py
808	%%DATADIR%%/lib/document.py	888	%%DATADIR%%/lib/document.py
		889	%%DATADIR%%/lib/errors.py
		890	%%DATADIR%%/lib/fileutils.py
		891	%%DATADIR%%/lib/gettext.py
		892	%%DATADIR%%/lib/gichecks.py
		893	%%DATADIR%%/lib/glib.py
809	%%DATADIR%%/lib/helpers.py	894	%%DATADIR%%/lib/helpers.py
		895	%%DATADIR%%/lib/i18n.py
810	%%DATADIR%%/lib/idletask.py	896	%%DATADIR%%/lib/idletask.py
811	%%DATADIR%%/lib/layer.py	897	%%DATADIR%%/lib/layer/__init__.py
		898	%%DATADIR%%/lib/layer/core.py
		899	%%DATADIR%%/lib/layer/data.py
		900	%%DATADIR%%/lib/layer/error.py
		901	%%DATADIR%%/lib/layer/group.py
		902	%%DATADIR%%/lib/layer/test.py
		903	%%DATADIR%%/lib/layer/tree.py
		904	%%DATADIR%%/lib/meta.py
		905	%%DATADIR%%/lib/modes.py
812	%%DATADIR%%/lib/mypaintlib.py	906	%%DATADIR%%/lib/mypaintlib.py
		907	%%DATADIR%%/lib/observable.py
		908	%%DATADIR%%/lib/palette.py
		909	%%DATADIR%%/lib/pixbuf.py
813	%%DATADIR%%/lib/pixbufsurface.py	910	%%DATADIR%%/lib/pixbufsurface.py
814	%%DATADIR%%/lib/scratchpad_palette.py
815	%%DATADIR%%/lib/stroke.py	911	%%DATADIR%%/lib/stroke.py
816	%%DATADIR%%/lib/strokemap.py	912	%%DATADIR%%/lib/strokemap.py
		913	%%DATADIR%%/lib/surface.py
817	%%DATADIR%%/lib/tiledsurface.py	914	%%DATADIR%%/lib/tiledsurface.py
		915	%%DATADIR%%/lib/xml.py
818	%%DATADIR%%/palettes/All_color_choice.gpl	916	%%DATADIR%%/palettes/All_color_choice.gpl
819	%%DATADIR%%/palettes/Browns_And_Yellows.gpl	917	%%DATADIR%%/palettes/Browns_And_Yellows.gpl
820	%%DATADIR%%/palettes/Classic_4.gpl	918	%%DATADIR%%/palettes/Classic_4.gpl
Lines 835-840 Link Here
835	%%DATADIR%%/palettes/Watercolor.gpl	933	%%DATADIR%%/palettes/Watercolor.gpl
836	%%DATADIR%%/palettes/Zenburn.gpl	934	%%DATADIR%%/palettes/Zenburn.gpl
837	%%DATADIR%%/pixmaps/crosshair_closed.png	935	%%DATADIR%%/pixmaps/crosshair_closed.png
		936	%%DATADIR%%/pixmaps/cursor_add.png
838	%%DATADIR%%/pixmaps/cursor_arrow.png	937	%%DATADIR%%/pixmaps/cursor_arrow.png
839	%%DATADIR%%/pixmaps/cursor_arrow_forbidden.png	938	%%DATADIR%%/pixmaps/cursor_arrow_forbidden.png
840	%%DATADIR%%/pixmaps/cursor_color_picker.png	939	%%DATADIR%%/pixmaps/cursor_color_picker.png
Lines 848-858 Link Here
848	%%DATADIR%%/pixmaps/cursor_move_nw_se.png	947	%%DATADIR%%/pixmaps/cursor_move_nw_se.png
849	%%DATADIR%%/pixmaps/cursor_move_w_e.png	948	%%DATADIR%%/pixmaps/cursor_move_w_e.png
850	%%DATADIR%%/pixmaps/cursor_pencil.png	949	%%DATADIR%%/pixmaps/cursor_pencil.png
851	%%DATADIR%%/pixmaps/eye_closed.png	950	%%DATADIR%%/pixmaps/cursor_remove.png
852	%%DATADIR%%/pixmaps/eye_open.png
853	%%DATADIR%%/pixmaps/layer_duplicate.png	951	%%DATADIR%%/pixmaps/layer_duplicate.png
854	%%DATADIR%%/pixmaps/layers.png	952	%%DATADIR%%/pixmaps/layers.png
855	%%DATADIR%%/pixmaps/lock_closed.png
856	%%DATADIR%%/pixmaps/lock_open.png
857	%%DATADIR%%/pixmaps/mypaint_logo.png	953	%%DATADIR%%/pixmaps/mypaint_logo.png
858	%%DATADIR%%/pixmaps/plus.png	954	%%DATADIR%%/pixmaps/plus.png
		955	share/thumbnailers/mypaint-ora.thumbnailer

Return to bug 209297

Lines 2-55 Link Here

(-)graphics/mypaint/Makefile (-33 / +27 lines)
2	# $FreeBSD: head/graphics/mypaint/Makefile 414046 2016-04-26 12:29:31Z jbeich $	2	# $FreeBSD: head/graphics/mypaint/Makefile 414046 2016-04-26 12:29:31Z jbeich $
3		3
4	PORTNAME= mypaint	4	PORTNAME= mypaint
5	DISTVERSIONPREFIX= v	5	PORTVERSION= 1.2.0
6	DISTVERSION= 1.1.0
7	PORTREVISION= 6
8	CATEGORIES= graphics	6	CATEGORIES= graphics
		7	MASTER_SITES= https://github.com/mypaint/mypaint/releases/download/${PORTVERSION:S/^/v/}/
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Fast painting/scribbling program	10	COMMENT= Fast painting/scribbling program
12		11
13	LICENSE= GPLv2+ ISCL MIT	12	LICENSE= GPLv2+ ISCL
14	LICENSE_COMB= multi	13	LICENSE_COMB= multi
15	LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING	14	LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
16	LICENSE_FILE_ISCL= ${WRKSRC}/brushlib/COPYING	15	LICENSE_FILE_ISCL= ${WRKSRC}/brushlib/COPYING
17	LICENSE_FILE_MIT= ${WRKSRC}/COPYING.cursors
18		16
19	RUN_DEPENDS= ${PYNUMPY} \	17	BUILD_DEPENDS= swig13>0:devel/swig13 \
20	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo \	18	${PYNUMPY}
21	${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf
22	LIB_DEPENDS= libjson-c.so:devel/json-c \	19	LIB_DEPENDS= libjson-c.so:devel/json-c \
23	liblcms2.so:graphics/lcms2	20	liblcms2.so:graphics/lcms2
24	BUILD_DEPENDS:= ${RUN_DEPENDS} \	21	RUN_DEPENDS= ${PYNUMPY}
25	swig:devel/swig13 \	22
26	protoc:devel/protobuf
27
28	USE_GITHUB= yes
29	USE_GNOME= glib20 pygtk2
30	MAKE_ARGS= prefix="${PREFIX}"
31	# XXX gcc-c++11-lib to fix runtime issues with old -lgcc_s and Clang	23	# XXX gcc-c++11-lib to fix runtime issues with old -lgcc_s and Clang
32	USES= compiler:gcc-c++11-lib desktop-file-utils gettext \	24	USES= compiler:gcc-c++11-lib desktop-file-utils gettext localbase \
33	pkgconfig python scons tar:bzip2	25	pkgconfig python:2 scons tar:xz
		26	USE_CSTD= c99
		27	USE_GNOME= gtk30 pygobject3 librsvg2:run
		28	MAKE_ARGS= prefix=${PREFIX} \
		29	enable_profiling=False \
		30	use_sharedlib=True \
		31	python_binary="${PYTHON_CMD}" \
		32	python_config="${PYTHON_CMD}-config"
		33	INSTALL_TARGET= ${STAGEDIR} --install-sandbox=${STAGEDIR}
		34	USE_LDCONFIG= yes
34	INSTALLS_ICONS= yes	35	INSTALLS_ICONS= yes
35		36
36	SUB_FILES= pkg-install	37	OPTIONS_DEFINE= GEGL
		38	OPTIONS_SUB= yes
37		39
38	post-patch:	40	GEGL_DESC= Graph based image processing framework support
39	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \	41	GEGL_LIB_DEPENDS= libgegl-0.3.so:graphics/gegl3
40	${WRKSRC}/brushlib/operationqueue.c \	42	GEGL_MAKE_ARGS= enable_gegl=True
41	${WRKSRC}/brushlib/fifo.c	43
42	@${REINPLACE_CMD} 's\|-O3\|\|g; s\|-g\|\|g' \	44	post-install:
43	${WRKSRC}/SConstruct	45	(cd ${WRKSRC}/brushlib && ${INSTALL_LIB} libmypaint*.so \
44		46	${STAGEDIR}${PREFIX}/lib)
45	pre-install:
46	@${RM} -rf ${WRKSRC}/sandbox 2>/dev/null \|\| ${TRUE}
47	@(cd ${WRKSRC} && ${DO_MAKE_BUILD} --install-sandbox=pre-stage)
48
49	do-install:
50	.for d in . po brushlib brushlib/po
51	(cd ${WRKSRC}/${d}/pre-stage && ${PAX} -rw . ${STAGEDIR})
52	.endfor
53	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mypaint/_mypaintlib.so	47	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mypaint/_mypaintlib.so
54		48
55	.include <bsd.port.mk>	49	.include <bsd.port.mk>

Lines 1-24 Link Here

(-)graphics/mypaint/files/patch-SConstruct (-15 / +21 lines)
1	--- SConstruct.orig 2012-12-31 16:35:54 UTC	1	--- SConstruct.orig 2016-01-15 19:42:54 UTC
2	+++ SConstruct	2	+++ SConstruct
3	@@ -39,7 +39,7 @@ opts.Add('python_config', 'python-config	3	@@ -95,14 +95,14 @@ if "$CCFLAGS" in env['CXXCOM']:
4		4
5	tools = ['default', 'textfile']
6
7	-env = Environment(ENV=os.environ, options=opts, tools=tools)
8	+env = Environment(ENV=os.environ, options=opts, tools=tools, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
9	print('building for %r (use scons python_binary=xxx to change)' % env['python_binary'])
10	print('using %r (use scons python_config=xxx to change)' % env['python_config'])
11	if sys.platform == "win32":
12	@@ -47,9 +47,9 @@ if sys.platform == "win32":
13	env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts)
14	opts.Update(env)	5	opts.Update(env)
15		6
16	-env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')	7	-env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
17	-env.Append(CCFLAGS='-Wall')	8	-env.Append(CCFLAGS='-Wall')
18	-env.Append(CFLAGS='-std=c99')	9	-env.Append(CFLAGS='-std=c99')
19	+env.Append(CXXFLAGS=['-Wall', '-Wno-sign-compare', '-Wno-write-strings'])	10	+#env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
20	+env.Append(CCFLAGS=['-Wall'])	11	+#env.Append(CCFLAGS='-Wall')
21	+env.Append(CFLAGS=['-std=c99'])	12	+#env.Append(CFLAGS='-std=c99')
		13
		14	env['GEGL_VERSION'] = 0.3
22		15
23	# Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008)	16	# Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008)
24	env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')	17	-env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
		18	+#env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
		19
		20	if env.get('CPPDEFINES'):
		21	# make sure assertions are enabled
		22	@@ -113,7 +113,7 @@ if env['debug']:
		23	env.Append(CCFLAGS='-O0', LINKFLAGS='-O0')
		24	else:
		25	# Overridable defaults
		26	- env.Prepend(CCFLAGS='-O3', LINKFLAGS='-O3')
		27	+ env.Prepend(CCFLAGS='', LINKFLAGS='')
		28
		29	if env['enable_profiling'] or env['debug']:
		30	env.Append(CCFLAGS='-g')

Lines 1-6 Link Here

(-)graphics/mypaint/files/patch-brushlib-SConscript (-17 / +16 lines)
1	--- brushlib/SConscript.orig 2012-12-31 16:35:54 UTC	1	--- brushlib/SConscript.orig 2016-01-15 19:42:55 UTC
2	+++ brushlib/SConscript	2	+++ brushlib/SConscript
3	@@ -47,7 +47,7 @@ def create_pkgconfig_files(env, pkgconfi	3	@@ -52,7 +52,7 @@ def create_pkgconfig_files(env, pkgconfi
4	}	4	}
5	pc_file = env.Substfile('%s.pc' % pkgconfig_name,	5	pc_file = env.Substfile('%s.pc' % pkgconfig_name,
6	"pkgconfig.pc.in", SUBST_DICT=pkg_info)	6	"pkgconfig.pc.in", SUBST_DICT=pkg_info)
Lines 9-28 Link Here
9		9
10	return pc_file	10	return pc_file
11		11
12	@@ -56,6 +56,7 @@ def create_pkgconfig_files(env, pkgconfi	12	@@ -163,7 +163,6 @@ if env['enable_introspection']:
13	# and also add our own specifics ones without affecting the other builds	13	install_perms(env, '$prefix/share/gir-1.0', gir)
14	top_env = env	14	install_perms(env, '$prefix/lib/girepository-1.0', typelib)
15	env = env.Clone()	15
16	+env.Prepend(LIBPATH=[".."])	16	-install_perms(env, '$prefix/lib/', brushlib)
		17	install_perms(env, '$prefix/include/libmypaint', Glob("./mypaint-*.h"))
		18	install_perms(env, '$prefix/include/libmypaint/glib', Glob("./glib/mypaint-*.h"))
		19	install_perms(env, "$prefix/share/libmypaint", Glob("./*.py"))
		20	@@ -183,7 +182,6 @@ if env['enable_gegl']:
		21	lib_builder = gegl_env.SharedLibrary if env['use_sharedlib'] else gegl_env.StaticPicLibrary
		22	brushlib_gegl = lib_builder('./mypaint-gegl', Glob("./gegl/*.c"))
17		23
18	if env['enable_introspection']:	24	- install_perms(env, '$prefix/lib/', brushlib_gegl)
19	env['use_glib'] = True	25	install_perms(env, '$prefix/include/libmypaint-gegl', Glob("./gegl/mypaint-gegl-*.h"))
20	@@ -73,7 +74,7 @@ if env['enable_docs']:
21
22	env.Append(CPPPATH='./')
23
24	-pkg_deps = ['json']
25	+pkg_deps = ['json-c']
26	libs = ['m']
27	linkflags = []
28		26
		27	create_pkgconfig_files(env, 'libmypaint-gegl', brushlib_version, 'MyPaint brush engine library, with GEGL integration',

Line 0 Link Here

(-)graphics/mypaint/files/patch-brushlib-SConstruct (+30 lines)
	1	--- brushlib/SConstruct.orig 2016-01-15 19:42:55 UTC
	2	+++ brushlib/SConstruct
	3	@@ -57,14 +57,14 @@ if os.environ.has_key('LDFLAGS'):
	4
	5	opts.Update(env)
	6
	7	-env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
	8	-env.Append(CCFLAGS='-Wall -Wstrict-prototypes -Werror')
	9	-env.Append(CFLAGS='-std=c99')
	10	+#env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
	11	+#env.Append(CCFLAGS='-Wall -Wstrict-prototypes -Werror')
	12	+#env.Append(CFLAGS='-std=c99')
	13
	14	env['GEGL_VERSION'] = 0.3
	15
	16	# Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008)
	17	-env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
	18	+#env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
	19
	20	if env.get('CPPDEFINES'):
	21	# make sure assertions are enabled
	22	@@ -75,7 +75,7 @@ if env['debug']:
	23	env.Append(CCFLAGS='-O0', LINKFLAGS='-O0')
	24	else:
	25	# Overridable defaults
	26	- env.Prepend(CCFLAGS='-O3', LINKFLAGS='-O3')
	27	+ env.Prepend(CCFLAGS='', LINKFLAGS='')
	28
	29	if env['enable_profiling'] or env['debug']:
	30	env.Append(CCFLAGS='-g')

Lines 1-14 Link Here

(-)graphics/mypaint/files/patch-brushlib-tests-SConscript (-9 / +11 lines)
1	--- brushlib/tests/SConscript.orig 2012-12-31 16:35:54 UTC	1	--- brushlib/tests/SConscript.orig 2016-01-15 19:42:55 UTC
2	+++ brushlib/tests/SConscript	2	+++ brushlib/tests/SConscript
3	@@ -13,8 +13,9 @@ def is_test(fn):	3	@@ -15,11 +15,11 @@ tests_sources = [fn for fn in os.listdir
4	tests_sources = [fn for fn in os.listdir("./") if is_test(fn) and is_csource(fn)]
5	testlib_sources = [fn for fn in os.listdir("./") if not is_test(fn) and is_csource(fn)]	4	testlib_sources = [fn for fn in os.listdir("./") if not is_test(fn) and is_csource(fn)]
6		5
7	-testlib_env.Append(LIBS=['mypaint'])	6	testlib_env.Append(LIBS=['mypaint'])
8	-testlib_env.Append(CPPPATH=['../'], LIBPATH=['../..'])	7	-if sys.platform == 'win32':
9	+testlib_env.Append(LIBS=['intl', 'mypaint'])	8	+if sys.platform == 'win32' or sys.platform.startswith("freebsd"):
10	+testlib_env.Append(CPPPATH=['../'])	9	testlib_env.Append(LIBS=['intl'])
11	+testlib_env.Prepend(LIBPATH=['../..'])	10	elif sys.platform == "msys" and os.environ.get("MSYSTEM") != "MSYS":
		11	testlib_env.Append(LIBS=['intl'])
		12	-testlib_env.Append(CPPPATH=['../'], LIBPATH=['../'])
		13	+testlib_env.Prepend(CPPPATH=['../'], LIBPATH=['../'])
12		14
13	if testlib_env['enable_gperftools']:	15	if testlib_env['enable_gperftools']:
14	testlib_env.ParseConfig('pkg-config --cflags --libs libprofiler')	16	parse_pkg_config(testlib_env, "libprofiler")

Line 0 Link Here

(-)graphics/mypaint/files/patch-lib-glib.py (+46 lines)
	1	--- lib/glib.py.orig 2016-01-15 19:42:55 UTC
	2	+++ lib/glib.py
	3	@@ -1,5 +1,5 @@
	4	# This file is part of MyPaint.
	5	-# Copyright (C) 2015 by Andrew Chadwick <a.t.chadwick@gmail.com>
	6	+# Copyright (C) 2015-2016 by the MyPaint Development Team.
	7	#
	8	# This program is free software; you can redistribute it and/or modify
	9	# it under the terms of the GNU General Public License as published by
	10	@@ -19,11 +19,12 @@ unicode, and may not even be UTF-8). Thi
	11	## Imports
	12
	13	import sys
	14	-from logging import getLogger
	15	-logger = getLogger(__name__)
	16	+import logging
	17
	18	from gi.repository import GLib
	19
	20	+logger = logging.getLogger(__name__)
	21	+
	22
	23	## File path getter functions
	24
	25	@@ -35,7 +36,6 @@ def filename_to_unicode(opsysstring):
	26	:returns: the converted filename
	27	:rtype: unicode
	28
	29	- >>> from gi.repository import GLib
	30	>>> filename_to_unicode('/ascii/only/path')
	31	u'/ascii/only/path'
	32	>>> filename_to_unicode(None) is None
	33	@@ -54,7 +54,12 @@ def filename_to_unicode(opsysstring):
	34	# Other systems are dependent in opaque ways on the environment.
	35	if not isinstance(opsysstring, str):
	36	raise TypeError("Argument must be bytes")
	37	- ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0)
	38	+ # This function's annotation seems to vary quite a bit.
	39	+ # See https://github.com/mypaint/mypaint/issues/634
	40	+ try:
	41	+ ustring, _, _ = GLib.filename_to_utf8(opsysstring, -1)
	42	+ except TypeError:
	43	+ ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0)
	44	if ustring is None:
	45	raise UnicodeDecodeError(
	46	"GLib failed to convert %r to a UTF-8 string. "

Lines 1-14 Link Here

(-)graphics/mypaint/files/patch-mypaint.py (-14 lines)
1	--- mypaint.py.orig 2012-12-31 16:35:54 UTC
2	+++ mypaint.py
3	@@ -172,11 +172,6 @@ if __name__ == '__main__':
4	print "DEBUG: localepath: ", localepath
5	print "DEBUG: localepath_brushlib: ", localepath_brushlib
6
7	- # Low-level bindtextdomain, required for GtkBuilder stuff.
8	- locale.bindtextdomain("mypaint", localepath)
9	- locale.bindtextdomain("libmypaint", localepath_brushlib)
10	- locale.textdomain("mypaint")
11	-
12	# Python gettext module.
13	# See http://docs.python.org/release/2.7/library/locale.html
14	gettext.bindtextdomain("mypaint", localepath)

Lines 1-21 Link Here

(-)graphics/mypaint/files/pkg-install.in (-21 lines)
1	#!/bin/sh
2
3	if [ "$2" = "POST-INSTALL" ]; then
4	pygtk_check_file="%%LOCALBASE%%/share/examples/py-gtk/Makefile"
5
6	if [ -e "$pygtk_check_file" ]; then
7	if ! grep -q numpy "$pygtk_check_file"; then
8	message="Dependent x11-toolkits/py-gtk2 port was built with NUMPY option disabled, but mypaint requires it to be enabled. Please rebuild x11-toolkits/py-gtk2 WITH_NUMPY, instead mypaint won't run"
9	fi
10	else
11	message="Note that dependent x11-toolkits/py-gtk2 port should be build with NUMPY option enabled"
12	fi
13
14	if [ -n "$message" ]; then
15	echo "======================================================================"
16	echo
17	echo $message \| fmt -w 70
18	echo
19	echo "======================================================================"
20	fi
21	fi