=== added file '.gitignore'
--- a/.gitignore	1970-01-01 00:00:00 +0000
+++ b/.gitignore	2018-09-21 13:35:07 +0000
@@ -0,0 +1,1 @@
+build/

=== modified file 'README'
--- a/README	2018-12-13 16:44:14 +0000
+++ b/README	2019-12-08 10:26:28 +0000
@@ -5,6 +5,11 @@
 
     https://wiki.gnome.org/Apps/Devhelp
 
+Professional services
+---------------------
+
+See the file: docs/professional-services.md
+
 How to contribute
 -----------------
 

=== modified file 'data/icons/meson.build'
--- a/data/icons/meson.build	2019-03-10 11:11:17 +0000
+++ b/data/icons/meson.build	2019-12-08 10:26:28 +0000
@@ -1,18 +1,17 @@
 install_data(
-        'scalable/org.gnome.Devhelp.svg',
-        install_dir : join_paths(
-                get_option('prefix'),
-                get_option('datadir'),
-                'icons/hicolor/scalable/apps'
-        )
+  'scalable/org.gnome.Devhelp.svg',
+  install_dir : join_paths(
+    get_option('prefix'),
+    get_option('datadir'),
+    'icons/hicolor/scalable/apps'
+  )
 )
 
-
 install_data(
-        'symbolic/org.gnome.Devhelp-symbolic.svg',
-        install_dir : join_paths(
-                get_option('prefix'),
-                get_option('datadir'),
-                'icons/hicolor/symbolic/apps'
-        )
+  'symbolic/org.gnome.Devhelp-symbolic.svg',
+  install_dir : join_paths(
+    get_option('prefix'),
+    get_option('datadir'),
+    'icons/hicolor/symbolic/apps'
+  )
 )

=== modified file 'data/meson.build'
--- a/data/meson.build	2018-06-16 14:17:39 +0000
+++ b/data/meson.build	2019-12-08 10:26:28 +0000
@@ -1,58 +1,58 @@
 subdir('icons')
 
 install_data(
-        'org.gnome.devhelp.gschema.xml',
-        install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
+  'org.gnome.devhelp.gschema.xml',
+  install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
 )
 
 libdevhelp_gschema_conf = configuration_data()
 libdevhelp_gschema_conf.set('LIBDEVHELP_API_VERSION', LIBDEVHELP_API_VERSION)
 configure_file(
-        input : 'org.gnome.libdevhelp.gschema.xml.in',
-        output : 'org.gnome.libdevhelp-@0@.gschema.xml'.format(LIBDEVHELP_API_VERSION),
-        configuration : libdevhelp_gschema_conf,
-        install : true,
-        install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
+  input : 'org.gnome.libdevhelp.gschema.xml.in',
+  output : 'org.gnome.libdevhelp-@0@.gschema.xml'.format(LIBDEVHELP_API_VERSION),
+  configuration : libdevhelp_gschema_conf,
+  install : true,
+  install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
 )
 
 appdata = 'org.gnome.Devhelp.appdata.xml'
 I18N.merge_file(
-        appdata,
-        input : appdata + '.in',
-        output : appdata,
-        po_dir : '../po/',
-        install : true,
-        install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'metainfo')
+  appdata,
+  input : appdata + '.in',
+  output : appdata,
+  po_dir : '../po/',
+  install : true,
+  install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'metainfo')
 )
 
 desktop_file = 'org.gnome.Devhelp.desktop'
 I18N.merge_file(
-        desktop_file,
-        type : 'desktop',
-        input : desktop_file + '.in',
-        output : desktop_file,
-        po_dir : '../po/',
-        install : true,
-        install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'applications')
+  desktop_file,
+  type : 'desktop',
+  input : desktop_file + '.in',
+  output : desktop_file,
+  po_dir : '../po/',
+  install : true,
+  install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'applications')
 )
 
 service_file = 'org.gnome.Devhelp.service'
 service_conf = configuration_data()
 service_conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
 configure_file(
-        input : service_file + '.in',
-        output : service_file,
-        configuration : service_conf,
-        install : true,
-        install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'dbus-1/services')
-)
-
-install_data(
-        ['assistant.css', 'assistant.js'],
-        install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'devhelp/assistant')
-)
-
-install_data(
-        'devhelp.1',
-        install_dir : join_paths(get_option('prefix'), get_option('mandir'), 'man1')
+  input : service_file + '.in',
+  output : service_file,
+  configuration : service_conf,
+  install : true,
+  install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'dbus-1/services')
+)
+
+install_data(
+  ['assistant.css', 'assistant.js'],
+  install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'devhelp/assistant')
+)
+
+install_data(
+  'devhelp.1',
+  install_dir : join_paths(get_option('prefix'), get_option('mandir'), 'man1')
 )

