[gtk-osx: 4/17] Update webkit1gtk3 to 2.4.9

[John Ralls <jralls src gnome org>]

commit b4acff7b0aa6d272db6c013f9b22c30b5a34eebe
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Jun 21 22:25:40 2015 -0700

    Update webkit1gtk3 to 2.4.9
    
    This release contains fixes for two of the patches that we carry, so
    those can be removed. One of the remaining patches (webkit-140167-
    disable-netscape-api) is unlikely to be fixed, and the other one (webkit-
    133293-cfi-clang-failure) was actually a clang bug that has been fixed in
    XCode 6.3. We'll leave it in since it doesn't seem to do any harm, and
    XCode 6.3 might not be present on older systems.

 modulesets-stable/gtk-osx-unsupported.modules   |    6 +---
 modulesets-unstable/gtk-osx-unsupported.modules |    6 +---
 modulesets/gtk-osx-unsupported.modules          |    6 +---
 patches/patch status                            |    8 ++---
 patches/webkit-126324-clang-check.patch         |   33 -----------------------
 patches/webkit-126433-check-platform-gtk.patch  |   16 -----------
 6 files changed, 6 insertions(+), 69 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 5bb649c..55c0669 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -282,17 +282,13 @@
   -->
   <autotools id="webkit1gtk3" autogen-sh="autoreconf" makeargs="-j1"
              autogenargs="--enable-quartz-target --with-gtk=3.0 --disable-webkit2 
--disable-credential-storage --disable-geolocation --disable-video --disable-web-audio 
CXXFLAGS='-std=gnu++11'">
-    <branch repo="webkit.org" module="webkitgtk-2.4.8.tar.xz" version="2.4.8">
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-126324-clang-check.patch";
-             strip="1"/>
+    <branch repo="webkit.org" module="webkitgtk-2.4.9.tar.xz" version="2.4.9">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
              strip="1"/>
       <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
       it's left in -->
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-133293-cfi-clang-failure.patch";
              strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-126433-check-platform-gtk.patch";
-             strip="1"/>
     </branch>
     <dependencies>
       <dep package="libwebp"/>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index ac9e32d..8152512 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -215,17 +215,13 @@
   -->
   <autotools id="webkit1gtk3" autogen-sh="autoreconf" makeargs="-j1"
              autogenargs="--enable-quartz-target --with-gtk=3.0 --disable-webkit2 
--disable-credential-storage --disable-geolocation --disable-video --disable-web-audio 
CXXFLAGS='-std=gnu++11'">
-    <branch repo="webkit.org" module="webkitgtk-2.4.8.tar.xz" version="2.4.8">
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-126324-clang-check.patch";
-             strip="1"/>
+    <branch repo="webkit.org" module="webkitgtk-2.4.9.tar.xz" version="2.4.9">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
              strip="1"/>
       <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
       it's left in -->
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-133293-cfi-clang-failure.patch";
              strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-126433-check-platform-gtk.patch";
-             strip="1"/>
     </branch>
     <dependencies>
       <dep package="libwebp"/>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index a765a98..82b652b 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -224,17 +224,13 @@
   -->
   <autotools id="webkit1gtk3" autogen-sh="autoreconf" makeargs="-j1"
              autogenargs="--enable-quartz-target --with-gtk=3.0 --disable-webkit2 
--disable-credential-storage --disable-geolocation --disable-video --disable-web-audio 
CXXFLAGS='-std=gnu++11'">
-    <branch repo="webkit.org" module="webkitgtk-2.4.8.tar.xz" version="2.4.8">
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-126324-clang-check.patch";
-             strip="1"/>
+    <branch repo="webkit.org" module="webkitgtk-2.4.9.tar.xz" version="2.4.9">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
              strip="1"/>
       <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
       it's left in -->
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-133293-cfi-clang-failure.patch";
              strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-126433-check-platform-gtk.patch";
-             strip="1"/>
     </branch>
     <dependencies>
       <dep package="libwebp"/>
diff --git a/patches/patch status b/patches/patch status
index 3e91cb0..89494ce 100644
--- a/patches/patch status      
+++ b/patches/patch status      
@@ -30,16 +30,14 @@ Webkit:             Webkit-1.6-enable-blob.patch
                webkit-1.6-no-x11.patch
                webkit-1.6-pango-includes.patch
 
-webkit1gtk:    webkit-126324-clang-check.patch
-                       https://bugs.webkit.org/show_bug.cgi?id=126324
-               webkit-140167-disable-netscape-api.patch
+webkit1gtk:    webkit-140167-disable-netscape-api.patch
                        There's no configure option to disable this. Work around by
                        modifying the variable directly.
                        https://bugs.webkit.org/show_bug.cgi?id=140167
                webkit-133293-cfi-clang-failure.patch
                        Workaround for https://bugs.webkit.org/show_bug.cgi?id=133293
-               webkit-126433-check-platform-gtk.patch
-                       https://bugs.webkit.org/show_bug.cgi?id=126433
+                       This patch is a workaround for a clang bug in XCode < 6.3. It can
+                       be commented out for XCode 6.3 and later versions.
 
 GConf:         GConf-characters.patch Bug 161209. Unlikely ever to be fixed.