From: | "Pacho Ramos (pacho)" <pacho@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk/files: webkit-gtk-2.4.4-atomic-ppc.patch |
Date: | Sun, 27 Jul 2014 12:31:06 |
Message-Id: | 20140727123103.242552004F@flycatcher.gentoo.org |
1 | pacho 14/07/27 12:31:03 |
2 | |
3 | Added: webkit-gtk-2.4.4-atomic-ppc.patch |
4 | Log: |
5 | Fix building on ppc (from OpenBSD, only needed on slot 3), bug #518288 by ago |
6 | |
7 | (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
8 | |
9 | Revision Changes Path |
10 | 1.1 net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: webkit-gtk-2.4.4-atomic-ppc.patch |
16 | =================================================================== |
17 | $OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $ |
18 | https://bugs.webkit.org/show_bug.cgi?id=130837 |
19 | --- Source/WebKit2/Platform/IPC/Connection.h.orig Fri Jul 4 11:06:55 2014 |
20 | +++ Source/WebKit2/Platform/IPC/Connection.h Mon Jul 14 19:31:35 2014 |
21 | @@ -216,7 +216,11 @@ class Connection : public ThreadSafeRefCounted<Connect |
22 | |
23 | Client* m_client; |
24 | bool m_isServer; |
25 | +#if CPU(PPC) |
26 | + uint64_t m_syncRequestID; |
27 | +#else |
28 | std::atomic<uint64_t> m_syncRequestID; |
29 | +#endif |
30 | |
31 | bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage; |
32 | bool m_shouldExitOnSyncMessageSendFailure; |
33 | $OpenBSD: patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp,v 1.3 2014/03/27 22:03:48 landry Exp $ |
34 | https://bugs.webkit.org/show_bug.cgi?id=130837 |
35 | --- Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig Thu Mar 27 21:13:49 2014 |
36 | +++ Source/WebKit2/UIProcess/StatisticsRequest.cpp Thu Mar 27 21:14:23 2014 |
37 | @@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest() |
38 | |
39 | uint64_t StatisticsRequest::addOutstandingRequest() |
40 | { |
41 | +#if CPU(PPC) |
42 | + static int64_t uniqueRequestID; |
43 | +#else |
44 | static std::atomic<int64_t> uniqueRequestID; |
45 | +#endif |
46 | |
47 | uint64_t requestID = ++uniqueRequestID; |
48 | m_outstandingRequests.add(requestID); |