=== modified file 'debian/changelog'
--- a/debian/changelog	2019-09-22 16:34:36 +0000
+++ b/debian/changelog	2019-12-08 10:26:28 +0000
@@ -1,3 +1,9 @@
+devhelp (3.34.0+git20191122.068fe73-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 08 Dec 2019 10:26:17 +0000
+
 devhelp (3.34.0-1) unstable; urgency=medium
 
   * New upstream release

=== modified file 'debian/patches/00install-devhelp-el.patch'
--- a/debian/patches/00install-devhelp-el.patch	2018-02-19 00:39:29 +0000
+++ b/debian/patches/00install-devhelp-el.patch	2019-12-08 10:26:51 +0000
@@ -6,10 +6,10 @@
  plugins/devhelp.el | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/plugins/devhelp.el b/plugins/devhelp.el
-index 705f4c7..01ac88c 100644
---- a/plugins/devhelp.el
-+++ b/plugins/devhelp.el
+Index: devhelp/plugins/devhelp.el
+===================================================================
+--- devhelp.orig/plugins/devhelp.el
++++ devhelp/plugins/devhelp.el
 @@ -34,7 +34,7 @@
  ;; Examples:
  ;;

=== modified file 'devhelp/meson.build'
--- a/devhelp/meson.build	2018-06-18 18:17:40 +0000
+++ b/devhelp/meson.build	2019-12-08 10:26:28 +0000
@@ -1,141 +1,141 @@
 libdevhelp_public_headers = [
-        'devhelp.h',
-        'dh-application-window.h',
-        'dh-assistant-view.h',
-        'dh-book.h',
-        'dh-book-list.h',
-        'dh-book-list-builder.h',
-        'dh-book-list-directory.h',
-        'dh-book-manager.h',
-        'dh-book-tree.h',
-        'dh-completion.h',
-        'dh-init.h',
-        'dh-keyword-model.h',
-        'dh-link.h',
-        'dh-notebook.h',
-        'dh-profile.h',
-        'dh-profile-builder.h',
-        'dh-search-bar.h',
-        'dh-settings.h',
-        'dh-settings-builder.h',
-        'dh-sidebar.h',
-        'dh-tab.h',
-        'dh-tab-label.h',
-        'dh-web-view.h'
+  'devhelp.h',
+  'dh-application-window.h',
+  'dh-assistant-view.h',
+  'dh-book.h',
+  'dh-book-list.h',
+  'dh-book-list-builder.h',
+  'dh-book-list-directory.h',
+  'dh-book-manager.h',
+  'dh-book-tree.h',
+  'dh-completion.h',
+  'dh-init.h',
+  'dh-keyword-model.h',
+  'dh-link.h',
+  'dh-notebook.h',
+  'dh-profile.h',
+  'dh-profile-builder.h',
+  'dh-search-bar.h',
+  'dh-settings.h',
+  'dh-settings-builder.h',
+  'dh-sidebar.h',
+  'dh-tab.h',
+  'dh-tab-label.h',
+  'dh-web-view.h'
 ]
 
 libdevhelp_public_c_files = [
-        'dh-application-window.c',
-        'dh-assistant-view.c',
-        'dh-book.c',
-        'dh-book-list.c',
-        'dh-book-list-builder.c',
-        'dh-book-list-directory.c',
-        'dh-book-manager.c',
-        'dh-book-tree.c',
-        'dh-completion.c',
-        'dh-init.c',
-        'dh-keyword-model.c',
-        'dh-link.c',
-        'dh-notebook.c',
-        'dh-profile.c',
-        'dh-profile-builder.c',
-        'dh-search-bar.c',
-        'dh-settings.c',
-        'dh-settings-builder.c',
-        'dh-sidebar.c',
-        'dh-tab.c',
-        'dh-tab-label.c',
-        'dh-web-view.c'
+  'dh-application-window.c',
+  'dh-assistant-view.c',
+  'dh-book.c',
+  'dh-book-list.c',
+  'dh-book-list-builder.c',
+  'dh-book-list-directory.c',
+  'dh-book-manager.c',
+  'dh-book-tree.c',
+  'dh-completion.c',
+  'dh-init.c',
+  'dh-keyword-model.c',
+  'dh-link.c',
+  'dh-notebook.c',
+  'dh-profile.c',
+  'dh-profile-builder.c',
+  'dh-search-bar.c',
+  'dh-settings.c',
+  'dh-settings-builder.c',
+  'dh-sidebar.c',
+  'dh-tab.c',
+  'dh-tab-label.c',
+  'dh-web-view.c'
 ]
 
 libdevhelp_private_c_files = [
-        'dh-book-list-simple.c',
-        'dh-error.c',
-        'dh-parser.c',
-        'dh-search-context.c',
-        'dh-util-lib.c'
+  'dh-book-list-simple.c',
+  'dh-error.c',
+  'dh-parser.c',
+  'dh-search-context.c',
+  'dh-util-lib.c'
 ]
 
 install_headers_first_subdir = 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION)
 install_headers_subdir = join_paths(install_headers_first_subdir, 'devhelp')
 install_headers_fulldir = join_paths(
-        get_option('prefix'),
-        get_option('includedir'),
-        install_headers_subdir
+  get_option('prefix'),
+  get_option('includedir'),
+  install_headers_subdir
 )
 
 libdevhelp_enums = GNOME.mkenums_simple(
-        'dh-enum-types',
-        sources : libdevhelp_public_headers,
-        install_header : true,
-        install_dir : install_headers_fulldir
+  'dh-enum-types',
+  sources : libdevhelp_public_headers,
+  install_header : true,
+  install_dir : install_headers_fulldir
 )
 libdevhelp_enum_header = libdevhelp_enums[1]
 
 libdevhelp_static = static_library(
-        'devhelp-static',
-        [libdevhelp_public_c_files,
-         libdevhelp_private_c_files,
-         libdevhelp_enums],
-        include_directories : [CONFIG_H_INCLUDE_DIR, ROOT_INCLUDE_DIR],
-        dependencies : LIBDEVHELP_DEPS
+  'devhelp-static',
+  [libdevhelp_public_c_files,
+   libdevhelp_private_c_files,
+   libdevhelp_enums],
+  include_directories : [CONFIG_H_INCLUDE_DIR, ROOT_INCLUDE_DIR],
+  dependencies : LIBDEVHELP_DEPS
 )
 
 # For unit tests, to be able to test private functions.
 STATIC_LIBDEVHELP_DECLARED_DEP = declare_dependency(
-        sources : libdevhelp_enum_header,
-        link_with : libdevhelp_static,
-        include_directories : [ROOT_INCLUDE_DIR],
-        dependencies : LIBDEVHELP_DEPS
+  sources : libdevhelp_enum_header,
+  link_with : libdevhelp_static,
+  include_directories : [ROOT_INCLUDE_DIR],
+  dependencies : LIBDEVHELP_DEPS
 )
 
 symbol_map = join_paths(meson.current_source_dir(), 'symbol.map')
 
 libdevhelp = shared_library(
-        'devhelp-@0@'.format(LIBDEVHELP_API_VERSION),
-        link_whole : libdevhelp_static,
-        link_args : '-Wl,--version-script,' + symbol_map,
-        link_depends : symbol_map,
-        version : LIBDEVHELP_LT_VERSION,
-        install : true
+  'devhelp-@0@'.format(LIBDEVHELP_API_VERSION),
+  link_whole : libdevhelp_static,
+  link_args : '-Wl,--version-script,' + symbol_map,
+  link_depends : symbol_map,
+  version : LIBDEVHELP_LT_VERSION,
+  install : true
 )
 
 SHARED_LIBDEVHELP_DECLARED_DEP = declare_dependency(
-        sources : libdevhelp_enum_header,
-        link_with : libdevhelp,
-        include_directories : [ROOT_INCLUDE_DIR, include_directories('.')],
-        dependencies : LIBDEVHELP_DEPS
+  sources : libdevhelp_enum_header,
+  link_with : libdevhelp,
+  include_directories : [ROOT_INCLUDE_DIR, include_directories('.')],
+  dependencies : LIBDEVHELP_DEPS
 )
 
 install_headers(
-        libdevhelp_public_headers,
-        subdir : install_headers_subdir
+  libdevhelp_public_headers,
+  subdir : install_headers_subdir
 )
 
 PKG_CONFIG.generate(
-        filebase : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
-        name : meson.project_name(),
-        description : meson.project_name(),
-        version : meson.project_version(),
-        libraries : libdevhelp,
-        subdirs : install_headers_first_subdir,
-        requires : LIBDEVHELP_DEPS_STR
+  filebase : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
+  name : meson.project_name(),
+  description : meson.project_name(),
+  version : meson.project_version(),
+  libraries : libdevhelp,
+  subdirs : install_headers_first_subdir,
+  requires : LIBDEVHELP_DEPS_STR
 )
 
 GNOME.generate_gir(
-        libdevhelp,
-        export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
-        sources : [
-                libdevhelp_public_headers,
-                libdevhelp_public_c_files,
-                libdevhelp_enums
-        ],
-        namespace : 'Devhelp',
-        nsversion : LIBDEVHELP_API_VERSION_FULL,
-        identifier_prefix : 'Dh',
-        includes : ['Gtk-3.0', 'WebKit2-4.0'],
-        header : 'devhelp/devhelp.h',
-        include_directories : ROOT_INCLUDE_DIR,
-        install : true
+  libdevhelp,
+  export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
+  sources : [
+    libdevhelp_public_headers,
+    libdevhelp_public_c_files,
+    libdevhelp_enums
+  ],
+  namespace : 'Devhelp',
+  nsversion : LIBDEVHELP_API_VERSION_FULL,
+  identifier_prefix : 'Dh',
+  includes : ['Gtk-3.0', 'WebKit2-4.0'],
+  header : 'devhelp/devhelp.h',
+  include_directories : ROOT_INCLUDE_DIR,
+  install : true
 )

=== added file 'docs/professional-services.md'
--- a/docs/professional-services.md	1970-01-01 00:00:00 +0000
+++ b/docs/professional-services.md	2019-11-04 08:21:31 +0000
@@ -0,0 +1,14 @@
+Professional services for Devhelp
+=================================
+
+Sébastien Wilmet
+----------------
+
+Sébastien Wilmet is a freelance software developer and one of the co-maintainers
+of Devhelp.
+
+He is available to sign contracts to work on Devhelp. For example to create a
+specialized API browser for a specific development platform.
+
+See [Sébastien Wilmet's website](https://swilmet.be/freelance/) for more
+information and to contact him.

=== modified file 'docs/reference/meson.build'
--- a/docs/reference/meson.build	2018-09-22 13:55:17 +0000
+++ b/docs/reference/meson.build	2019-12-08 10:26:28 +0000
@@ -1,9 +1,9 @@
 subdir('xml')
 
 configure_file(
-        input : 'devhelp-sections.txt',
-        output : 'devhelp-@0@-sections.txt'.format(LIBDEVHELP_API_VERSION),
-        copy : true
+  input : 'devhelp-sections.txt',
+  output : 'devhelp-@0@-sections.txt'.format(LIBDEVHELP_API_VERSION),
+  copy : true
 )
 
 gtkdoc_module_name = 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION)
@@ -13,26 +13,26 @@
 webkitgtk_prefix = webkitgtk_dep.get_pkgconfig_variable('prefix')
 
 GNOME.gtkdoc(
-        gtkdoc_module_name,
-        main_xml : 'devhelp-docs.xml',
-        src_dir : include_directories('../../devhelp/'),
-        dependencies : SHARED_LIBDEVHELP_DECLARED_DEP,
-        scan_args : ['--rebuild-types'],
-        gobject_typesfile : 'devhelp-@0@.types'.format(LIBDEVHELP_API_VERSION),
-        fixxref_args : [
-                '--html-dir=@0@'.format(html_dir),
-                '--extra-dir=@0@/share/gtk-doc/html/@1@'.format(webkitgtk_prefix, WEBKITGTK_DEP_STR)
-        ],
-        content_files : [
-                'api-breaks.xml'
-        ],
-        ignore_headers : [
-                'dh-book-list-simple.h',
-                'dh-dconf-migration.h',
-                'dh-error.h',
-                'dh-parser.h',
-                'dh-search-context.h',
-                'dh-util-lib.h'
-        ],
-        install : true
+  gtkdoc_module_name,
+  main_xml : 'devhelp-docs.xml',
+  src_dir : include_directories('../../devhelp/'),
+  dependencies : SHARED_LIBDEVHELP_DECLARED_DEP,
+  scan_args : ['--rebuild-types'],
+  gobject_typesfile : 'devhelp-@0@.types'.format(LIBDEVHELP_API_VERSION),
+  fixxref_args : [
+    '--html-dir=@0@'.format(html_dir),
+    '--extra-dir=@0@/share/gtk-doc/html/@1@'.format(webkitgtk_prefix, WEBKITGTK_DEP_STR)
+  ],
+  content_files : [
+    'api-breaks.xml'
+  ],
+  ignore_headers : [
+    'dh-book-list-simple.h',
+    'dh-dconf-migration.h',
+    'dh-error.h',
+    'dh-parser.h',
+    'dh-search-context.h',
+    'dh-util-lib.h'
+  ],
+  install : true
 )

