[gtk-osx: 11/14] Update libsoup

[John Ralls <jralls src gnome org>]

commit 8749d1d2273baf3048b2e2a1010106df1f70cd6f
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Dec 26 14:13:28 2014 -0700

    Update libsoup
    
    In modulesets-unstable, remove obsolete libsoup-gnome module. The gnome
    extensions are built as part of the regular libsoup build.

 modulesets-stable/gtk-osx-unsupported.modules   |    5 ++---
 modulesets-unstable/gtk-osx-unsupported.modules |   11 ++---------
 modulesets/gtk-osx-unsupported.modules          |    3 +--
 3 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 3b71c8e..6299d0f 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -111,12 +111,11 @@
   </autotools>
 
   <autotools id="libsoup" autogen-sh="configure" autogenargs="set_more_warnings=no">
-    <branch module="libsoup/2.46/libsoup-2.46.0.tar.xz"
-            version="2.46.0" hash="sha256:fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3" 
/>
+    <branch module="libsoup/2.48/libsoup-2.48.1.tar.xz" version="2.48.1"
+            hash="sha256:9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="glib-networking"/>
-      <dep package="libgnome-keyring"/>
       <dep package='sqlite'/>
     </dependencies>
   </autotools>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index c8ed2d8..bfd2133 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -138,20 +138,13 @@
     </dependencies>
   </autotools>
 
- <autotools id="libsoup-gnome">
+ <autotools id="libsoup" autogenargs="set_more_warnings=no">
     <branch />
     <dependencies>
       <dep package='sqlite'/>
-      <dep package="libgnome-keyring"/>
+      <dep package="glib"/>
       <dep package="glib-networking"/>
     </dependencies>
-  </autotools>
-
- <autotools id="libsoup" autogenargs="--without-gnome --disable-tls-check set_more_warnings=no">
-    <branch />
-    <after>
-      <dep package="glib-networking"/>
-    </after>
  </autotools>
 
  <autotools id="enchant" >
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 105681b..475c214 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -103,11 +103,10 @@
   </autotools>
 
   <autotools id="libsoup" autogenargs="set_more_warnings=no">
-    <branch revision="gnome-3-6"/>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="glib-networking"/>
-      <dep package="libgnome-keyring"/>
       <dep package='sqlite'/>
     </dependencies>
   </autotools>