[gtk-osx] Silence some WebKit1 compilation warnings.

[John Ralls <jralls src gnome org>]

commit 295521e9fce3aadc87c80edf7dfd70dc3fe2446e
Author: John Ralls <jralls ceridwen us>
Date:   Fri Oct 27 10:26:13 2017 -0700

    Silence some WebKit1 compilation warnings.

 jhbuildrc-gtk-osx                  |    2 ++
 patches/WebKit-2.4.11-fixups.patch |   12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index c3c5c23..674b776 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -336,6 +336,8 @@ def setup_sdk(target=_target, sdk_version=None, architectures=[_default_arch]):
     # Kill a couple of noisy warnings for webkit1:
     module_extra_env["webkit"] = {'CPPFLAGS':os.environ['CPPFLAGS'] + " -Wno-unused-local-typedef 
-Wno-missing-field-initializsers"}
     module_extra_env["webkit1gtk3"] = {'CPPFLAGS':os.environ['CPPFLAGS'] + " -Wno-unused-local-typedef 
-Wno-missing-field-initializsers -Wno-undefined-bool-conversion"}
+    module_extra_env["webkit"] = {'CXXFLAGS':os.environ['CXXFLAGS'] + ' -Wno-inconsistent-missing-override'}
+    module_extra_env["webkit1gtk3"] = {'CXXFLAGS':os.environ['CXXFLAGS'] + ' 
-Wno-inconsistent-missing-override'}
 
     # Finally when building normally we need to force CFLAGS_FOR_BUILD
     # to our current CFLAGS so that everything will link with other
diff --git a/patches/WebKit-2.4.11-fixups.patch b/patches/WebKit-2.4.11-fixups.patch
index 6798697..6f0e17d 100644
--- a/patches/WebKit-2.4.11-fixups.patch
+++ b/patches/WebKit-2.4.11-fixups.patch
@@ -46,4 +46,14 @@
          // Only allow a limited set of fractional components
          double scaledValue = value * 8;
          if (scaledValue / 8 != value)
-         
\ No newline at end of file
+--- a/Source/autotools/FindDependencies.m4~
++++ b/Source/autotools/FindDependencies.m4
+@@ -104,0 +104,0 @@ GLIB_GSETTINGS
+
+ # TODO: use pkg-config (after CFLAGS in their .pc files are cleaned up).
+ case "$host" in
+-    *-*-darwin*)
++    *-*-foo*)
+         UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
+         UNICODE_LIBS="-licucore"
+         ;;