[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - external/firebird

[Andras Timar]

 external/firebird/UnpackedTarball_firebird.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7adcac2a172954b735dcb0079987c1c8d630f576
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jul 2 13:04:20 2018 +0200

    Resolve conflict with firebird-cygwin-msvc.patch
    
    Change-Id: I7dbc8f71c25a6c6fb508614c3cb9e396f178ff8a

diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index 31a3ea53d7df..84caf692b9f0 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 		external/firebird/libc++.patch \
 		external/firebird/0001-Avoid-hangup-in-SS-when-error-happens-at-system-atta.patch.1 \
 		external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1 \
-		external/firebird/macos-segv-fix.patch \
 ))
 
 ifeq ($(OS),WNT)
@@ -43,6 +42,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 	external/firebird/firebird-configure-x86-64-macosx.patch.1 \
 	external/firebird/firebird-macosx.patch.1 \
 	external/firebird/macosx-elcapitan-dyld.patch \
+	external/firebird/macos-segv-fix.patch \
 ))
 endif