Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory vz-cvs-3.sog:/tmp/cvs-serv11976/stable/main/finkinfo/languages
Modified Files:
python26-2.6.6.info python26-2.6.6.patch python26.info
python26.patch
Log Message:
Stealing danielj's fix for ctypes loading of fink libraries
Index: python26.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python26.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- python26.patch 2 Jan 2012 19:32:52 -0000 1.6
+++ python26.patch 2 Jan 2012 19:43:38 -0000 1.7
@@ -40,6 +40,17 @@
gid = adapt(gid %i)
self.db.put(i, gid, txn=txn, flags=db.DB_APPEND)
txns.add(gid)
+diff -Nurd -x'*~' Python-2.6.7.orig/Lib/ctypes/macholib/dyld.py
Python-2.6.7/Lib/ctypes/macholib/dyld.py
+--- Python-2.6.7.orig/Lib/ctypes/macholib/dyld.py 2008-02-21
13:52:20.000000000 -0500
++++ Python-2.6.7/Lib/ctypes/macholib/dyld.py 2012-01-02 14:40:32.000000000
-0500
+@@ -26,6 +26,7 @@
+
+ DEFAULT_LIBRARY_FALLBACK = [
+ os.path.expanduser("~/lib"),
++ "@PREFIX@/lib",
+ "/usr/local/lib",
+ "/lib",
+ "/usr/lib",
diff -Nurd -x'*~' Python-2.6.7.orig/Lib/locale.py Python-2.6.7/Lib/locale.py
--- Python-2.6.7.orig/Lib/locale.py 2009-05-06 09:21:17.000000000 -0400
+++ Python-2.6.7/Lib/locale.py 2011-06-29 13:25:48.000000000 -0400
Index: python26-2.6.6.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python26-2.6.6.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- python26-2.6.6.info 29 Jun 2011 18:48:19 -0000 1.1
+++ python26-2.6.6.info 2 Jan 2012 19:43:38 -0000 1.2
@@ -1,7 +1,7 @@
Info2: <<
Package: python%type_pkg[python]
Version: 2.6.6
-Revision: 2
+Revision: 3
Epoch: 1
Type: python 2.6
Maintainer: Daniel Macks <dma...@netspace.org>
@@ -40,7 +40,7 @@
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
Source2-MD5: d963121537cd6e295ef91301b660633a
PatchFile: %n-%v.patch
-PatchFile-MD5: c38f81ac18263570e038255839db24f3
+PatchFile-MD5: 3493a12459bffe7c4a56d51bac5d2eec
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
<<
@@ -185,6 +185,8 @@
Fix language-encoding bug for japanese locale. See:
https://trac.macports.org/attachment/ticket/21517/patch-locale-from-apple-darwinsource.diff
+
+ Patch ctypes to look in %p/lib for libraries.
<<
License: OSI-Approved
Homepage: http://www.python.org
Index: python26-2.6.6.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python26-2.6.6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- python26-2.6.6.patch 29 Jun 2011 18:48:19 -0000 1.1
+++ python26-2.6.6.patch 2 Jan 2012 19:43:38 -0000 1.2
@@ -40,6 +40,17 @@
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/ctypes/macholib/dyld.py
Python-2.6.6/Lib/ctypes/macholib/dyld.py
+--- Python-2.6.6.orig/Lib/ctypes/macholib/dyld.py 2008-02-21
13:52:20.000000000 -0500
++++ Python-2.6.6/Lib/ctypes/macholib/dyld.py 2012-01-02 14:38:39.000000000
-0500
+@@ -26,6 +26,7 @@
+
+ DEFAULT_LIBRARY_FALLBACK = [
+ os.path.expanduser("~/lib"),
++ "@PREFIX@/lib",
+ "/usr/local/lib",
+ "/lib",
+ "/usr/lib",
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
Index: python26.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python26.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- python26.info 2 Jan 2012 19:32:52 -0000 1.9
+++ python26.info 2 Jan 2012 19:43:38 -0000 1.10
@@ -3,7 +3,7 @@
# 2.6.7 fails self-tests on 10.6/i386
Version: 2.6.7
-Revision: 1
+Revision: 2
Epoch: 1
Architecture: x86_64
@@ -44,7 +44,7 @@
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
Source2-MD5: a2fc12049840d5c66262c546cdf241fd
PatchFile: %n.patch
-PatchFile-MD5: 2ec512f8f128369f54b9822186021e7d
+PatchFile-MD5: 5182d3734839b54639f7d858b26273c9
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
<<
@@ -192,6 +192,8 @@
Fix language-encoding bug for japanese locale. See:
https://trac.macports.org/attachment/ticket/21517/patch-locale-from-apple-darwinsource.diff
+
+ Patch ctypes to look in %p/lib for libraries.
<<
License: OSI-Approved
Homepage: http://www.python.org
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
