<!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>[122030] trunk/dports/lang/python27</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/122030">122030</a></dd>
<dt>Author</dt> <dd>jwa@macports.org</dd>
<dt>Date</dt> <dd>2014-07-13 02:27:35 -0700 (Sun, 13 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>python27: patch pyport.h to be safe for C++, closes #44288</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpython27Portfile">trunk/dports/lang/python27/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangpython27filespatchIncludepyporthdiff">trunk/dports/lang/python27/files/patch-Include-pyport.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpython27Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python27/Portfile (122029 => 122030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python27/Portfile 2014-07-13 09:12:13 UTC (rev 122029)
+++ trunk/dports/lang/python27/Portfile 2014-07-13 09:27:35 UTC (rev 122030)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> epoch 2
</span><span class="cx"> # Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
</span><span class="cx"> version 2.7.8
</span><ins>+revision 1
</ins><span class="cx">
</span><span class="cx"> set major [lindex [split $version .] 0]
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="lines">@@ -36,7 +37,8 @@
</span><span class="cx"> patch-Lib-cgi.py.diff \
</span><span class="cx"> patch-Lib-ctypes-macholib-dyld.py.diff \
</span><span class="cx"> patch-configure.diff \
</span><del>- patch-libedit.diff
</del><ins>+ patch-libedit.diff \
+ patch-Include-pyport.h.diff
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gettext \
</span><span class="cx"> port:zlib \
</span></span></pre></div>
<a id="trunkdportslangpython27filespatchIncludepyporthdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/python27/files/patch-Include-pyport.h.diff (0 => 122030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python27/files/patch-Include-pyport.h.diff (rev 0)
+++ trunk/dports/lang/python27/files/patch-Include-pyport.h.diff 2014-07-13 09:27:35 UTC (rev 122030)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+--- Include/pyport.h.orig 2014-06-29 21:05:24.000000000 -0500
++++ Include/pyport.h 2014-07-11 13:36:52.000000000 -0500
+@@ -713,6 +713,12 @@
+ #endif
+
+ #ifdef _PY_PORT_CTYPE_UTF8_ISSUE
++#ifndef __cplusplus
++ /* The workaround below is unsafe in C++ because
++ * the <locale> defines these symbols as real functions,
++ * with a slightly different signature.
++ * See issue #10910
++ */
+ #include <ctype.h>
+ #include <wctype.h>
+ #undef isalnum
+@@ -730,6 +736,7 @@
+ #undef toupper
+ #define toupper(c) towupper(btowc(c))
+ #endif
++#endif
+
+
+ /* Declarations for symbol visibility.
</ins></span></pre>
</div>
</div>
</body>
</html>