[jhbuild/wip/libhttpseverywhere] 3.22: Add libhttpseverywhere

[Michael Catanzaro <mcatanzaro src gnome org>]

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

    3.22: Add libhttpseverywhere
    
    Don't actually want this in 3.22, but in 3.24. But 3.24 modules don't
    exist yet.
    
    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-deps-3.22.modules |   12 ++++++++++++
 2 files changed, 13 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-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index 1553146..458df8a 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -1127,6 +1127,18 @@
     </dependencies>
   </autotools>
 
+  <cmake id="libhttpseverywhere" supports-non-srcdir-builds="no">
+    <branch repo="github.com" checkoutdir="libhttpseverywhere" module="grindhold/libhttpseverywhere.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libgee"/>
+      <dep package="libxml2"/>
+      <dep package="sqlite3"/>
+      <dep package="vala"/>
+    </dependencies>
+  </cmake>
+
   <autotools id="libinput">
     <branch repo="git.freedesktop.org" checkoutdir="libinput" module="wayland/libinput.git" />
     <dependencies>