[gnome-build-meta/valentindavid/pipewire-experiment] Fix build of NetworkManager
- From: Valentin David <valentindavid src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/valentindavid/pipewire-experiment] Fix build of NetworkManager
- Date: Tue, 8 Sep 2020 15:24:36 +0000 (UTC)
commit 8ad2643e9ff4b0e7c8061e3005f915db6e163460
Author: Valentin David <valentin david codethink co uk>
Date: Tue Sep 8 17:21:00 2020 +0200
Fix build of NetworkManager
elements/core-deps/NetworkManager.bst | 2 ++
files/NetworkManager/fix-doc-build.patch | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+)
---
diff --git a/elements/core-deps/NetworkManager.bst b/elements/core-deps/NetworkManager.bst
index ff5a821a..c627d441 100644
--- a/elements/core-deps/NetworkManager.bst
+++ b/elements/core-deps/NetworkManager.bst
@@ -3,6 +3,8 @@ sources:
- kind: git_tag
url: git_freedesktop_org:NetworkManager/NetworkManager.git
track: master
+- kind: patch
+ path: files/NetworkManager/fix-doc-build.patch
build-depends:
- core-deps/intltool.bst
- sdk/gtk-doc.bst
diff --git a/files/NetworkManager/fix-doc-build.patch b/files/NetworkManager/fix-doc-build.patch
new file mode 100644
index 00000000..096df11e
--- /dev/null
+++ b/files/NetworkManager/fix-doc-build.patch
@@ -0,0 +1,24 @@
+commit a6e8dfe5034378719beab3eb701ef34f6a63216a
+Author: Valentin David <valentin david codethink co uk>
+Date: Tue Sep 8 17:15:30 2020 +0200
+
+ docs: Fix generated XML syntax in tools/generate-docs-nm-settings-docs-gir.py
+
+ Class description may contains double quotes which is not valid as XML
+ attribute value.
+
+diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
+index ebda99560a..4950045d08 100755
+--- a/tools/generate-docs-nm-settings-docs-gir.py
++++ b/tools/generate-docs-nm-settings-docs-gir.py
+@@ -244,8 +244,8 @@ for settingxml in settings:
+ "%s needs a gtk-doc block with one-line description" % setting.props.name
+ )
+ outfile.write(
+- ' <setting name="%s" description="%s" name_upper="%s" >\n'
+- % (setting.props.name, class_desc, get_setting_name_define(settingxml))
++ ' <setting name="%s" description=%s name_upper="%s" >\n'
++ % (setting.props.name, xml_quoteattr(class_desc), get_setting_name_define(settingxml))
+ )
+
+ setting_properties = {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]