diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-05-12 16:13:30 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-05-21 00:08:02 -0500 |
| commit | 005fae2bddf4e43cb361bbdb9fc2cfb961693ffd (patch) | |
| tree | 9e57ef1259d1011bd04715520985eaf9cfcf362c /external/python3/python-3.3.0-implicit-int.patch.1 | |
| parent | 19979ae27055cb910bfc368bfc2899d211f56be1 (diff) | |
upgrade to python-3.3.5
- remove now obselete patches, which were applied upstream.
- Hack to get MacOS to build
Change-Id: Id68e78e411efc92a46ea9e180f09c390fe5acb4a
Reviewed-on: https://gerrit.libreoffice.org/9311
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/python3/python-3.3.0-implicit-int.patch.1')
| -rw-r--r-- | external/python3/python-3.3.0-implicit-int.patch.1 | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/external/python3/python-3.3.0-implicit-int.patch.1 b/external/python3/python-3.3.0-implicit-int.patch.1 deleted file mode 100644 index 6e4d2b05127d..000000000000 --- a/external/python3/python-3.3.0-implicit-int.patch.1 +++ /dev/null @@ -1,30 +0,0 @@ -fix function names in import.h - -MSVC complains about some declarations in Include/import.h. -Apparently the problem is a missing space between PyAPI_FUNC(int) and the -function name, leading to concatenated int_PyImport... names and no -return type. - -diff -ru python3.old/Include/import.h python3/Include/import.h ---- python3.old/Include/import.h 2012-09-29 10:00:26.000000000 +0200 -+++ python3/Include/import.h 2012-11-27 16:09:26.449390966 +0100 -@@ -86,15 +86,15 @@ - - PyAPI_FUNC(void) _PyImport_ReInitLock(void); - --PyAPI_FUNC(PyObject *)_PyImport_FindBuiltin( -+PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin( - const char *name /* UTF-8 encoded string */ - ); --PyAPI_FUNC(PyObject *)_PyImport_FindExtensionObject(PyObject *, PyObject *); --PyAPI_FUNC(int)_PyImport_FixupBuiltin( -+PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *); -+PyAPI_FUNC(int) _PyImport_FixupBuiltin( - PyObject *mod, - char *name /* UTF-8 encoded string */ - ); --PyAPI_FUNC(int)_PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *); -+PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *); - - struct _inittab { - char *name; /* ASCII encoded string */ |