github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-07 20:31:01 -05:00
Code Issues Projects Releases Packages Wiki Activity

Remove diff --git a/ from patches (#189)

Browse source 
The `diff --git a/` indicates that the patch is generated from `git diff`
and it should be applied with `patch -p1`. Because the patches bundled
with python-build have already re-formated for `patch -p0`, this is not
the desired behaviour.

Just removing `diff --git` from patches will force python-build to apply
those patches with `patch -p0`.
This commit is contained in:
Yamashita Yuu 2014-06-11 12:17:20 +09:00
parent 2ec8f0f0a4
commit d496c03497
21 changed files with 168 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
plugins/python-build/share/python-build/patches/2.5.1/Python-2.5.1/004_osx_libffi.patch
View file

@ -1,4 +1,4 @@
diff --git ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
diff -r -u ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
new file mode 100644
index 0000000..f591795
--- /dev/null
@ -24,7 +24,7 @@ index 0000000..f591795
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
diff -r -u ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
new file mode 100644
index 0000000..1fc2747
--- /dev/null
@ -530,7 +530,7 @@ index 0000000..1fc2747
+
+If you have a problem, or have found a bug, please send a note to
+green@cygnus.com.
diff --git ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
diff -r -u ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
new file mode 100644
index 0000000..405d85f
--- /dev/null
@ -541,7 +541,7 @@ index 0000000..405d85f
+
+The only modifications are those that are necessary to compile libffi using
+the Apple provided compiler and outside of the GCC source tree.
diff --git ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
diff -r -u ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
new file mode 100644
index 0000000..bf42093
--- /dev/null
@ -773,7 +773,7 @@ index 0000000..bf42093
+ return ffi_prep_cif_machdep(cif);
+}
+#endif /* not __CRIS__ */
diff --git ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
new file mode 100644
index 0000000..c104a5c
--- /dev/null
@ -1134,7 +1134,7 @@ index 0000000..c104a5c
+#endif
+
+#endif // #ifndef LIBFFI_H
diff --git ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
new file mode 100644
index 0000000..685a358
--- /dev/null
@ -1243,7 +1243,7 @@ index 0000000..685a358
+
+#endif // #ifndef FFI_COMMON_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
new file mode 100644
index 0000000..2172490
--- /dev/null
@ -1400,7 +1400,7 @@ index 0000000..2172490
+# endif
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
new file mode 100644
index 0000000..faaa30d
--- /dev/null
@ -1420,7 +1420,7 @@ index 0000000..faaa30d
+#error "Unsupported CPU type"
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
new file mode 100644
index 0000000..2318421
--- /dev/null
@ -1531,7 +1531,7 @@ index 0000000..2318421
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
new file mode 100644
index 0000000..55c2b6c
--- /dev/null
@ -1626,7 +1626,7 @@ index 0000000..55c2b6c
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
new file mode 100644
index 0000000..f143dbd
--- /dev/null
@ -1997,7 +1997,7 @@ index 0000000..f143dbd
+
+#endif // __ppc64__
+#endif // __ppc__ || __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
new file mode 100644
index 0000000..cf4bd50
--- /dev/null
@ -2089,7 +2089,7 @@ index 0000000..cf4bd50
+
+#endif // !defined(LIBFFI_ASM)
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
new file mode 100644
index 0000000..c3d30c2
--- /dev/null
@ -2403,7 +2403,7 @@ index 0000000..c3d30c2
+
+
+#endif // __ppc__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
new file mode 100644
index 0000000..8953d5f
--- /dev/null
@ -4185,7 +4185,7 @@ index 0000000..8953d5f
+
+#endif /* defined(__ppc64__) */
+#endif /* __ppc__ || __ppc64__ */
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
new file mode 100644
index 0000000..7162fa1
--- /dev/null
@ -4609,7 +4609,7 @@ index 0000000..7162fa1
+ .g_long dyld_stub_binding_helper
+
+#endif // __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
diff -r -u ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
new file mode 100644
index 0000000..44806ae
--- /dev/null
@ -4731,7 +4731,7 @@ index 0000000..44806ae
+FFI_INTEGRAL_TYPEDEF(longdouble, 8, 8, FFI_TYPE_LONGDOUBLE);
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
new file mode 100644
index 0000000..165d469
--- /dev/null
@ -5154,7 +5154,7 @@ index 0000000..165d469
+ .subsections_via_symbols
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
new file mode 100644
index 0000000..925a841
--- /dev/null
@ -5582,7 +5582,7 @@ index 0000000..925a841
+#endif /* ifndef __x86_64__ */
+
+#endif /* defined __i386__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
new file mode 100644
index 0000000..06feaf2
--- /dev/null
@ -6322,7 +6322,7 @@ index 0000000..06feaf2
+}
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
new file mode 100644
index 0000000..706ea0f
--- /dev/null
@ -6766,7 +6766,7 @@ index 0000000..706ea0f
+
+#endif
+#endif // __i386__
diff --git ./setup.py ./setup.py
diff -r -u ./setup.py ./setup.py
index 46b92fe..2bf6b4b 100644
--- ./setup.py
+++ ./setup.py

4
plugins/python-build/share/python-build/patches/2.5.1/Python-2.5.1/005_osx_failed_modules.patch
View file

