New upstream version 1.11.3 upstream/1.11.3

5 files changed, 48 insertions, 24 deletions

diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am
index b1386e60..5b8d7260 100644
--- a/docs/libnm-util/Makefile.am
+++ b/docs/libnm-util/Makefile.am
@@ -17,9 +17,6 @@ DOC_SOURCE_DIR= \
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS=--rebuild-types --rebuild-sections
 
-# Extra options to supply to gtkdoc-scangobj.
-SCANGOBJ_OPTIONS=--type-init-func 'g_type_init();'
-
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
@@ -33,7 +30,6 @@ CFILE_GLOB=$(top_srcdir)/libnm-util/*.c
 # Header files to ignore when scanning.
 IGNORE_HFILES= \
 	crypto.h \
-	nm-setting-template.h \
 	nm-utils-private.h \
 	nm-setting-private.h \
 	nm-param-spec-specialized.h \
@@ -41,7 +37,7 @@ IGNORE_HFILES= \
 	nm-version.h
 
 # Images to copy into HTML directory.
-HTML_IMAGES = 
+HTML_IMAGES =
 
 # Extra XML files that are included by $(DOC_MAIN_SGML_FILE).
 content_files = version.xml
@@ -52,11 +48,10 @@ extra_files =
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS =				\
-	-I$(top_srcdir)/libnm-util	\
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
+GTKDOC_CFLAGS = \
+	-I$(top_srcdir)/libnm-util \
 	-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
-	$(GLIB_CFLAGS)			\
+	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 GTKDOC_LIBS = \
@@ -68,7 +63,7 @@ GTKDOC_LIBS = \
 # include common portion ...
 include $(top_srcdir)/gtk-doc.make
 
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in meson.build
 
 CLEANFILES += \
 	libnm-util-sections.txt \
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 6471f826..63858099 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -209,7 +209,7 @@ GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
@@ -263,14 +263,13 @@ LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBNDP_CFLAGS = @LIBNDP_CFLAGS@
 LIBNDP_LIBS = @LIBNDP_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBPSL_CFLAGS = @LIBPSL_CFLAGS@
 LIBPSL_LIBS = @LIBPSL_LIBS@
 LIBS = @LIBS@
 LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@
 LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@
+LIBSYSTEMD_NM_CFLAGS = @LIBSYSTEMD_NM_CFLAGS@
 LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@
 LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
@@ -341,8 +340,11 @@ QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READELF = @READELF@
 READLINE_LIBS = @READLINE_LIBS@
-SANITIZERS = @SANITIZERS@
 SANITIZER_ENV = @SANITIZER_ENV@
+SANITIZER_EXEC_CFLAGS = @SANITIZER_EXEC_CFLAGS@
+SANITIZER_EXEC_LDFLAGS = @SANITIZER_EXEC_LDFLAGS@
+SANITIZER_LIB_CFLAGS = @SANITIZER_LIB_CFLAGS@
+SANITIZER_LIB_LDFLAGS = @SANITIZER_LIB_LDFLAGS@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -465,9 +467,6 @@ DOC_SOURCE_DIR = \
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS = --rebuild-types --rebuild-sections
 
-# Extra options to supply to gtkdoc-scangobj.
-SCANGOBJ_OPTIONS = --type-init-func 'g_type_init();'
-
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS = --sgml-mode --output-format=xml
 
@@ -481,7 +480,6 @@ CFILE_GLOB = $(top_srcdir)/libnm-util/*.c
 # Header files to ignore when scanning.
 IGNORE_HFILES = \
 	crypto.h \
-	nm-setting-template.h \
 	nm-utils-private.h \
 	nm-setting-private.h \
 	nm-param-spec-specialized.h \
@@ -501,10 +499,9 @@ extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
-	-I$(top_srcdir)/libnm-util	\
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
+	-I$(top_srcdir)/libnm-util \
 	-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
-	$(GLIB_CFLAGS)			\
+	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 GTKDOC_LIBS = \
@@ -534,7 +531,7 @@ SETUP_FILES = \
 
 
 # include common portion ...
-EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
+EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in meson.build
 DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
 	sgml.stamp html.stamp pdf.stamp
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 83ae4a9f..99edcddf 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-util Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-util 1.10.6
+      for libnm-util 1.11.3
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm-util/stable/" target="_top">https://developer.gnome.org/libnm-util/stable/</a>.
diff --git a/docs/libnm-util/meson.build b/docs/libnm-util/meson.build
new file mode 100644
index 00000000..7b06baf3
--- /dev/null
+++ b/docs/libnm-util/meson.build
@@ -0,0 +1,32 @@
+doc_module = libnm_util_name
+
+private_headers = [
+  'crypto.h',
+  'nm-utils-private.h',
+  'nm-setting-private.h',
+  'nm-param-spec-specialized.h',
+  'nm-test-utils.h',
+  'nm-version.h'
+]
+
+configure_file(
+  input: version_xml + '.in',
+  output: version_xml,
+  configuration: version_conf
+)
+
+gnome.gtkdoc(
+  doc_module,
+  main_xml: doc_module + '-docs.sgml',
+  src_dir: libnm_util_inc,
+  dependencies: libnm_util_dep,
+  scan_args: [
+    '--rebuild-types',
+    '--rebuild-sections',
+    '--ignore-headers=' + ' '.join(private_headers)
+  ],
+  scanobjs_args: '--type-init-func="g_type_init();"',
+  fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
+  gobject_typesfile: doc_module + '.types',
+  install: true
+)
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index 7b4d9a4f..0a5af26d 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.10.6
+1.11.3