[gtk-osx: 5/7] Upgrade glib-networking

[John Ralls <jralls src gnome org>]

commit 172d88e2550f064f2e656ec9a1140aeaad80520f
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed Jan 21 21:33:47 2015 -0800

    Upgrade glib-networking
    
    This was previously limited to 2.40.x due to our version of gnutls.

 modulesets-stable/gtk-osx-unsupported.modules   |    7 +++----
 modulesets-unstable/gtk-osx-unsupported.modules |    3 +--
 modulesets/gtk-osx-unsupported.modules          |    3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 4c2cc20..0702437 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -121,12 +121,11 @@
     </dependencies>
   </autotools>
 
-  <!-- 2.42 requires gnutls 3.0 -->
   <autotools id="glib-networking" autogen-sh="configure"
             autogenargs="--without-ca-certificates set_more_warnings=no">
-    <branch module="glib-networking/2.40/glib-networking-2.40.1.tar.xz"
-            hash="sha256:9fb3e54d049a480afdb814ff7452e7ab67e5d5f607ade230d7713f19922b5a28"
-            version="2.40.1"/>
+    <branch module="glib-networking/2.42/glib-networking-2.42.1.tar.xz"
+            hash="sha256:c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0"
+            version="2.42.1"/>
     <dependencies>
       <dep package="gnutls"/>
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index d1ff845..8d123ac 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -130,9 +130,8 @@
     </dependencies>
   </autotools>
 
-  <!-- 2.42 requires gnutls 3.0 -->
   <autotools id="glib-networking" autogenargs="--without-ca-certificates set_more_warnings=no">
-    <branch revision="glib-2-40"/>
+    <branch/>
     <dependencies>
       <dep package="gnutls"/>
     </dependencies>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 6680067..4858588 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -122,10 +122,9 @@
     </dependencies>
   </autotools>
 
-  <!-- 2.42 requires gnutls 3.0 -->
   <autotools id="glib-networking"
             autogenargs="--without-ca-certificates set_more_warnings=no">
-    <branch revision="glib-2-40"/>
+    <branch revision="glib-2-42"/>
     <dependencies>
       <dep package="gnutls"/>
     </dependencies>