From 9e57ffe96e0b793ffa75cd1b785b25fa9d71eb16 Mon Sep 17 00:00:00 2001 From: Stephen Hurd <deuce@synchro.net> Date: Fri, 25 Feb 2022 04:10:29 -0500 Subject: [PATCH] Regenerate the patches --- patches/cl-msvc-sucks-datetime.patch | 17 +++++------------ patches/cl-windowsbuildfix.patch | 13 +++---------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/patches/cl-msvc-sucks-datetime.patch b/patches/cl-msvc-sucks-datetime.patch index e2f2826..1302c7e 100644 --- a/patches/cl-msvc-sucks-datetime.patch +++ b/patches/cl-msvc-sucks-datetime.patch @@ -1,12 +1,5 @@ ---- misc/consts.h.orig 2022-02-25 03:29:19.561319000 -0500 -+++ misc/consts.h 2022-02-25 03:31:30.766485000 -0500 -@@ -346,8 +346,7 @@ - #define MAX_TIME_VALUE ( YEARS_TO_SECONDS( 2036 - 1970 ) ) - - #if ( defined( __clang__ ) && ( __clang_major__ > 5 ) ) || \ -- ( defined( __GNUC__ ) && ( __GNUC__ > 6 ) ) || \ -- ( defined( _MSC_VER ) && VC_GE_2017( _MSC_VER ) ) -+ ( defined( __GNUC__ ) && ( __GNUC__ > 6 ) ) - #define CURRENT_TIME_VALUE ( ( DATE_YEAR + DATE_MONTH + DATE_DAY - 30 ) * 86400 ) - #else - #define CURRENT_TIME_VALUE ( YEARS_TO_SECONDS( 2019 - 1970 ) ) +349,350c349 +< ( defined( __GNUC__ ) && ( __GNUC__ > 11 ) ) || \ +< ( defined( _MSC_VER ) && VC_GE_2017( _MSC_VER ) ) +--- +> ( defined( __GNUC__ ) && ( __GNUC__ > 11 ) )\ diff --git a/patches/cl-windowsbuildfix.patch b/patches/cl-windowsbuildfix.patch index ad96a34..cb534c9 100644 --- a/patches/cl-windowsbuildfix.patch +++ b/patches/cl-windowsbuildfix.patch @@ -1,5 +1,5 @@ ---- crypt32.vcxproj.orig 2022-02-25 03:16:40.714299000 -0500 -+++ crypt32.vcxproj 2022-02-25 03:20:40.528577000 -0500 +--- 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> @@ -32,7 +32,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> -@@ -392,9 +392,6 @@ +@@ -401,9 +401,6 @@ <ClCompile Include="envelope\res_env.c" /> <ClCompile Include="io\dns.c" /> <ClCompile Include="io\dns_srv.c" /> @@ -42,10 +42,3 @@ <ClCompile Include="io\file.c" /> <ClCompile Include="io\http.c" /> <ClCompile Include="io\http_parse.c" /> -@@ -607,4 +604,4 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> --</Project> -\ No newline at end of file -+</Project> -- GitLab