From 14eb3e66a6ac5cebe4abc10928507ee3b78b06ad Mon Sep 17 00:00:00 2001 From: Stephen Hurd <deuce@synchro.net> Date: Sun, 27 Feb 2022 14:35:36 -0500 Subject: [PATCH] Massage overlapping patches --- patches/cl-static-library.patch | 13 +++++++++---- patches/cl-windowsbuildfix.patch | 32 -------------------------------- 2 files changed, 9 insertions(+), 36 deletions(-) diff --git a/patches/cl-static-library.patch b/patches/cl-static-library.patch index 4fe204b..12ac5bc 100644 --- a/patches/cl-static-library.patch +++ b/patches/cl-static-library.patch @@ -1,6 +1,6 @@ --- ../orig/crypt32.vcxproj 2019-01-31 03:34:12.000000000 -0500 +++ crypt32.vcxproj 2022-02-27 14:30:15.454574000 -0500 -@@ -32,26 +32,26 @@ +@@ -32,27 +32,27 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -8,14 +8,16 @@ + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>NotSet</CharacterSet> - <PlatformToolset>v140</PlatformToolset> +- <PlatformToolset>v140</PlatformToolset> ++ <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>NotSet</CharacterSet> - <PlatformToolset>v140</PlatformToolset> +- <PlatformToolset>v140</PlatformToolset> ++ <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> @@ -23,7 +25,8 @@ <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>NotSet</CharacterSet> - <PlatformToolset>v140</PlatformToolset> +- <PlatformToolset>v140</PlatformToolset> ++ <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> @@ -31,3 +34,5 @@ <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>NotSet</CharacterSet> +- <PlatformToolset>v140</PlatformToolset> ++ <PlatformToolset>v143</PlatformToolset> diff --git a/patches/cl-windowsbuildfix.patch b/patches/cl-windowsbuildfix.patch index cb534c9..37ef476 100644 --- a/patches/cl-windowsbuildfix.patch +++ b/patches/cl-windowsbuildfix.patch @@ -1,37 +1,5 @@ --- crypt32.vcxproj.orig 2022-02-25 04:07:11.835347000 -0500 +++ crypt32.vcxproj 2022-02-25 04:07:36.519348000 -0500 -@@ -35,27 +35,27 @@ - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>NotSet</CharacterSet> -- <PlatformToolset>v140</PlatformToolset> -+ <PlatformToolset>v143</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>NotSet</CharacterSet> -- <PlatformToolset>v140</PlatformToolset> -+ <PlatformToolset>v143</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>NotSet</CharacterSet> -- <PlatformToolset>v140</PlatformToolset> -+ <PlatformToolset>v143</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>NotSet</CharacterSet> -- <PlatformToolset>v140</PlatformToolset> -+ <PlatformToolset>v143</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> @@ -401,9 +401,6 @@ <ClCompile Include="envelope\res_env.c" /> <ClCompile Include="io\dns.c" /> -- GitLab