[jhbuild] 3.24: Add libhttpseverywhere

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 5bfca218982cd4a23263cda22e831190defb0599
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Sep 18 22:16:52 2016 -0500

    3.24: Add libhttpseverywhere
    
    Also, workaround an encoding bug I don't really understand that causes
    jhbuild to crash when installing libhttpseverywhere.

 jhbuild/utils/packagedb.py                     |    2 +-
 modulesets/gnome-suites-core-3.24.modules      |    1 +
 modulesets/gnome-suites-core-deps-3.24.modules |   16 ++++++++++++++++
 3 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/utils/packagedb.py b/jhbuild/utils/packagedb.py
index 467e1a2..2131d6d 100644
--- a/jhbuild/utils/packagedb.py
+++ b/jhbuild/utils/packagedb.py
@@ -85,7 +85,7 @@ class PackageEntry:
         # write manifest
         fileutils.mkdir_with_parents(os.path.join(self.dirname, 'manifests'))
         writer = fileutils.SafeWriter(os.path.join(self.dirname, 'manifests', self.package))
-        writer.fp.write('\n'.join(self.manifest) + '\n')
+        writer.fp.write('\n'.join(self.manifest).encode('utf-8', 'backslashreplace') + '\n')
         writer.commit()
 
     def remove(self):
diff --git a/modulesets/gnome-suites-core-3.24.modules b/modulesets/gnome-suites-core-3.24.modules
index 6a39b86..8ef85cb 100644
--- a/modulesets/gnome-suites-core-3.24.modules
+++ b/modulesets/gnome-suites-core-3.24.modules
@@ -685,6 +685,7 @@
       <dep package="gtk+-3"/>
       <dep package="iso-codes"/>
       <dep package="json-glib"/>
+      <dep package="libhttpseverywhere"/>
       <dep package="libnotify"/>
       <dep package="libsecret"/>
       <dep package="libsoup"/>
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index 64777cd..2b71105 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -1179,6 +1179,22 @@
     </dependencies>
   </autotools>
 
+  <meson id="libhttpseverywhere">
+    <branch repo="github.com" checkoutdir="libhttpseverywhere" module="grindhold/libhttpseverywhere.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="json-glib"/>
+      <dep package="libarchive"/>
+      <dep package="libgee"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="sqlite3"/>
+      <dep package="vala"/>
+      <dep package="valadoc"/>
+    </dependencies>
+  </meson>
+
   <autotools id="libinput">
     <branch repo="git.freedesktop.org" checkoutdir="libinput" module="wayland/libinput.git" />
     <dependencies>