@ -1,4 +1,4 @@
diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
diff -r -u ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
index 8115614..e36fce9 100755
--- ./Mac/Modules/cg/_CGmodule.c
+++ ./Mac/Modules/cg/_CGmodule.c
@ -53,7 +53,7 @@ index 8115614..e36fce9 100755
{NULL, NULL, 0}
};
diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
diff -r -u ./Modules/_curses_panel.c ./Modules/_curses_panel.c
index 0acf3fd..1728b59 100644
--- ./Modules/_curses_panel.c
+++ ./Modules/_curses_panel.c

42
plugins/python-build/share/python-build/patches/2.5.2/Python-2.5.2/004_osx_libffi.patch
View file

@ -1,4 +1,4 @@
diff --git ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
diff -r -u ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
new file mode 100644
index 0000000..f591795
--- /dev/null
@ -24,7 +24,7 @@ index 0000000..f591795
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
diff -r -u ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
new file mode 100644
index 0000000..1fc2747
--- /dev/null
@ -530,7 +530,7 @@ index 0000000..1fc2747
+
+If you have a problem, or have found a bug, please send a note to
+green@cygnus.com.
diff --git ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
diff -r -u ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
new file mode 100644
index 0000000..405d85f
--- /dev/null
@ -541,7 +541,7 @@ index 0000000..405d85f
+
+The only modifications are those that are necessary to compile libffi using
+the Apple provided compiler and outside of the GCC source tree.
diff --git ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
diff -r -u ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
new file mode 100644
index 0000000..bf42093
--- /dev/null
@ -773,7 +773,7 @@ index 0000000..bf42093
+ return ffi_prep_cif_machdep(cif);
+}
+#endif /* not __CRIS__ */
diff --git ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
new file mode 100644
index 0000000..c104a5c
--- /dev/null
@ -1134,7 +1134,7 @@ index 0000000..c104a5c
+#endif
+
+#endif // #ifndef LIBFFI_H
diff --git ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
new file mode 100644
index 0000000..685a358
--- /dev/null
@ -1243,7 +1243,7 @@ index 0000000..685a358
+
+#endif // #ifndef FFI_COMMON_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
new file mode 100644
index 0000000..2172490
--- /dev/null
@ -1400,7 +1400,7 @@ index 0000000..2172490
+# endif
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
new file mode 100644
index 0000000..faaa30d
--- /dev/null
@ -1420,7 +1420,7 @@ index 0000000..faaa30d
+#error "Unsupported CPU type"
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
new file mode 100644
index 0000000..2318421
--- /dev/null
@ -1531,7 +1531,7 @@ index 0000000..2318421
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
new file mode 100644
index 0000000..55c2b6c
--- /dev/null
@ -1626,7 +1626,7 @@ index 0000000..55c2b6c
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
new file mode 100644
index 0000000..f143dbd
--- /dev/null
@ -1997,7 +1997,7 @@ index 0000000..f143dbd
+
+#endif // __ppc64__
+#endif // __ppc__ || __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
new file mode 100644
index 0000000..cf4bd50
--- /dev/null
@ -2089,7 +2089,7 @@ index 0000000..cf4bd50
+
+#endif // !defined(LIBFFI_ASM)
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
new file mode 100644
index 0000000..c3d30c2
--- /dev/null
@ -2403,7 +2403,7 @@ index 0000000..c3d30c2
+
+
+#endif // __ppc__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
new file mode 100644
index 0000000..8953d5f
--- /dev/null
@ -4185,7 +4185,7 @@ index 0000000..8953d5f
+
+#endif /* defined(__ppc64__) */
+#endif /* __ppc__ || __ppc64__ */
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
new file mode 100644
index 0000000..7162fa1
--- /dev/null
@ -4609,7 +4609,7 @@ index 0000000..7162fa1
+ .g_long dyld_stub_binding_helper
+
+#endif // __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
diff -r -u ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
new file mode 100644
index 0000000..44806ae
--- /dev/null
@ -4731,7 +4731,7 @@ index 0000000..44806ae
+FFI_INTEGRAL_TYPEDEF(longdouble, 8, 8, FFI_TYPE_LONGDOUBLE);
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
new file mode 100644
index 0000000..165d469
--- /dev/null
@ -5154,7 +5154,7 @@ index 0000000..165d469
+ .subsections_via_symbols
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
new file mode 100644
index 0000000..925a841
--- /dev/null
@ -5582,7 +5582,7 @@ index 0000000..925a841
+#endif /* ifndef __x86_64__ */
+
+#endif /* defined __i386__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
new file mode 100644
index 0000000..06feaf2
--- /dev/null
@ -6322,7 +6322,7 @@ index 0000000..06feaf2
+}
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
new file mode 100644
index 0000000..706ea0f
--- /dev/null
@ -6766,7 +6766,7 @@ index 0000000..706ea0f
+
+#endif
+#endif // __i386__
diff --git ./setup.py ./setup.py
diff -r -u ./setup.py ./setup.py
index 46b92fe..2bf6b4b 100644
--- ./setup.py
+++ ./setup.py

