From 127c61038689626676d66815c2887e4fa4f0c93f Mon Sep 17 00:00:00 2001
From: Jose Medrano <josmed@microsoft.com>
Date: Wed, 24 Nov 2021 13:31:16 +0100
Subject: [PATCH 1/2] Adds fullpaths to dylibs in libglib and pango

---
 Xwt.Gtk/Xwt.Gtk.dll.config | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Xwt.Gtk/Xwt.Gtk.dll.config b/Xwt.Gtk/Xwt.Gtk.dll.config
index f1630bb2a..2ee2337e5 100644
--- a/Xwt.Gtk/Xwt.Gtk.dll.config
+++ b/Xwt.Gtk/Xwt.Gtk.dll.config
@@ -10,13 +10,13 @@
 	<dllmap os="!windows,osx" dll="libwebkitgtk-1.0-0.dll" target="libwebkitgtk-1.0.so.0"/>
 	<dllmap os="!windows,osx" dll="fontconfig" target="libfontconfig.so.1"/>
 
-	<dllmap os="osx" dll="libglib-2.0-0.dll" target="libglib-2.0.0.dylib"/>
-	<dllmap os="osx" dll="libgobject-2.0-0.dll" target="libgobject-2.0.0.dylib"/>
-	<dllmap os="osx" dll="libatk-1.0-0.dll" target="libatk-1.0.0.dylib"/>
-	<dllmap os="osx" dll="libgtk-win32-2.0-0.dll" target="libgtk-quartz-2.0.0.dylib"/>
-	<dllmap os="osx" dll="libgdk-win32-2.0-0.dll" target="libgdk-quartz-2.0.0.dylib"/>
-	<dllmap os="osx" dll="libpango-1.0-0.dll" target="libpango-1.0.0.dylib"/>
-	<dllmap os="osx" dll="libpangocairo-1.0-0.dll" target="libpangocairo-1.0.0.dylib"/>
+	<dllmap os="osx" dll="libglib-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libglib-2.0.0.dylib"/>
+	<dllmap os="osx" dll="libgobject-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libgobject-2.0.0.dylib"/>
+	<dllmap os="osx" dll="libatk-1.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libatk-1.0.0.dylib"/>
+	<dllmap os="osx" dll="libgtk-win32-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libgtk-quartz-2.0.0.dylib"/>
+	<dllmap os="osx" dll="libgdk-win32-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdk-quartz-2.0.0.dylib"/>
+	<dllmap os="osx" dll="libpango-1.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libpango-1.0.0.dylib"/>
+	<dllmap os="osx" dll="libpangocairo-1.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libpangocairo-1.0.0.dylib"/>
 	<dllmap os="osx" dll="libwebkitgtk-1.0-0.dll" target="libwebkitgtk-1.0.0.dylib"/>
-	<dllmap os="osx" dll="fontconfig" target="libfontconfig.1.dylib"/>
+	<dllmap os="osx" dll="fontconfig" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libfontconfig.1.dylib"/>
 </configuration>

From 97d9adcfc28010959b71b769cbbd85829cb00300 Mon Sep 17 00:00:00 2001
From: sevo <sevoku@microsoft.com>
Date: Wed, 1 Dec 2021 17:26:26 +0100
Subject: [PATCH 2/2] Use $mono_libdir instead of a hardcoded path

Mono runtime will resolve the variable to its own lib path automatically.

See https://github.com/mono/xwt/pull/1075#pullrequestreview-819080596
---
 Xwt.Gtk/Xwt.Gtk.dll.config | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Xwt.Gtk/Xwt.Gtk.dll.config b/Xwt.Gtk/Xwt.Gtk.dll.config
index 2ee2337e5..1f7be21ab 100644
--- a/Xwt.Gtk/Xwt.Gtk.dll.config
+++ b/Xwt.Gtk/Xwt.Gtk.dll.config
@@ -10,13 +10,12 @@
 	<dllmap os="!windows,osx" dll="libwebkitgtk-1.0-0.dll" target="libwebkitgtk-1.0.so.0"/>
 	<dllmap os="!windows,osx" dll="fontconfig" target="libfontconfig.so.1"/>
 
-	<dllmap os="osx" dll="libglib-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libglib-2.0.0.dylib"/>
-	<dllmap os="osx" dll="libgobject-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libgobject-2.0.0.dylib"/>
-	<dllmap os="osx" dll="libatk-1.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libatk-1.0.0.dylib"/>
-	<dllmap os="osx" dll="libgtk-win32-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libgtk-quartz-2.0.0.dylib"/>
-	<dllmap os="osx" dll="libgdk-win32-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdk-quartz-2.0.0.dylib"/>
-	<dllmap os="osx" dll="libpango-1.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libpango-1.0.0.dylib"/>
-	<dllmap os="osx" dll="libpangocairo-1.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libpangocairo-1.0.0.dylib"/>
+	<dllmap os="osx" dll="libglib-2.0-0.dll" target="$mono_libdir/libglib-2.0.0.dylib"/>
+	<dllmap os="osx" dll="libgobject-2.0-0.dll" target="$mono_libdir/libgobject-2.0.0.dylib"/>
+	<dllmap os="osx" dll="libatk-1.0-0.dll" target="$mono_libdir/libatk-1.0.0.dylib"/>
+	<dllmap os="osx" dll="libgtk-win32-2.0-0.dll" target="$mono_libdir/libgtk-quartz-2.0.0.dylib"/>
+	<dllmap os="osx" dll="libpango-1.0-0.dll" target="$mono_libdir/libpango-1.0.0.dylib"/>
+	<dllmap os="osx" dll="libpangocairo-1.0-0.dll" target="$mono_libdir/libpangocairo-1.0.0.dylib"/>
 	<dllmap os="osx" dll="libwebkitgtk-1.0-0.dll" target="libwebkitgtk-1.0.0.dylib"/>
-	<dllmap os="osx" dll="fontconfig" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libfontconfig.1.dylib"/>
+	<dllmap os="osx" dll="fontconfig" target="$mono_libdir/libfontconfig.1.dylib"/>
 </configuration>