From 52d584291e4779d39a1e14a27dd8ba3cf1176360 Mon Sep 17 00:00:00 2001
From: Jose Medrano <jose.medrano@microsoft.com>
Date: Tue, 30 Nov 2021 15:07:16 +0100
Subject: Adds full path to libcairo for correct assembly directory resolution
 in monterey (#21326)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

New MacOS Monterey is not correctly resolving dylib locations when dllmap configuration is not specifying full paths, this makes VS4Mac use libcairo-2.dll from a dependency of a installed library in Hombrew.

A workaround was set full path to libcairo-2 and this fixed the problem.

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
---
 data/config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/config.in b/data/config.in
index 5758a172e19..2718b6e9f45 100644
--- a/data/config.in
+++ b/data/config.in
@@ -30,7 +30,7 @@
 	<dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" />
 	<dllmap dll="libasound" target="libasound.so.2" os="!windows" />
 	<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
-	<dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
+	<dllmap dll="libcairo-2.dll" target="$mono_libdir/libcairo.2.dylib" os="osx" />
 	<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
 	<dllmap dll="libcups" target="libcups.dylib" os="osx"/>
 	<dllmap dll="i:kernel32.dll">
-- 
cgit v1.2.3