4
plugins/python-build/share/python-build/patches/2.5.2/Python-2.5.2/005_osx_failed_modules.patch
View file

@ -1,4 +1,4 @@
diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
diff -r -u ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
index 8115614..e36fce9 100755
--- ./Mac/Modules/cg/_CGmodule.c
+++ ./Mac/Modules/cg/_CGmodule.c
@ -53,7 +53,7 @@ index 8115614..e36fce9 100755
{NULL, NULL, 0}
};
diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
diff -r -u ./Modules/_curses_panel.c ./Modules/_curses_panel.c
index 0acf3fd..1728b59 100644
--- ./Modules/_curses_panel.c
+++ ./Modules/_curses_panel.c

42
plugins/python-build/share/python-build/patches/2.5.3/Python-2.5.3/004_osx_libffi.patch
View file

@ -1,4 +1,4 @@
diff --git ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
diff -r -u ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
new file mode 100644
index 0000000..f591795
--- /dev/null
@ -24,7 +24,7 @@ index 0000000..f591795
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
diff -r -u ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
new file mode 100644
index 0000000..1fc2747
--- /dev/null
@ -530,7 +530,7 @@ index 0000000..1fc2747
+
+If you have a problem, or have found a bug, please send a note to
+green@cygnus.com.
diff --git ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
diff -r -u ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
new file mode 100644
index 0000000..405d85f
--- /dev/null
@ -541,7 +541,7 @@ index 0000000..405d85f
+
+The only modifications are those that are necessary to compile libffi using
+the Apple provided compiler and outside of the GCC source tree.
diff --git ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
diff -r -u ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
new file mode 100644
index 0000000..bf42093
--- /dev/null
@ -773,7 +773,7 @@ index 0000000..bf42093
+ return ffi_prep_cif_machdep(cif);
+}
+#endif /* not __CRIS__ */
diff --git ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
new file mode 100644
index 0000000..c104a5c
--- /dev/null
@ -1134,7 +1134,7 @@ index 0000000..c104a5c
+#endif
+
+#endif // #ifndef LIBFFI_H
diff --git ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
new file mode 100644
index 0000000..685a358
--- /dev/null
@ -1243,7 +1243,7 @@ index 0000000..685a358
+
+#endif // #ifndef FFI_COMMON_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
new file mode 100644
index 0000000..2172490
--- /dev/null
@ -1400,7 +1400,7 @@ index 0000000..2172490
+# endif
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
new file mode 100644
index 0000000..faaa30d
--- /dev/null
@ -1420,7 +1420,7 @@ index 0000000..faaa30d
+#error "Unsupported CPU type"
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
new file mode 100644
index 0000000..2318421
--- /dev/null
@ -1531,7 +1531,7 @@ index 0000000..2318421
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
new file mode 100644
index 0000000..55c2b6c
--- /dev/null
@ -1626,7 +1626,7 @@ index 0000000..55c2b6c
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
new file mode 100644
index 0000000..f143dbd
--- /dev/null
@ -1997,7 +1997,7 @@ index 0000000..f143dbd
+
+#endif // __ppc64__
+#endif // __ppc__ || __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
new file mode 100644
index 0000000..cf4bd50
--- /dev/null
@ -2089,7 +2089,7 @@ index 0000000..cf4bd50
+
+#endif // !defined(LIBFFI_ASM)
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
new file mode 100644
index 0000000..c3d30c2
--- /dev/null
@ -2403,7 +2403,7 @@ index 0000000..c3d30c2
+
+
+#endif // __ppc__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
new file mode 100644
index 0000000..8953d5f
--- /dev/null
@ -4185,7 +4185,7 @@ index 0000000..8953d5f
+
+#endif /* defined(__ppc64__) */
+#endif /* __ppc__ || __ppc64__ */
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
new file mode 100644
index 0000000..7162fa1
--- /dev/null
@ -4609,7 +4609,7 @@ index 0000000..7162fa1
+ .g_long dyld_stub_binding_helper
+
+#endif // __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
diff -r -u ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
new file mode 100644
index 0000000..44806ae
--- /dev/null
@ -4731,7 +4731,7 @@ index 0000000..44806ae
+FFI_INTEGRAL_TYPEDEF(longdouble, 8, 8, FFI_TYPE_LONGDOUBLE);
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
new file mode 100644
index 0000000..165d469
--- /dev/null
@ -5154,7 +5154,7 @@ index 0000000..165d469
+ .subsections_via_symbols
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
new file mode 100644
index 0000000..925a841
--- /dev/null
@ -5582,7 +5582,7 @@ index 0000000..925a841
+#endif /* ifndef __x86_64__ */
+
+#endif /* defined __i386__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
new file mode 100644
index 0000000..06feaf2
--- /dev/null
@ -6322,7 +6322,7 @@ index 0000000..06feaf2
+}
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
new file mode 100644
index 0000000..706ea0f
--- /dev/null
@ -6766,7 +6766,7 @@ index 0000000..706ea0f
+
+#endif
+#endif // __i386__
diff --git ./setup.py ./setup.py
diff -r -u ./setup.py ./setup.py
index 46b92fe..2bf6b4b 100644
--- ./setup.py
+++ ./setup.py

4
plugins/python-build/share/python-build/patches/2.5.3/Python-2.5.3/005_osx_failed_modules.patch
View file

@ -1,4 +1,4 @@
diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
diff -r -u ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
index 8115614..e36fce9 100755
--- ./Mac/Modules/cg/_CGmodule.c
+++ ./Mac/Modules/cg/_CGmodule.c
@ -53,7 +53,7 @@ index 8115614..e36fce9 100755
{NULL, NULL, 0}
};
diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
diff -r -u ./Modules/_curses_panel.c ./Modules/_curses_panel.c
index 0acf3fd..1728b59 100644
--- ./Modules/_curses_panel.c
+++ ./Modules/_curses_panel.c

42
plugins/python-build/share/python-build/patches/2.5.4/Python-2.5.4/004_osx_libffi.patch
View file

@ -1,4 +1,4 @@
diff --git ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
diff -r -u ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
new file mode 100644
index 0000000..f591795
--- /dev/null
@ -24,7 +24,7 @@ index 0000000..f591795
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
diff -r -u ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
new file mode 100644
index 0000000..1fc2747
--- /dev/null
@ -530,7 +530,7 @@ index 0000000..1fc2747
+
+If you have a problem, or have found a bug, please send a note to
+green@cygnus.com.
diff --git ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
diff -r -u ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
new file mode 100644
index 0000000..405d85f
--- /dev/null
@ -541,7 +541,7 @@ index 0000000..405d85f
+
+The only modifications are those that are necessary to compile libffi using
+the Apple provided compiler and outside of the GCC source tree.
diff --git ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
diff -r -u ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
new file mode 100644
index 0000000..bf42093
--- /dev/null
@ -773,7 +773,7 @@ index 0000000..bf42093
+ return ffi_prep_cif_machdep(cif);
+}
+#endif /* not __CRIS__ */
diff --git ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
new file mode 100644
index 0000000..c104a5c
--- /dev/null
@ -1134,7 +1134,7 @@ index 0000000..c104a5c
+#endif
+
+#endif // #ifndef LIBFFI_H
diff --git ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
new file mode 100644
index 0000000..685a358
--- /dev/null
@ -1243,7 +1243,7 @@ index 0000000..685a358
+
+#endif // #ifndef FFI_COMMON_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
new file mode 100644
index 0000000..2172490
--- /dev/null
@ -1400,7 +1400,7 @@ index 0000000..2172490
+# endif
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
new file mode 100644
index 0000000..faaa30d
--- /dev/null
@ -1420,7 +1420,7 @@ index 0000000..faaa30d
+#error "Unsupported CPU type"
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
new file mode 100644
index 0000000..2318421
--- /dev/null
@ -1531,7 +1531,7 @@ index 0000000..2318421
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
new file mode 100644
index 0000000..55c2b6c
--- /dev/null
@ -1626,7 +1626,7 @@ index 0000000..55c2b6c
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
new file mode 100644
index 0000000..f143dbd
--- /dev/null
@ -1997,7 +1997,7 @@ index 0000000..f143dbd
+
+#endif // __ppc64__
+#endif // __ppc__ || __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
new file mode 100644
index 0000000..cf4bd50
--- /dev/null
@ -2089,7 +2089,7 @@ index 0000000..cf4bd50
+
+#endif // !defined(LIBFFI_ASM)
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
new file mode 100644
index 0000000..c3d30c2
--- /dev/null
@ -2403,7 +2403,7 @@ index 0000000..c3d30c2
+
+
+#endif // __ppc__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
new file mode 100644
index 0000000..8953d5f
--- /dev/null
@ -4185,7 +4185,7 @@ index 0000000..8953d5f
+
+#endif /* defined(__ppc64__) */
+#endif /* __ppc__ || __ppc64__ */
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
new file mode 100644
index 0000000..7162fa1
--- /dev/null
@ -4609,7 +4609,7 @@ index 0000000..7162fa1
+ .g_long dyld_stub_binding_helper
+
+#endif // __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
diff -r -u ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
new file mode 100644
index 0000000..44806ae
--- /dev/null
@ -4731,7 +4731,7 @@ index 0000000..44806ae
+FFI_INTEGRAL_TYPEDEF(longdouble, 8, 8, FFI_TYPE_LONGDOUBLE);
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
new file mode 100644
index 0000000..165d469
--- /dev/null
@ -5154,7 +5154,7 @@ index 0000000..165d469
+ .subsections_via_symbols
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
new file mode 100644
index 0000000..925a841
--- /dev/null
@ -5582,7 +5582,7 @@ index 0000000..925a841
+#endif /* ifndef __x86_64__ */
+
+#endif /* defined __i386__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
new file mode 100644
index 0000000..06feaf2
--- /dev/null
@ -6322,7 +6322,7 @@ index 0000000..06feaf2
+}
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
new file mode 100644
index 0000000..706ea0f
--- /dev/null
@ -6766,7 +6766,7 @@ index 0000000..706ea0f
+
+#endif
+#endif // __i386__
diff --git ./setup.py ./setup.py
diff -r -u ./setup.py ./setup.py
index 46b92fe..2bf6b4b 100644
--- ./setup.py
+++ ./setup.py

