[jhbuild/fix-gnome-shell] gnome-shell: depends on asciidoc and json-glib

[Rafael Fontenelle <rafaelff src gnome org>]

commit fd29221c5949ead139faa3b475826005d1b9325d
Author: Rafael Fontenelle <rafaelff gnome org>
Date:   Sat Sep 7 17:48:52 2019 -0300

    gnome-shell: depends on asciidoc and json-glib
    
    This includes asciidoc and json-glib to gnome-shell's depedency list.
    
    This also adds asciidoc 8.6.10 to gnome-suites-core-deps-latest.
    
    The patch file replace a hard-coded python call in Makefile with the
    variable $(PYTHON) allowing to use the proper binary filename (thats
    required for Arch Linux).
    
    Fixes: #29

 modulesets/gnome-suites-core-deps-latest.modules | 19 +++++++++++++++++++
 modulesets/gnome-suites-core-latest.modules      |  2 ++
 patches/asciidoc-set-PYTHON.patch                | 11 +++++++++++
 3 files changed, 32 insertions(+)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index a3f55a66..9ec2bd0b 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -100,6 +100,25 @@
     </dependencies>
   </meson>
 
+  <autotools id="asciidoc"
+             autogen-sh="autoreconf"
+             supports-non-srcdir-builds="no">
+    <branch repo="github-tar"
+            version="8.6.10"
+            module="asciidoc/asciidoc/archive/${version}.tar.gz"
+            hash="sha256:9e52f8578d891beaef25730a92a6e723596ddbd07bfe0d2a56486fcf63a0b983"
+            size="577208"
+            rename-tarball="asciidoc-${version}.tar.gz"
+            checkoutdir="asciidoc-${version}">
+      <patch file="asciidoc-set-PYTHON.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="python2"/>
+      <dep package="libxslt"/>
+      <dep package="docbook-xsl"/>
+    </dependencies>
+  </autotools>
+
   <meson id="atk">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-suites-core-latest.modules b/modulesets/gnome-suites-core-latest.modules
index cfdedb02..d8d5bbed 100644
--- a/modulesets/gnome-suites-core-latest.modules
+++ b/modulesets/gnome-suites-core-latest.modules
@@ -365,6 +365,7 @@
     <branch/>
     <dependencies>
       <dep package="accountsservice"/>
+      <dep package="asciidoc"/>
       <dep package="dconf"/>
       <dep package="evolution-data-server"/>
       <dep package="gdm"/> <!-- runtime dependency on Gdm-1.0.typelib-->
@@ -376,6 +377,7 @@
       <dep package="gobject-introspection"/>
       <dep package="gtk+-3"/>
       <dep package="intltool"/>
+      <dep package="json-glib"/>
       <dep package="libcanberra"/>
       <dep package="libcroco"/>
       <dep package="libsoup"/>
diff --git a/patches/asciidoc-set-PYTHON.patch b/patches/asciidoc-set-PYTHON.patch
new file mode 100644
index 00000000..aee659c5
--- /dev/null
+++ b/patches/asciidoc-set-PYTHON.patch
@@ -0,0 +1,11 @@
+--- asciidoc-orig/Makefile.in  2017-09-28 22:10:02.000000000 -0300
++++ asciidoc/Makefile.in       2019-09-07 14:58:10.321694702 -0300
+@@ -107,7 +107,7 @@
+       $(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
+ 
+ $(manp): %.1 : %.1.txt
+-      python a2x.py -f manpage $<
++      $(PYTHON) a2x.py -f manpage $<
+ 
+ docs:
+       $(INSTALL) -d $(DESTDIR)/$(docdir)