From: Carl Hetherington <cth@carlh.net>
Date: Sat, 9 Feb 2019 00:30:53 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.13.116~1
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=dc5a2865d004ba56f8cbbdb3a56668a3967d1aa2;hp=f113e0f98c50e27ecdb648d21a64220300a6a114

Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
---

diff --git a/src/lib/util.cc b/src/lib/util.cc
index fe8b193d6..544045bcb 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -366,6 +366,11 @@ dcpomatic_setup ()
 	putenv (String::compose("FONTCONFIG_PATH=%1", shared_path().string()).c_str());
 #endif
 
+#ifdef DCPOMATIC_OSX
+	setenv ("PANGOCAIRO_BACKEND", "fontconfig", 1);
+	setenv ("FONTCONFIG_PATH", shared_path().string().c_str(), 1);
+#endif
+
 	Pango::init ();
 	dcp::init ();