From 8998e44cd9017cdd09f8be3ad8c6853e1b52771e Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 25 May 2016 10:44:03 +0100
Subject: [PATCH 1/2] Support passing extra arguments to gtkdoc-fixxref

The extra arguments are typically used to specified the location of
installed API references that gtk-doc can use to create cross links
for symbols.

Fixes #555
---
 mesonbuild/modules/gnome.py        |  1 +
 mesonbuild/scripts/gtkdochelper.py | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 39a6ff75f..718d07af5 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -289,6 +289,7 @@ class GnomeModule:
                 '--modulename=' + modulename]
         args += self.unpack_args('--htmlargs=', 'html_args', kwargs)
         args += self.unpack_args('--scanargs=', 'scan_args', kwargs)
+        args += self.unpack_args('--fixxrefargs=', 'fixxref_args', kwargs)
         res = [build.RunTarget(targetname, command[0], command[1:] + args, state.subdir)]
         if kwargs.get('install', True):
             res.append(build.InstallScript(command + args))
diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py
index 68be8f2af..d920b614a 100644
--- a/mesonbuild/scripts/gtkdochelper.py
+++ b/mesonbuild/scripts/gtkdochelper.py
@@ -28,9 +28,10 @@ parser.add_argument('--mainfile', dest='mainfile')
 parser.add_argument('--modulename', dest='modulename')
 parser.add_argument('--htmlargs', dest='htmlargs', default='')
 parser.add_argument('--scanargs', dest='scanargs', default='')
+parser.add_argument('--fixxrefargs', dest='fixxrefargs', default='')
 
 def build_gtkdoc(source_root, build_root, doc_subdir, src_subdir,
-                 main_file, module, html_args, scan_args):
+                 main_file, module, html_args, scan_args, fixxref_args):
     abs_src = os.path.join(source_root, src_subdir)
     abs_out = os.path.join(build_root, doc_subdir)
     htmldir = os.path.join(abs_out, 'html')
@@ -76,7 +77,7 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdir,
     subprocess.check_call(mkhtml_cmd, cwd=os.path.join(abs_out, 'html'), shell=False)
     fixref_cmd = ['gtkdoc-fixxref',
                   '--module=' + module,
-                  '--module-dir=html']
+                  '--module-dir=html'] + fixxref_args
 #    print(fixref_cmd)
 #    sys.exit(1)
     subprocess.check_call(fixref_cmd, cwd=abs_out)
@@ -97,6 +98,10 @@ def run(args):
         scanargs = options.scanargs.split('@@')
     else:
         scanargs = []
+    if len(options.fixxrefargs) > 0:
+        fixxrefargs = options.fixxrefargs.split('@@')
+    else:
+        fixxrefargs = []
     build_gtkdoc(options.sourcedir,
                  options.builddir,
                  options.subdir,
@@ -104,7 +109,8 @@ def run(args):
                  options.mainfile,
                  options.modulename,
                  htmlargs,
-                 scanargs)
+                 scanargs,
+                 fixxrefargs)
 
     if 'MESON_INSTALL_PREFIX' in os.environ:
         if 'DESTDIR' in os.environ:

From 245d6b09042314ca5d3295142fc172822e86d2ce Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 25 May 2016 15:59:23 +0100
Subject: [PATCH 2/2] Add myself to the authors file

---
 authors.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/authors.txt b/authors.txt
index d8b0abc38..d628368c9 100644
--- a/authors.txt
+++ b/authors.txt
@@ -33,3 +33,4 @@ Nicolas Schneider
 Luke Adams
 Rogiel Sulzbach
 Tim-Philipp Müller
+Emmanuele Bassi