4
plugins/python-build/share/python-build/patches/2.5.4/Python-2.5.4/005_osx_failed_modules.patch
View file

@ -1,4 +1,4 @@
diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
diff -r -u ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
index 8115614..e36fce9 100755
--- ./Mac/Modules/cg/_CGmodule.c
+++ ./Mac/Modules/cg/_CGmodule.c
@ -53,7 +53,7 @@ index 8115614..e36fce9 100755
{NULL, NULL, 0}
};
diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
diff -r -u ./Modules/_curses_panel.c ./Modules/_curses_panel.c
index 0acf3fd..1728b59 100644
--- ./Modules/_curses_panel.c
+++ ./Modules/_curses_panel.c

42
plugins/python-build/share/python-build/patches/2.5.5/Python-2.5.5/004_osx_libffi.patch
View file

@ -1,4 +1,4 @@
diff --git ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
diff -r -u ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
new file mode 100644
index 0000000..f591795
--- /dev/null
@ -24,7 +24,7 @@ index 0000000..f591795
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
diff -r -u ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
new file mode 100644
index 0000000..1fc2747
--- /dev/null
@ -530,7 +530,7 @@ index 0000000..1fc2747
+
+If you have a problem, or have found a bug, please send a note to
+green@cygnus.com.
diff --git ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
diff -r -u ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
new file mode 100644
index 0000000..405d85f
--- /dev/null
@ -541,7 +541,7 @@ index 0000000..405d85f
+
+The only modifications are those that are necessary to compile libffi using
+the Apple provided compiler and outside of the GCC source tree.
diff --git ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
diff -r -u ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
new file mode 100644
index 0000000..bf42093
--- /dev/null
@ -773,7 +773,7 @@ index 0000000..bf42093
+ return ffi_prep_cif_machdep(cif);
+}
+#endif /* not __CRIS__ */
diff --git ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
new file mode 100644
index 0000000..c104a5c
--- /dev/null
@ -1134,7 +1134,7 @@ index 0000000..c104a5c
+#endif
+
+#endif // #ifndef LIBFFI_H
diff --git ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
new file mode 100644
index 0000000..685a358
--- /dev/null
@ -1243,7 +1243,7 @@ index 0000000..685a358
+
+#endif // #ifndef FFI_COMMON_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
new file mode 100644
index 0000000..2172490
--- /dev/null
@ -1400,7 +1400,7 @@ index 0000000..2172490
+# endif
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
new file mode 100644
index 0000000..faaa30d
--- /dev/null
@ -1420,7 +1420,7 @@ index 0000000..faaa30d
+#error "Unsupported CPU type"
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
new file mode 100644
index 0000000..2318421
--- /dev/null
@ -1531,7 +1531,7 @@ index 0000000..2318421
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
new file mode 100644
index 0000000..55c2b6c
--- /dev/null
@ -1626,7 +1626,7 @@ index 0000000..55c2b6c
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
new file mode 100644
index 0000000..f143dbd
--- /dev/null
@ -1997,7 +1997,7 @@ index 0000000..f143dbd
+
+#endif // __ppc64__
+#endif // __ppc__ || __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
new file mode 100644
index 0000000..cf4bd50
--- /dev/null
@ -2089,7 +2089,7 @@ index 0000000..cf4bd50
+
+#endif // !defined(LIBFFI_ASM)
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
new file mode 100644
index 0000000..c3d30c2
--- /dev/null
@ -2403,7 +2403,7 @@ index 0000000..c3d30c2
+
+
+#endif // __ppc__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
new file mode 100644
index 0000000..8953d5f
--- /dev/null
@ -4185,7 +4185,7 @@ index 0000000..8953d5f
+
+#endif /* defined(__ppc64__) */
+#endif /* __ppc__ || __ppc64__ */
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
new file mode 100644
index 0000000..7162fa1
--- /dev/null
@ -4609,7 +4609,7 @@ index 0000000..7162fa1
+ .g_long dyld_stub_binding_helper
+
+#endif // __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
diff -r -u ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
new file mode 100644
index 0000000..44806ae
--- /dev/null
@ -4731,7 +4731,7 @@ index 0000000..44806ae
+FFI_INTEGRAL_TYPEDEF(longdouble, 8, 8, FFI_TYPE_LONGDOUBLE);
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
new file mode 100644
index 0000000..165d469
--- /dev/null
@ -5154,7 +5154,7 @@ index 0000000..165d469
+ .subsections_via_symbols
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
new file mode 100644
index 0000000..925a841
--- /dev/null
@ -5582,7 +5582,7 @@ index 0000000..925a841
+#endif /* ifndef __x86_64__ */
+
+#endif /* defined __i386__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
new file mode 100644
index 0000000..06feaf2
--- /dev/null
@ -6322,7 +6322,7 @@ index 0000000..06feaf2
+}
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
new file mode 100644
index 0000000..706ea0f
--- /dev/null
@ -6766,7 +6766,7 @@ index 0000000..706ea0f
+
+#endif
+#endif // __i386__
diff --git ./setup.py ./setup.py
diff -r -u ./setup.py ./setup.py
index 46b92fe..2bf6b4b 100644
--- ./setup.py
+++ ./setup.py