=== modified file 'docs/reference/xml/meson.build'
--- a/docs/reference/xml/meson.build	2018-06-16 18:48:57 +0000
+++ b/docs/reference/xml/meson.build	2019-12-08 10:26:28 +0000
@@ -6,7 +6,7 @@
 gtkdocentities_filename = 'gtkdocentities.ent'
 
 configure_file(
-        input : gtkdocentities_filename + '.in',
-        output : gtkdocentities_filename,
-        configuration : gtkdocentities_conf_data
+  input : gtkdocentities_filename + '.in',
+  output : gtkdocentities_filename,
+  configuration : gtkdocentities_conf_data
 )

=== modified file 'help/meson.build'
--- a/help/meson.build	2018-03-13 12:38:19 +0000
+++ b/help/meson.build	2019-12-08 10:26:28 +0000
@@ -1,9 +1,9 @@
 pages = [
-        'index.page',
-        'search.page'
+  'index.page',
+  'search.page'
 ]
 
 GNOME.yelp(
-        'devhelp',
-        sources : pages
+  'devhelp',
+  sources : pages
 )

=== modified file 'meson.build'
--- a/meson.build	2019-09-22 16:23:54 +0000
+++ b/meson.build	2019-12-08 10:26:28 +0000
@@ -4,9 +4,10 @@
 # See: https://github.com/mesonbuild/meson/issues/2607
 
 project(
-        'devhelp', 'c',
-        meson_version : '>= 0.47',
-        version : '3.34.0'
+  'devhelp', 'c',
+  meson_version : '>= 0.50',
+  version : '3.34.0',
+  default_options : ['warning_level=2']
 )
 
 GNOME = import('gnome')
@@ -33,32 +34,32 @@
 
 WEBKITGTK_DEP_STR = 'webkit2gtk-4.0'
 libdevhelp_deps_array = [
-        ['gio-2.0', '>= 2.56'],
-        ['gtk+-3.0', '>= 3.22'],
-        [WEBKITGTK_DEP_STR, '>= 2.20']
+  ['gio-2.0', '>= 2.56'],
+  ['gtk+-3.0', '>= 3.22'],
+  [WEBKITGTK_DEP_STR, '>= 2.20']
 ]
 
 LIBDEVHELP_DEPS_STR = []
 LIBDEVHELP_DEPS = [meson.get_compiler('c').find_library('m')]
 foreach dep : libdevhelp_deps_array
