Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29689 Modified Files: python25-10.6.info python25-10.6.patch python25.info python25.patch python26.info python26.patch Log Message: fix for asian-language charsets. Thanks danielj! Index: python25-10.6.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python25-10.6.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- python25-10.6.patch 14 May 2010 16:32:47 -0000 1.2 +++ python25-10.6.patch 31 Dec 2010 21:21:02 -0000 1.3 @@ -1,6 +1,18 @@ -diff -Nurd -x'*~' Python-2.5.4.orig/Lib/pydoc.py Python-2.5.4/Lib/pydoc.py ---- Python-2.5.4.orig/Lib/pydoc.py 2008-12-10 21:09:36.000000000 -0500 -+++ Python-2.5.4/Lib/pydoc.py 2009-03-17 01:53:23.000000000 -0400 +diff -Nurd -x'*~' Python-2.5.5.orig/Lib/locale.py Python-2.5.5/Lib/locale.py +--- Python-2.5.5.orig/Lib/locale.py 2007-05-01 02:08:20.000000000 -0400 ++++ Python-2.5.5/Lib/locale.py 2010-12-31 16:04:09.000000000 -0500 +@@ -487,7 +487,7 @@ + """ + _setlocale(category, _build_localename(getdefaultlocale())) + +-if sys.platform in ('win32', 'darwin', 'mac'): ++if sys.platform in ('win32', 'mac'): + # On Win32, this will return the ANSI code page + # On the Mac, it should return the system encoding; + # it might return "ascii" instead +diff -Nurd -x'*~' Python-2.5.5.orig/Lib/pydoc.py Python-2.5.5/Lib/pydoc.py +--- Python-2.5.5.orig/Lib/pydoc.py 2008-12-10 21:09:36.000000000 -0500 ++++ Python-2.5.5/Lib/pydoc.py 2010-12-31 16:04:00.000000000 -0500 @@ -1621,19 +1621,7 @@ def __init__(self, input, output): self.input = input @@ -22,9 +34,54 @@ def __repr__(self): if inspect.stack()[1][3] == '?': -diff -Nurd -x'*~' Python-2.5.4.orig/Modules/posixmodule.c Python-2.5.4/Modules/posixmodule.c ---- Python-2.5.4.orig/Modules/posixmodule.c 2008-12-13 10:14:30.000000000 -0500 -+++ Python-2.5.4/Modules/posixmodule.c 2009-10-31 15:47:35.000000000 -0400 +diff -Nurd -x'*~' Python-2.5.5.orig/Modules/_localemodule.c Python-2.5.5/Modules/_localemodule.c +--- Python-2.5.5.orig/Modules/_localemodule.c 2007-04-03 00:39:34.000000000 -0400 ++++ Python-2.5.5/Modules/_localemodule.c 2010-12-31 16:04:09.000000000 -0500 +@@ -32,7 +32,7 @@ + #include <wchar.h> + #endif + +-#if defined(__APPLE__) ++#if 0 + #include <CoreFoundation/CoreFoundation.h> + #endif + +@@ -410,7 +410,7 @@ + } + #endif + +-#if defined(__APPLE__) ++#if 0 + /* + ** Find out what the current script is. + ** Donated by Fredrik Lundh. +@@ -683,7 +683,7 @@ + METH_VARARGS, strcoll__doc__}, + {"strxfrm", (PyCFunction) PyLocale_strxfrm, + METH_VARARGS, strxfrm__doc__}, +-#if defined(MS_WINDOWS) || defined(__APPLE__) ++#if defined(MS_WINDOWS) || 0 + {"_getdefaultlocale", (PyCFunction) PyLocale_getdefaultlocale, METH_NOARGS}, + #endif + #ifdef HAVE_LANGINFO_H +diff -Nurd -x'*~' Python-2.5.5.orig/Modules/mmapmodule.c Python-2.5.5/Modules/mmapmodule.c +--- Python-2.5.5.orig/Modules/mmapmodule.c 2008-07-31 13:08:14.000000000 -0400 ++++ Python-2.5.5/Modules/mmapmodule.c 2010-12-31 16:04:00.000000000 -0500 +@@ -55,6 +55,11 @@ + #include <sys/types.h> + #endif /* HAVE_SYS_TYPES_H */ + ++/* Force inclusion of fcntl.h, seems to be broken on MacOS 10.6. */ ++#ifndef _SYS_FCNTL_H_ ++#include <sys/fcntl.h> ++#endif /* _SYS_FCNTL_H_ */ ++ + /* Prefer MAP_ANONYMOUS since MAP_ANON is deprecated according to man page. */ + #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) + # define MAP_ANONYMOUS MAP_ANON +diff -Nurd -x'*~' Python-2.5.5.orig/Modules/posixmodule.c Python-2.5.5/Modules/posixmodule.c +--- Python-2.5.5.orig/Modules/posixmodule.c 2008-12-13 10:14:30.000000000 -0500 ++++ Python-2.5.5/Modules/posixmodule.c 2010-12-31 16:04:00.000000000 -0500 @@ -339,7 +339,7 @@ #endif @@ -129,24 +186,9 @@ }; static int -diff -Nurd -x'*~' Python-2.5.5.orig/Modules/mmapmodule.c Python-2.5.5/Modules/mmapmodule.c ---- Python-2.5.5.orig/Modules/mmapmodule.c 2008-07-31 18:08:14.000000000 +0100 -+++ Python-2.5.5/Modules/mmapmodule.c 2010-05-14 15:24:55.000000000 +0100 -@@ -55,6 +55,11 @@ - #include <sys/types.h> - #endif /* HAVE_SYS_TYPES_H */ - -+/* Force inclusion of fcntl.h, seems to be broken on MacOS 10.6. */ -+#ifndef _SYS_FCNTL_H_ -+#include <sys/fcntl.h> -+#endif /* _SYS_FCNTL_H_ */ -+ - /* Prefer MAP_ANONYMOUS since MAP_ANON is deprecated according to man page. */ - #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) - # define MAP_ANONYMOUS MAP_ANON -diff -Nurd -x'*~' Python-2.5.4.orig/configure Python-2.5.4/configure ---- Python-2.5.4.orig/configure 2008-12-13 09:13:52.000000000 -0500 -+++ Python-2.5.4/configure 2009-03-17 01:53:23.000000000 -0400 +diff -Nurd -x'*~' Python-2.5.5.orig/configure Python-2.5.5/configure +--- Python-2.5.5.orig/configure 2008-12-13 09:13:52.000000000 -0500 ++++ Python-2.5.5/configure 2010-12-31 16:04:00.000000000 -0500 @@ -4534,7 +4534,7 @@ ;; # is there any other compiler on Darwin besides gcc? @@ -187,9 +229,9 @@ fi fi ;; -diff -Nurd -x'*~' Python-2.5.4.orig/setup.py Python-2.5.4/setup.py ---- Python-2.5.4.orig/setup.py 2008-10-16 14:58:19.000000000 -0400 -+++ Python-2.5.4/setup.py 2009-03-17 01:53:23.000000000 -0400 +diff -Nurd -x'*~' Python-2.5.5.orig/setup.py Python-2.5.5/setup.py +--- Python-2.5.5.orig/setup.py 2008-10-16 14:58:19.000000000 -0400 ++++ Python-2.5.5/setup.py 2010-12-31 16:04:00.000000000 -0500 @@ -244,8 +244,8 @@ def detect_modules(self): Index: python25.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python25.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- python25.patch 14 May 2010 16:32:47 -0000 1.6 +++ python25.patch 31 Dec 2010 21:21:02 -0000 1.7 @@ -1,6 +1,18 @@ -diff -Nurd -x'*~' Python-2.5.4.orig/Lib/pydoc.py Python-2.5.4/Lib/pydoc.py ---- Python-2.5.4.orig/Lib/pydoc.py 2008-12-10 21:09:36.000000000 -0500 -+++ Python-2.5.4/Lib/pydoc.py 2009-03-17 01:53:23.000000000 -0400 +diff -Nurd -x'*~' Python-2.5.5.orig/Lib/locale.py Python-2.5.5/Lib/locale.py +--- Python-2.5.5.orig/Lib/locale.py 2007-05-01 02:08:20.000000000 -0400 ++++ Python-2.5.5/Lib/locale.py 2010-12-31 16:06:32.000000000 -0500 +@@ -487,7 +487,7 @@ + """ + _setlocale(category, _build_localename(getdefaultlocale())) + +-if sys.platform in ('win32', 'darwin', 'mac'): ++if sys.platform in ('win32', 'mac'): + # On Win32, this will return the ANSI code page + # On the Mac, it should return the system encoding; + # it might return "ascii" instead +diff -Nurd -x'*~' Python-2.5.5.orig/Lib/pydoc.py Python-2.5.5/Lib/pydoc.py +--- Python-2.5.5.orig/Lib/pydoc.py 2008-12-10 21:09:36.000000000 -0500 ++++ Python-2.5.5/Lib/pydoc.py 2010-12-31 16:06:29.000000000 -0500 @@ -1621,19 +1621,7 @@ def __init__(self, input, output): self.input = input @@ -22,9 +34,54 @@ def __repr__(self): if inspect.stack()[1][3] == '?': -diff -Nurd -x'*~' Python-2.5.4.orig/Modules/posixmodule.c Python-2.5.4/Modules/posixmodule.c ---- Python-2.5.4.orig/Modules/posixmodule.c 2008-12-13 10:14:30.000000000 -0500 -+++ Python-2.5.4/Modules/posixmodule.c 2009-03-17 01:53:23.000000000 -0400 +diff -Nurd -x'*~' Python-2.5.5.orig/Modules/_localemodule.c Python-2.5.5/Modules/_localemodule.c +--- Python-2.5.5.orig/Modules/_localemodule.c 2007-04-03 00:39:34.000000000 -0400 ++++ Python-2.5.5/Modules/_localemodule.c 2010-12-31 16:06:32.000000000 -0500 +@@ -32,7 +32,7 @@ + #include <wchar.h> + #endif + +-#if defined(__APPLE__) ++#if 0 + #include <CoreFoundation/CoreFoundation.h> + #endif + +@@ -410,7 +410,7 @@ + } + #endif + +-#if defined(__APPLE__) ++#if 0 + /* + ** Find out what the current script is. + ** Donated by Fredrik Lundh. +@@ -683,7 +683,7 @@ + METH_VARARGS, strcoll__doc__}, + {"strxfrm", (PyCFunction) PyLocale_strxfrm, + METH_VARARGS, strxfrm__doc__}, +-#if defined(MS_WINDOWS) || defined(__APPLE__) ++#if defined(MS_WINDOWS) || 0 + {"_getdefaultlocale", (PyCFunction) PyLocale_getdefaultlocale, METH_NOARGS}, + #endif + #ifdef HAVE_LANGINFO_H +diff -Nurd -x'*~' Python-2.5.5.orig/Modules/mmapmodule.c Python-2.5.5/Modules/mmapmodule.c +--- Python-2.5.5.orig/Modules/mmapmodule.c 2008-07-31 13:08:14.000000000 -0400 ++++ Python-2.5.5/Modules/mmapmodule.c 2010-12-31 16:06:29.000000000 -0500 +@@ -55,6 +55,11 @@ + #include <sys/types.h> + #endif /* HAVE_SYS_TYPES_H */ + ++/* Force inclusion of fcntl.h, seems to be broken on MacOS 10.6. */ ++#ifndef _SYS_FCNTL_H_ ++#include <sys/fcntl.h> ++#endif /* _SYS_FCNTL_H_ */ ++ + /* Prefer MAP_ANONYMOUS since MAP_ANON is deprecated according to man page. */ + #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) + # define MAP_ANONYMOUS MAP_ANON +diff -Nurd -x'*~' Python-2.5.5.orig/Modules/posixmodule.c Python-2.5.5/Modules/posixmodule.c +--- Python-2.5.5.orig/Modules/posixmodule.c 2008-12-13 10:14:30.000000000 -0500 ++++ Python-2.5.5/Modules/posixmodule.c 2010-12-31 16:06:29.000000000 -0500 @@ -339,7 +339,7 @@ #endif @@ -43,24 +100,9 @@ if (environ == NULL) environ = *_NSGetEnviron(); #endif -diff -Nurd -x'*~' Python-2.5.5.orig/Modules/mmapmodule.c Python-2.5.5/Modules/mmapmodule.c ---- Python-2.5.5.orig/Modules/mmapmodule.c 2008-07-31 18:08:14.000000000 +0100 -+++ Python-2.5.5/Modules/mmapmodule.c 2010-05-14 15:24:55.000000000 +0100 -@@ -55,6 +55,11 @@ - #include <sys/types.h> - #endif /* HAVE_SYS_TYPES_H */ - -+/* Force inclusion of fcntl.h, seems to be broken on MacOS 10.6. */ -+#ifndef _SYS_FCNTL_H_ -+#include <sys/fcntl.h> -+#endif /* _SYS_FCNTL_H_ */ -+ - /* Prefer MAP_ANONYMOUS since MAP_ANON is deprecated according to man page. */ - #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) - # define MAP_ANONYMOUS MAP_ANON -diff -Nurd -x'*~' Python-2.5.4.orig/configure Python-2.5.4/configure ---- Python-2.5.4.orig/configure 2008-12-13 09:13:52.000000000 -0500 -+++ Python-2.5.4/configure 2009-03-17 01:53:23.000000000 -0400 +diff -Nurd -x'*~' Python-2.5.5.orig/configure Python-2.5.5/configure +--- Python-2.5.5.orig/configure 2008-12-13 09:13:52.000000000 -0500 ++++ Python-2.5.5/configure 2010-12-31 16:06:29.000000000 -0500 @@ -4534,7 +4534,7 @@ ;; # is there any other compiler on Darwin besides gcc? @@ -101,9 +143,9 @@ fi fi ;; -diff -Nurd -x'*~' Python-2.5.4.orig/setup.py Python-2.5.4/setup.py ---- Python-2.5.4.orig/setup.py 2008-10-16 14:58:19.000000000 -0400 -+++ Python-2.5.4/setup.py 2009-03-17 01:53:23.000000000 -0400 +diff -Nurd -x'*~' Python-2.5.5.orig/setup.py Python-2.5.5/setup.py +--- Python-2.5.5.orig/setup.py 2008-10-16 14:58:19.000000000 -0400 ++++ Python-2.5.5/setup.py 2010-12-31 16:06:29.000000000 -0500 @@ -244,8 +244,8 @@ def detect_modules(self): Index: python26.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python26.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- python26.patch 10 Oct 2010 18:29:34 -0000 1.12 +++ python26.patch 31 Dec 2010 21:21:02 -0000 1.13 @@ -40,6 +40,18 @@ gid = adapt(gid %i) self.db.put(i, gid, txn=txn, flags=db.DB_APPEND) txns.add(gid) +diff -Nurd -x'*~' Python-2.6.6.orig/Lib/locale.py Python-2.6.6/Lib/locale.py +--- Python-2.6.6.orig/Lib/locale.py 2009-05-06 09:21:17.000000000 -0400 ++++ Python-2.6.6/Lib/locale.py 2010-12-31 16:01:06.000000000 -0500 +@@ -522,7 +522,7 @@ + """ + _setlocale(category, _build_localename(getdefaultlocale())) + +-if sys.platform in ('win32', 'darwin', 'mac'): ++if sys.platform in ('win32', 'mac'): + # On Win32, this will return the ANSI code page + # On the Mac, it should return the system encoding; + # it might return "ascii" instead diff -Nurd -x'*~' Python-2.6.6.orig/Lib/platform.py Python-2.6.6/Lib/platform.py --- Python-2.6.6.orig/Lib/platform.py 2010-08-03 04:09:15.000000000 -0400 +++ Python-2.6.6/Lib/platform.py 2010-10-10 14:22:01.000000000 -0400 @@ -225,6 +237,36 @@ ADD_INT(d, DB_RECOVER); ADD_INT(d, DB_RECOVER_FATAL); +diff -Nurd -x'*~' Python-2.6.6.orig/Modules/_localemodule.c Python-2.6.6/Modules/_localemodule.c +--- Python-2.6.6.orig/Modules/_localemodule.c 2010-05-09 11:15:40.000000000 -0400 ++++ Python-2.6.6/Modules/_localemodule.c 2010-12-31 16:01:06.000000000 -0500 +@@ -32,7 +32,7 @@ + #include <wchar.h> + #endif + +-#if defined(__APPLE__) ++#if 0 + #include <CoreFoundation/CoreFoundation.h> + #endif + +@@ -412,7 +412,7 @@ + } + #endif + +-#if defined(__APPLE__) ++#if 0 + /* + ** Find out what the current script is. + ** Donated by Fredrik Lundh. +@@ -689,7 +689,7 @@ + METH_VARARGS, strcoll__doc__}, + {"strxfrm", (PyCFunction) PyLocale_strxfrm, + METH_VARARGS, strxfrm__doc__}, +-#if defined(MS_WINDOWS) || defined(__APPLE__) ++#if defined(MS_WINDOWS) || 0 + {"_getdefaultlocale", (PyCFunction) PyLocale_getdefaultlocale, METH_NOARGS}, + #endif + #ifdef HAVE_LANGINFO_H diff -Nurd -x'*~' Python-2.6.6.orig/Modules/posixmodule.c Python-2.6.6/Modules/posixmodule.c --- Python-2.6.6.orig/Modules/posixmodule.c 2010-07-24 06:05:19.000000000 -0400 +++ Python-2.6.6/Modules/posixmodule.c 2010-10-10 14:18:05.000000000 -0400 Index: python25-10.6.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python25-10.6.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- python25-10.6.info 13 Aug 2010 16:21:45 -0000 1.4 +++ python25-10.6.info 31 Dec 2010 21:21:02 -0000 1.5 @@ -1,7 +1,7 @@ Info2: << Package: python%type_pkg[python] Version: 2.5.5 -Revision: 103 +Revision: 104 Epoch: 1 Distribution: 10.6 Type: python 2.5 @@ -37,7 +37,7 @@ gettext-bin, gettext-tools, libgettext8-dev, - libjpeg, + libjpeg8, libncurses5 (>= 5.4-20041023-1006), libncursesw5, readline5, @@ -51,7 +51,7 @@ Source-MD5: 1d00e2fb19418e486c30b850df625aa3 Source2-MD5: 64b4db34805109fcfd4ff528859c5a1b PatchFile: %n-10.6.patch -PatchFile-MD5: 0973471e11b951b6208ffe97cce69fc5 +PatchFile-MD5: b93bb7f272a442ba18a231d6179aef87 PatchScript: << sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 perl -pi -e 's|-Wno-long-double||' configure @@ -192,6 +192,9 @@ Fix 10.6 mmapmodule.c missing #include to get O_RDWR (compile failure which doesn't abort build process!). Seems safe enough keep in all distros' pkgs + + Fix language-encoding bug for japanese locale. See: + https://trac.macports.org/attachment/ticket/21517/patch-locale-from-apple-darwinsource.diff << License: OSI-Approved Homepage: http://www.python.org Index: python25.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python25.info,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- python25.info 13 Aug 2010 16:21:45 -0000 1.17 +++ python25.info 31 Dec 2010 21:21:02 -0000 1.18 @@ -1,7 +1,7 @@ Info2: << Package: python%type_pkg[python] Version: 2.5.5 -Revision: 3 +Revision: 4 Epoch: 1 Distribution: 10.4, 10.5 Type: python 2.5 @@ -37,7 +37,7 @@ gettext-bin, gettext-tools, libgettext8-dev, - libjpeg, + libjpeg8, libncurses5 (>= 5.4-20041023-1006), libncursesw5, readline5, @@ -51,7 +51,7 @@ Source-MD5: 1d00e2fb19418e486c30b850df625aa3 Source2-MD5: 64b4db34805109fcfd4ff528859c5a1b PatchFile: %n.patch -PatchFile-MD5: b35316a349d3982919ab4f005b008000 +PatchFile-MD5: 50dafb42c089681700eec4090fc87b8b PatchScript: << sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 perl -pi -e 's|-Wno-long-double||' configure @@ -187,6 +187,9 @@ Fix 10.6 mmapmodule.c missing #include to get O_RDWR (compile failure which doesn't abort build process!). Seems safe enough keep in all distros' pkgs + + Fix language-encoding bug for japanese locale. See: + https://trac.macports.org/attachment/ticket/21517/patch-locale-from-apple-darwinsource.diff << License: OSI-Approved Homepage: http://www.python.org Index: python26.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python26.info,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- python26.info 10 Oct 2010 18:29:34 -0000 1.20 +++ python26.info 31 Dec 2010 21:21:02 -0000 1.21 @@ -1,7 +1,7 @@ Info2: << Package: python%type_pkg[python] Version: 2.6.6 -Revision: 1 +Revision: 2 Epoch: 1 Type: python 2.6 Maintainer: Daniel Macks <dm...@ne...> @@ -40,7 +40,7 @@ Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2 Source2-MD5: d963121537cd6e295ef91301b660633a PatchFile: %n.patch -PatchFile-MD5: 5d4c42e5ae16fb94c947120a6f1cbaf4 +PatchFile-MD5: c38f81ac18263570e038255839db24f3 PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 SetLDFLAGS: -L%p/lib/system-openssl/lib ConfigureParams: --enable-shared @@ -176,6 +176,9 @@ requires uses the MacOS module when reading gestalt and MacOS is not available on 64bit. Add fallback implementation using posix.uname. + + Fix language-encoding bug for japanese locale. See: + https://trac.macports.org/attachment/ticket/21517/patch-locale-from-apple-darwinsource.diff << License: OSI-Approved Homepage: http://www.python.org |