804042606c
Add new webkitgtk24 package. The difference with the legacy webkit package is that this one uses the new webkit2 API, and optionally the webkit1 API. It's versioned because the latest release of midori can't use the newer 2.6.x or 2.8.x webkitgtk versions yet. This paves the way for a newer webkitgtk26 or webkitgtk28 package that can live side-by-side with this one for other uses. Some loose checks (like !xorg7) are in place for possible/future wayland support. Right now wayland requires gtk2, hence xorg, but it might be possible to patch that out with some work (it seems to be done for version 2.6.x, though the build system changed to cmake so it might not be a straighfoward patch). Choices had to be made in the GL-area, right now the preference order is libGL (full OpenGL), then GLES, then nothing (obviously). And when gtk3 is around it's also preferred as well. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From https://bugs.webkit.org/show_bug.cgi?id=130837
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
|
diff -Nura webkitgtk-2.4.8/Source/WebKit2/Platform/IPC/Connection.h webkitgtk-2.4.8-ppc/Source/WebKit2/Platform/IPC/Connection.h
|
|
--- webkitgtk-2.4.8/Source/WebKit2/Platform/IPC/Connection.h 2015-01-07 06:45:43.000000000 -0300
|
|
+++ webkitgtk-2.4.8-ppc/Source/WebKit2/Platform/IPC/Connection.h 2015-04-20 01:55:41.554547510 -0300
|
|
@@ -216,7 +216,11 @@
|
|
|
|
Client* m_client;
|
|
bool m_isServer;
|
|
+#if CPU(PPC)
|
|
+ uint64_t m_syncRequestID;
|
|
+#else
|
|
std::atomic<uint64_t> m_syncRequestID;
|
|
+#endif
|
|
|
|
bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage;
|
|
bool m_shouldExitOnSyncMessageSendFailure;
|
|
diff -Nura webkitgtk-2.4.8/Source/WebKit2/UIProcess/StatisticsRequest.cpp webkitgtk-2.4.8-ppc/Source/WebKit2/UIProcess/StatisticsRequest.cpp
|
|
--- webkitgtk-2.4.8/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2015-01-07 06:45:43.000000000 -0300
|
|
+++ webkitgtk-2.4.8-ppc/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2015-04-20 01:55:41.555547544 -0300
|
|
@@ -44,7 +44,11 @@
|
|
|
|
uint64_t StatisticsRequest::addOutstandingRequest()
|
|
{
|
|
+#if CPU(PPC)
|
|
+ static int64_t uniqueRequestID;
|
|
+#else
|
|
static std::atomic<int64_t> uniqueRequestID;
|
|
+#endif
|
|
|
|
uint64_t requestID = ++uniqueRequestID;
|
|
m_outstandingRequests.add(requestID);
|