+From a369e61d2a20493e6fcde9b6ac7e800174487a41 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Fri, 6 Sep 2019 11:00:52 +0200
+Subject: [PATCH] build: use regexp in gtkdoc --ignore-decorators option
+
+gtkdoc-scan supports regular expressions in the --ignore-decorators
+command-line option. Since it is easier to use a regexp than grepping
+macros from a source file, revert the ugly solution from commit
+2d941dc95a1d ('build: fix errors when building with gtk-doc 1.32').
+
+(cherry picked from commit 11cf082a6233a5c2f17da1b49457a66266062678)
+---
+ docs/libnm/Makefile.am | 4 +---
+ docs/libnm/meson.build | 5 +----
+ tools/decorators.sh | 7 -------
+ 3 files changed, 2 insertions(+), 14 deletions(-)
+ delete mode 100755 tools/decorators.sh
+
+diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am
+index ded32f8218..20dc8de571 100644
+--- a/docs/libnm/Makefile.am
++++ b/docs/libnm/Makefile.am
+@@ -18,10 +18,8 @@ DOC_SOURCE_DIR= \
+ $(top_srcdir)/libnm \