4
plugins/python-build/share/python-build/patches/2.5.5/Python-2.5.5/005_osx_failed_modules.patch
View file

@ -1,4 +1,4 @@
diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
diff -r -u ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
index 8115614..e36fce9 100755
--- ./Mac/Modules/cg/_CGmodule.c
+++ ./Mac/Modules/cg/_CGmodule.c
@ -53,7 +53,7 @@ index 8115614..e36fce9 100755
{NULL, NULL, 0}
};
diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
diff -r -u ./Modules/_curses_panel.c ./Modules/_curses_panel.c
index 0acf3fd..1728b59 100644
--- ./Modules/_curses_panel.c
+++ ./Modules/_curses_panel.c

42
plugins/python-build/share/python-build/patches/2.5.6/Python-2.5.6/004_osx_libffi.patch
View file

@ -1,4 +1,4 @@
diff --git ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
diff -r -u ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
new file mode 100644
index 0000000..f591795
--- /dev/null
@ -24,7 +24,7 @@ index 0000000..f591795
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
diff -r -u ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
new file mode 100644
index 0000000..1fc2747
--- /dev/null
@ -530,7 +530,7 @@ index 0000000..1fc2747
+
+If you have a problem, or have found a bug, please send a note to
+green@cygnus.com.
diff --git ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
diff -r -u ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
new file mode 100644
index 0000000..405d85f
--- /dev/null
@ -541,7 +541,7 @@ index 0000000..405d85f
+
+The only modifications are those that are necessary to compile libffi using
+the Apple provided compiler and outside of the GCC source tree.
diff --git ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
diff -r -u ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
new file mode 100644
index 0000000..bf42093
--- /dev/null
@ -773,7 +773,7 @@ index 0000000..bf42093
+ return ffi_prep_cif_machdep(cif);
+}
+#endif /* not __CRIS__ */
diff --git ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
new file mode 100644
index 0000000..c104a5c
--- /dev/null
@ -1134,7 +1134,7 @@ index 0000000..c104a5c
+#endif
+
+#endif // #ifndef LIBFFI_H
diff --git ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
new file mode 100644
index 0000000..685a358
--- /dev/null
@ -1243,7 +1243,7 @@ index 0000000..685a358
+
+#endif // #ifndef FFI_COMMON_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
new file mode 100644
index 0000000..2172490
--- /dev/null
@ -1400,7 +1400,7 @@ index 0000000..2172490
+# endif
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
new file mode 100644
index 0000000..faaa30d
--- /dev/null
@ -1420,7 +1420,7 @@ index 0000000..faaa30d
+#error "Unsupported CPU type"
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
new file mode 100644
index 0000000..2318421
--- /dev/null
@ -1531,7 +1531,7 @@ index 0000000..2318421
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
new file mode 100644
index 0000000..55c2b6c
--- /dev/null
@ -1626,7 +1626,7 @@ index 0000000..55c2b6c
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
new file mode 100644
index 0000000..f143dbd
--- /dev/null
@ -1997,7 +1997,7 @@ index 0000000..f143dbd
+
+#endif // __ppc64__
+#endif // __ppc__ || __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
new file mode 100644
index 0000000..cf4bd50
--- /dev/null
@ -2089,7 +2089,7 @@ index 0000000..cf4bd50
+
+#endif // !defined(LIBFFI_ASM)
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
new file mode 100644
index 0000000..c3d30c2
--- /dev/null
@ -2403,7 +2403,7 @@ index 0000000..c3d30c2
+
+
+#endif // __ppc__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
new file mode 100644
index 0000000..8953d5f
--- /dev/null
@ -4185,7 +4185,7 @@ index 0000000..8953d5f
+
+#endif /* defined(__ppc64__) */
+#endif /* __ppc__ || __ppc64__ */
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
new file mode 100644
index 0000000..7162fa1
--- /dev/null
@ -4609,7 +4609,7 @@ index 0000000..7162fa1
+ .g_long dyld_stub_binding_helper
+
+#endif // __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
diff -r -u ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
new file mode 100644
index 0000000..44806ae
--- /dev/null
@ -4731,7 +4731,7 @@ index 0000000..44806ae
+FFI_INTEGRAL_TYPEDEF(longdouble, 8, 8, FFI_TYPE_LONGDOUBLE);
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
new file mode 100644
index 0000000..165d469
--- /dev/null
@ -5154,7 +5154,7 @@ index 0000000..165d469
+ .subsections_via_symbols
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
new file mode 100644
index 0000000..925a841
--- /dev/null
@ -5582,7 +5582,7 @@ index 0000000..925a841
+#endif /* ifndef __x86_64__ */
+
+#endif /* defined __i386__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
new file mode 100644
index 0000000..06feaf2
--- /dev/null
@ -6322,7 +6322,7 @@ index 0000000..06feaf2
+}
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
new file mode 100644
index 0000000..706ea0f
--- /dev/null
@ -6766,7 +6766,7 @@ index 0000000..706ea0f
+
+#endif
+#endif // __i386__
diff --git ./setup.py ./setup.py
diff -r -u ./setup.py ./setup.py
index 46b92fe..2bf6b4b 100644
--- ./setup.py
+++ ./setup.py

