diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-03 20:28:42 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-04 02:40:45 -0600 |
| commit | 9dc3f0f5af0fe64ced5d1aca2fc1ddf28c3974c9 (patch) | |
| tree | 9dd3583b360f02747470d68b4f4de644ab73a4d4 /external/python3/python-3.3.0-msvc2012.patch.1 | |
| parent | 45053900a4b05018359bfc135ebe0b2c6ab93f4f (diff) | |
fdo#70393: move python3 to a subdir of external
Change-Id: Ic5796f096255d2d84e39415324e8a2e06bcf09c9
Reviewed-on: https://gerrit.libreoffice.org/6550
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/python3/python-3.3.0-msvc2012.patch.1')
| -rw-r--r-- | external/python3/python-3.3.0-msvc2012.patch.1 | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/external/python3/python-3.3.0-msvc2012.patch.1 b/external/python3/python-3.3.0-msvc2012.patch.1 new file mode 100644 index 000000000000..9bbfbfbaf0d6 --- /dev/null +++ b/external/python3/python-3.3.0-msvc2012.patch.1 @@ -0,0 +1,72 @@ +Adapt VC10/MSVC2010 stuff for VC11/MSVC2012 (apparently builds with both then) + +diff -ru python3.old_/PCbuild/_msi.vcxproj python3/PCbuild/_msi.vcxproj +--- python3.old_/PCbuild/_msi.vcxproj 2012-09-29 10:00:48.000000000 +0200 ++++ python3/PCbuild/_msi.vcxproj 2012-11-13 15:52:40.656101165 +0100 +@@ -151,7 +151,7 @@ + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Link> +- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> + <BaseAddress>0x1D160000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -160,13 +160,13 @@ + <TargetEnvironment>X64</TargetEnvironment> + </Midl> + <Link> +- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> + <BaseAddress>0x1D160000</BaseAddress> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Link> +- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> + <BaseAddress>0x1D160000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -175,13 +175,13 @@ + <TargetEnvironment>X64</TargetEnvironment> + </Midl> + <Link> +- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> + <BaseAddress>0x1D160000</BaseAddress> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'"> + <Link> +- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> + <BaseAddress>0x1D160000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -190,14 +190,14 @@ + <TargetEnvironment>X64</TargetEnvironment> + </Midl> + <Link> +- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> + <BaseAddress>0x1D160000</BaseAddress> + <TargetMachine>MachineX64</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'"> + <Link> +- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> + <BaseAddress>0x1D160000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -206,7 +206,7 @@ + <TargetEnvironment>X64</TargetEnvironment> + </Midl> + <Link> +- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> + <BaseAddress>0x1D160000</BaseAddress> + <TargetMachine>MachineX64</TargetMachine> + </Link> |