diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2019-12-09 14:08:19 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-02-23 12:32:32 +0100 |
commit | 38d41938090f26721d22b36f37b55a1aaf6e526b (patch) | |
tree | f3ae4cb094e45d7ea382be0eaba09e5e74a3422a /external/python3/python3-osx-avoid-new-10.13.patch.1 | |
parent | f197ea6fa7400832ef81fd3964bf3ede0b4db080 (diff) |
python3: upgrade to release 3.7.6
* external/python3/python-3.3.3-aix.patch.1:
most of it doesn't apply and AIX port isn't maintained anyway so
remove it for now
* external/python3/ubsan.patch.0:
apparently one of the files was removed
* 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1:
fixed upstream
* python3-osx-avoid-new-10.13.patch.1:
replace with simply passing ac_cv_func_utimensat=no to configure
* external/python3/python-3.5.4-ssl.patch.1:
project files to build OpenSSL removed upstream
* There have been changes to how python locates OpenSSL; new variables
OPENSSL_INCLUDES etc; it turns out that you have to pass one directory
to --with-openssl, as the variables cannot be passed
* libuuid.so.1 is a new dependency of the _uuid module
* libffi.so.6 is a new dependency of the _ctypes module (the bundled
copy of libffi for non-Darwin platforms was removed)
* python-3.3.0-pythreadstate.patch.1:
the PyThreadState functions have been changed such that
CppunitTest_services asserts when there is a PyThreadAttach on top of
PyThreadDetach on top of PyThreadAttach, i.e., 2 PyThreadState per
thread (PyGILState_Check() fails). Instead of patching in additional
workarounds, change PyThreadAttach so that it re-uses an existing
PyThreadState if one exists for the thread.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84765
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit b10be5d48433076f0b7238d818020f708553e114)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86398
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 853cc90f49d59a94242494c4aee2479de0865486)
Change-Id: I24c19d79b43a30709261fd9db66312b2e3872fd9
Diffstat (limited to 'external/python3/python3-osx-avoid-new-10.13.patch.1')
-rw-r--r-- | external/python3/python3-osx-avoid-new-10.13.patch.1 | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/external/python3/python3-osx-avoid-new-10.13.patch.1 b/external/python3/python3-osx-avoid-new-10.13.patch.1 deleted file mode 100644 index 93bf5a078e01..000000000000 --- a/external/python3/python3-osx-avoid-new-10.13.patch.1 +++ /dev/null @@ -1,61 +0,0 @@ --*- Mode: Diff -*- - ---- python3/Modules/posixmodule.c -+++ python3/Modules/posixmodule.c -@@ -4565,12 +4565,12 @@ - } \ - - --#if defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMENSAT) -+#if defined(HAVE_FUTIMESAT) - - static int - utime_dir_fd(utime_t *ut, int dir_fd, char *path, int follow_symlinks) - { --#ifdef HAVE_UTIMENSAT -+#if 0 - int flags = follow_symlinks ? 0 : AT_SYMLINK_NOFOLLOW; - UTIME_TO_TIMESPEC; - return utimensat(dir_fd, path, time, flags); -@@ -4591,12 +4591,12 @@ - #define FUTIMENSAT_DIR_FD_CONVERTER dir_fd_unavailable - #endif - --#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMENS) -+#if defined(HAVE_FUTIMES) - - static int - utime_fd(utime_t *ut, int fd) - { --#ifdef HAVE_FUTIMENS -+#if 0 - UTIME_TO_TIMESPEC; - return futimens(fd, time); - #else -@@ -4619,7 +4619,7 @@ - static int - utime_nofollow_symlinks(utime_t *ut, char *path) - { --#ifdef HAVE_UTIMENSAT -+#if 0 - UTIME_TO_TIMESPEC; - return utimensat(DEFAULT_DIR_FD, path, time, AT_SYMLINK_NOFOLLOW); - #else -@@ -4635,7 +4635,7 @@ - static int - utime_default(utime_t *ut, char *path) - { --#ifdef HAVE_UTIMENSAT -+#if 0 - UTIME_TO_TIMESPEC; - return utimensat(DEFAULT_DIR_FD, path, time, 0); - #elif defined(HAVE_UTIMES) -@@ -4836,7 +4836,7 @@ - else - #endif - --#if defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMENSAT) -+#if defined(HAVE_FUTIMESAT) - if ((dir_fd != DEFAULT_DIR_FD) || (!follow_symlinks)) - result = utime_dir_fd(&utime, dir_fd, path->narrow, follow_symlinks); - else |