view src/cairo-2-static-init.patch @ 5495:fb50ae69121c

Add build rule for python3 (bug #58689). * src/build-python3.mk: Add build rule for python3 version 3.8.3. * dist-files.mk: Add new file to list. * index.html: Add new package to list. * src/build-setuptools.mk: Update to version 44.1.1 (last version compatible with python2). Use python2. Set installation prefix. * src/build-mako.mk: Use python2. Set installation prefix. * src/build-markupsafe.mk: Use python2. Set installation prefix. * src/mesa.mk: Windows rule depends on scons. Use python2. * src/nsis.mk: Depend on scons. Use python2.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 05 Jul 2020 12:21:53 +0200
parents 6aaa1723e277
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

When DllMain is not being run, we need to initialize the font face mutex before using it.

diff --git a/src/win32/cairo-win32-font.c b/src/win32/cairo-win32-font.c
index a65d81b..31d854d 100644
--- a/src/win32/cairo-win32-font.c
+++ b/src/win32/cairo-win32-font.c
@@ -1912,6 +1912,10 @@ _cairo_win32_font_face_hash_table_destroy (void)
 {
     cairo_hash_table_t *hash_table;

+#ifndef DLL_EXPORT 
+    CAIRO_MUTEX_INITIALIZE ();
+#endif
+
     /* We manually acquire the lock rather than calling
      * _cairo_win32_font_face_hash_table_lock simply to avoid creating
      * the table only to destroy it again. */
@@ -1927,6 +1929,10 @@ _cairo_win32_font_face_hash_table_destroy (void)
 static cairo_hash_table_t *
 _cairo_win32_font_face_hash_table_lock (void)
 {
+#ifndef DLL_EXPORT
+    CAIRO_MUTEX_INITIALIZE ();
+#endif
+
     CAIRO_MUTEX_LOCK (_cairo_win32_font_face_mutex);
 
     if (unlikely (cairo_win32_font_face_hash_table == NULL))