[113802] trunk/dports/lang/python33
jwa at macports.org
jwa at macports.org
Sat Nov 23 12:28:11 PST 2013
Revision: 113802
https://trac.macports.org/changeset/113802
Author: jwa at macports.org
Date: 2013-11-23 12:28:11 -0800 (Sat, 23 Nov 2013)
Log Message:
-----------
python33: version bump to 3.3.3, libedit patch file modified
Modified Paths:
--------------
trunk/dports/lang/python33/Portfile
trunk/dports/lang/python33/files/patch-libedit.diff
Modified: trunk/dports/lang/python33/Portfile
===================================================================
--- 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)
@@ -7,8 +7,8 @@
name python33
# Remember to keep py33-tkinter and py33-gdbm's versions sync'd with this
-version 3.3.2
-epoch 20130516
+version 3.3.3
+epoch 20131119
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
@@ -29,8 +29,8 @@
use_xz yes
-checksums rmd160 59af4ddcc99757da5044e395093cf45e1ec7333c \
- sha256 745b32c4b810e36fa66346198dbc2e313524fd68888922b85005656825e64b43
+checksums rmd160 62e262879f871fc2e9c5b3e85debd51c2691ca32 \
+ sha256 339275b30a1a3fef1589016bf6302c14e870f7a6fd2522bf87a6c2c6d383c685
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
Modified: trunk/dports/lang/python33/files/patch-libedit.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
---- configure.orig 2012-08-13 17:14:16.000000000 +0300
-+++ configure 2012-08-13 17:21:44.000000000 +0300
-@@ -13725,9 +13725,9 @@
+--- configure.orig 2013-11-23 20:56:02.000000000 +0200
++++ configure 2013-11-23 21:01:51.000000000 +0200
+@@ -13871,9 +13871,9 @@
$as_echo_n "checking how to link readline libs... " >&6; }
for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do
if test -z "$py_libtermcap"; then
@@ -12,7 +12,7 @@
fi
LIBS="$READLINE_LIBS $LIBS_no_readline"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13771,13 +13771,13 @@
+@@ -13917,13 +13917,13 @@
fi
# check for readline 2.1
@@ -29,7 +29,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13817,7 +13817,7 @@
+@@ -13963,7 +13963,7 @@
# check for readline 2.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -38,7 +38,7 @@
_ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
-@@ -13830,7 +13830,7 @@
+@@ -13976,7 +13976,7 @@
then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -47,7 +47,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-@@ -13843,7 +13843,7 @@
+@@ -13989,7 +13989,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -56,7 +56,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-@@ -13857,13 +13857,13 @@
+@@ -14003,13 +14003,13 @@
fi
# check for readline 4.0
@@ -73,7 +73,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13901,13 +13901,13 @@
+@@ -14047,13 +14047,13 @@
# also in 4.0
@@ -90,7 +90,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13945,13 +13945,13 @@
+@@ -14091,13 +14091,13 @@
# check for readline 4.2
@@ -107,7 +107,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13991,7 +13991,7 @@
+@@ -14137,7 +14137,7 @@
# also in readline 4.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -116,7 +116,7 @@
_ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
-@@ -14004,7 +14004,7 @@
+@@ -14150,7 +14150,7 @@
then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -125,9 +125,9 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
---- 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 @@
+--- 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 @@
exts.append( Extension('audioop', ['audioop.c']) )
# readline
@@ -136,7 +136,7 @@
readline_termcap_library = ""
curses_library = ""
# Cannot use os.popen here in py3k.
-@@ -723,7 +723,7 @@
+@@ -706,7 +706,7 @@
else:
readline_extra_link_args = ()
@@ -145,8 +145,8 @@
if readline_termcap_library:
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
---- Modules/readline.c.orig 2012-08-13 17:27:11.000000000 +0300
-+++ Modules/readline.c 2012-08-13 17:30:18.000000000 +0300
+--- Modules/readline.c.orig 2013-11-23 20:51:46.000000000 +0200
++++ Modules/readline.c 2013-11-23 21:31:10.000000000 +0200
@@ -28,8 +28,7 @@
/* GNU readline definitions */
@@ -157,23 +157,7 @@
#ifdef HAVE_RL_COMPLETION_MATCHES
#define completion_matches(x, y) \
-@@ -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 @@
+@@ -1028,7 +1027,6 @@
PyEval_SaveThread();
#endif
if (s < 0) {
@@ -181,17 +165,14 @@
rl_cleanup_after_signal();
rl_callback_handler_remove();
*signal = 1;
-@@ -1101,15 +1098,6 @@
+@@ -1127,12 +1125,6 @@
const char *line;
int length = _py_get_history_length();
if (length > 0)
-#ifdef __APPLE__
- if (using_libedit_emulation) {
-- /*
-- * Libedit's emulation uses 0-based indexes,
-- * the real readline uses 1-based indexes.
-- */
-- line = (const char *)history_get(length - 1)->line;
+- /* handle older 0-based or newer 1-based indexing */
+- line = (const char *)history_get(length + libedit_history_start - 1)->line;
- } else
-#endif /* __APPLE__ */
line = (const char *)history_get(length)->line;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131123/7eae4ed2/attachment-0001.html>
More information about the macports-changes
mailing list