!121 修复master分支编译失败

From: @bitcoffee
Reviewed-by: @t_feng
Signed-off-by: @t_feng

anaconda.spec

@@ -1,7 +1,7 @@
 %define _empty_manifest_terminate_build 0
 Name:    anaconda
 Version: 33.19
-Release: 22
+Release: 23
 Summary: Graphical system installer
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -110,6 +110,7 @@ Patch6070:    bugfix-Don-t-enter-spokes-after-we-leave-the-Summary-hub.patch
 Patch6071:    bugfix-do-not-mount-dbus-source.patch
 Patch6072:    fix-xorg-timeout-and-throw-exception.patch
 Patch6073:    bugfix-Fix-issue-when-ns_info-cannot-be-retrieved-for-NVDim.patch
+Patch6074:    bugfix-Fix-SECTION-headers-in-docstrings.patch
 
 %define dbusver 1.2.3
 %define dnfver 3.6.0
@@ -323,6 +324,12 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Jun 21 2021 liuxin <liuxin264@huawei.com> - 33.19-23
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Fix section headers in docstrings
+
 * Wed May 19 2021 liuxin <liuxin264@huawei.com> - 33.19-22
 - Type:bugfix
 - ID:NA

bugfix-Fix-SECTION-headers-in-docstrings.patch

@@ -0,0 +1,149 @@
+From 5d81a7faa67bc065a6e309561865d1682abbcee4 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <mpitt@redhat.com>
+Date: Wed, 7 Oct 2020 07:26:18 +0200
+Subject: [PATCH] Fix SECTION headers in docstrings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Make them coincide with the class names. The missing "Anaconda" prefix
+causes a build failure with gobject-introspection ≥ 1.61.1 due to [1]:
+
+    Namespace conflict: DocSection('BaseWindow')
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=1885825 for some
+details.
+
+[1] https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/346c0690fe62f614ecb1f55857ea72939d9c0f83
+---
+ widgets/src/BaseStandalone.c     | 2 +-
+ widgets/src/BaseWindow.c         | 2 +-
+ widgets/src/DiskOverview.c       | 2 +-
+ widgets/src/HubWindow.c          | 2 +-
+ widgets/src/LayoutIndicator.c    | 2 +-
+ widgets/src/MountpointSelector.c | 2 +-
+ widgets/src/SpokeSelector.c      | 2 +-
+ widgets/src/SpokeWindow.c        | 2 +-
+ widgets/src/StandaloneWindow.c   | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/widgets/src/BaseStandalone.c b/widgets/src/BaseStandalone.c
+index 361f94d..ae84bfc 100644
+--- a/widgets/src/BaseStandalone.c
++++ b/widgets/src/BaseStandalone.c
+@@ -22,7 +22,7 @@
+ #include "intl.h"
+ 
+ /**
+- * SECTION: BaseStandalone
++ * SECTION: AnacondaBaseStandalone
+  * @title: AnacondaBaseStandalone
+  * @short_description: Abstract base class for standalone Anaconda windows.
+  *
+diff --git a/widgets/src/BaseWindow.c b/widgets/src/BaseWindow.c
+index 203d4a7..35a8fe0 100644
+--- a/widgets/src/BaseWindow.c
++++ b/widgets/src/BaseWindow.c
+@@ -30,7 +30,7 @@
+  #include <atk/atk.h>
+ 
+ /**
+- * SECTION: BaseWindow
++ * SECTION: AnacondaBaseWindow
+  * @title: AnacondaBaseWindow
+  * @short_description: Top-level, non-resizeable window
+  *
+diff --git a/widgets/src/DiskOverview.c b/widgets/src/DiskOverview.c
+index c9e6e0b..2d5aec4 100644
+--- a/widgets/src/DiskOverview.c
++++ b/widgets/src/DiskOverview.c
+@@ -27,7 +27,7 @@
+ #include "widgets-common.h"
+ 
+ /**
+- * SECTION: DiskOverview
++ * SECTION: AnacondaDiskOverview
+  * @title: AnacondaDiskOverview
+  * @short_description: A widget that displays basic information about a disk
+  *
+diff --git a/widgets/src/HubWindow.c b/widgets/src/HubWindow.c
+index 77d89e8..02ecde4 100644
+--- a/widgets/src/HubWindow.c
++++ b/widgets/src/HubWindow.c
+@@ -22,7 +22,7 @@
+ #include "intl.h"
+ 
+ /**
+- * SECTION: HubWindow
++ * SECTION: AnacondaHubWindow
+  * @title: AnacondaHubWindow
+  * @short_description: Window for displaying a Hub
+  *
+diff --git a/widgets/src/LayoutIndicator.c b/widgets/src/LayoutIndicator.c
+index 6e83edd..9fcd983 100644
+--- a/widgets/src/LayoutIndicator.c
++++ b/widgets/src/LayoutIndicator.c
+@@ -36,7 +36,7 @@
+ #define DEFAULT_LABEL_MAX_CHAR_WIDTH 8
+ 
+ /**
+- * SECTION: LayoutIndicator
++ * SECTION: AnacondaLayoutIndicator
+  * @title: AnacondaLayoutIndicator
+  * @short_description: An indicator of currently activated X layout
+  *
+diff --git a/widgets/src/MountpointSelector.c b/widgets/src/MountpointSelector.c
+index e87ba6b..e4b1ad3 100644
+--- a/widgets/src/MountpointSelector.c
++++ b/widgets/src/MountpointSelector.c
+@@ -29,7 +29,7 @@
+ #include "widgets-common.h"
+ 
+ /**
+- * SECTION: MountpointSelector
++ * SECTION: AnacondaMountpointSelector
+  * @title: AnacondaMountpointSelector
+  * @short_description: A graphical way to select a mount point.
+  *
+diff --git a/widgets/src/SpokeSelector.c b/widgets/src/SpokeSelector.c
+index 56db102..a6c680a 100644
+--- a/widgets/src/SpokeSelector.c
++++ b/widgets/src/SpokeSelector.c
+@@ -28,7 +28,7 @@
+ #include "widgets-common.h"
+ 
+ /**
+- * SECTION: SpokeSelector
++ * SECTION: AnacondaSpokeSelector
+  * @title: AnacondaSpokeSelector
+  * @short_description: A graphical way to enter a configuration spoke
+  *
+diff --git a/widgets/src/SpokeWindow.c b/widgets/src/SpokeWindow.c
+index 226eb2c..7a958c6 100644
+--- a/widgets/src/SpokeWindow.c
++++ b/widgets/src/SpokeWindow.c
+@@ -25,7 +25,7 @@
+ #include <gdk/gdkkeysyms.h>
+ 
+ /**
+- * SECTION: SpokeWindow
++ * SECTION: AnacondaSpokeWindow
+  * @title: AnacondaSpokeWindow
+  * @short_description: Window for displaying single spokes
+  *
+diff --git a/widgets/src/StandaloneWindow.c b/widgets/src/StandaloneWindow.c
+index 8a92e7b..cc31547 100644
+--- a/widgets/src/StandaloneWindow.c
++++ b/widgets/src/StandaloneWindow.c
+@@ -25,7 +25,7 @@
+ #include <gdk/gdkkeysyms.h>
+ 
+ /**
+- * SECTION: StandaloneWindow
++ * SECTION: AnacondaStandaloneWindow
+  * @title: AnacondaStandaloneWindow
+  * @short_description: Window for displaying standalone spokes
+  *
+-- 
+2.27.0
+