[Libreoffice-commits] core.git: external/python3

Michael Stahl mstahl at redhat.com
Tue Apr 15 07:59:10 PDT 2014 

 external/python3/UnpackedTarball_python3.mk        |    4 
 external/python3/python-3.3.0-msvc-disable.patch.1 |   76 ---------
 external/python3/python-3.3.0-msvc-x64.patch.1     |  113 --------------
 external/python3/python-3.3.0-ssl.patch.1          |  162 ---------------------
 4 files changed, 355 deletions(-)

New commits:
commit 4ce1cec2a4c98451b8b686f6f7a114a6927f0cae
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 15 16:48:59 2014 +0200

    python3: remove obsolete MSVC2008 patches
    
    Change-Id: Ie514017dc186fea4c3f2699e92bfe46706eb6413

diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk
index 1de6b11..9ca68d5 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -13,10 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,python3,$(PYTHON_TARBALL),,python3)
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
 	PCbuild/pcbuild.sln \
-	PC/VS9.0/pcbuild.sln \
-	PC/VS9.0/make_versioninfo.vcproj \
-	PC/VS9.0/x64.vsprops \
-	PC/VS9.0/_ssl.vcproj \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1 b/external/python3/python-3.3.0-msvc-disable.patch.1
index e9cbef5..6a6a950 100644
--- a/external/python3/python-3.3.0-msvc-disable.patch.1
+++ b/external/python3/python-3.3.0-msvc-disable.patch.1
@@ -1,81 +1,5 @@
 Disable some stuff LO does not need, especially stuff with external dependencies
 
