diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-libs/webkit-gtk/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-libs/webkit-gtk/files')
16 files changed, 520 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper new file mode 100755 index 000000000000..d4f270c2fce7 --- /dev/null +++ b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper @@ -0,0 +1,33 @@ +#!/bin/bash +# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary +# generated by g-ir-scanner. +# PaX marking code stolen from pax-utils.eclass + +flags=${1//-}; shift + +echo ${LIBTOOL} "$@" +${LIBTOOL} "$@" + +retval=$? + +files=$(find . -path "*tmp-introspect*/.libs/*") + +if type -p paxctl > /dev/null; then + echo "PT PaX marking -${flags} ${files}" + for f in ${files}; do + # First, try modifying the existing PAX_FLAGS header + paxctl -q${flags} "${f}" && continue + # Second, try stealing the (unused under PaX) PT_GNU_STACK header + paxctl -qc${flags} "${f}" && continue + # Third, try pulling the base down a page, to create space and + # insert a PT_GNU_STACK header (works on ET_EXEC) + paxctl -qC${flags} "${f}" && continue + done +elif type -p scanelf > /dev/null; then + # Try scanelf, the Gentoo swiss-army knife ELF utility + # Currently this sets PT if it can, no option to control what it does. + echo "Fallback PaX marking -${flags} ${files}" + scanelf -Xxz ${flags} ${files} +fi + +exit ${retval} diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch new file mode 100644 index 000000000000..8f56ab227148 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch @@ -0,0 +1,10 @@ +--- configure.ac.old 2013-03-02 09:22:53.791750644 +0200 ++++ configure.ac 2013-03-02 09:24:56.725213764 +0200 +@@ -24,6 +24,7 @@ + m4_include([Source/autotools/SetupLibtool.m4]) + m4_include([Source/autotools/ReadCommandLineArguments.m4]) + m4_include([Source/autotools/FindDependencies.m4]) ++GTK_DOC_CHECK([1.10]) + m4_include([Source/autotools/SetupCompilerFlags.m4]) + m4_include([Source/autotools/SetupAutoconfHeader.m4]) + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch new file mode 100644 index 000000000000..5ad357e9eeed --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch @@ -0,0 +1,67 @@ +Original from: +http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt +http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt + +Adapted for 1.6.1 + +--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp ++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp +@@ -70,6 +70,8 @@ + #endif + #include <gtk/gtk.h> + ++#undef XP_UNIX ++ + #if defined(XP_UNIX) + #include "RefPtrCairo.h" + #include "gtk2xtbin.h" +@@ -439,9 +441,9 @@ + event->setDefaultHandled(); + } + +-#if defined(XP_UNIX) + void PluginView::handleFocusInEvent() + { ++#if defined(XP_UNIX) + if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully) + return; + +@@ -454,10 +456,12 @@ + event.detail = NotifyDetailNone; + + dispatchNPEvent(npEvent); ++#endif + } + + void PluginView::handleFocusOutEvent() + { ++#if defined(XP_UNIX) + if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully) + return; + +@@ -470,8 +474,8 @@ + event.detail = NotifyDetailNone; + + dispatchNPEvent(npEvent); +-} + #endif ++} + + void PluginView::setParent(ScrollView* parent) + { +--- Source/WebCore/plugins/gtk/gtk2xtbin.c ++++ Source/WebCore/plugins/gtk/gtk2xtbin.c +@@ -41,7 +41,7 @@ + * The GtkXtBin widget allows for Xt toolkit code to be used + * inside a GTK application. + */ +- ++#if 0 + #include "GtkVersioning.h" + #include "xembed.h" + #include "gtk2xtbin.h" +@@ -966,3 +966,4 @@ + + return; + } ++#endif diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch new file mode 100644 index 000000000000..854a11201720 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch @@ -0,0 +1,95 @@ +Description: deadlock in gobject introspection +Bug-Dyson: http://osdyson.org/issues/161 +Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=463960 +Stack: +25849: /home/pashev/packaging/webkitgtk/webkitgtk-2.0.4/build-2.0/tmp-introsp +----------------- lwp# 1 / thread# 1 -------------------- + fffffd7ffeeaf957 lwp_park (0, 0, 0) + fffffd7ffeea8036 mutex_lock_impl () + 156 + fffffd7ffeea810b mutex_lock () + b + fffffd7ffee340fa _preexec_atfork_unload () + 3a + fffffd7ffee343ab _preexec_exit_handlers () + bb + fffffd7fff5ccf0d purge_exit_handlers () + 10d + fffffd7fff5cec18 remove_hdl () + ce8 + fffffd7fff5c8895 dlclose_core () + c5 + fffffd7fff5c88e5 dlclose_intn () + 15 + fffffd7fff5c89bb dlclose_check () + 7b + fffffd7fff5c8a21 dlclose () + 41 + fffffd7ffaa03c41 px_module_manager_load () + 191 + fffffd7ffaa03cf6 px_module_manager_load_dir () + 66 + fffffd7ffaa050d7 px_proxy_factory_new () + 107 + fffffd7ffb201671 ???????? () + fffffd7feca30eca g_type_create_instance () + 16a + fffffd7feca1597c ???????? () + fffffd7feca17472 g_object_newv () + 792 + fffffd7feca17aec g_object_new () + ec + fffffd7fece5d052 ???????? () + fffffd7fece5d1d8 ???????? () + fffffd7fc98659a5 ???????? () + fffffd7feca173f6 g_object_newv () + 716 + fffffd7feca17aec g_object_new () + ec + fffffd7fc986da24 soup_session_add_feature_by_type () + e4 + fffffd7fc986fb43 ???????? () + fffffd7feca17e00 g_object_set_valist () + 300 + fffffd7feca186d7 g_object_set () + e7 + fffffd7fc5724f87 WebCore::ResourceHandle::defaultSession() () + a7 + fffffd7fc48da299 webkitExit() () + 9 + fffffd7ffee33f56 _exithandle () + 66 + fffffd7ffee1e191 exit () + 11 + 00000000004086af ???????? () + 000000000040724c _start () + 6c +----------------- lwp# 2 / thread# 2 -------------------- + fffffd7ffeeaf957 lwp_park (0, 0, 0) + fffffd7ffeea94bf cond_wait_queue () + 4f + fffffd7ffeea9b12 __cond_wait () + b2 + fffffd7ffeea9b42 cond_wait () + 22 + fffffd7ffeea9b79 pthread_cond_wait () + 9 + fffffd7fc4eed04b WebCore::IconDatabase::syncThreadMainLoop() () + 12b + fffffd7fc4eed278 WebCore::IconDatabase::iconDatabaseSyncThread() () + 138 + fffffd7fc3b2bc59 WTF::wtfThreadEntryPoint(void*) () + 19 + fffffd7ffeeaf617 _thrp_setup () + 77 + fffffd7ffeeaf910 _lwp_start () +----------------- lwp# 3 / thread# 3 -------------------- + fffffd7ffeeaf957 lwp_park (0, 0, 0) + fffffd7ffeea8036 mutex_lock_impl () + 156 + fffffd7ffeea810b mutex_lock () + b + fffffd7ffee33e17 atexit_locks () + 17 + fffffd7ffee58ce9 libc_prepare_atfork () + 9 + fffffd7ffee34533 _prefork_handler () + 33 + fffffd7ffee9fc85 forkx () + 275 + fffffd7ffee9fcab fork () + b + fffffd7fec68aacb ???????? () + fffffd7fec68b2a7 g_spawn_sync () + 167 + fffffd7fec68b994 g_spawn_command_line_sync () + 74 + fffffd7feceb2748 ???????? () + fffffd7feceb4019 g_dbus_address_get_for_bus_sync () + 2c9 + fffffd7fecebd11e ???????? () + fffffd7fecec4643 g_bus_get_sync () + 63 + fffffd7ffc60700b ???????? () + fffffd7ffc60714f ???????? () + fffffd7fec648ad0 g_main_context_dispatch () + 130 + fffffd7fec648e40 ???????? () + fffffd7fec648f08 g_main_context_iteration () + 38 + fffffd7ffc606f65 ???????? () + fffffd7fec66d50d ???????? () + fffffd7ffeeaf617 _thrp_setup () + 77 + fffffd7ffeeaf910 _lwp_start () +Index: webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp +=================================================================== +--- webkit.orig/Source/WebKit/gtk/webkit/webkitglobals.cpp 2013-12-02 00:06:10.504150531 +0400 ++++ webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp 2013-12-03 14:08:05.956932011 +0400 +@@ -564,6 +564,14 @@ + + WebCore::SchemeRegistry::registerURLSchemeAsLocal("resource"); + ++ // http://osdyson.org/issues/161 ++ // WebKitGTK FTBFS when building GObject introspection due to deadlock. ++ // When gobject introspection is done, a simple program call exit() ++ // exit() -> webkitExit() -> g_object_unref() -> webkit_get_default_session() ++ // -> ResourceHandle::defaultSession() => default session doesn't exist! AND ++ // we try to create it! Thus deadlock. So, create default session earlier: ++ (void) webkit_get_default_session(); ++ + atexit(webkitExit); + } + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch new file mode 100644 index 000000000000..8aee778c1bb9 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch @@ -0,0 +1,20 @@ +Index: webkitgtk/Source/WTF/wtf/Platform.h +=================================================================== +--- webkitgtk.orig/Source/WTF/wtf/Platform.h ++++ webkitgtk/Source/WTF/wtf/Platform.h +@@ -72,6 +72,15 @@ + #define WTF_CPU_BIG_ENDIAN 1 + #endif + ++/* CPU(HPPA) - HP PARISC */ ++#if defined(__hppa__) ++#define WTF_CPU_HPPA 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#define ENABLE_JIT 0 ++#define ENABLE_YARR_JIT 0 ++#define ENABLE_ASSEMBLER 0 ++#endif ++ + /* CPU(IA64) - Itanium / IA-64 */ + #if defined(__ia64__) + #define WTF_CPU_IA64 1 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch new file mode 100644 index 000000000000..5f0542c4bd02 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch @@ -0,0 +1,20 @@ +Description: Fix wide pointer issues on ia64 (closes: #642750). +Author: Stephan Schreiber <info@fs-driver.org> +Index: webkitgtk/Source/WTF/wtf/Platform.h +=================================================================== +--- webkitgtk.orig/Source/WTF/wtf/Platform.h ++++ webkitgtk/Source/WTF/wtf/Platform.h +@@ -705,6 +705,13 @@ + #define ENABLE_JIT 1 + #endif + ++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because ++ some memory barriers are missing in the thread-unsafe code around the ++ pagemap_cache_ object. */ ++#if CPU(IA64) || CPU(IA64_32) ++#define USE_SYSTEM_MALLOC 1 ++#endif ++ + /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms. */ + #if !defined(ENABLE_JIT) \ + && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \ diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch new file mode 100644 index 000000000000..a63e9e82e31a --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch @@ -0,0 +1,12 @@ +--- a/Source/WTF/wtf/Platform.h 2014-02-25 00:33:16.561606810 +0100 ++++ b/Source/WTF/wtf/Platform.h 2014-02-25 00:49:52.895512955 +0100 +@@ -79,6 +79,9 @@ + #if !defined(__LP64__) + #define WTF_CPU_IA64_32 1 + #endif ++#define ENABLE_JIT 0 ++#define ENABLE_YARR_JIT 0 ++#define ENABLE_ASSEMBLER 0 + #endif + + /* CPU(MIPS) - MIPS 32-bit */ diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch new file mode 100644 index 000000000000..8c387ffecb61 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch @@ -0,0 +1,20 @@ +Description: Fix wide pointer issues on ia64 (closes: #642750). +Author: Stephan Schreiber <info@fs-driver.org> +Index: webkitgtk/Source/WTF/wtf/Platform.h +=================================================================== +--- webkitgtk.orig/Source/WTF/wtf/Platform.h ++++ webkitgtk/Source/WTF/wtf/Platform.h +@@ -705,6 +705,13 @@ + #define ENABLE_JIT 1 + #endif + ++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because ++ some memory barriers are missing in the thread-unsafe code around the ++ pagemap_cache_ object. */ ++#if CPU(IA64) || CPU(IA64_32) ++#define USE_SYSTEM_MALLOC 1 ++#endif ++ + /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except Win64. */ + #if !defined(ENABLE_JIT) \ + && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \ diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch new file mode 100644 index 000000000000..3c0ea88b8964 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch @@ -0,0 +1,32 @@ +$OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $ +https://bugs.webkit.org/show_bug.cgi?id=130837 +--- Source/WebKit2/Platform/IPC/Connection.h.orig Fri Jul 4 11:06:55 2014 ++++ Source/WebKit2/Platform/IPC/Connection.h Mon Jul 14 19:31:35 2014 +@@ -216,7 +216,11 @@ class Connection : public ThreadSafeRefCounted<Connect + + 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; +$OpenBSD: patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp,v 1.3 2014/03/27 22:03:48 landry Exp $ +https://bugs.webkit.org/show_bug.cgi?id=130837 +--- Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig Thu Mar 27 21:13:49 2014 ++++ Source/WebKit2/UIProcess/StatisticsRequest.cpp Thu Mar 27 21:14:23 2014 +@@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest() + + 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); diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch new file mode 100644 index 000000000000..4226f2fb0780 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch @@ -0,0 +1,30 @@ +http://bugs.gentoo.org/481688 +http://trac.webkit.org/changeset/166490/trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp + +--- Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp ++++ Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp +@@ -334,5 +334,5 @@ + case JPEG_HEADER: + // Read file parameters with jpeg_read_header(). +- if (jpeg_read_header(&m_info, true) == JPEG_SUSPENDED) ++ if (jpeg_read_header(&m_info, TRUE) == JPEG_SUSPENDED) + return false; // I/O suspension. + +@@ -420,7 +420,7 @@ + m_info.dct_method = dctMethod(); + m_info.dither_mode = ditherMode(); +- m_info.do_fancy_upsampling = doFancyUpsampling(); +- m_info.enable_2pass_quant = false; +- m_info.do_block_smoothing = true; ++ m_info.do_fancy_upsampling = doFancyUpsampling() ? TRUE : FALSE; ++ m_info.enable_2pass_quant = FALSE; ++ m_info.do_block_smoothing = TRUE; + + // Start decompressor. +@@ -573,5 +573,5 @@ + // called, then we have hit the end of the buffer. A return value of false + // indicates that we have no data to supply yet. +- return false; ++ return FALSE; + } + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch new file mode 100644 index 000000000000..67760e2878ba --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch @@ -0,0 +1,11 @@ +--- webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp 2014-09-26 11:40:44.000000000 +0400 ++++ webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp 2014-10-13 15:38:38.496444600 +0400 +@@ -17,7 +17,7 @@ + */ + + #include "config.h" +-#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS) ++#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS) || USE(EGL) || USE(GLX) + + #define DISABLE_SHIMS + #include "OpenGLShims.h" diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-atomic-ppc.patch new file mode 100644 index 000000000000..af6d467e232a --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-atomic-ppc.patch @@ -0,0 +1,48 @@ +From 7960c437511c650ad33708f4e42457118d95a13d Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 19 Oct 2014 19:43:09 +0200 +Subject: [PATCH 4/4] Do not use std::atomic on PPC + +$OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $ + +https://bugs.webkit.org/show_bug.cgi?id=130837 +--- + Source/WebKit2/Platform/IPC/Connection.h | 4 ++++ + Source/WebKit2/UIProcess/StatisticsRequest.cpp | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/Source/WebKit2/Platform/IPC/Connection.h b/Source/WebKit2/Platform/IPC/Connection.h +index b52cf1e..5597e94 100644 +--- a/Source/WebKit2/Platform/IPC/Connection.h ++++ b/Source/WebKit2/Platform/IPC/Connection.h +@@ -233,7 +233,11 @@ private: + + 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 --git a/Source/WebKit2/UIProcess/StatisticsRequest.cpp b/Source/WebKit2/UIProcess/StatisticsRequest.cpp +index bc0a1e6..ef259d1 100644 +--- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp ++++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp +@@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest() + + 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); +-- +2.1.2 + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch new file mode 100644 index 000000000000..06235829395c --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch @@ -0,0 +1,34 @@ +From 8ba68225e9ad35958197aacc03a7a1716741b14c Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 19 Oct 2014 19:37:40 +0200 +Subject: [PATCH 1/4] Fix support for HPPA + +Debian patches to fix support for some arches +https://bugs.webkit.org/show_bug.cgi?id=129540 +--- + Source/WTF/wtf/Platform.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 7712ddb..65f1379 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -71,6 +71,15 @@ + #define WTF_CPU_BIG_ENDIAN 1 + #endif + ++/* CPU(HPPA) - HP PARISC */ ++#if defined(__hppa__) ++#define WTF_CPU_HPPA 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#define ENABLE_JIT 0 ++#define ENABLE_YARR_JIT 0 ++#define ENABLE_ASSEMBLER 0 ++#endif ++ + /* CPU(IA64) - Itanium / IA-64 */ + #if defined(__ia64__) + #define WTF_CPU_IA64 1 +-- +2.1.2 + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch new file mode 100644 index 000000000000..0b7808bd1ace --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch @@ -0,0 +1,31 @@ +From 9348d1c7fbbd9fcbb1702c0c6d81c723ec0b6879 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 19 Oct 2014 19:40:21 +0200 +Subject: [PATCH 3/4] Use system malloc for IA64 + +https://bugs.webkit.org/show_bug.cgi?id=129542 +--- + Source/WTF/wtf/Platform.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index d9afcd7..c4cf1d2 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -662,6 +662,13 @@ + #endif + #endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */ + ++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because ++ some memory barriers are missing in the thread-unsafe code around the ++ pagemap_cache_ object. */ ++#if CPU(IA64) || CPU(IA64_32) ++#define USE_SYSTEM_MALLOC 1 ++#endif ++ + /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k and Windows. */ + #if !defined(ENABLE_JIT) \ + && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \ +-- +2.1.2 + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch new file mode 100644 index 000000000000..57587e91fec0 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch @@ -0,0 +1,26 @@ +From d98ac8c1040318e648f8417fa5ca6df66cc00b35 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 19 Oct 2014 19:38:18 +0200 +Subject: [PATCH 2/4] Fix support for IA64 + +--- + Source/WTF/wtf/Platform.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 65f1379..d9afcd7 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -87,6 +87,9 @@ + #if !defined(__LP64__) + #define WTF_CPU_IA64_32 1 + #endif ++#define ENABLE_JIT 0 ++#define ENABLE_YARR_JIT 0 ++#define ENABLE_ASSEMBLER 0 + #endif + + /* CPU(MIPS) - MIPS 32-bit */ +-- +2.1.2 + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch new file mode 100644 index 000000000000..57be875e6aae --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch @@ -0,0 +1,31 @@ +From 9348d1c7fbbd9fcbb1702c0c6d81c723ec0b6879 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 19 Oct 2014 19:40:21 +0200 +Subject: [PATCH 3/4] Use system malloc for IA64 + +https://bugs.webkit.org/show_bug.cgi?id=129542 +--- + Source/WTF/wtf/Platform.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index d9afcd7..c4cf1d2 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -662,6 +662,13 @@ + #endif + #endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */ + ++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because ++ some memory barriers are missing in the thread-unsafe code around the ++ pagemap_cache_ object. */ ++#if CPU(IA64) || CPU(IA64_32) ++#define USE_SYSTEM_MALLOC 1 ++#endif ++ + /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k. */ + #if !defined(ENABLE_JIT) \ + && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \ +-- +2.1.2 + |