From f1f8ae5a833cd22f59b2f5b880367af484cd9594 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 28 Apr 2022 11:31:43 +0200
Subject: [PATCH] libnm: drop NM_DEPRECATED_IN_1_2/NM_AVAILABLE_IN_1_2 macros
 from structs in libnm headers

On rhel-8.7, we are going to no longer use the pre-generated docs, but
instead generate them on build time with "gtk-doc-1.28-4.el8".

That version of gtk-doc has problems with these deprecated/available
macros on the structs, so it will generate:

  /usr/share/gtk-doc/html/libnm/libnm-nm-vpn-service-plugin.html
  /usr/share/gtk-doc/html/libnm/libnm-nm-vpn-plugin-old.html

instead of

  /usr/share/gtk-doc/html/libnm/NMVpnServicePlugin.html
  /usr/share/gtk-doc/html/libnm/NMVpnPluginOld.html

Newer gtk-doc versions don't have this problem.

But as we usually don't use these macros on typedefs (only on functions), and as
1.2 is very old already, it seems simpler to just drop this (instead of
fixing gtk-doc).

See-also: https://bugzilla.redhat.com/show_bug.cgi?id=1995915
---
 src/libnm-client-public/nm-vpn-plugin-old.h     | 4 ++--
 src/libnm-client-public/nm-vpn-service-plugin.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libnm-client-public/nm-vpn-plugin-old.h b/src/libnm-client-public/nm-vpn-plugin-old.h
index 7704c1539e..fe0d4bc2cd 100644
--- a/src/libnm-client-public/nm-vpn-plugin-old.h
+++ b/src/libnm-client-public/nm-vpn-plugin-old.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 typedef struct {
     NM_DEPRECATED_IN_1_2
     GObject parent;
-} NMVpnPluginOld NM_DEPRECATED_IN_1_2;
+} NMVpnPluginOld;
 
 typedef struct {
     NM_DEPRECATED_IN_1_2
@@ -85,7 +85,7 @@ typedef struct {
     /*< private >*/
     NM_DEPRECATED_IN_1_2
     gpointer padding[8];
-} NMVpnPluginOldClass NM_DEPRECATED_IN_1_2;
+} NMVpnPluginOldClass;
 
 NM_DEPRECATED_IN_1_2
 GType nm_vpn_plugin_old_get_type(void);
diff --git a/src/libnm-client-public/nm-vpn-service-plugin.h b/src/libnm-client-public/nm-vpn-service-plugin.h
index 81fb6730ae..5187d93d43 100644
--- a/src/libnm-client-public/nm-vpn-service-plugin.h
+++ b/src/libnm-client-public/nm-vpn-service-plugin.h
@@ -39,7 +39,7 @@ G_BEGIN_DECLS
 typedef struct {
     NM_AVAILABLE_IN_1_2
     GObject parent;
-} NMVpnServicePlugin NM_AVAILABLE_IN_1_2;
+} NMVpnServicePlugin;
 
 typedef struct {
     NM_AVAILABLE_IN_1_2
@@ -92,7 +92,7 @@ typedef struct {
     /*< private >*/
     NM_AVAILABLE_IN_1_2
     gpointer padding[8];
-} NMVpnServicePluginClass NM_AVAILABLE_IN_1_2;
+} NMVpnServicePluginClass;
 
 NM_AVAILABLE_IN_1_2
 GType nm_vpn_service_plugin_get_type(void);