fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 01:40:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: drop NM_DEPRECATED_IN_1_2/NM_AVAILABLE_IN_1_2 macros from structs in libnm headers

Browse source 
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
This commit is contained in:
Thomas Haller 2022-04-28 11:31:43 +02:00
parent 0ddc664526
commit f1f8ae5a83
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libnm-client-public/nm-vpn-plugin-old.h
View file

@ -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);

4
src/libnm-client-public/nm-vpn-service-plugin.h
View file

@ -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);