Index: head/graphics/mypaint/Makefile =================================================================== --- head/graphics/mypaint/Makefile (revision 475150) +++ head/graphics/mypaint/Makefile (revision 475151) @@ -1,56 +1,55 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= mypaint -PORTVERSION= 1.2.0 -PORTREVISION= 7 +PORTVERSION= 1.2.1 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 BUILD_DEPENDS= swig3.0:devel/swig30 \ ${PYNUMPY} LIB_DEPENDS= libjson-c.so:devel/json-c \ liblcms2.so:graphics/lcms2 RUN_DEPENDS= ${PYNUMPY} BINARY_ALIAS= swig=swig3.0 USE_GNOME= gtk30 pygobject3 librsvg2:run CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} CFLAGS_gcc= -std=c99 MAKE_ARGS= prefix=${PREFIX} \ enable_profiling=False \ use_sharedlib=True \ python_binary="${PYTHON_CMD}" \ python_config="${PYTHON_CMD}-config" # XXX Embed RPATH via USES=fortran for py-numpy to load libgcc_s.so from ports USES= desktop-file-utils fortran gettext localbase \ pkgconfig python:2.7 scons tar:xz INSTALL_TARGET= ${STAGEDIR} --install-sandbox=${STAGEDIR} USE_LDCONFIG= yes INSTALLS_ICONS= yes OPTIONS_DEFINE= GEGL OPENMP OPTIONS_DEFAULT= OPENMP 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 OPENMP_USES= compiler:openmp OPENMP_USES_OFF= compiler # XXX ports/199603 OPENMP_MAKE_ARGS_OFF= enable_openmp=False post-install: ${INSTALL_LIB} ${WRKSRC}/brushlib/libmypaint*.so ${STAGEDIR}${PREFIX}/lib ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mypaint/_mypaintlib.so .include Index: head/graphics/mypaint/distinfo =================================================================== --- head/graphics/mypaint/distinfo (revision 475150) +++ head/graphics/mypaint/distinfo (revision 475151) @@ -1,2 +1,3 @@ -SHA256 (mypaint-1.2.0.tar.xz) = cdab33dd0c146cf678c97bcdd44e561f97a0aec40421b8c6785a74b33b9728e2 -SIZE (mypaint-1.2.0.tar.xz) = 37895196 +TIMESTAMP = 1532315716 +SHA256 (mypaint-1.2.1.tar.xz) = ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7 +SIZE (mypaint-1.2.1.tar.xz) = 37897196 Index: head/graphics/mypaint/files/patch-lib_glib.py =================================================================== --- head/graphics/mypaint/files/patch-lib_glib.py (revision 475150) +++ head/graphics/mypaint/files/patch-lib_glib.py (nonexistent) @@ -1,46 +0,0 @@ ---- 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 -+# 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. " Property changes on: head/graphics/mypaint/files/patch-lib_glib.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property