[150873] trunk
ionic at macports.org
ionic at macports.org
Sun Jul 31 23:43:57 PDT 2016
Revision: 150873
https://trac.macports.org/changeset/150873
Author: ionic at macports.org
Date: 2016-07-31 23:43:57 -0700 (Sun, 31 Jul 2016)
Log Message:
-----------
python31: backport patch from #44288. Part of #51939.
Modified Paths:
--------------
trunk/dports/lang/python31/Portfile
Added Paths:
-----------
trunk/lang/
trunk/lang/python31/
trunk/lang/python31/files/
trunk/lang/python31/files/patch-Include-pyport.h.diff
Modified: trunk/dports/lang/python31/Portfile
===================================================================
--- trunk/dports/lang/python31/Portfile 2016-08-01 06:43:50 UTC (rev 150872)
+++ trunk/dports/lang/python31/Portfile 2016-08-01 06:43:57 UTC (rev 150873)
@@ -8,7 +8,7 @@
epoch 1
# Remember to keep py31-tkinter and py31-gdbm's versions sync'd with this
version 3.1.5
-revision 4
+revision 5
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -35,7 +35,8 @@
patch-Lib-distutils-dist.py.diff \
patch-setup.py-disabled_modules.diff \
patch-libedit.diff \
- patch-Lib-site.py-omit_local_site_packages.diff
+ patch-Lib-site.py-omit_local_site_packages.diff \
+ patch-Include-pyport.h.diff
# http://bugs.python.org/issue21811
patchfiles-append patch-configure_configure.ac-yosemite_configure_fixes.diff \
Added: trunk/lang/python31/files/patch-Include-pyport.h.diff
===================================================================
--- trunk/lang/python31/files/patch-Include-pyport.h.diff (rev 0)
+++ trunk/lang/python31/files/patch-Include-pyport.h.diff 2016-08-01 06:43:57 UTC (rev 150873)
@@ -0,0 +1,23 @@
+--- Include/pyport.h.old 2012-04-10 01:25:33.000000000 +0200
++++ Include/pyport.h 2016-08-01 05:50:34.000000000 +0200
+@@ -619,6 +619,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
+@@ -636,6 +642,7 @@
+ #undef toupper
+ #define toupper(c) towupper(btowc(c))
+ #endif
++#endif
+
+
+ /* Declarations for symbol visibility.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160731/c239a713/attachment.html>
More information about the macports-changes
mailing list