Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory vz-cvs-3.sog:/tmp/cvs-serv13808
Modified Files:
python25-10.6.info python25-10.6.patch python25.info
python25.patch
Log Message:
new version; also fix some silently-ignored compiler failures...stoopid build
system!
Index: python25.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python25.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- python25.info 31 Dec 2010 21:21:02 -0000 1.18
+++ python25.info 16 Jun 2011 07:51:51 -0000 1.19
@@ -1,7 +1,7 @@
Info2: <<
Package: python%type_pkg[python]
-Version: 2.5.5
-Revision: 4
+Version: 2.5.6
+Revision: 1
Epoch: 1
Distribution: 10.4, 10.5
Type: python 2.5
@@ -48,10 +48,10 @@
<<
Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2
Source2: http://www.python.org/ftp/python/doc/2.5.4/html-2.5.4.zip
-Source-MD5: 1d00e2fb19418e486c30b850df625aa3
+Source-MD5: 5d45979c5f30fb2dd5f067c6b06b88e4
Source2-MD5: 64b4db34805109fcfd4ff528859c5a1b
PatchFile: %n.patch
-PatchFile-MD5: 50dafb42c089681700eec4090fc87b8b
+PatchFile-MD5: 30ae833dbf37e9e57044569848a7ce71
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
perl -pi -e 's|-Wno-long-double||' configure
@@ -190,6 +190,10 @@
Fix language-encoding bug for japanese locale. See:
https://trac.macports.org/attachment/ticket/21517/patch-locale-from-apple-darwinsource.diff
+
+ Adjust some tokens so we get other needed tokens and types.
+
+ Sync ffitarget.h with darwin's to get 64bit platform support.
<<
License: OSI-Approved
Homepage: http://www.python.org
Index: python25.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python25.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- python25.patch 31 Dec 2010 21:21:02 -0000 1.7
+++ python25.patch 16 Jun 2011 07:51:51 -0000 1.8
@@ -1,6 +1,6 @@
-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
+diff -Nurd -x'*~' Python-2.5.6.orig/Lib/locale.py Python-2.5.6/Lib/locale.py
+--- Python-2.5.6.orig/Lib/locale.py 2007-05-01 02:08:20.000000000 -0400
++++ Python-2.5.6/Lib/locale.py 2011-06-16 02:36:13.000000000 -0400
@@ -487,7 +487,7 @@
"""
_setlocale(category, _build_localename(getdefaultlocale()))
@@ -10,9 +10,9 @@
# 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
+diff -Nurd -x'*~' Python-2.5.6.orig/Lib/pydoc.py Python-2.5.6/Lib/pydoc.py
+--- Python-2.5.6.orig/Lib/pydoc.py 2008-12-10 21:09:36.000000000 -0500
++++ Python-2.5.6/Lib/pydoc.py 2011-06-16 02:36:13.000000000 -0400
@@ -1621,19 +1621,7 @@
def __init__(self, input, output):
self.input = input
@@ -34,9 +34,52 @@
def __repr__(self):
if inspect.stack()[1][3] == '?':
-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
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/_bsddb.c
Python-2.5.6/Modules/_bsddb.c
+--- Python-2.5.6.orig/Modules/_bsddb.c 2008-05-17 02:46:39.000000000 -0400
++++ Python-2.5.6/Modules/_bsddb.c 2011-06-16 02:55:56.000000000 -0400
+@@ -87,6 +87,7 @@
+
+ #include <stddef.h> /* for offsetof() */
+ #include <Python.h>
++#undef _POSIX_C_SOURCE
+ #include <db.h>
+
+ /* --------------------------------------------------------------------- */
+diff -Nurd -x'*~'
Python-2.5.6.orig/Modules/_ctypes/libffi/src/darwin/ffitarget.h
Python-2.5.6/Modules/_ctypes/libffi/src/darwin/ffitarget.h
+--- Python-2.5.6.orig/Modules/_ctypes/libffi/src/darwin/ffitarget.h
2006-05-25 17:58:05.000000000 -0400
++++ Python-2.5.6/Modules/_ctypes/libffi/src/darwin/ffitarget.h 2011-06-16
03:43:08.000000000 -0400
+@@ -4,7 +4,7 @@
+ * created by configure). This makes is possible to build a univeral binary
+ * of ctypes in one go.
+ */
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__x86_64__)
+
+ #ifndef X86_DARWIN
+ #define X86_DARWIN
+@@ -13,7 +13,7 @@
+
+ #include "../src/x86/ffitarget.h"
+
+-#elif defined(__ppc__)
++#elif defined(__ppc__) || defined(__ppc64__)
+
+ #ifndef POWERPC_DARWIN
+ #define POWERPC_DARWIN
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/_ctypes/malloc_closure.c
Python-2.5.6/Modules/_ctypes/malloc_closure.c
+--- Python-2.5.6.orig/Modules/_ctypes/malloc_closure.c 2006-06-12
16:56:48.000000000 -0400
++++ Python-2.5.6/Modules/_ctypes/malloc_closure.c 2011-06-16
02:36:29.000000000 -0400
+@@ -7,6 +7,7 @@
+ #ifdef MS_WIN32
+ #include <windows.h>
+ #else
++#define _DARWIN_C_SOURCE
+ #include <sys/mman.h>
+ #include <unistd.h>
+ # if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/_localemodule.c
Python-2.5.6/Modules/_localemodule.c
+--- Python-2.5.6.orig/Modules/_localemodule.c 2007-04-03 00:39:34.000000000
-0400
++++ Python-2.5.6/Modules/_localemodule.c 2011-06-16 02:36:13.000000000
-0400
@@ -32,7 +32,7 @@
#include <wchar.h>
#endif
@@ -64,9 +107,9 @@
{"_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
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/mmapmodule.c
Python-2.5.6/Modules/mmapmodule.c
+--- Python-2.5.6.orig/Modules/mmapmodule.c 2008-07-31 13:08:14.000000000
-0400
++++ Python-2.5.6/Modules/mmapmodule.c 2011-06-16 02:36:13.000000000 -0400
@@ -55,6 +55,11 @@
#include <sys/types.h>
#endif /* HAVE_SYS_TYPES_H */
@@ -79,9 +122,20 @@
/* 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
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/nismodule.c
Python-2.5.6/Modules/nismodule.c
+--- Python-2.5.6.orig/Modules/nismodule.c 2006-02-27 11:46:16.000000000
-0500
++++ Python-2.5.6/Modules/nismodule.c 2011-06-16 02:56:48.000000000 -0400
+@@ -12,6 +12,7 @@
+
+ #include "Python.h"
+
++#undef _POSIX_C_SOURCE
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <rpc/rpc.h>
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/posixmodule.c
Python-2.5.6/Modules/posixmodule.c
+--- Python-2.5.6.orig/Modules/posixmodule.c 2008-12-13 10:14:30.000000000
-0500
++++ Python-2.5.6/Modules/posixmodule.c 2011-06-16 02:36:13.000000000 -0400
@@ -339,7 +339,7 @@
#endif
@@ -100,9 +154,9 @@
if (environ == NULL)
environ = *_NSGetEnviron();
#endif
-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
+diff -Nurd -x'*~' Python-2.5.6.orig/configure Python-2.5.6/configure
+--- Python-2.5.6.orig/configure 2008-12-13 09:13:52.000000000 -0500
++++ Python-2.5.6/configure 2011-06-16 02:36:14.000000000 -0400
@@ -4534,7 +4534,7 @@
;;
# is there any other compiler on Darwin besides gcc?
@@ -143,9 +197,9 @@
fi
fi
;;
-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
+diff -Nurd -x'*~' Python-2.5.6.orig/setup.py Python-2.5.6/setup.py
+--- Python-2.5.6.orig/setup.py 2008-10-16 14:58:19.000000000 -0400
++++ Python-2.5.6/setup.py 2011-06-16 02:36:14.000000000 -0400
@@ -244,8 +244,8 @@
def detect_modules(self):
Index: python25-10.6.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python25-10.6.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python25-10.6.patch 31 Dec 2010 21:21:02 -0000 1.3
+++ python25-10.6.patch 16 Jun 2011 07:51:51 -0000 1.4
@@ -1,6 +1,6 @@
-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
+diff -Nurd -x'*~' Python-2.5.6.orig/Lib/locale.py Python-2.5.6/Lib/locale.py
+--- Python-2.5.6.orig/Lib/locale.py 2007-05-01 02:08:20.000000000 -0400
++++ Python-2.5.6/Lib/locale.py 2011-06-16 02:36:13.000000000 -0400
@@ -487,7 +487,7 @@
"""
_setlocale(category, _build_localename(getdefaultlocale()))
@@ -10,9 +10,9 @@
# 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
+diff -Nurd -x'*~' Python-2.5.6.orig/Lib/pydoc.py Python-2.5.6/Lib/pydoc.py
+--- Python-2.5.6.orig/Lib/pydoc.py 2008-12-10 21:09:36.000000000 -0500
++++ Python-2.5.6/Lib/pydoc.py 2011-06-16 02:36:13.000000000 -0400
@@ -1621,19 +1621,7 @@
def __init__(self, input, output):
self.input = input
@@ -34,9 +34,52 @@
def __repr__(self):
if inspect.stack()[1][3] == '?':
-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
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/_bsddb.c
Python-2.5.6/Modules/_bsddb.c
+--- Python-2.5.6.orig/Modules/_bsddb.c 2008-05-17 02:46:39.000000000 -0400
++++ Python-2.5.6/Modules/_bsddb.c 2011-06-16 02:55:56.000000000 -0400
+@@ -87,6 +87,7 @@
+
+ #include <stddef.h> /* for offsetof() */
+ #include <Python.h>
++#undef _POSIX_C_SOURCE
+ #include <db.h>
+
+ /* --------------------------------------------------------------------- */
+diff -Nurd -x'*~'
Python-2.5.6.orig/Modules/_ctypes/libffi/src/darwin/ffitarget.h
Python-2.5.6/Modules/_ctypes/libffi/src/darwin/ffitarget.h
+--- Python-2.5.6.orig/Modules/_ctypes/libffi/src/darwin/ffitarget.h
2006-05-25 17:58:05.000000000 -0400
++++ Python-2.5.6/Modules/_ctypes/libffi/src/darwin/ffitarget.h 2011-06-16
03:43:08.000000000 -0400
+@@ -4,7 +4,7 @@
+ * created by configure). This makes is possible to build a univeral binary
+ * of ctypes in one go.
+ */
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__x86_64__)
+
+ #ifndef X86_DARWIN
+ #define X86_DARWIN
+@@ -13,7 +13,7 @@
+
+ #include "../src/x86/ffitarget.h"
+
+-#elif defined(__ppc__)
++#elif defined(__ppc__) || defined(__ppc64__)
+
+ #ifndef POWERPC_DARWIN
+ #define POWERPC_DARWIN
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/_ctypes/malloc_closure.c
Python-2.5.6/Modules/_ctypes/malloc_closure.c
+--- Python-2.5.6.orig/Modules/_ctypes/malloc_closure.c 2006-06-12
16:56:48.000000000 -0400
++++ Python-2.5.6/Modules/_ctypes/malloc_closure.c 2011-06-16
02:36:29.000000000 -0400
+@@ -7,6 +7,7 @@
+ #ifdef MS_WIN32
+ #include <windows.h>
+ #else
++#define _DARWIN_C_SOURCE
+ #include <sys/mman.h>
+ #include <unistd.h>
+ # if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/_localemodule.c
Python-2.5.6/Modules/_localemodule.c
+--- Python-2.5.6.orig/Modules/_localemodule.c 2007-04-03 00:39:34.000000000
-0400
++++ Python-2.5.6/Modules/_localemodule.c 2011-06-16 02:36:13.000000000
-0400
@@ -32,7 +32,7 @@
#include <wchar.h>
#endif
@@ -64,9 +107,9 @@
{"_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
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/mmapmodule.c
Python-2.5.6/Modules/mmapmodule.c
+--- Python-2.5.6.orig/Modules/mmapmodule.c 2008-07-31 13:08:14.000000000
-0400
++++ Python-2.5.6/Modules/mmapmodule.c 2011-06-16 02:36:13.000000000 -0400
@@ -55,6 +55,11 @@
#include <sys/types.h>
#endif /* HAVE_SYS_TYPES_H */
@@ -79,9 +122,20 @@
/* 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
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/nismodule.c
Python-2.5.6/Modules/nismodule.c
+--- Python-2.5.6.orig/Modules/nismodule.c 2006-02-27 11:46:16.000000000
-0500
++++ Python-2.5.6/Modules/nismodule.c 2011-06-16 02:56:48.000000000 -0400
+@@ -12,6 +12,7 @@
+
+ #include "Python.h"
+
++#undef _POSIX_C_SOURCE
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <rpc/rpc.h>
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/posixmodule.c
Python-2.5.6/Modules/posixmodule.c
+--- Python-2.5.6.orig/Modules/posixmodule.c 2008-12-13 10:14:30.000000000
-0500
++++ Python-2.5.6/Modules/posixmodule.c 2011-06-16 02:36:13.000000000 -0400
@@ -339,7 +339,7 @@
#endif
@@ -186,9 +240,18 @@
};
static int
-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
+diff -Nurd -x'*~' Python-2.5.6.orig/Modules/resource.c
Python-2.5.6/Modules/resource.c
+--- Python-2.5.6.orig/Modules/resource.c 2006-05-29 17:04:52.000000000
-0400
++++ Python-2.5.6/Modules/resource.c 2011-06-16 03:18:00.000000000 -0400
+@@ -1,4 +1,5 @@
+
++#define _DARWIN_C_SOURCE
+ #include "Python.h"
+ #include "structseq.h"
+ #include <sys/resource.h>
+diff -Nurd -x'*~' Python-2.5.6.orig/configure Python-2.5.6/configure
+--- Python-2.5.6.orig/configure 2008-12-13 09:13:52.000000000 -0500
++++ Python-2.5.6/configure 2011-06-16 02:36:14.000000000 -0400
@@ -4534,7 +4534,7 @@
;;
# is there any other compiler on Darwin besides gcc?
@@ -229,9 +292,9 @@
fi
fi
;;
-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
+diff -Nurd -x'*~' Python-2.5.6.orig/setup.py Python-2.5.6/setup.py
+--- Python-2.5.6.orig/setup.py 2008-10-16 14:58:19.000000000 -0400
++++ Python-2.5.6/setup.py 2011-06-16 02:36:14.000000000 -0400
@@ -244,8 +244,8 @@
def detect_modules(self):
Index: python25-10.6.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python25-10.6.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- python25-10.6.info 31 Dec 2010 21:21:02 -0000 1.5
+++ python25-10.6.info 16 Jun 2011 07:51:50 -0000 1.6
@@ -1,7 +1,7 @@
Info2: <<
Package: python%type_pkg[python]
-Version: 2.5.5
-Revision: 104
+Version: 2.5.6
+Revision: 101
Epoch: 1
Distribution: 10.6
Type: python 2.5
@@ -48,10 +48,10 @@
<<
Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2
Source2: http://www.python.org/ftp/python/doc/2.5.4/html-2.5.4.zip
-Source-MD5: 1d00e2fb19418e486c30b850df625aa3
+Source-MD5: 5d45979c5f30fb2dd5f067c6b06b88e4
Source2-MD5: 64b4db34805109fcfd4ff528859c5a1b
PatchFile: %n-10.6.patch
-PatchFile-MD5: b93bb7f272a442ba18a231d6179aef87
+PatchFile-MD5: 75d2833d5268b419dd7fedf8b6633b78
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
perl -pi -e 's|-Wno-long-double||' configure
@@ -195,6 +195,10 @@
Fix language-encoding bug for japanese locale. See:
https://trac.macports.org/attachment/ticket/21517/patch-locale-from-apple-darwinsource.diff
+
+ Adjust some tokens so we get other needed tokens and types.
+
+ Sync ffitarget.h with darwin's to get 64bit platform support.
<<
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
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
