diff options
author | David Ostrovsky <david@ostrovsky.org> | 2017-08-10 00:18:12 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-08-21 09:00:34 +0200 |
commit | 80fa3893360e548c58195619f474604a5387bd1b (patch) | |
tree | d2b55110b913afab74a83b581a43e6798048b735 /external/python3 | |
parent | ofz#2899 increment pos before check, like all the other cases (diff) | |
download | core-80fa3893360e548c58195619f474604a5387bd1b.tar.gz core-80fa3893360e548c58195619f474604a5387bd1b.zip |
python3: upgrade to release 3.5.4
Change-Id: I9300b2ec1e1dcedbcbfe793e1450166af1bf1944
Reviewed-on: https://gerrit.libreoffice.org/40944
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit f0e68d4feaaa43f7450432ad1ebd92c2b572400f)
Reviewed-on: https://gerrit.libreoffice.org/41028
(cherry picked from commit f18ea813967c1b35a8977bd193c19857f61f7a8c)
Diffstat (limited to 'external/python3')
-rw-r--r-- | external/python3/UnpackedTarball_python3.mk | 4 | ||||
-rw-r--r-- | external/python3/python-3.5.4-msvc-disable.patch.1 (renamed from external/python3/python-3.3.0-msvc-disable.patch.1) | 7 | ||||
-rw-r--r-- | external/python3/python-3.5.4-ssl.patch.1 (renamed from external/python3/python-3.3.0-ssl.patch.1) | 83 |
3 files changed, 50 insertions, 44 deletions
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index f84b98299b8c..20192af318bf 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python3/i100492-freebsd.patch.1 \ $(if $(filter AIX,$(OS)),external/python3/python-3.3.3-aix.patch.1) \ external/python3/python-3.3.0-darwin.patch.1 \ - external/python3/python-3.3.0-ssl.patch.1 \ - external/python3/python-3.3.0-msvc-disable.patch.1 \ + external/python3/python-3.5.4-ssl.patch.1 \ + external/python3/python-3.5.4-msvc-disable.patch.1 \ external/python3/python-3.3.0-i42553.patch.2 \ external/python3/python-3.3.0-pythreadstate.patch.1 \ external/python3/python-3.3.0-clang.patch.1 \ diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1 b/external/python3/python-3.5.4-msvc-disable.patch.1 index c571c5c4e878..54b2a5f46540 100644 --- a/external/python3/python-3.3.0-msvc-disable.patch.1 +++ b/external/python3/python-3.5.4-msvc-disable.patch.1 @@ -1,8 +1,8 @@ Disable some stuff LO does not need, especially stuff with external dependencies diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln ---- python3.orig/PCbuild/pcbuild.sln 2015-07-26 17:43:52.262528695 +0200 -+++ python3/PCbuild/pcbuild.sln 2015-07-26 18:00:18.438594901 +0200 +--- python3.orig/PCbuild/pcbuild.sln 2017-08-10 00:04:44.359879894 +0200 ++++ python3/PCbuild/pcbuild.sln 2017-08-10 00:13:51.179873748 +0200 @@ -12,8 +12,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" @@ -45,7 +45,7 @@ diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" -@@ -58,12 +58,6 @@ +@@ -80,12 +64,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", "_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}" EndProject @@ -58,3 +58,4 @@ diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", "pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}" EndProject Global +Only in python3/PCbuild: pcbuild.sln~ diff --git a/external/python3/python-3.3.0-ssl.patch.1 b/external/python3/python-3.5.4-ssl.patch.1 index c4bc117f5558..beb6fe38882f 100644 --- a/external/python3/python-3.3.0-ssl.patch.1 +++ b/external/python3/python-3.5.4-ssl.patch.1 @@ -1,11 +1,11 @@ -*- Mode: diff -*- -Tweak SSL build to find OpenSSL in solver & not build it itself in "ssl.vcproj" etc. +Tweak SSL build to find OpenSSL in workdir & not build it itself in "ssl.vcproj" etc. diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln ---- python3.orig/PCbuild/pcbuild.sln 2015-08-22 18:57:16.653719900 +0200 -+++ python3/PCbuild/pcbuild.sln 2015-08-22 19:03:06.062853000 +0200 -@@ -64,10 +64,6 @@ +--- python3.orig/PCbuild/pcbuild.sln 2017-08-09 23:39:15.511897077 +0200 ++++ python3/PCbuild/pcbuild.sln 2017-08-09 23:48:41.375890717 +0200 +@@ -86,10 +86,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tk", "tk.vcxproj", "{7E85ECCF-A72C-4DA4-9E52-884508E80BA1}" EndProject @@ -17,40 +17,46 @@ diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln EndProject Global diff -ru python3.orig/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj ---- python3.orig/PCbuild/_ssl.vcxproj 2015-08-11 02:52:36.000000000 +0200 -+++ python3/PCbuild/_ssl.vcxproj 2015-08-22 18:19:20.744299000 +0200 +--- python3.orig/PCbuild/_ssl.vcxproj 2017-08-07 09:59:11.000000000 +0200 ++++ python3/PCbuild/_ssl.vcxproj 2017-08-09 23:50:36.871889419 +0200 +@@ -1,4 +1,4 @@ +-<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
+ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
@@ -61,10 +61,10 @@ - </PropertyGroup> - <ItemDefinitionGroup> - <ClCompile> -- <AdditionalIncludeDirectories>$(opensslIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> -- <AdditionalDependencies>ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>ws2_32.lib;crypt32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemGroup> -@@ -75,14 +75,6 @@ - <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - </ProjectReference> -- <ProjectReference Include="libeay.vcxproj"> -- <Project>{e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0}</Project> -- <ReferenceOutputAssembly>false</ReferenceOutputAssembly> -- </ProjectReference> -- <ProjectReference Include="ssleay.vcxproj"> -- <Project>{10615b24-73bf-4efa-93aa-236916321317}</Project> -- <ReferenceOutputAssembly>false</ReferenceOutputAssembly> -- </ProjectReference> - <ProjectReference Include="_socket.vcxproj"> - <Project>{86937f53-c189-40ef-8ce8-8759d8e7d480}</Project> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+- <AdditionalIncludeDirectories>$(opensslIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+- <AdditionalDependencies>ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>ws2_32.lib;crypt32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+@@ -78,14 +78,6 @@ + <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+- <ProjectReference Include="libeay.vcxproj">
+- <Project>{e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0}</Project>
+- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+- </ProjectReference>
+- <ProjectReference Include="ssleay.vcxproj">
+- <Project>{10615b24-73bf-4efa-93aa-236916321317}</Project>
+- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+- </ProjectReference>
+ <ProjectReference Include="_socket.vcxproj">
+ <Project>{86937f53-c189-40ef-8ce8-8759d8e7d480}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff -ru python3.orig/setup.py python3/setup.py ---- python3.orig/setup.py 2015-08-22 18:16:15.825267200 +0200 -+++ python3/setup.py 2015-08-22 18:22:44.162757900 +0200 -@@ -778,7 +778,10 @@ +--- python3.orig/setup.py 2017-08-09 23:39:15.495897077 +0200 ++++ python3/setup.py 2017-08-09 23:53:06.891887733 +0200 +@@ -807,7 +807,10 @@ exts.append( Extension('_socket', ['socketmodule.c'], depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) @@ -61,7 +67,7 @@ diff -ru python3.orig/setup.py python3/setup.py '/usr/local/ssl/include', '/usr/contrib/ssl/include/' ] -@@ -790,8 +793,12 @@ +@@ -819,8 +822,12 @@ ['/usr/kerberos/include']) if krb5_h: ssl_incs += krb5_h @@ -74,5 +80,4 @@ diff -ru python3.orig/setup.py python3/setup.py + '/usr/local/ssl/lib', '/usr/contrib/ssl/lib/' ] ) - - + |