mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 19:08:30 +00:00
22b10bac78
Qt 5.8 is immediately removed because its support window is ended. The qtlocation module is built with `enableParallelBuilding = false` so that the clipper library will be built before the components which link to it. kjs now depends directly on pcre. The dependency was previously propagated from qtbase, which now depends on pcre2.
26 lines
794 B
Diff
26 lines
794 B
Diff
From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Tuegel <ttuegel@gmail.com>
|
|
Date: Sun, 23 Aug 2015 09:13:34 -0500
|
|
Subject: [PATCH] glib-2.32
|
|
|
|
---
|
|
src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
|
|
index 1f6d25e..087c3fb 100644
|
|
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
|
|
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
|
|
@@ -81,7 +81,7 @@
|
|
#include <pthread.h>
|
|
#elif PLATFORM(GTK)
|
|
#include <wtf/gtk/GOwnPtr.h>
|
|
-typedef struct _GMutex GMutex;
|
|
+typedef union _GMutex GMutex;
|
|
typedef struct _GCond GCond;
|
|
#endif
|
|
|
|
--
|
|
2.5.0
|
|
|