4
plugins/python-build/share/python-build/patches/2.5.6/Python-2.5.6/005_osx_failed_modules.patch
View file

@ -1,4 +1,4 @@
diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
diff -r -u ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
index 8115614..e36fce9 100755
--- ./Mac/Modules/cg/_CGmodule.c
+++ ./Mac/Modules/cg/_CGmodule.c
@ -53,7 +53,7 @@ index 8115614..e36fce9 100755
{NULL, NULL, 0}
};
diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
diff -r -u ./Modules/_curses_panel.c ./Modules/_curses_panel.c
index 0acf3fd..1728b59 100644
--- ./Modules/_curses_panel.c
+++ ./Modules/_curses_panel.c

42
plugins/python-build/share/python-build/patches/2.5/Python-2.5/004_osx_libffi.patch
View file

@ -1,4 +1,4 @@
diff --git ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
diff -r -u ./Modules/_ctypes/libffi_osx/LICENSE ./Modules/_ctypes/libffi_osx/LICENSE
new file mode 100644
index 0000000..f591795
--- /dev/null
@ -24,7 +24,7 @@ index 0000000..f591795
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
diff -r -u ./Modules/_ctypes/libffi_osx/README ./Modules/_ctypes/libffi_osx/README
new file mode 100644
index 0000000..1fc2747
--- /dev/null
@ -530,7 +530,7 @@ index 0000000..1fc2747
+
+If you have a problem, or have found a bug, please send a note to
+green@cygnus.com.
diff --git ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
diff -r -u ./Modules/_ctypes/libffi_osx/README.pyobjc ./Modules/_ctypes/libffi_osx/README.pyobjc
new file mode 100644
index 0000000..405d85f
--- /dev/null
@ -541,7 +541,7 @@ index 0000000..405d85f
+
+The only modifications are those that are necessary to compile libffi using
+the Apple provided compiler and outside of the GCC source tree.
diff --git ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
diff -r -u ./Modules/_ctypes/libffi_osx/ffi.c ./Modules/_ctypes/libffi_osx/ffi.c
new file mode 100644
index 0000000..bf42093
--- /dev/null
@ -773,7 +773,7 @@ index 0000000..bf42093
+ return ffi_prep_cif_machdep(cif);
+}
+#endif /* not __CRIS__ */
diff --git ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi.h ./Modules/_ctypes/libffi_osx/include/ffi.h
new file mode 100644
index 0000000..c104a5c
--- /dev/null
@ -1134,7 +1134,7 @@ index 0000000..c104a5c
+#endif
+
+#endif // #ifndef LIBFFI_H
diff --git ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffi_common.h ./Modules/_ctypes/libffi_osx/include/ffi_common.h
new file mode 100644
index 0000000..685a358
--- /dev/null
@ -1243,7 +1243,7 @@ index 0000000..685a358
+
+#endif // #ifndef FFI_COMMON_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/fficonfig.h ./Modules/_ctypes/libffi_osx/include/fficonfig.h
new file mode 100644
index 0000000..2172490
--- /dev/null
@ -1400,7 +1400,7 @@ index 0000000..2172490
+# endif
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ffitarget.h ./Modules/_ctypes/libffi_osx/include/ffitarget.h
new file mode 100644
index 0000000..faaa30d
--- /dev/null
@ -1420,7 +1420,7 @@ index 0000000..faaa30d
+#error "Unsupported CPU type"
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h ./Modules/_ctypes/libffi_osx/include/ppc-ffitarget.h
new file mode 100644
index 0000000..2318421
--- /dev/null
@ -1531,7 +1531,7 @@ index 0000000..2318421
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
diff -r -u ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h ./Modules/_ctypes/libffi_osx/include/x86-ffitarget.h
new file mode 100644
index 0000000..55c2b6c
--- /dev/null
@ -1626,7 +1626,7 @@ index 0000000..55c2b6c
+
+#endif // #ifndef LIBFFI_TARGET_H
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.S
new file mode 100644
index 0000000..f143dbd
--- /dev/null
@ -1997,7 +1997,7 @@ index 0000000..f143dbd
+
+#endif // __ppc64__
+#endif // __ppc__ || __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin.h
new file mode 100644
index 0000000..cf4bd50
--- /dev/null
@ -2089,7 +2089,7 @@ index 0000000..cf4bd50
+
+#endif // !defined(LIBFFI_ASM)
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc-darwin_closure.S
new file mode 100644
index 0000000..c3d30c2
--- /dev/null
@ -2403,7 +2403,7 @@ index 0000000..c3d30c2
+
+
+#endif // __ppc__
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c ./Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
new file mode 100644
index 0000000..8953d5f
--- /dev/null
@ -4185,7 +4185,7 @@ index 0000000..8953d5f
+
+#endif /* defined(__ppc64__) */
+#endif /* __ppc__ || __ppc64__ */
diff --git ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
diff -r -u ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S ./Modules/_ctypes/libffi_osx/powerpc/ppc64-darwin_closure.S
new file mode 100644
index 0000000..7162fa1
--- /dev/null
@ -4609,7 +4609,7 @@ index 0000000..7162fa1
+ .g_long dyld_stub_binding_helper
+
+#endif // __ppc64__
diff --git ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
diff -r -u ./Modules/_ctypes/libffi_osx/types.c ./Modules/_ctypes/libffi_osx/types.c
new file mode 100644
index 0000000..44806ae
--- /dev/null
@ -4731,7 +4731,7 @@ index 0000000..44806ae
+FFI_INTEGRAL_TYPEDEF(longdouble, 8, 8, FFI_TYPE_LONGDOUBLE);
+#endif
\ No newline at end of file
diff --git ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/darwin64.S ./Modules/_ctypes/libffi_osx/x86/darwin64.S
new file mode 100644
index 0000000..165d469
--- /dev/null
@ -5154,7 +5154,7 @@ index 0000000..165d469
+ .subsections_via_symbols
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S ./Modules/_ctypes/libffi_osx/x86/x86-darwin.S
new file mode 100644
index 0000000..925a841
--- /dev/null
@ -5582,7 +5582,7 @@ index 0000000..925a841
+#endif /* ifndef __x86_64__ */
+
+#endif /* defined __i386__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
new file mode 100644
index 0000000..06feaf2
--- /dev/null
@ -6322,7 +6322,7 @@ index 0000000..06feaf2
+}
+
+#endif /* __x86_64__ */
diff --git ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
diff -r -u ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c ./Modules/_ctypes/libffi_osx/x86/x86-ffi_darwin.c
new file mode 100644
index 0000000..706ea0f
--- /dev/null
@ -6766,7 +6766,7 @@ index 0000000..706ea0f
+
+#endif
+#endif // __i386__
diff --git ./setup.py ./setup.py
diff -r -u ./setup.py ./setup.py
index 46b92fe..2bf6b4b 100644
--- ./setup.py
+++ ./setup.py

