forked from amazingfate/loongoffice
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>
This commit is contained in:
committed by
David Tardon
parent
19979ae270
commit
005fae2bdd
28
external/python3/python-3.3.5-pyexpat-symbols.patch.1
vendored
Normal file
28
external/python3/python-3.3.5-pyexpat-symbols.patch.1
vendored
Normal file
@ -0,0 +1,28 @@
|
||||
HACK: Fix build breakage on MacOS:
|
||||
|
||||
*** WARNING: renaming "pyexpat" since importing it failed: dlopen(build/lib.macosx-10.6-i386-3.3/pyexpat.so, 2): Symbol not found: _XML_ErrorString
|
||||
|
||||
This reverts c242a8f30806 from the python hg repo:
|
||||
|
||||
restore namespacing of pyexpat symbols (closes #19186)
|
||||
|
||||
|
||||
See http://bugs.python.org/issue19186#msg214069
|
||||
|
||||
The recommendation to include Modules/inc at first broke the Linux build...
|
||||
|
||||
So do it this way, as it was before. Needs some realignment later.
|
||||
|
||||
--- python3/Modules/expat/expat_external.h
|
||||
+++ python3/Modules/expat/expat_external.h
|
||||
@@ -7,10 +7,6 @@
|
||||
|
||||
/* External API definitions */
|
||||
|
||||
-/* Namespace external symbols to allow multiple libexpat version to
|
||||
- co-exist. */
|
||||
-#include "pyexpatns.h"
|
||||
-
|
||||
#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
|
||||
#define XML_USE_MSC_EXTENSIONS 1
|
||||
#endif
|
||||
Reference in New Issue
Block a user