-        dep_name = dep[0]
-        dep_version = dep[1]
-        LIBDEVHELP_DEPS_STR += '@0@ @1@'.format(dep_name, dep_version)
-        LIBDEVHELP_DEPS += dependency(dep_name, version : dep_version)
+  dep_name = dep[0]
+  dep_version = dep[1]
+  LIBDEVHELP_DEPS_STR += '@0@ @1@'.format(dep_name, dep_version)
+  LIBDEVHELP_DEPS += dependency(dep_name, version : dep_version)
 endforeach
 
 DEVHELP_APP_DEPS = [
-        LIBDEVHELP_DEPS,
-        dependency('amtk-5', version : '>= 5.0'),
-        # TODO: move gsettings-desktop-schemas dep for the libdevhelp, in the
-        # *.pc file it must be a private dep. With meson 0.47 there is no clean
-        # and generic way to do it :-( Clean: no information duplication (to
-        # create both the list of dependency objects plus creating the *.pc
-        # file). Generic: declare the dependencies public/private, with/without
-        # version requirements. Without the need to copy/paste a chunk of build
-        # code from one project to another (i.e. have something short and
-        # simple, like with the AX_PKG_CHECK_MODULES Autotools macro).
-        dependency('gsettings-desktop-schemas'),
+  LIBDEVHELP_DEPS,
+  dependency('amtk-5', version : '>= 5.0'),
+  # TODO: move gsettings-desktop-schemas dep for the libdevhelp, in the
+  # *.pc file it must be a private dep. With meson 0.47 there is no clean
+  # and generic way to do it :-( Clean: no information duplication (to
+  # create both the list of dependency objects plus creating the *.pc
+  # file). Generic: declare the dependencies public/private, with/without
+  # version requirements. Without the need to copy/paste a chunk of build
+  # code from one project to another (i.e. have something short and
+  # simple, like with the AX_PKG_CHECK_MODULES Autotools macro).
+  dependency('gsettings-desktop-schemas'),
 ]
 
 # config.h
@@ -66,25 +67,25 @@
 config_data = configuration_data()
 GETTEXT_PACKAGE_NAME = meson.project_name()
 config_data.set_quoted(
-        'GETTEXT_PACKAGE',
-        GETTEXT_PACKAGE_NAME,
-        description : 'Define to the gettext package name.'
-)
-config_data.set_quoted(
-        'DATADIR',
-        join_paths(get_option('prefix'), get_option('datadir'))
-)
-config_data.set_quoted(
-        'LOCALEDIR',
-        join_paths(get_option('prefix'), get_option('localedir'))
+  'GETTEXT_PACKAGE',
+  GETTEXT_PACKAGE_NAME,
+  description : 'gettext package name.'
+)
+config_data.set_quoted(
+  'DATADIR',
+  join_paths(get_option('prefix'), get_option('datadir'))
+)
+config_data.set_quoted(
+  'LOCALEDIR',
+  join_paths(get_option('prefix'), get_option('localedir'))
 )
 config_data.set_quoted('PACKAGE_VERSION', meson.project_version())
 config_data.set_quoted('LIBDEVHELP_API_VERSION', LIBDEVHELP_API_VERSION)
 config_data.set('FLATPAK_BUILD', get_option('flatpak_build'))
 
 configure_file(
-        output : 'config.h',
-        configuration : config_data
+  output : 'config.h',
+  configuration : config_data
 )
 
 CONFIG_H_INCLUDE_DIR = include_directories('.')
@@ -94,64 +95,64 @@
 # For #include <devhelp/something.h>
 ROOT_INCLUDE_DIR = include_directories('.')
 
