commit bc1fb7b

pixman: patch was applied upstream

 1@@ -1,60 +0,0 @@
 2-From 76c1b0d85878fb3eb6cba54b5a67ad3df095bad7 Mon Sep 17 00:00:00 2001
 3-From: Michael Forney <mforney@mforney.org>
 4-Date: Thu, 11 Jul 2019 00:12:19 -0700
 5-Subject: [PATCH] Prevent empty top-level declaration
 6-Upstream: https://lists.freedesktop.org/archives/pixman/2019-November/004896.html
 7-
 8-The expansion of PIXMAN_DEFINE_THREAD_LOCAL(...) may end in a
 9-function definition, so the following semicolon is considered an
10-empty top-level declaration, which is not allowed in ISO C.
11----
12- pixman/pixman-compiler.h       | 6 +++---
13- pixman/pixman-implementation.c | 2 +-
14- 2 files changed, 4 insertions(+), 4 deletions(-)
15-
16-diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
17-index a02aa49..6394156 100644
18---- a/pixman/pixman-compiler.h
19-+++ b/pixman/pixman-compiler.h
20-@@ -109,14 +109,14 @@
21- #if defined(PIXMAN_NO_TLS)
22- 
23- #   define PIXMAN_DEFINE_THREAD_LOCAL(type, name)			\
24--    static type name
25-+    static type name;
26- #   define PIXMAN_GET_THREAD_LOCAL(name)				\
27-     (&name)
28- 
29- #elif defined(TLS)
30- 
31- #   define PIXMAN_DEFINE_THREAD_LOCAL(type, name)			\
32--    static TLS type name
33-+    static TLS type name;
34- #   define PIXMAN_GET_THREAD_LOCAL(name)				\
35-     (&name)
36- 
37-@@ -176,7 +176,7 @@
38- #elif defined(_MSC_VER)
39- 
40- #   define PIXMAN_DEFINE_THREAD_LOCAL(type, name)			\
41--    static __declspec(thread) type name
42-+    static __declspec(thread) type name;
43- #   define PIXMAN_GET_THREAD_LOCAL(name)				\
44-     (&name)
45- 
46-diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c
47-index 2c7de4c..5a2cbfe 100644
48---- a/pixman/pixman-implementation.c
49-+++ b/pixman/pixman-implementation.c
50-@@ -63,7 +63,7 @@ typedef struct
51-     } cache [N_CACHED_FAST_PATHS];
52- } cache_t;
53- 
54--PIXMAN_DEFINE_THREAD_LOCAL (cache_t, fast_path_cache);
55-+PIXMAN_DEFINE_THREAD_LOCAL (cache_t, fast_path_cache)
56- 
57- static void
58- dummy_composite_rect (pixman_implementation_t *imp,
59--- 
60-2.26.2
61-

1@@ -1 +1 @@
2-0.43.4 r0
3+0.43.4 r1