ce31e09a6d
macOS Ventura replaced the patch utility by Apple's version: patch 2.0-12u11-Apple (as of macOS 13.0.1) It is picker/less robust when it comes to locating matches, and absolutely refuses to apply when the hunks are out of order. Only one patch needed rework in the current codebase (master an 7-4 branch), and being more correct about the locations in the files to be patched is not a bad thing either, so accept Apple's version of patch (with a warning for now) Change-Id: I707d00958b814307b13caf9923f1de7f3919442c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143461 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
34 lines
1.9 KiB
Diff
34 lines
1.9 KiB
Diff
--- misc/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
|
|
+++ misc/build/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
|
|
@@ -190,7 +190,6 @@
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
|
- <DebugInformationFormat>OldStyle</DebugInformationFormat>
|
|
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation>
|
|
@@ -222,6 +221,7 @@
|
|
<Link>
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<LinkDLL>true</LinkDLL>
|
|
+ <GenerateDebugInformation>true</GenerateDebugInformation>
|
|
<SubSystem>Console</SubSystem>
|
|
<OutputFile>.\ReleaseDll\cppunit_dll.dll</OutputFile>
|
|
<ImportLibrary>.\ReleaseDll\cppunit_dll.lib</ImportLibrary>
|
|
@@ -237,7 +237,6 @@
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
|
- <DebugInformationFormat>OldStyle</DebugInformationFormat>
|
|
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation>
|
|
@@ -266,6 +266,7 @@
|
|
<Link>
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<LinkDLL>true</LinkDLL>
|
|
+ <GenerateDebugInformation>true</GenerateDebugInformation>
|
|
<SubSystem>Console</SubSystem>
|
|
<OutputFile>.\ReleaseDll\cppunit_dll.dll</OutputFile>
|
|
<ImportLibrary>.\ReleaseDll\cppunit_dll.lib</ImportLibrary>
|