Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory vz-cvs-3.sog:/tmp/cvs-serv5356/stable/main/finkinfo/languages
Modified Files:
python26.info python26.patch
Log Message:
a bunch of build- and runtime-fixes from unstable
Index: python26.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python26.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python26.patch 14 Oct 2010 05:13:57 -0000 1.3
+++ python26.patch 14 Jun 2011 04:40:36 -0000 1.4
@@ -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: python26.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python26.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- python26.info 14 Oct 2010 05:13:57 -0000 1.5
+++ python26.info 14 Jun 2011 04:40:36 -0000 1.6
@@ -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 <dma...@netspace.org>
@@ -40,8 +40,16 @@
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
Source2-MD5: d963121537cd6e295ef91301b660633a
PatchFile: %n.patch
-PatchFile-MD5: 5d4c42e5ae16fb94c947120a6f1cbaf4
-PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+PatchFile-MD5: c38f81ac18263570e038255839db24f3
+PatchScript: <<
+#!/bin/sh -ev
+ sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+
+ darwin_vers=`uname -r | cut -d. -f1`
+ if test "$darwin_vers" = 11 ; then
+ perl -pi -e 's|-lSystem -lSystemStubs|-lSystem|g' ./configure
+ fi
+<<
SetLDFLAGS: -L%p/lib/system-openssl/lib
ConfigureParams: --enable-shared
#GCC: 4.0
@@ -50,7 +58,7 @@
if [ "%m" = "x86_64" ]; then
perl -pi.bak -e 's|num_missing != 5:|num_missing != 7:|g;
s|have 5 missing|have 7 missing|' ./setup.py
# Architecture:x86_64 has tcltk-8.5.x, other arch have 8.4.x
- perl -pi.bak -e "s/8.4\'/8.5\'/" ./setup.py
+ perl -pi.bak -e "s/8.4\'/8.5\'/" ./setup.py
# Architecture:x86_64 can't build with toolbox-glue
./configure %c --disable-toolbox-glue
else
@@ -176,6 +184,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
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