4
plugins/python-build/share/python-build/patches/2.5/Python-2.5/005_osx_failed_modules.patch
View file

@ -1,4 +1,4 @@
diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
diff -r -u ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
index 8115614..e36fce9 100755
--- ./Mac/Modules/cg/_CGmodule.c
+++ ./Mac/Modules/cg/_CGmodule.c
@ -53,7 +53,7 @@ index 8115614..e36fce9 100755
{NULL, NULL, 0}
};
diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
diff -r -u ./Modules/_curses_panel.c ./Modules/_curses_panel.c
index 0acf3fd..1728b59 100644
--- ./Modules/_curses_panel.c
+++ ./Modules/_curses_panel.c

2
plugins/python-build/share/python-build/patches/2.6.6/Python-2.6.6/000_patch-setup.py.diff
View file

@ -7,7 +7,7 @@
Backport for Python 2.7 of issue 11715 support for building Python on
multiarch Debian/Ubuntu.
diff --git a/setup.py b/setup.py
diff -r -u setup.py setup.py
--- setup.py.orig
+++ setup.py
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext):

2
plugins/python-build/share/python-build/patches/2.6.7/Python-2.6.7/000_patch-setup.py.diff
View file

@ -7,7 +7,7 @@
Backport for Python 2.7 of issue 11715 support for building Python on
multiarch Debian/Ubuntu.
diff --git a/setup.py b/setup.py
diff -r -u setup.py setup.py
--- setup.py.orig
+++ setup.py
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext):

2
plugins/python-build/share/python-build/patches/2.6.8/Python-2.6.8/000_patch-setup.py.diff
View file

@ -7,7 +7,7 @@
Backport for Python 2.7 of issue 11715 support for building Python on
multiarch Debian/Ubuntu.
diff --git a/setup.py b/setup.py
diff -r -u setup.py setup.py
--- setup.py.orig
+++ setup.py
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext):

2
plugins/python-build/share/python-build/patches/2.6.9/Python-2.6.9/000_patch-setup.py.diff
View file

@ -7,7 +7,7 @@
Backport for Python 2.7 of issue 11715 support for building Python on
multiarch Debian/Ubuntu.
diff --git a/setup.py b/setup.py
diff -r -u setup.py setup.py
--- setup.py.orig
+++ setup.py
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext):

2
plugins/python-build/share/python-build/patches/2.7.1/Python-2.7.1/000_patch-setup.py.diff
View file

@ -7,7 +7,7 @@
Backport for Python 2.7 of issue 11715 support for building Python on
multiarch Debian/Ubuntu.
diff --git a/setup.py b/setup.py
diff -r -u setup.py setup.py
--- setup.py.orig
+++ setup.py
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext):

2
plugins/python-build/share/python-build/patches/2.7/Python-2.7/000_patch-setup.py.diff
View file

@ -7,7 +7,7 @@
Backport for Python 2.7 of issue 11715 support for building Python on
multiarch Debian/Ubuntu.
diff --git a/setup.py b/setup.py
diff -r -u setup.py setup.py
--- setup.py.orig
+++ setup.py
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext):

2
plugins/python-build/share/python-build/patches/3.1.3/Python-3.1.3/000_patch-setup.py.diff
View file

@ -7,7 +7,7 @@
Backport for Python 2.7 of issue 11715 support for building Python on
multiarch Debian/Ubuntu.
diff --git a/setup.py b/setup.py
diff -r -u setup.py setup.py
--- setup.py.orig
+++ setup.py
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext):