Mercurial > mxe-octave

annotate src/cairo-2-static-init.patch @ 5895:2db7f803d55d release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
librsb: Update to version 1.2.0.10 (bug #60042). * src/librsb.mk: Update version and checksum. Remove work-around for fixed bug.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 19 Sep 2021 14:32:07 +0200
parents 6aaa1723e277
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2613
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
1 This file is part of MXE.
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
2 See index.html for further information.
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
3
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
4 When DllMain is not being run, we need to initialize the font face mutex before using it.
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
5
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
6 diff --git a/src/win32/cairo-win32-font.c b/src/win32/cairo-win32-font.c
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
7 index a65d81b..31d854d 100644
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
8 --- a/src/win32/cairo-win32-font.c
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
9 +++ b/src/win32/cairo-win32-font.c
3167
6aaa1723e277 [MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 2613
diff changeset
10 @@ -1912,6 +1912,10 @@ _cairo_win32_font_face_hash_table_destroy (void)
2613
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
11 {
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
12 cairo_hash_table_t *hash_table;
3167
6aaa1723e277 [MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 2613
diff changeset
13
6aaa1723e277 [MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 2613
diff changeset
14 +#ifndef DLL_EXPORT
2613
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
15 + CAIRO_MUTEX_INITIALIZE ();
3167
6aaa1723e277 [MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 2613
diff changeset
16 +#endif
2613
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
17 +
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
18 /* We manually acquire the lock rather than calling
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
19 * _cairo_win32_font_face_hash_table_lock simply to avoid creating
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
20 * the table only to destroy it again. */
3167
6aaa1723e277 [MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 2613
diff changeset
21 @@ -1927,6 +1929,10 @@ _cairo_win32_font_face_hash_table_destroy (void)
2613
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
22 static cairo_hash_table_t *
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
23 _cairo_win32_font_face_hash_table_lock (void)
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
24 {
3167
6aaa1723e277 [MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 2613
diff changeset
25 +#ifndef DLL_EXPORT
2613
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
26 + CAIRO_MUTEX_INITIALIZE ();
3167
6aaa1723e277 [MSVC] enable Cairo compilation (and bump version to 1.12.14)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 2613
diff changeset
27 +#endif
2613
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
28 +
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
29 CAIRO_MUTEX_LOCK (_cairo_win32_font_face_mutex);
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
30
d6edff1d892a update package cairo
Hans Petter Jansson <hpj@cl.no>
parents:
diff changeset
31 if (unlikely (cairo_win32_font_face_hash_table == NULL))