[gtk-osx: 2/14] WebKit depends on icu



commit 0bf9c8d64013f71a0033b0445b38a5c973863712
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Dec 26 13:35:54 2014 -0700

    WebKit depends on icu
    
    If we add a dependency on icu, then WebKit doesn't have to use its faulty
    internal copy of icu, which allows us to get rid of one patch.

 modulesets-stable/gtk-osx-unsupported.modules |    2 +-
 patches/patch status                          |    1 -
 patches/webkit-1.6-missing-icu-files.patch    |  921 -------------------------
 3 files changed, 1 insertions(+), 923 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 718bda7..9d29bcc 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -164,7 +164,6 @@
     <branch repo="webkit.org" module="webkit-1.6.1.tar.gz" version="1.6.1">
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-no-x11.patch"; strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-pango-includes.patch"; 
strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-missing-icu-files.patch"; 
strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-missing-utf8-include.patch"; 
strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-enable-blob.patch"; 
strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-gnome-3.6-fixup.patch"; 
strip="1"/>
@@ -173,6 +172,7 @@
     </branch>
     <dependencies>
       <dep package="enchant"/>
+      <dep package="icu"/>
       <dep package="libsoup"/>
       <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
diff --git a/patches/patch status b/patches/patch status
index 3e33295..8bdaf7a 100644
--- a/patches/patch status      
+++ b/patches/patch status      
@@ -29,7 +29,6 @@ pygtk:                pygtk-libtool.patch: The PyGtk-2.24.0 tarball uses an argument
                export-symbols-regex, which llvm-gcc doesn't seem to like.
 
 Webkit:                Webkit-1.6-enable-blob.patch
-               webkit-1.6-missing-icu-files.patch
                webkit-1.6-missing-utf8-include.patch
                webkit-1.6-no-x11.patch
                webkit-1.6-pango-includes.patch


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]