[gtk-osx] Update libsoup to the last version that supports autotools.

[John Ralls <jralls src gnome org>]

commit d8d1cca02d666ee81cc5ad46c75a50aa847a15d8
Author: John Ralls <jralls ceridwen us>
Date:   Sun Mar 24 09:12:15 2019 -0700

    Update libsoup to the last version that supports autotools.
    
    Also disable introspection because it errors until it uses up memory,
    then crashes the computer.
    
    Introduces a new dependency, libps1.

 modulesets-stable/gtk-osx-network.modules   | 15 +++++++++++----
 modulesets-unstable/gtk-osx-network.modules | 12 ++++++++++--
 modulesets/gtk-osx-network.modules          | 13 +++++++++++--
 3 files changed, 32 insertions(+), 8 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 7bcb28b..dc539b0 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -16,6 +16,7 @@
               href="http://www.webkitgtk.org/releases/"/>
   <repository type="tarball" name="icu"
               href="http://download.icu-project.org/files/"/>
+  <repository type="tarball" name="github-tarball" href="https://github.com/"/>
 
   <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
   <metamodule id="meta-gtk-osx-webkit">
@@ -98,13 +99,19 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libpsl" autogen-sh='configure'>
+    <branch repo="github-tarball" version="0.20.2"
+            module="rockdaboot/libpsl/releases/download/libpsl-0.20.2/libpsl-0.20.2.tar.gz" />
+  </autotools>
+  
   <autotools id="libsoup" autogen-sh="configure"
-             autogenargs="set_more_warnings=no">
-    <branch module="libsoup/2.62/libsoup-2.62.2.tar.xz" version="2.62.2"
-            hash="sha256:9e536fe3da60b25d2c63addb84a9d5072d00b0d8b8cbeabc629a6bcd63f879b6">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/libsoup-python.patch"; 
strip="0"/>
+             autogenargs="set_more_warnings=no --enable-introspection=no">
+    <branch module="libsoup/2.64/libsoup-2.64.2.tar.xz" version="2.64.2"
+            hash="sha256:75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6">
     </branch>
     <dependencies>
+      <dep package="libpsl"/>
+      <dep package="python3"/>
       <dep package="glib"/>
       <dep package="glib-networking"/>
       <dep package="sqlite"/>
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index cf74646..d2ec1ed 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -22,6 +22,7 @@
               href="git://git.webkit.org"/>
   <repository type="tarball" name="icu"
               href="http://download.icu-project.org/files/"/>
+  <repository type="git" name="github" href="https://github.com/"/>
 
   <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
   <metamodule id="meta-gtk-osx-webkit">
@@ -105,9 +106,16 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libsoup" autogenargs="set_more_warnings=no">
-    <branch/>
+  <autotools id="libpsl" autogen-sh='configure'>
+    <branch repo="github" tag="libpsl-0.20.2" module="rockdaboot/libpsl"/>
+  </autotools>
+
+  <autotools id="libsoup"
+             autogenargs="set_more_warnings=no --enable-introspection=no">
+    <branch revision="gnome-3-30"/> <!-- requires meson after this -->
     <dependencies>
+      <dep package="libpsl"/>
+      <dep package="python3"/>
       <dep package="vala"/>
       <dep package="sqlite"/>
       <dep package="glib"/>
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index 9858c5d..769e094 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -20,6 +20,7 @@
               href="http://www.webkitgtk.org/releases/"/>
   <repository type="tarball" name="icu"
               href="http://download.icu-project.org/files/"/>
+  <repository type="git" name="github" href="https://github.com/"/>
 
   <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
   <metamodule id="meta-gtk-osx-webkit">
@@ -101,9 +102,17 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libsoup" autogenargs="set_more_warnings=no">
-    <branch revision="gnome-3-24"/>
+  <autotools id="libpsl" autogen-sh='configure'>
+    <branch repo="github" tag="libpsl-0.20.2" module="rockdaboot/libpsl"/>
+  </autotools>
+  
+  <autotools id="libsoup"
+             autogenargs="set_more_warnings=no --enable-introspection=no">
+    <branch revision="gnome-3-30"/>
     <dependencies>
+      <dep package="libpsl"/>
+      <dep package="python3"/>
+      <dep package="vala"/>
       <dep package="glib"/>
       <dep package="glib-networking"/>
       <dep package="sqlite"/>