-add_global_arguments(
-        '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()),
-        language : 'c'
+add_project_arguments(
+  '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()),
+  language : 'c'
 )
 
 #####
 # CFLAGS
-# (This is one of the ugly parts of Meson, currently.)
-# The same as the AX_COMPILER_FLAGS Autotools macro.
+# Try to mimic the AX_COMPILER_FLAGS Autotools macro.
+# Some flags are missing when using only the builtin warning_level meson option,
+# even at the maximum level.
+# The following warning_cflags suppose that warning_level=2.
 
 warning_cflags = [
-        '-fno-strict-aliasing',
-        '-Wall',
-        '-Wextra',
-        '-Wundef',
-        '-Wnested-externs',
-        '-Wwrite-strings',
-        '-Wpointer-arith',
-        '-Wmissing-declarations',
-        '-Wmissing-prototypes',
-        '-Wstrict-prototypes',
-        '-Wredundant-decls',
-        '-Wno-unused-parameter',
-        '-Wno-missing-field-initializers',
-        '-Wdeclaration-after-statement',
-        '-Wformat=2',
-        '-Wold-style-definition',
-        '-Wcast-align',
-        '-Wformat-nonliteral',
-        '-Wformat-security',
-        '-Wsign-compare',
-        '-Wstrict-aliasing',
-        '-Wshadow',
-        '-Winline',
-        '-Wpacked',
-        '-Wmissing-format-attribute',
-        '-Wmissing-noreturn',
-        '-Winit-self',
-        '-Wredundant-decls',
-        '-Wmissing-include-dirs',
-        '-Wunused-but-set-variable',
-        '-Warray-bounds',
-        '-Wimplicit-function-declaration',
-        '-Wreturn-type',
-        '-Wswitch-enum',
-        '-Wswitch-default',
-        '-Wduplicated-cond',
-        '-Wduplicated-branches',
-        '-Wlogical-op',
-        '-Wrestrict',
-        '-Wnull-dereference',
-        '-Wjump-misses-init',
-        '-Wdouble-promotion'
+  '-fno-strict-aliasing',
+  '-Wundef',
+  '-Wnested-externs',
+  '-Wwrite-strings',
+  '-Wpointer-arith',
+  '-Wmissing-declarations',
+  '-Wmissing-prototypes',
+  '-Wstrict-prototypes',
+  '-Wredundant-decls',
+  '-Wno-unused-parameter',
+  '-Wno-missing-field-initializers',
+  '-Wdeclaration-after-statement',
+  '-Wformat=2',
+  '-Wold-style-definition',
+  '-Wcast-align',
+  '-Wformat-nonliteral',
+  '-Wformat-security',
+  '-Wsign-compare',
+  '-Wstrict-aliasing',
+  '-Wshadow',
+  '-Winline',
+  '-Wpacked',
+  '-Wmissing-format-attribute',
+  '-Wmissing-noreturn',
+  '-Winit-self',
+  '-Wredundant-decls',
+  '-Wmissing-include-dirs',
+  '-Wunused-but-set-variable',
+  '-Warray-bounds',
+  '-Wimplicit-function-declaration',
+  '-Wreturn-type',
+  '-Wswitch-enum',
+  '-Wswitch-default',
+  '-Wduplicated-cond',
+  '-Wduplicated-branches',
+  '-Wlogical-op',
+  '-Wrestrict',
+  '-Wnull-dereference',
+  '-Wjump-misses-init',
+  '-Wdouble-promotion'
 ]
 
 c_compiler = meson.get_compiler('c')
 supported_warning_cflags = c_compiler.get_supported_arguments(warning_cflags)
-add_global_arguments(supported_warning_cflags, language : 'c')
+add_project_arguments(supported_warning_cflags, language : 'c')
 ##### end CFLAGS
 
 subdir('data')
@@ -163,12 +164,12 @@
 subdir('unit-tests')
 
 if get_option('gtk_doc')
-        subdir('docs/reference')
+  subdir('docs/reference')
 endif
 
 meson.add_install_script(
-        'meson_post_install.py',
-        join_paths(get_option('prefix'), get_option('datadir'))
+  'meson_post_install.py',
+  join_paths(get_option('prefix'), get_option('datadir'))
 )
 
 # Print a summary of the configuration

=== modified file 'plugins/gedit-plugin/meson.build'
--- a/plugins/gedit-plugin/meson.build	2018-03-14 11:52:49 +0000
+++ b/plugins/gedit-plugin/meson.build	2019-12-08 10:26:28 +0000
@@ -1,17 +1,17 @@
 gedit_plugin_dir = join_paths(get_option('prefix'), get_option('libdir'), 'gedit/plugins')
 
 install_data(
-        'devhelp.py',
-        install_dir : gedit_plugin_dir
+  'devhelp.py',
+  install_dir : gedit_plugin_dir
 )
 
 plugin_info_file = 'devhelp.plugin'
 I18N.merge_file(
-        plugin_info_file,
-        type : 'desktop',
-        input : plugin_info_file + '.desktop.in',
-        output : plugin_info_file,
-        po_dir : '../../po/',
-        install : true,
-        install_dir : gedit_plugin_dir
+  plugin_info_file,
+  type : 'desktop',
+  input : plugin_info_file + '.desktop.in',
+  output : plugin_info_file,
+  po_dir : '../../po/',
+  install : true,
+  install_dir : gedit_plugin_dir
 )

=== modified file 'po/meson.build'
--- a/po/meson.build	2018-03-13 12:21:00 +0000
+++ b/po/meson.build	2019-12-08 10:26:28 +0000
@@ -1,4 +1,4 @@
 I18N.gettext(
-        GETTEXT_PACKAGE_NAME,
-        preset : 'glib'
+  GETTEXT_PACKAGE_NAME,
+  preset : 'glib'
 )

=== modified file 'src/meson.build'
--- a/src/meson.build	2018-06-07 16:40:05 +0000
+++ b/src/meson.build	2019-12-08 10:26:28 +0000
@@ -1,22 +1,22 @@
 devhelp_app_sources = [
-        'dh-app.c',
-        'dh-assistant.c',
-        'dh-main.c',
-        'dh-preferences.c',
-        'dh-settings-app.c',
-        'dh-util-app.c',
-        'dh-window.c'
+  'dh-app.c',
+  'dh-assistant.c',
+  'dh-main.c',
+  'dh-preferences.c',
+  'dh-settings-app.c',
+  'dh-util-app.c',
+  'dh-window.c'
 ]
 
 devhelp_app_sources += GNOME.compile_resources(
-        'dh-resources',
-        'dh.gresource.xml'
+  'dh-resources',
+  'dh.gresource.xml'
 )
 
 executable(
-        'devhelp',
-        devhelp_app_sources,
-        include_directories : [CONFIG_H_INCLUDE_DIR, ROOT_INCLUDE_DIR],
-        dependencies : [DEVHELP_APP_DEPS, SHARED_LIBDEVHELP_DECLARED_DEP],
-        install : true
+  'devhelp',
+  devhelp_app_sources,
+  include_directories : [CONFIG_H_INCLUDE_DIR, ROOT_INCLUDE_DIR],
+  dependencies : [DEVHELP_APP_DEPS, SHARED_LIBDEVHELP_DECLARED_DEP],
+  install : true
 )

=== modified file 'unit-tests/meson.build'
--- a/unit-tests/meson.build	2018-03-12 20:14:47 +0000
+++ b/unit-tests/meson.build	2019-12-08 10:26:28 +0000
@@ -1,17 +1,17 @@
 unit_tests = [
-        'test-completion',
-        'test-link',
-        'test-search-context',
-        'test-util'
+  'test-completion',
+  'test-link',
+  'test-search-context',
+  'test-util'
 ]
 
 foreach unit_test : unit_tests
-        exe = executable(
-                unit_test,
-                unit_test + '.c',
-                include_directories : ROOT_INCLUDE_DIR,
-                dependencies : [LIBDEVHELP_DEPS, STATIC_LIBDEVHELP_DECLARED_DEP]
-        )
+  exe = executable(
+    unit_test,
+    unit_test + '.c',
+    include_directories : ROOT_INCLUDE_DIR,
+    dependencies : [LIBDEVHELP_DEPS, STATIC_LIBDEVHELP_DECLARED_DEP]
+  )
 
-        test(unit_test, exe)
+  test(unit_test, exe)
 endforeach