diff options
| author | Wen Heping <wen@FreeBSD.org> | 2018-07-23 07:34:14 +0000 |
|---|---|---|
| committer | Wen Heping <wen@FreeBSD.org> | 2018-07-23 07:34:14 +0000 |
| commit | 4f67e0a9d1d31b394f4fc8635ef5e2ee594ce661 (patch) | |
| tree | f96415af7167997fae90f9357dcf985f9014d644 /graphics/mypaint | |
| parent | 6d4a3088baa09c63cd66f30e1c0d2634fdd0cbe0 (diff) | |
| download | ports-4f67e0a9d1d31b394f4fc8635ef5e2ee594ce661.tar.gz ports-4f67e0a9d1d31b394f4fc8635ef5e2ee594ce661.zip | |
- Update to 1.2.1
PR: 229911
Submitted by: ryo@tetera.org
Notes
Notes:
svn path=/head/; revision=475151
Diffstat (limited to 'graphics/mypaint')
| -rw-r--r-- | graphics/mypaint/Makefile | 3 | ||||
| -rw-r--r-- | graphics/mypaint/distinfo | 5 | ||||
| -rw-r--r-- | graphics/mypaint/files/patch-lib_glib.py | 46 |
3 files changed, 4 insertions, 50 deletions
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile index 0e55e4ce8cad..07e257600b2f 100644 --- a/graphics/mypaint/Makefile +++ b/graphics/mypaint/Makefile @@ -2,8 +2,7 @@ # $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/}/ diff --git a/graphics/mypaint/distinfo b/graphics/mypaint/distinfo index ab2cc833aeb3..528683a9e376 100644 --- a/graphics/mypaint/distinfo +++ b/graphics/mypaint/distinfo @@ -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 diff --git a/graphics/mypaint/files/patch-lib_glib.py b/graphics/mypaint/files/patch-lib_glib.py deleted file mode 100644 index ba74c72adfb7..000000000000 --- a/graphics/mypaint/files/patch-lib_glib.py +++ /dev/null @@ -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 <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. " |