diff --git a/python2/0260-wrong-parameters.patch b/python2/0260-wrong-parameters.patch new file mode 100644 index 00000000..30e7317d --- /dev/null +++ b/python2/0260-wrong-parameters.patch @@ -0,0 +1,22 @@ +diff -r c087ac6fc171 Modules/_ctypes/_ctypes.c +--- a/Modules/_ctypes/_ctypes.c Wed Jan 28 10:52:49 2015 +0200 ++++ b/Modules/_ctypes/_ctypes.c Wed Jan 28 19:53:12 2015 +0900 +@@ -637,17 +637,17 @@ CDataType_in_dll(PyObject *type, PyObjec + return NULL; + } + #else + address = (void *)ctypes_dlsym(handle, name); + if (!address) { + #ifdef __CYGWIN__ + /* dlerror() isn't very helpful on cygwin */ + PyErr_Format(PyExc_ValueError, +- "symbol '%s' not found (%s) ", ++ "symbol '%s' not found", + name); + #else + PyErr_SetString(PyExc_ValueError, ctypes_dlerror()); + #endif + return NULL; + } + #endif + return PyCData_AtAddress(type, address); diff --git a/python2/PKGBUILD b/python2/PKGBUILD index d4c6ebe3..35b7a0ab 100644 --- a/python2/PKGBUILD +++ b/python2/PKGBUILD @@ -3,7 +3,7 @@ pkgname=python2 pkgver=2.7.9 -pkgrel=1 +pkgrel=2 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') @@ -29,6 +29,7 @@ source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0200-msys2.patch 0210-reorder-bininstall-ln-symlink-creation.patch 0250-allow-win-drives-in-os-path-isabs.patch + 0260-wrong-parameters.patch 2.7.5-allow-windows-paths-for-executable.patch) sha1sums=('3172f6e957713c2d9fca462cc16068222fd1b9d3' 'ff18e75ffa0351c481ca45065cdcc5cd83857712' @@ -45,6 +46,7 @@ sha1sums=('3172f6e957713c2d9fca462cc16068222fd1b9d3' 'a1806da6956df1860cc23ff3701cd80cbb126b87' 'e6e13cb541efaaf228355cb1d7d5cd8574757c72' '80975639f5ad78fd15b8f81bd98fb460c4ee05c4' + 'd00ab9da69c45fa3d0c41c2de46b1967c1101d76' 'fb78069fadcf5394ba380e26e371ad687d344415') prepare() { @@ -64,6 +66,7 @@ prepare() { patch -p1 -i ${srcdir}/0200-msys2.patch patch -p1 -i ${srcdir}/0210-reorder-bininstall-ln-symlink-creation.patch patch -p1 -i ${srcdir}/0250-allow-win-drives-in-os-path-isabs.patch + patch -p1 -i ${srcdir}/0260-wrong-parameters.patch # Incomplete patch from Ray Donnelly # patch -p1 -i ${srcdir}/2.7.5-allow-windows-paths-for-executable.patch diff --git a/python3/3.3-wrong-parameters.patch b/python3/3.3-wrong-parameters.patch new file mode 100644 index 00000000..30e7317d --- /dev/null +++ b/python3/3.3-wrong-parameters.patch @@ -0,0 +1,22 @@ +diff -r c087ac6fc171 Modules/_ctypes/_ctypes.c +--- a/Modules/_ctypes/_ctypes.c Wed Jan 28 10:52:49 2015 +0200 ++++ b/Modules/_ctypes/_ctypes.c Wed Jan 28 19:53:12 2015 +0900 +@@ -637,17 +637,17 @@ CDataType_in_dll(PyObject *type, PyObjec + return NULL; + } + #else + address = (void *)ctypes_dlsym(handle, name); + if (!address) { + #ifdef __CYGWIN__ + /* dlerror() isn't very helpful on cygwin */ + PyErr_Format(PyExc_ValueError, +- "symbol '%s' not found (%s) ", ++ "symbol '%s' not found", + name); + #else + PyErr_SetString(PyExc_ValueError, ctypes_dlerror()); + #endif + return NULL; + } + #endif + return PyCData_AtAddress(type, address); diff --git a/python3/PKGBUILD b/python3/PKGBUILD index e6a7eda8..9f3f2496 100644 --- a/python3/PKGBUILD +++ b/python3/PKGBUILD @@ -3,7 +3,7 @@ pkgname=python pkgver=3.3.3 -pkgrel=2 +pkgrel=3 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64') @@ -33,6 +33,7 @@ source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz 3.3-tkinter.patch 3.3.2-allow-windows-paths-for-executable.patch 3.3.2-cygwin-siginfo.patch + 3.3-wrong-parameters.patch python-3.3.2-msys2.patch 3.3.3-allow-win-drives-in-os-path-isabs.patch) sha1sums=('af4e75a34bd538c79b9871227c2e7f56569ac107' @@ -53,6 +54,7 @@ sha1sums=('af4e75a34bd538c79b9871227c2e7f56569ac107' 'b303a2da60abded2ca020dfb63da5d5184c1d92f' 'd3cbd7286fab191a5a9086cea1a9a3dc386e17da' '1ec44391e21ad83cd149e83e65b2e77af13b9fbd' + 'd00ab9da69c45fa3d0c41c2de46b1967c1101d76' '4f5ef705c8806900313480e13fb8d34c49aeb77a' 'e0f3d9388e888357a920c32a4ca525ef4ec69343') prepare() { @@ -77,9 +79,10 @@ prepare() { patch -p1 -i ${srcdir}/3.3-thread-cygwin64.patch patch -p1 -i ${srcdir}/python-3.3.2-msys2.patch patch -p1 -i ${srcdir}/3.3.2-cygwin-siginfo.patch + patch -p1 -i ${srcdir}/3.3-wrong-parameters.patch # Incomplete patch from Ray Donnelly # patch -p1 -i ${srcdir}/3.3.2-allow-windows-paths-for-executable.patch - patch -p1 -i ${srcdir}/33.3.3-allow-win-drives-in-os-path-isabs.patch + patch -p1 -i ${srcdir}/3.3.3-allow-win-drives-in-os-path-isabs.patch # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball