diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-11-29 12:28:20 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-06-19 20:06:07 +0200 |
| commit | 8263cac3fb78fa1a43ef4db314696d4a44dcf26e (patch) | |
| tree | 0715480e9e729fb43b3c7f49cf03844e25bb701c | |
| parent | Resolves: tdf#155791 export of default impress slide master to svg failed (diff) | |
| download | core-8263cac3fb78fa1a43ef4db314696d4a44dcf26e.tar.gz core-8263cac3fb78fa1a43ef4db314696d4a44dcf26e.zip | |
accept Apple's patch utility - pickier than GNU patch, but should be OK
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>
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | external/cppunit/enable-win32-debug.patch | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 40987b268ba6..f83a3c7f8f6b 100644 --- a/configure.ac +++ b/configure.ac @@ -11423,7 +11423,12 @@ if test "$_os" = "SunOS" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it]) + if $GNUPATCH --version | grep "2\.0-.*-Apple" >/dev/null 2>/dev/null; then + AC_MSG_RESULT([no, but accepted (Apple patch)]) + add_warning "patch utility is not GNU patch. Apple's patch should work OK, but it might experience issues where GNU patch doesn't." + else + AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it]) + fi fi else GNUPATCH=$PATCH diff --git a/external/cppunit/enable-win32-debug.patch b/external/cppunit/enable-win32-debug.patch index dc159ecc51ad..2c7f4f956d2f 100644 --- a/external/cppunit/enable-win32-debug.patch +++ b/external/cppunit/enable-win32-debug.patch @@ -1,6 +1,6 @@ --- misc/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj +++ misc/build/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj -@@ -107,7 +107,6 @@ +@@ -190,7 +190,6 @@ <SuppressStartupBanner>true</SuppressStartupBanner> <WarningLevel>Level3</WarningLevel> <RuntimeTypeInfo>true</RuntimeTypeInfo> @@ -8,7 +8,7 @@ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation> -@@ -138,6 +137,7 @@ +@@ -222,6 +221,7 @@ <Link> <SuppressStartupBanner>true</SuppressStartupBanner> <LinkDLL>true</LinkDLL> |