-diff -ru python3/PC/VS9.0/pcbuild.sln python3.new/PC/VS9.0/pcbuild.sln
---- python3/PC/VS9.0/pcbuild.sln	2012-09-29 10:00:47.000000000 +0200
-+++ python3.new/PC/VS9.0/pcbuild.sln	2012-11-12 22:34:55.365289858 +0100
-@@ -15,16 +15,6 @@
- 		{C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD}
- 	EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
--	ProjectSection(ProjectDependencies) = postProject
--		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
--	EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"
--	ProjectSection(ProjectDependencies) = postProject
--		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
--	EndProjectSection
--EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
- EndProject
- Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}"
-@@ -68,12 +58,6 @@
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- 	EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
--	ProjectSection(ProjectDependencies) = postProject
--		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
--		{A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
--	EndProjectSection
--EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
- 	ProjectSection(ProjectDependencies) = postProject
- 		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-@@ -87,21 +71,6 @@
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- 	EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
--	ProjectSection(ProjectDependencies) = postProject
--		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
--	EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bz2", "_bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
--	ProjectSection(ProjectDependencies) = postProject
--		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
--	EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_lzma", "_lzma.vcproj", "{F9D71780-F393-11E0-BE50-0800200C9A66}"
--	ProjectSection(ProjectDependencies) = postProject
--		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
--	EndProjectSection
--EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
- 	ProjectSection(ProjectDependencies) = postProject
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -117,20 +86,6 @@
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- 	EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
--	ProjectSection(ProjectDependencies) = postProject
--		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
--		{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0} = {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}
--		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
--	EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
--	ProjectSection(ProjectDependencies) = postProject
--		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
--	EndProjectSection
--EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
- 	ProjectSection(ProjectDependencies) = postProject
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
 diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
 --- python3/PCbuild/pcbuild.sln	2012-09-29 10:00:48.000000000 +0200
 +++ python3.new/PCbuild/pcbuild.sln	2012-11-12 22:13:49.445159668 +0100
diff --git a/external/python3/python-3.3.0-msvc-x64.patch.1 b/external/python3/python-3.3.0-msvc-x64.patch.1
index 7071573..03fcfa7 100644
--- a/external/python3/python-3.3.0-msvc-x64.patch.1
+++ b/external/python3/python-3.3.0-msvc-x64.patch.1
@@ -1,118 +1,5 @@
 Fix Python build for x64 Windows
 
-diff -ru python3/PC/VS9.0/make_versioninfo.vcproj python3.new/PC/VS9.0/make_versioninfo.vcproj
---- python3/PC/VS9.0/make_versioninfo.vcproj	2012-09-29 10:00:47.000000000 +0200
-+++ python3.new/PC/VS9.0/make_versioninfo.vcproj	2012-11-12 22:44:03.027363013 +0100
-@@ -124,6 +124,8 @@
- 				InlineFunctionExpansion="1"
- 				EnableIntrinsicFunctions="true"
- 				PreprocessorDefinitions="_CONSOLE"
-+				RuntimeLibrary="2"
-+				CompileAs="0"
- 			/>
- 			<Tool
- 				Name="VCManagedResourceCompilerTool"
-@@ -137,6 +139,8 @@
- 			<Tool
- 				Name="VCLinkerTool"
- 				OutputFile="$(SolutionDir)make_versioninfo.exe"
-+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
-+				SubSystem="1"
- 			/>
- 			<Tool
- 				Name="VCALinkTool"
-@@ -281,7 +285,8 @@
- 			<Tool
- 				Name="VCLinkerTool"
- 				OutputFile="$(SolutionDir)make_versioninfo_d.exe"
--				TargetMachine="17"
-+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
-+				SubSystem="1"
- 			/>
- 			<Tool
- 				Name="VCALinkTool"
-diff -ru python3/PC/VS9.0/pcbuild.sln python3.new/PC/VS9.0/pcbuild.sln
---- python3/PC/VS9.0/pcbuild.sln	2012-09-29 10:00:47.000000000 +0200
-+++ python3.new/PC/VS9.0/pcbuild.sln	2012-11-12 22:34:55.365289858 +0100
-@@ -182,20 +137,20 @@
- 		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64
- 		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
- 		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32
--		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32
--		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32
-+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|x64
-+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|x64
- 		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32
- 		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32
--		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32
--		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32
-+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64
-+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|x64
- 		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32
- 		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32
--		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32
--		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32
-+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|x64
-+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|x64
- 		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32
- 		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32
--		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32
--		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32
-+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|x64
-+		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|x64
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64
-@@ -246,20 +201,20 @@
- 		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64
- 		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32
- 		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32
--		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32
--		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32
-+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|x64
-+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|x64
- 		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32
- 		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32
--		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32
--		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32
-+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64
-+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|x64
- 		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32
- 		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32
--		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32
--		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32
-+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|x64
-+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|x64
- 		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32
- 		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32
--		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32
--		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32
-+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|x64
-+		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|x64
- 		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32
- 		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32
- 		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64
-diff -ru python3/PC/VS9.0/x64.vsprops python3.new/PC/VS9.0/x64.vsprops
---- python3/PC/VS9.0/x64.vsprops	2012-09-29 10:00:47.000000000 +0200
-+++ python3.new/PC/VS9.0/x64.vsprops	2012-11-12 22:45:30.584374039 +0100
-@@ -3,7 +3,7 @@
- 	ProjectType="Visual C++"
- 	Version="8.00"
- 	Name="amd64"
--	OutputDirectory="$(SolutionDir)\amd64\"
-+	OutputDirectory="$(SolutionDir)"
- 	IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\"
- 	>
- 	<Tool
-@@ -15,8 +15,4 @@
- 		Name="VCLinkerTool"
- 		TargetMachine="17"
- 	/>
--	<UserMacro
--		Name="PythonExe"
--		Value="$(HOST_PYTHON)"
--	/>
- </VisualStudioPropertySheet>
 diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
 --- python3/PCbuild/pcbuild.sln	2012-09-29 10:00:48.000000000 +0200
 +++ python3.new/PCbuild/pcbuild.sln	2012-11-12 22:13:49.445159668 +0100
diff --git a/external/python3/python-3.3.0-ssl.patch.1 b/external/python3/python-3.3.0-ssl.patch.1
index d5777df..b85fe07 100644
--- a/external/python3/python-3.3.0-ssl.patch.1
+++ b/external/python3/python-3.3.0-ssl.patch.1
@@ -24,168 +24,6 @@ diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist
  
  
  # The _tkinter module.
-diff -ru python3.old_/PC/VS9.0/pcbuild.sln python3/PC/VS9.0/pcbuild.sln
---- python3.old_/PC/VS9.0/pcbuild.sln	2012-09-29 10:00:47.000000000 +0200
-+++ python3/PC/VS9.0/pcbuild.sln	2012-11-13 14:44:29.329147866 +0100
-@@ -136,11 +136,6 @@
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- 	EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssl", "ssl.vcproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}"
--	ProjectSection(ProjectDependencies) = postProject
--		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
--	EndProjectSection
--EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}"
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
-diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj
---- python3.old_/PC/VS9.0/_ssl.vcproj	2012-09-29 10:00:47.000000000 +0200
-+++ python3/PC/VS9.0/_ssl.vcproj	2012-11-13 14:27:15.874169273 +0100
-@@ -42,7 +42,7 @@
- 			/>
- 			<Tool
- 				Name="VCCLCompilerTool"
--				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-+				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
- 			/>
- 			<Tool
- 				Name="VCManagedResourceCompilerTool"
-@@ -56,7 +56,7 @@
- 			/>
- 			<Tool
- 				Name="VCLinkerTool"
--				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+				AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib"
- 			/>
- 			<Tool
- 				Name="VCALinkTool"
-@@ -104,7 +104,7 @@
- 			/>
- 			<Tool
- 				Name="VCCLCompilerTool"
--				AdditionalIncludeDirectories="$(opensslDir)\inc64"
-+				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
- 			/>
- 			<Tool
- 				Name="VCManagedResourceCompilerTool"
-@@ -118,7 +118,7 @@
- 			/>
- 			<Tool
- 				Name="VCLinkerTool"
--				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+				AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib"
- 			/>
- 			<Tool
- 				Name="VCALinkTool"
-@@ -166,7 +166,7 @@
- 			/>
- 			<Tool
- 				Name="VCCLCompilerTool"
--				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-+				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
- 			/>
- 			<Tool
- 				Name="VCManagedResourceCompilerTool"
-@@ -180,7 +180,7 @@
- 			/>
- 			<Tool
- 				Name="VCLinkerTool"
--				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+				AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib"
- 			/>
- 			<Tool
- 				Name="VCALinkTool"
-@@ -229,7 +229,7 @@
- 			/>
- 			<Tool
- 				Name="VCCLCompilerTool"
--				AdditionalIncludeDirectories="$(opensslDir)\inc64"
-+				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
- 			/>
- 			<Tool
- 				Name="VCManagedResourceCompilerTool"
-@@ -243,7 +243,7 @@
- 			/>
- 			<Tool
- 				Name="VCLinkerTool"
--				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+				AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib"
- 			/>
- 			<Tool
- 				Name="VCALinkTool"
-@@ -291,7 +291,7 @@
- 			/>
- 			<Tool
- 				Name="VCCLCompilerTool"
--				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-+				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
- 			/>
- 			<Tool
- 				Name="VCManagedResourceCompilerTool"
-@@ -305,7 +305,7 @@
- 			/>
- 			<Tool
- 				Name="VCLinkerTool"
--				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+				AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib"
- 			/>
- 			<Tool
- 				Name="VCALinkTool"
-@@ -354,7 +354,7 @@
- 			/>
- 			<Tool
- 				Name="VCCLCompilerTool"
--				AdditionalIncludeDirectories="$(opensslDir)\inc64"
-+				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
- 			/>
- 			<Tool
- 				Name="VCManagedResourceCompilerTool"
-@@ -368,7 +368,7 @@
- 			/>
- 			<Tool
- 				Name="VCLinkerTool"
--				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+				AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib"
- 				TargetMachine="17"
- 			/>
- 			<Tool
-@@ -417,7 +417,7 @@
- 			/>
- 			<Tool
- 				Name="VCCLCompilerTool"
--				AdditionalIncludeDirectories="$(opensslDir)\inc32"
-+				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
- 			/>
- 			<Tool
- 				Name="VCManagedResourceCompilerTool"
-@@ -431,7 +431,7 @@
- 			/>
- 			<Tool
- 				Name="VCLinkerTool"
--				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-+				AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib"
- 			/>
- 			<Tool
- 				Name="VCALinkTool"
-@@ -480,7 +480,7 @@
- 			/>
- 			<Tool
- 				Name="VCCLCompilerTool"
--				AdditionalIncludeDirectories="$(opensslDir)\inc64"
-+				AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
- 			/>
- 			<Tool
- 				Name="VCManagedResourceCompilerTool"
-@@ -494,7 +494,7 @@
- 			/>
- 			<Tool
- 				Name="VCLinkerTool"
--				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+				AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib"
- 				TargetMachine="17"
- 			/>
- 			<Tool
 diff -ru python3.old_/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
 --- python3.old_/PCbuild/pcbuild.sln	2012-09-29 10:00:48.000000000 +0200
 +++ python3/PCbuild/pcbuild.sln	2012-11-13 14:50:39.220142472 +0100

More information about the Libreoffice-commits mailing list