Update to Python 2.4.4.
Approved by: maintainer timeout, alexbl (python@) Tested by: pointyhat PR: ports/105901
This commit is contained in:
Xin LI
parent
971b8d2d5f
commit
f523e0e7b2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=185141
@ -331,9 +331,9 @@ PYTHON_VER= 2.5
|
||||
|
||||
# Python-2.4
|
||||
.elif ${PYTHON_VERSION} == "python2.4"
|
||||
PYTHON_PORTVERSION?=2.4.3
|
||||
PYTHON_PORTVERSION?=2.4.4
|
||||
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python24
|
||||
PYTHON_REL= 243
|
||||
PYTHON_REL= 244
|
||||
PYTHON_SUFFIX= 24
|
||||
PYTHON_VER= 2.4
|
||||
|
||||
|
||||
@ -16,6 +16,7 @@ MD5 (python/html-2.3.tar.bz2) = 382a934e0943a24f44ed161e78ff8347
|
||||
MD5 (python/html-2.4.1.tar.bz2) = 00fb0aee372eae2d9cef649853dfc5d8
|
||||
MD5 (python/html-2.4.2.tar.bz2) = 4e3f177f32e15713130d9d9cf35f991f
|
||||
MD5 (python/html-2.4.3.tar.bz2) = 86edf38b83fde1ff44d0725acf90c95c
|
||||
MD5 (python/html-2.4.4.tar.bz2) = 21259033b5663533ed64b4592c6925e2
|
||||
MD5 (python/html-2.4.tar.bz2) = 10cca09fcdf1b5ad269bc9edb652d76f
|
||||
MD5 (python/html-2.5.tar.bz2) = 3badfa2d460f52b7f9face12abdb2e91
|
||||
MD5 (python/pdf-a4-2.0.1.tar.bz2) = fec4b5bcc4161bc82d1a4564fe71409a
|
||||
@ -35,6 +36,7 @@ MD5 (python/pdf-a4-2.3.tar.bz2) = 0556201159879872acdc3eeb170de59e
|
||||
MD5 (python/pdf-a4-2.4.1.tar.bz2) = 5a15fc66b7b3a927c2f1c503fa41dec7
|
||||
MD5 (python/pdf-a4-2.4.2.tar.bz2) = f9712931eb8dd460000596eec0694bfc
|
||||
MD5 (python/pdf-a4-2.4.3.tar.bz2) = 85f82cb2df6872e4d6ef3652be184b50
|
||||
MD5 (python/pdf-a4-2.4.4.tar.bz2) = 2b43ac2c9948af26af61c792397bc3fb
|
||||
MD5 (python/pdf-a4-2.4.tar.bz2) = 8f6b0a891dbff04f3b6ab07d9f8f6df6
|
||||
MD5 (python/pdf-a4-2.5.tar.bz2) = 9cc4e5a2992fb7be2373c3e03c765536
|
||||
MD5 (python/pdf-letter-2.0.1.tar.bz2) = c31282a516b5b49b83cb7df3d3f23cb7
|
||||
@ -54,6 +56,7 @@ MD5 (python/pdf-letter-2.3.tar.bz2) = 7894638799efe17916143b4b1f9f581a
|
||||
MD5 (python/pdf-letter-2.4.1.tar.bz2) = c4b988a0d09adb3d120121395d679e2e
|
||||
MD5 (python/pdf-letter-2.4.2.tar.bz2) = 82d1ae6045042c08a6a68f69fe2831c2
|
||||
MD5 (python/pdf-letter-2.4.3.tar.bz2) = 2f503f360ecd06fde2efdc61b4f1e644
|
||||
MD5 (python/pdf-letter-2.4.4.tar.bz2) = 80da7a7611b11f4ac059a84d63af3b0e
|
||||
MD5 (python/pdf-letter-2.4.tar.bz2) = 46e9741fa8d42c813d02f2d7c3342c55
|
||||
MD5 (python/pdf-letter-2.5.tar.bz2) = e58eef4dcf9384ef7ee105068f7bc26e
|
||||
MD5 (python/postscript-a4-2.0.1.tar.bz2) = ef7b98c07ed7da1e91f2963c38a03b5c
|
||||
@ -73,6 +76,7 @@ MD5 (python/postscript-a4-2.3.tar.bz2) = 59255ce295650103aaf59b9dea7729dc
|
||||
MD5 (python/postscript-a4-2.4.1.tar.bz2) = 64b0ab6de74ea5620d558b2f9fd7b1ee
|
||||
MD5 (python/postscript-a4-2.4.2.tar.bz2) = 2ef6f2128333042f82c365697ac8d5be
|
||||
MD5 (python/postscript-a4-2.4.3.tar.bz2) = f71f0b6d77778ba57a4d7b8cf918bab0
|
||||
MD5 (python/postscript-a4-2.4.4.tar.bz2) = 8680d3d6043a0dd3d6683e2fb727c2ab
|
||||
MD5 (python/postscript-a4-2.4.tar.bz2) = 261da37a6faf721846e27e44f3c12f62
|
||||
MD5 (python/postscript-a4-2.5.tar.bz2) = 831964fa3d53b3afe973995d7fcc05b2
|
||||
MD5 (python/postscript-letter-2.0.1.tar.bz2) = 13365181bab30ca27c9d7b69c60e0f03
|
||||
@ -92,6 +96,7 @@ MD5 (python/postscript-letter-2.3.tar.bz2) = 73fab7f4ffbf4f18afd533ea951dbb98
|
||||
MD5 (python/postscript-letter-2.4.1.tar.bz2) = 37465c3e957a5836901238193c3bcc88
|
||||
MD5 (python/postscript-letter-2.4.2.tar.bz2) = 11d90c85951dc2439e0f32459380dbbd
|
||||
MD5 (python/postscript-letter-2.4.3.tar.bz2) = ca001fb091019aadb66a25226768c523
|
||||
MD5 (python/postscript-letter-2.4.4.tar.bz2) = 3daa1afbaff58db82b22b45efc528ccd
|
||||
MD5 (python/postscript-letter-2.4.tar.bz2) = a54ca46c53f0ed8e2f47e94286c7a419
|
||||
MD5 (python/postscript-letter-2.5.tar.bz2) = 9f5aaba82f37fce8435c2bcc9886e2bf
|
||||
SHA256 (python/html-2.0.1.tar.bz2) = d42308dda686cc3a27f11d93bdb05c400f4754f51c8e9734435a3b600ea0689e
|
||||
@ -112,6 +117,7 @@ SHA256 (python/html-2.3.tar.bz2) = 9edb3799769bf31da6279d7e0a806b1f8e5ec30ad3d8c
|
||||
SHA256 (python/html-2.4.1.tar.bz2) = 3bde4e86a4d22a9e7fcecd6a0040df1a3858dee62cab2578bd3d187aa58dd393
|
||||
SHA256 (python/html-2.4.2.tar.bz2) = 963d98c8f9adc4a9301632efe27c3a505f72c447ee6340e3ab59d4b640bacb7e
|
||||
SHA256 (python/html-2.4.3.tar.bz2) = 6fe6d1c4ee6fed254be260d25f5c44f550d7d634970d33c77dec5a438b1720e9
|
||||
SHA256 (python/html-2.4.4.tar.bz2) = 6b1a6f1be187b1d0cab69ab7c8c436409468232d376419c978cbb1d019c6f465
|
||||
SHA256 (python/html-2.4.tar.bz2) = 667d51b683549e708e271573e825d09e6db6a0d4bd97d31ddcad23b52cf1ee36
|
||||
SHA256 (python/html-2.5.tar.bz2) = 52a473258528bec3617da8cfd9188e8b7b2833ade61d705058ee5b0adef64a5b
|
||||
SHA256 (python/pdf-a4-2.0.1.tar.bz2) = a938337ae963e3b4bfe667380a67dbf50cc4d07701dfcb6fbf33a996f7d79c0e
|
||||
@ -131,6 +137,7 @@ SHA256 (python/pdf-a4-2.3.tar.bz2) = d725e46b312fe5532e1bca9cfb2b87cd4804e1cbac1
|
||||
SHA256 (python/pdf-a4-2.4.1.tar.bz2) = e9619fd03e2678f8a12b7cd93551d608ef24183a4292cc3e848b5b7d9d34b160
|
||||
SHA256 (python/pdf-a4-2.4.2.tar.bz2) = 38445bfc55be1bafb4136c3a2d999a468caf613d56667015b9ad296179a7c46a
|
||||
SHA256 (python/pdf-a4-2.4.3.tar.bz2) = b5d1d850ea60d7251d66e47a6918dc2852465a837ebf39588f561c9da9bd5b79
|
||||
SHA256 (python/pdf-a4-2.4.4.tar.bz2) = d72bddbebc60430ee971d53e922cdf730c221b9aa610d4b52be3c3796fc8dc68
|
||||
SHA256 (python/pdf-a4-2.4.tar.bz2) = 40d7fb2618d3a88cbe353fd9ce7ce04b30fc76c85da27c0e90b9f2c98f40a044
|
||||
SHA256 (python/pdf-a4-2.5.tar.bz2) = ac591b0d29276de9bf98c4d1240ac57c5ec55bb5e8bbf62b2888343a8eb1b111
|
||||
SHA256 (python/pdf-letter-2.0.1.tar.bz2) = e29269a80b77fe8b65d759620dba3445bb67597ede477f6e5904062456a4baed
|
||||
@ -150,6 +157,7 @@ SHA256 (python/pdf-letter-2.3.tar.bz2) = 347f278ad75fcb5fdd08550111c18df23a6f3c2
|
||||
SHA256 (python/pdf-letter-2.4.1.tar.bz2) = 61c325ccf0855ff623ccf0cae537d39ed6782a12b0d4b382dbec01d25325c4cc
|
||||
SHA256 (python/pdf-letter-2.4.2.tar.bz2) = 2f364e054c2d4e50197d84359ca1a92fe843d70f082ab6d88ec571ff1a5d5682
|
||||
SHA256 (python/pdf-letter-2.4.3.tar.bz2) = a2aa3cf6334e64e3f025564a824017b7fb2f86344f00db21ea85cc06dafb80bd
|
||||
SHA256 (python/pdf-letter-2.4.4.tar.bz2) = 8ee0df31d5090b2c0a895854ec0700c49cc50f06dd8d3ff5f2151d7da23caada
|
||||
SHA256 (python/pdf-letter-2.4.tar.bz2) = e87c19834c20d8adb0b9ac90810d6c3d405e47bc075241fe17d19790c19de3aa
|
||||
SHA256 (python/pdf-letter-2.5.tar.bz2) = d7be3abd1ad5efc62ca0d7ace9165605e6f955b819d33082c73306871f3d8576
|
||||
SHA256 (python/postscript-a4-2.0.1.tar.bz2) = 9a02e5812d81a9af10f159c463a55c36b2dea77808a5410859a33109dbea7da7
|
||||
@ -169,6 +177,7 @@ SHA256 (python/postscript-a4-2.3.tar.bz2) = 3f0c98d7db4ad885898c34eba1fecde70ae6
|
||||
SHA256 (python/postscript-a4-2.4.1.tar.bz2) = 5285f7df64599f5444e1863809f53d841e28529efccb258ba8fbb7ca9a42c031
|
||||
SHA256 (python/postscript-a4-2.4.2.tar.bz2) = 753c8af05ca26d3a064c337e79a1f7af26ad740f3a9039b2fe559cc427dcd39d
|
||||
SHA256 (python/postscript-a4-2.4.3.tar.bz2) = 7dd43824ee9e14db1c2ecb5f25ac6c0ad2618b2c8abd677a8f34f39b850b11c7
|
||||
SHA256 (python/postscript-a4-2.4.4.tar.bz2) = ec1a4c256f733e0b5917bb5c951b042f39781afec5480b76c28f5a5544784b08
|
||||
SHA256 (python/postscript-a4-2.4.tar.bz2) = 4530dee0c06486d6c13f19dbf05b8d01e7bb47faaf9855c44916d2e9e992e50f
|
||||
SHA256 (python/postscript-a4-2.5.tar.bz2) = 6654fbce933aa2e47b94c5faf75e69036510a10f0e0fbd35108361a130103ab8
|
||||
SHA256 (python/postscript-letter-2.0.1.tar.bz2) = 871bc7ed57b6dfb9b2f844fe6150204399dda73ebcafc47df4bbeb75b81fb9be
|
||||
@ -188,6 +197,7 @@ SHA256 (python/postscript-letter-2.3.tar.bz2) = 4bdeaad23a93018c9c3c64955dbb52b8
|
||||
SHA256 (python/postscript-letter-2.4.1.tar.bz2) = 628d0d65034ecd555fdc447e3ce5494d9b249dd0bfc2abd1c3721408e7f1874b
|
||||
SHA256 (python/postscript-letter-2.4.2.tar.bz2) = 1ed9da9b4e0c4bd14cd72f477cbf8a79699aaab8458f250013234d71bd8a278d
|
||||
SHA256 (python/postscript-letter-2.4.3.tar.bz2) = ed242d9f6e2ceef2e79c10419a1966add922de573240383cd869779f0ecc3ff0
|
||||
SHA256 (python/postscript-letter-2.4.4.tar.bz2) = 3f93c91d217ac8d90d4873dd0a62c4a88115f81707582424ab4d102b39a87bc7
|
||||
SHA256 (python/postscript-letter-2.4.tar.bz2) = d9e89330107bb77e29e9e938b71b8f1ec1ac7e73021c1d284a8def95acb5c7f3
|
||||
SHA256 (python/postscript-letter-2.5.tar.bz2) = c2be9ac9cca88cebb2f48b4cc467f6d46a10997b2ad651c2047bf7cccf2ff656
|
||||
SIZE (python/html-2.0.1.tar.bz2) = 704567
|
||||
@ -208,6 +218,7 @@ SIZE (python/html-2.3.tar.bz2) = 1216526
|
||||
SIZE (python/html-2.4.1.tar.bz2) = 1393522
|
||||
SIZE (python/html-2.4.2.tar.bz2) = 1395537
|
||||
SIZE (python/html-2.4.3.tar.bz2) = 1397233
|
||||
SIZE (python/html-2.4.4.tar.bz2) = 1398442
|
||||
SIZE (python/html-2.4.tar.bz2) = 1390125
|
||||
SIZE (python/html-2.5.tar.bz2) = 1562256
|
||||
SIZE (python/pdf-a4-2.0.1.tar.bz2) = 2297342
|
||||
@ -227,6 +238,7 @@ SIZE (python/pdf-a4-2.3.tar.bz2) = 3516924
|
||||
SIZE (python/pdf-a4-2.4.1.tar.bz2) = 4224980
|
||||
SIZE (python/pdf-a4-2.4.2.tar.bz2) = 4249646
|
||||
SIZE (python/pdf-a4-2.4.3.tar.bz2) = 4258522
|
||||
SIZE (python/pdf-a4-2.4.4.tar.bz2) = 5345687
|
||||
SIZE (python/pdf-a4-2.4.tar.bz2) = 4203864
|
||||
SIZE (python/pdf-a4-2.5.tar.bz2) = 5520351
|
||||
SIZE (python/pdf-letter-2.0.1.tar.bz2) = 2182069
|
||||
@ -246,6 +258,7 @@ SIZE (python/pdf-letter-2.3.tar.bz2) = 3534870
|
||||
SIZE (python/pdf-letter-2.4.1.tar.bz2) = 4247783
|
||||
SIZE (python/pdf-letter-2.4.2.tar.bz2) = 4273457
|
||||
SIZE (python/pdf-letter-2.4.3.tar.bz2) = 4279762
|
||||
SIZE (python/pdf-letter-2.4.4.tar.bz2) = 5368031
|
||||
SIZE (python/pdf-letter-2.4.tar.bz2) = 4226357
|
||||
SIZE (python/pdf-letter-2.5.tar.bz2) = 5547378
|
||||
SIZE (python/postscript-a4-2.0.1.tar.bz2) = 994104
|
||||
@ -265,6 +278,7 @@ SIZE (python/postscript-a4-2.3.tar.bz2) = 1479145
|
||||
SIZE (python/postscript-a4-2.4.1.tar.bz2) = 1704306
|
||||
SIZE (python/postscript-a4-2.4.2.tar.bz2) = 1714155
|
||||
SIZE (python/postscript-a4-2.4.3.tar.bz2) = 1716850
|
||||
SIZE (python/postscript-a4-2.4.4.tar.bz2) = 1699663
|
||||
SIZE (python/postscript-a4-2.4.tar.bz2) = 1699997
|
||||
SIZE (python/postscript-a4-2.5.tar.bz2) = 1816570
|
||||
SIZE (python/postscript-letter-2.0.1.tar.bz2) = 941017
|
||||
@ -284,5 +298,6 @@ SIZE (python/postscript-letter-2.3.tar.bz2) = 1475014
|
||||
SIZE (python/postscript-letter-2.4.1.tar.bz2) = 1700012
|
||||
SIZE (python/postscript-letter-2.4.2.tar.bz2) = 1709251
|
||||
SIZE (python/postscript-letter-2.4.3.tar.bz2) = 1712719
|
||||
SIZE (python/postscript-letter-2.4.4.tar.bz2) = 1695892
|
||||
SIZE (python/postscript-letter-2.4.tar.bz2) = 1693474
|
||||
SIZE (python/postscript-letter-2.5.tar.bz2) = 1813655
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= python
|
||||
PORTVERSION= 2.4.3
|
||||
PORTVERSION= 2.4.4
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= lang python ipv6
|
||||
MASTER_SITES= # empty
|
||||
|
||||
@ -15,6 +15,7 @@ MD5 (python/Python-2.3.tgz) = 595620a4769073a812e353597585c4e8
|
||||
MD5 (python/Python-2.4.1.tgz) = 7bb2416a4f421c3452d306694d3efbba
|
||||
MD5 (python/Python-2.4.2.tgz) = 07cfc759546f6723bb367be5b1ce9875
|
||||
MD5 (python/Python-2.4.3.tgz) = edf994473a8c1a963aaa71e442b285b7
|
||||
MD5 (python/Python-2.4.4.tgz) = 82d000617baaef269ad5795c595fdc58
|
||||
MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606
|
||||
MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95
|
||||
SHA256 (python/Python-2.1.1.tgz) = 6a5455b2ab72642feffc060a04e8ea543de2d0671a3f9c335b52f2e1e41edc5f
|
||||
@ -34,6 +35,7 @@ SHA256 (python/Python-2.3.tgz) = 20ea7faad43e1993f5c9292c5864671cf9de68eda1a0579
|
||||
SHA256 (python/Python-2.4.1.tgz) = f449c3b167389324c525ad99d02376c518ac11e163dbbbc13bc88a5c7101fd00
|
||||
SHA256 (python/Python-2.4.2.tgz) = 2653e1846e87fd9b3ee287fefc965c80c54646548b4913a22265b0dd54493adf
|
||||
SHA256 (python/Python-2.4.3.tgz) = 985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5
|
||||
SHA256 (python/Python-2.4.4.tgz) = 92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e
|
||||
SHA256 (python/Python-2.4.tgz) = ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9
|
||||
SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2
|
||||
SIZE (python/Python-2.1.1.tgz) = 6187808
|
||||
@ -53,5 +55,6 @@ SIZE (python/Python-2.3.tgz) = 8436880
|
||||
SIZE (python/Python-2.4.1.tgz) = 9219882
|
||||
SIZE (python/Python-2.4.2.tgz) = 9239975
|
||||
SIZE (python/Python-2.4.3.tgz) = 9348239
|
||||
SIZE (python/Python-2.4.4.tgz) = 9531474
|
||||
SIZE (python/Python-2.4.tgz) = 9198035
|
||||
SIZE (python/Python-2.5.tgz) = 11019675
|
||||
|
||||
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= python24
|
||||
PORTVERSION= 2.4.3
|
||||
PORTREVISION= 3
|
||||
PORTVERSION= 2.4.4
|
||||
CATEGORIES= lang python ipv6
|
||||
MASTER_SITES= ${PYTHON_MASTER_SITES}
|
||||
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
|
||||
@ -22,7 +21,7 @@ GNU_CONFIGURE= yes
|
||||
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
|
||||
CONFIGURE_ENV= OPT="${CFLAGS}"
|
||||
MAKE_ENV= VPATH="${WRKSRC}"
|
||||
INSTALLS_SHLIB= yes
|
||||
USE_LDCONFIG= yes
|
||||
INSTALL_TARGET= install
|
||||
MAN1= python.1 ${PYTHON_VERSION}.1
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (python/Python-2.4.3.tgz) = edf994473a8c1a963aaa71e442b285b7
|
||||
SHA256 (python/Python-2.4.3.tgz) = 985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5
|
||||
SIZE (python/Python-2.4.3.tgz) = 9348239
|
||||
MD5 (python/Python-2.4.4.tgz) = 82d000617baaef269ad5795c595fdc58
|
||||
SHA256 (python/Python-2.4.4.tgz) = 92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e
|
||||
SIZE (python/Python-2.4.4.tgz) = 9531474
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
--- Objects/unicodeobject.c 2006/08/22 08:09:11 51465
|
||||
+++ Objects/unicodeobject.c 2006/08/22 08:25:33 51466
|
||||
@@ -1970,7 +1970,28 @@
|
||||
|
||||
static const char *hexdigit = "0123456789abcdef";
|
||||
|
||||
- repr = PyString_FromStringAndSize(NULL, 2 + 6*size + 1);
|
||||
+ /* Initial allocation is based on the longest-possible unichr
|
||||
+ escape.
|
||||
+
|
||||
+ In wide (UTF-32) builds '\U00xxxxxx' is 10 chars per source
|
||||
+ unichr, so in this case it's the longest unichr escape. In
|
||||
+ narrow (UTF-16) builds this is five chars per source unichr
|
||||
+ since there are two unichrs in the surrogate pair, so in narrow
|
||||
+ (UTF-16) builds it's not the longest unichr escape.
|
||||
+
|
||||
+ In wide or narrow builds '\uxxxx' is 6 chars per source unichr,
|
||||
+ so in the narrow (UTF-16) build case it's the longest unichr
|
||||
+ escape.
|
||||
+ */
|
||||
+
|
||||
+ repr = PyString_FromStringAndSize(NULL,
|
||||
+ 2
|
||||
+#ifdef Py_UNICODE_WIDE
|
||||
+ + 10*size
|
||||
+#else
|
||||
+ + 6*size
|
||||
+#endif
|
||||
+ + 1);
|
||||
if (repr == NULL)
|
||||
return NULL;
|
||||
|
||||
@@ -1995,15 +2016,6 @@
|
||||
#ifdef Py_UNICODE_WIDE
|
||||
/* Map 21-bit characters to '\U00xxxxxx' */
|
||||
else if (ch >= 0x10000) {
|
||||
- int offset = p - PyString_AS_STRING(repr);
|
||||
-
|
||||
- /* Resize the string if necessary */
|
||||
- if (offset + 12 > PyString_GET_SIZE(repr)) {
|
||||
- if (_PyString_Resize(&repr, PyString_GET_SIZE(repr) + 100))
|
||||
- return NULL;
|
||||
- p = PyString_AS_STRING(repr) + offset;
|
||||
- }
|
||||
-
|
||||
*p++ = '\\';
|
||||
*p++ = 'U';
|
||||
*p++ = hexdigit[(ch >> 28) & 0x0000000F];
|
||||
@@ -2016,8 +2028,8 @@
|
||||
*p++ = hexdigit[ch & 0x0000000F];
|
||||
continue;
|
||||
}
|
||||
-#endif
|
||||
- /* Map UTF-16 surrogate pairs to Unicode \UXXXXXXXX escapes */
|
||||
+#else
|
||||
+ /* Map UTF-16 surrogate pairs to '\U00xxxxxx' */
|
||||
else if (ch >= 0xD800 && ch < 0xDC00) {
|
||||
Py_UNICODE ch2;
|
||||
Py_UCS4 ucs;
|
||||
@@ -2042,6 +2054,7 @@
|
||||
s--;
|
||||
size++;
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* Map 16-bit characters to '\uxxxx' */
|
||||
if (ch >= 256) {
|
||||
@ -1,5 +1,5 @@
|
||||
--- setup.py.orig Mon Oct 9 22:08:07 2006
|
||||
+++ setup.py Mon Oct 9 22:08:42 2006
|
||||
--- setup.py.orig Mon Nov 27 03:33:44 2006
|
||||
+++ setup.py Mon Nov 27 03:35:40 2006
|
||||
@@ -15,7 +15,7 @@
|
||||
from distutils.command.install_lib import install_lib
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
def add_dir_to_list(dirlist, dir):
|
||||
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
|
||||
@@ -425,7 +425,7 @@
|
||||
@@ -442,7 +442,7 @@
|
||||
if self.compiler.find_library_file(lib_dirs, 'readline'):
|
||||
readline_libs = ['readline']
|
||||
if self.compiler.find_library_file(lib_dirs,
|
||||
@ -18,12 +18,12 @@
|
||||
readline_libs.append('ncursesw')
|
||||
elif self.compiler.find_library_file(lib_dirs,
|
||||
'ncurses'):
|
||||
@@ -681,7 +681,7 @@
|
||||
|
||||
@@ -728,7 +728,7 @@
|
||||
# Curses support, requiring the System V version of curses, often
|
||||
# provided by the ncurses library.
|
||||
panel_library = 'panel'
|
||||
- if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
|
||||
+ if (self.compiler.find_library_file(lib_dirs, 'xxxncursesw')):
|
||||
curses_libs = ['ncursesw']
|
||||
exts.append( Extension('_curses', ['_cursesmodule.c'],
|
||||
libraries = curses_libs) )
|
||||
# Bug 1464056: If _curses.so links with ncursesw,
|
||||
# _curses_panel.so must link with panelw.
|
||||
|
||||
@ -9,6 +9,7 @@ bin/python-shared%%PYVER%%
|
||||
bin/smtpd%%PYVER%%.py
|
||||
bin/smtpd.py
|
||||
%%PYTHON_INCLUDEDIR%%/Python.h
|
||||
%%PYTHON_INCLUDEDIR%%/Python-ast.h
|
||||
%%PYTHON_INCLUDEDIR%%/abstract.h
|
||||
%%PYTHON_INCLUDEDIR%%/bitset.h
|
||||
%%PYTHON_INCLUDEDIR%%/boolobject.h
|
||||
@ -139,6 +140,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
|
||||
%%PYTHON_LIBDIR%%/bsddb/test/test_join.py
|
||||
%%PYTHON_LIBDIR%%/bsddb/test/test_lock.py
|
||||
%%PYTHON_LIBDIR%%/bsddb/test/test_misc.py
|
||||
%%PYTHON_LIBDIR%%/bsddb/test/test_pickle.py
|
||||
%%PYTHON_LIBDIR%%/bsddb/test/test_queue.py
|
||||
%%PYTHON_LIBDIR%%/bsddb/test/test_recno.py
|
||||
%%PYTHON_LIBDIR%%/bsddb/test/test_thread.py
|
||||
@ -827,6 +829,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
|
||||
%%PYTHON_LIBDIR%%/test/reperf.py
|
||||
%%PYTHON_LIBDIR%%/test/sample_doctest.py
|
||||
%%PYTHON_LIBDIR%%/test/seq_tests.py
|
||||
%%PYTHON_LIBDIR%%/test/sgml_input.html
|
||||
%%PYTHON_LIBDIR%%/test/sortperf.py
|
||||
%%PYTHON_LIBDIR%%/test/string_tests.py
|
||||
%%PYTHON_LIBDIR%%/test/test.xml
|
||||
@ -1136,6 +1139,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
|
||||
%%PYTHON_LIBDIR%%/test/testrgb.uue
|
||||
%%PYTHON_LIBDIR%%/test/testtar.tar
|
||||
%%PYTHON_LIBDIR%%/test/tf_inherit_check.py
|
||||
%%PYTHON_LIBDIR%%/test/threaded_import_hangers.py
|
||||
%%PYTHON_LIBDIR%%/test/tokenize_tests.txt
|
||||
%%PYTHON_LIBDIR%%/test/xmltests.py
|
||||
%%PYTHON_LIBDIR%%/textwrap.py
|
||||
@ -1634,7 +1638,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/scripts
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche/X
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/msi
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator/Templates
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/i18n
|
||||
@ -1643,7 +1646,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/framer
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/faqwiz
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/compiler
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/buildbot
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/bgen/bgen
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/bgen
|
||||
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/audiopy
|
||||
|
||||
Loading…
Reference in New Issue
Block a user