<!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>[113802] trunk/dports/lang/python33</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/113802">113802</a></dd>
<dt>Author</dt> <dd>jwa@macports.org</dd>
<dt>Date</dt> <dd>2013-11-23 12:28:11 -0800 (Sat, 23 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>python33: version bump to 3.3.3, libedit patch file modified</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpython33Portfile">trunk/dports/lang/python33/Portfile</a></li>
<li><a href="#trunkdportslangpython33filespatchlibeditdiff">trunk/dports/lang/python33/files/patch-libedit.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpython33Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python33/Portfile (113801 => 113802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python33/Portfile 2013-11-23 20:19:14 UTC (rev 113801)
+++ trunk/dports/lang/python33/Portfile 2013-11-23 20:28:11 UTC (rev 113802)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> name python33
</span><span class="cx">
</span><span class="cx"> # Remember to keep py33-tkinter and py33-gdbm's versions sync'd with this
</span><del>-version 3.3.2
-epoch 20130516
</del><ins>+version 3.3.3
+epoch 20131119
</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">@@ -29,8 +29,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 59af4ddcc99757da5044e395093cf45e1ec7333c \
- sha256 745b32c4b810e36fa66346198dbc2e313524fd68888922b85005656825e64b43
</del><ins>+checksums rmd160 62e262879f871fc2e9c5b3e85debd51c2691ca32 \
+ sha256 339275b30a1a3fef1589016bf6302c14e870f7a6fd2522bf87a6c2c6d383c685
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-setup.py.diff \
</span><span class="cx"> patch-Lib-cgi.py.diff \
</span></span></pre></div>
<a id="trunkdportslangpython33filespatchlibeditdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python33/files/patch-libedit.diff (113801 => 113802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python33/files/patch-libedit.diff 2013-11-23 20:19:14 UTC (rev 113801)
+++ trunk/dports/lang/python33/files/patch-libedit.diff 2013-11-23 20:28:11 UTC (rev 113802)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2012-08-13 17:14:16.000000000 +0300
-+++ configure 2012-08-13 17:21:44.000000000 +0300
-@@ -13725,9 +13725,9 @@
</del><ins>+--- configure.orig 2013-11-23 20:56:02.000000000 +0200
++++ configure 2013-11-23 21:01:51.000000000 +0200
+@@ -13871,9 +13871,9 @@
</ins><span class="cx"> $as_echo_n "checking how to link readline libs... " >&6; }
</span><span class="cx"> for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do
</span><span class="cx"> if test -z "$py_libtermcap"; then
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> fi
</span><span class="cx"> LIBS="$READLINE_LIBS $LIBS_no_readline"
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><del>-@@ -13771,13 +13771,13 @@
</del><ins>+@@ -13917,13 +13917,13 @@
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> # check for readline 2.1
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -13817,7 +13817,7 @@
</del><ins>+@@ -13963,7 +13963,7 @@
</ins><span class="cx"> # check for readline 2.2
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> _ACEOF
</span><span class="cx"> if ac_fn_c_try_cpp "$LINENO"; then :
</span><span class="cx"> have_readline=yes
</span><del>-@@ -13830,7 +13830,7 @@
</del><ins>+@@ -13976,7 +13976,7 @@
</ins><span class="cx"> then
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> _ACEOF
</span><span class="cx"> if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><del>-@@ -13843,7 +13843,7 @@
</del><ins>+@@ -13989,7 +13989,7 @@
</ins><span class="cx">
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> _ACEOF
</span><span class="cx"> if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><del>-@@ -13857,13 +13857,13 @@
</del><ins>+@@ -14003,13 +14003,13 @@
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> # check for readline 4.0
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -13901,13 +13901,13 @@
</del><ins>+@@ -14047,13 +14047,13 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # also in 4.0
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -13945,13 +13945,13 @@
</del><ins>+@@ -14091,13 +14091,13 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # check for readline 4.2
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -13991,7 +13991,7 @@
</del><ins>+@@ -14137,7 +14137,7 @@
</ins><span class="cx"> # also in readline 4.2
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> _ACEOF
</span><span class="cx"> if ac_fn_c_try_cpp "$LINENO"; then :
</span><span class="cx"> have_readline=yes
</span><del>-@@ -14004,7 +14004,7 @@
</del><ins>+@@ -14150,7 +14150,7 @@
</ins><span class="cx"> then
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -125,9 +125,9 @@
</span><span class="cx">
</span><span class="cx"> _ACEOF
</span><span class="cx"> if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><del>---- setup.py.orig 2012-08-13 17:24:39.000000000 +0300
-+++ setup.py 2012-08-13 17:25:59.000000000 +0300
-@@ -659,7 +659,7 @@
</del><ins>+--- setup.py.orig 2013-11-23 20:56:13.000000000 +0200
++++ setup.py 2013-11-23 21:10:29.000000000 +0200
+@@ -642,7 +642,7 @@
</ins><span class="cx"> exts.append( Extension('audioop', ['audioop.c']) )
</span><span class="cx">
</span><span class="cx"> # readline
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> readline_termcap_library = ""
</span><span class="cx"> curses_library = ""
</span><span class="cx"> # Cannot use os.popen here in py3k.
</span><del>-@@ -723,7 +723,7 @@
</del><ins>+@@ -706,7 +706,7 @@
</ins><span class="cx"> else:
</span><span class="cx"> readline_extra_link_args = ()
</span><span class="cx">
</span><span class="lines">@@ -145,8 +145,8 @@
</span><span class="cx"> if readline_termcap_library:
</span><span class="cx"> pass # Issue 7384: Already linked against curses or tinfo.
</span><span class="cx"> elif curses_library:
</span><del>---- Modules/readline.c.orig 2012-08-13 17:27:11.000000000 +0300
-+++ Modules/readline.c 2012-08-13 17:30:18.000000000 +0300
</del><ins>+--- Modules/readline.c.orig 2013-11-23 20:51:46.000000000 +0200
++++ Modules/readline.c 2013-11-23 21:31:10.000000000 +0200
</ins><span class="cx"> @@ -28,8 +28,7 @@
</span><span class="cx">
</span><span class="cx"> /* GNU readline definitions */
</span><span class="lines">@@ -157,23 +157,7 @@
</span><span class="cx">
</span><span class="cx"> #ifdef HAVE_RL_COMPLETION_MATCHES
</span><span class="cx"> #define completion_matches(x, y) \
</span><del>-@@ -574,14 +573,13 @@
- * difference.
- */
- int length = _py_get_history_length();
-- idx --;
-
- /*
- * Apple's readline emulation crashes when
- * the index is out of range, therefore
- * test for that and fail gracefully.
- */
-- if (idx < 0 || idx >= length) {
-+ if (idx < 1 || idx > length) {
- Py_RETURN_NONE;
- }
- }
-@@ -1002,7 +1000,6 @@
</del><ins>+@@ -1028,7 +1027,6 @@
</ins><span class="cx"> PyEval_SaveThread();
</span><span class="cx"> #endif
</span><span class="cx"> if (s < 0) {
</span><span class="lines">@@ -181,17 +165,14 @@
</span><span class="cx"> rl_cleanup_after_signal();
</span><span class="cx"> rl_callback_handler_remove();
</span><span class="cx"> *signal = 1;
</span><del>-@@ -1101,15 +1098,6 @@
</del><ins>+@@ -1127,12 +1125,6 @@
</ins><span class="cx"> const char *line;
</span><span class="cx"> int length = _py_get_history_length();
</span><span class="cx"> if (length > 0)
</span><span class="cx"> -#ifdef __APPLE__
</span><span class="cx"> - if (using_libedit_emulation) {
</span><del>-- /*
-- * Libedit's emulation uses 0-based indexes,
-- * the real readline uses 1-based indexes.
-- */
-- line = (const char *)history_get(length - 1)->line;
</del><ins>+- /* handle older 0-based or newer 1-based indexing */
+- line = (const char *)history_get(length + libedit_history_start - 1)->line;
</ins><span class="cx"> - } else
</span><span class="cx"> -#endif /* __APPLE__ */
</span><span class="cx"> line = (const char *)history_get(length)->line;
</span></span></pre>
</div>
</div>
</body>
</html>