[gtk-osx: 3/14] Remove WebKit-svn modules and rename WebKit-git

[John Ralls <jralls src gnome org>]

commit 519046bd3deedb81ee53ac26ba926cbe2e502775
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Dec 26 13:38:33 2014 -0700

    Remove WebKit-svn modules and rename WebKit-git
    
    We shouldn't build WebKit from SVN in modulesets and modulesets-stable;
    instead use tarballs. Delete it from those modulesets and only build from
    Git in modulesets-unstable.
    
    This WebKit-git module won't work yet, but since it builds from git, it
    will be from the WebKitGTK 2.6.x series, for GTK 3.

 modulesets-stable/gtk-osx-unsupported.modules   |   18 ------------------
 modulesets-unstable/gtk-osx-unsupported.modules |    9 ++++-----
 modulesets/gtk-osx-unsupported.modules          |   19 -------------------
 3 files changed, 4 insertions(+), 42 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 9d29bcc..4ecc437 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -21,8 +21,6 @@
               href="http://curl.haxx.se/download/"/>
   <repository type="tarball" name="webkit.org"
               href="http://www.webkitgtk.org/releases/"/>
-  <repository type="svn" name="svn.webkit.org"
-             href="http://svn.webkit.org/repository/"/>
   <repository type='tarball' name='icu'
              href='http://download.icu-project.org/files/'/>
 
@@ -187,20 +185,4 @@
     <branch repo='icu' version='54.1' checkoutdir='icu'
             module='icu4c/54.1/icu4c-54_1-src.tgz'/>
   </autotools>
-
-  <autotools id="WebKit-svn"
-            autogenargs="--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=3.0">
-    <branch repo="svn.webkit.org" module="webkit/trunk" checkoutdir="WebKit"/>
-    <dependencies>
-      <dep package="libsoup"/>
-      <dep package="enchant"/>
-      <!--dep package="libgail"/-->
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-core"/>
-      <dep package="meta-gtk-osx-gtk3"/>
-      <!--dep package="gst-plugins-base"/-->
-    </after>
-  </autotools>
-
 </moduleset>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 3055f0f..2439817 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -181,22 +181,21 @@
             module='icu4c/54.1/icu4c-54_1-src.tgz'/>
   </autotools>
 
-  <autotools id="WebKit"
+  <autotools id="WebKit-git"
             autogenargs="--enable-quartz-target --disable-x11-target --disable-video 
--with-font-backend=pango --with-gtk=2.0 --disable-geolocation --disable-webkit2 --disable-credential-storage 
--disable-svg-fonts --disable-web-audio --disable-fast-malloc --disable-gtk-doc-html">
-    <!--branch repo="svn.webkit.org" module="webkit/trunk" checkoutdir="WebKit"/-->
-    <branch repo="git.webkit.org" module="WebKit"/>
+    <!--branch repo="svn.webkit.org" module="webkit/trunk" checkoutdir="WebKit-svn"/-->
+    <branch repo="git.webkit.org" module="WebKit" checkoutdir="WebKit-git"/>
     <dependencies>
       <dep package="libsoup"/>
       <dep package="enchant"/>
-      <dep package="meta-gtk-osx-core"/>
       <dep package="meta-gtk-osx-freetype"/>
-      <dep package="zlib"/>
       <dep package="icu"/>
     </dependencies>
     <after>
       <dep package="libcurl"/>
       <dep package="bison"/>
       <!--dep package="gst-plugins-base"/-->
+      <dep package="meta-gtk-osx-gtk3"/>
     </after>
   </autotools>
 
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 5069318..182f7e4 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -18,8 +18,6 @@
   <repository type='svn' name='libproxy.google.com'
               href='http://libproxy.googlecode.com/svn/'
               tags-template="tags/%(tag)s"/>
-  <repository type="svn" name="svn.webkit.org"
-             href="http://svn.webkit.org/repository/"/>
   <repository type='tarball' name='icu'
              href='http://download.icu-project.org/files/'/>
 
@@ -151,21 +149,4 @@
     <branch repo='icu' version='54.1' checkoutdir='icu'
             module='icu4c/54.1/icu4c-54_1-src.tgz'/>
   </autotools>
-
-  <autotools id="WebKit"
-            autogenargs="--with-target=quartz --disable-video">
-    <!-- Tags are for Safari versions, not much help to us. -->
-    <branch repo="svn.webkit.org" module="webkit/trunk" checkoutdir="WebKit"/>
-    <dependencies>
-      <dep package="libsoup"/>
-      <dep package="enchant"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-core"/>
-      <dep package="libcurl"/>
-      <dep package="bison"/>
-    </after>
-  </autotools>
-
-
 </moduleset>