<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[154007] trunk/dports/graphics/MyPaint</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/154007">154007</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-10-17 18:19:20 -0700 (Mon, 17 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>MyPaint: Fix incompatibility with glib 2.48+
Resolves #51234
Add missing dependency on pyobjc-cocoa
Resolves #48849</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsMyPaintPortfile">trunk/dports/graphics/MyPaint/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsMyPaintfilesGLibfilename_to_utf8patch">trunk/dports/graphics/MyPaint/files/GLib.filename_to_utf8.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsMyPaintPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/MyPaint/Portfile (154006 => 154007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/Portfile 2016-10-17 22:24:33 UTC (rev 154006)
+++ trunk/dports/graphics/MyPaint/Portfile 2016-10-18 01:19:20 UTC (rev 154007)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> if {${name} eq ${subport}} {
</span><span class="cx"> conflicts ${name}-devel
</span><span class="cx"> github.setup mypaint mypaint 1.2.0 v
</span><ins>+ revision 1
</ins><span class="cx">
</span><span class="cx"> github.tarball_from releases
</span><span class="cx"> use_xz yes
</span><span class="lines">@@ -22,6 +23,7 @@
</span><span class="cx"> conflicts ${name}
</span><span class="cx"> github.setup mypaint mypaint 6ba6c251207d6efa629b8a1d3a3d70dc688fac55
</span><span class="cx"> version 1.3.0-alpha.20160115+git.[string range ${git.branch} 0 7]
</span><ins>+ revision 1
</ins><span class="cx"> set libmypaint_branch f6278c97aa5af443e30069099c6461b056cdfe63
</span><span class="cx">
</span><span class="cx"> master_sites-append https://github.com/${github.author}/libmypaint/tarball/${libmypaint_branch}:libmypaint
</span><span class="lines">@@ -68,11 +70,13 @@
</span><span class="cx"> port:py27-cairo \
</span><span class="cx"> port:py27-gobject3 \
</span><span class="cx"> port:py27-numpy \
</span><del>- port:py27-protobuf
</del><ins>+ port:py27-protobuf \
+ port:py27-pyobjc-cocoa
</ins><span class="cx">
</span><span class="cx"> depends_run-append port:hicolor-icon-theme
</span><span class="cx">
</span><span class="cx"> patchfiles library-and-include-order.patch
</span><ins>+patchfiles-append GLib.filename_to_utf8.patch
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicsMyPaintfilesGLibfilename_to_utf8patch"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/MyPaint/files/GLib.filename_to_utf8.patch (0 => 154007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/MyPaint/files/GLib.filename_to_utf8.patch (rev 0)
+++ trunk/dports/graphics/MyPaint/files/GLib.filename_to_utf8.patch 2016-10-18 01:19:20 UTC (rev 154007)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+https://github.com/mypaint/mypaint/issues/634
+https://github.com/mypaint/mypaint/commit/c03602f3d5456d59fccfc8ad7d41c8c6f1a6d593
+--- lib/glib.py.orig
++++ 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 @@
+ ## 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. "
</ins></span></pre>
</div>
</div>
</body>
</html>