<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7fd06464f9461616c5b5a729ba7c57b30045a9bc">https://github.com/macports/macports-ports/commit/7fd06464f9461616c5b5a729ba7c57b30045a9bc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7fd0646 MyPaint: Update to 1.2.1
</span>7fd0646 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7fd06464f9461616c5b5a729ba7c57b30045a9bc
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Feb 2 03:38:17 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> MyPaint: Update to 1.2.1
</span>---
graphics/MyPaint/Portfile | 11 +++--
graphics/MyPaint/files/GLib.filename_to_utf8.patch | 48 ----------------------
2 files changed, 5 insertions(+), 54 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/MyPaint/Portfile b/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ccf69e..e45e01e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,14 +8,14 @@ name MyPaint
</span>
if {${name} eq ${subport}} {
conflicts ${name}-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup mypaint mypaint 1.2.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup mypaint mypaint 1.2.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
github.tarball_from releases
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 89c0960d1e38f71623225221ef109b1ed0ea217c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cdab33dd0c146cf678c97bcdd44e561f97a0aec40421b8c6785a74b33b9728e2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 fd57a9df4ad1900c52c0b4979231a0074a2f57be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7
</span> }
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,8 +74,7 @@ depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> depends_run-append port:hicolor-icon-theme
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append GLib.filename_to_utf8.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- library-and-include-order.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append library-and-include-order.patch
</span> }
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/MyPaint/files/GLib.filename_to_utf8.patch b/graphics/MyPaint/files/GLib.filename_to_utf8.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ae0cc92..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/MyPaint/files/GLib.filename_to_utf8.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/mypaint/mypaint/issues/634
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/mypaint/mypaint/commit/c03602f3d5456d59fccfc8ad7d41c8c6f1a6d593
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/glib.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/glib.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This file is part of MyPaint.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Copyright (C) 2015 by Andrew Chadwick <a.t.chadwick@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Copyright (C) 2015-2016 by the MyPaint Development Team.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,11 +19,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Imports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--from logging import getLogger
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--logger = getLogger(__name__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import logging
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi.repository import GLib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+logger = logging.getLogger(__name__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## File path getter functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +36,6 @@ def filename_to_unicode(opsysstring):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- :returns: the converted filename
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- :rtype: unicode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- >>> from gi.repository import GLib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- >>> filename_to_unicode('/ascii/only/path')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- u'/ascii/only/path'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- >>> filename_to_unicode(None) is None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,7 +54,12 @@ def filename_to_unicode(opsysstring):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Other systems are dependent in opaque ways on the environment.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not isinstance(opsysstring, str):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise TypeError("Argument must be bytes")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # This function's annotation seems to vary quite a bit.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # See https://github.com/mypaint/mypaint/issues/634
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ustring, _, _ = GLib.filename_to_utf8(opsysstring, -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except TypeError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ustring = GLib.filename_to_utf8(opsysstring, -1, 0, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ustring is None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise UnicodeDecodeError(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "GLib failed to convert %r to a UTF-8 string. "
</span></pre><pre style='margin:0'>
</pre>