[gtk-osx: 7/7] Merge Phil Chiemento's 'webkit-2-4' branch.

[John Ralls <jralls src gnome org>]

commit 55fafd73596b70766ec3173554041d89e7f5b92f
Merge: 58e18e9 48dc30e
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jan 29 15:35:23 2015 -0800

    Merge Phil Chiemento's 'webkit-2-4' branch.

 jhbuildrc-gtk-osx                                |    1 +
 modulesets-stable/gtk-osx-bootstrap.modules      |   11 +++++-
 modulesets-stable/gtk-osx-unsupported.modules    |   46 +++++++++++++++++++---
 modulesets-unstable/gtk-osx-bootstrap.modules    |   12 +++++-
 modulesets-unstable/gtk-osx-unsupported.modules  |   46 +++++++++++++++++++---
 modulesets/gtk-osx-bootstrap.modules             |   12 +++++-
 modulesets/gtk-osx-unsupported.modules           |   46 +++++++++++++++++++---
 patches/patch status                             |   11 +++++
 patches/webkit-126324-clang-check.patch          |   33 +++++++++++++++
 patches/webkit-126433-check-platform-gtk.patch   |   16 ++++++++
 patches/webkit-133293-cfi-clang-failure.patch    |   21 ++++++++++
 patches/webkit-140167-disable-netscape-api.patch |   12 ++++++
 12 files changed, 245 insertions(+), 22 deletions(-)
---