|
 |
4073ae |
From 1248b642ad32b0bdf296211c1a0a8817bebf1c66 Mon Sep 17 00:00:00 2001
|
|
|
4073ae |
From: Simon McVittie <smcv@collabora.com>
|
|
|
4073ae |
Date: Thu, 25 Feb 2021 10:35:36 +0000
|
|
|
4073ae |
Subject: [PATCH 1/2] gversionmacros: Add version macros for GLib 2.70
|
|
|
4073ae |
|
|
|
4073ae |
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
|
|
4073ae |
---
|
|
|
4073ae |
docs/reference/gio/gio-docs.xml | 4 +++
|
|
|
4073ae |
docs/reference/glib/glib-docs.xml | 4 +++
|
|
|
4073ae |
docs/reference/glib/glib-sections.txt | 14 ++++++++
|
|
|
4073ae |
docs/reference/gobject/gobject-docs.xml | 4 +++
|
|
|
4073ae |
docs/reference/meson.build | 2 +-
|
|
|
4073ae |
glib/gversionmacros.h | 44 +++++++++++++++++++++++++
|
|
|
4073ae |
6 files changed, 71 insertions(+), 1 deletion(-)
|
|
|
4073ae |
|
|
|
4073ae |
diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml
|
|
|
4073ae |
index 9cd3d0e39..a09d6d31d 100644
|
|
|
4073ae |
--- a/docs/reference/gio/gio-docs.xml
|
|
|
4073ae |
+++ b/docs/reference/gio/gio-docs.xml
|
|
|
4073ae |
@@ -389,6 +389,10 @@
|
|
|
4073ae |
<title>Index of new symbols in 2.68</title>
|
|
|
4073ae |
<xi:include href="xml/api-index-2.68.xml"><xi:fallback /></xi:include>
|
|
|
4073ae |
</index>
|
|
|
4073ae |
+ <index id="api-index-2-70" role="2.70">
|
|
|
4073ae |
+ <title>Index of new symbols in 2.70</title>
|
|
|
4073ae |
+ <xi:include href="xml/api-index-2.70.xml"><xi:fallback /></xi:include>
|
|
|
4073ae |
+ </index>
|
|
|
4073ae |
|
|
|
4073ae |
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
|
|
|
4073ae |
|
|
|
4073ae |
diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml
|
|
|
4073ae |
index e464fb792..2f5de9e31 100644
|
|
|
4073ae |
--- a/docs/reference/glib/glib-docs.xml
|
|
|
4073ae |
+++ b/docs/reference/glib/glib-docs.xml
|
|
|
4073ae |
@@ -288,6 +288,10 @@
|
|
|
4073ae |
<title>Index of new symbols in 2.68</title>
|
|
|
4073ae |
<xi:include href="xml/api-index-2.68.xml"><xi:fallback /></xi:include>
|
|
|
4073ae |
</index>
|
|
|
4073ae |
+ <index id="api-index-2-70" role="2.70">
|
|
|
4073ae |
+ <title>Index of new symbols in 2.70</title>
|
|
|
4073ae |
+ <xi:include href="xml/api-index-2.70.xml"><xi:fallback /></xi:include>
|
|
|
4073ae |
+ </index>
|
|
|
4073ae |
|
|
|
4073ae |
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
|
|
|
4073ae |
|
|
|
4073ae |
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
|
|
|
4073ae |
index 460a299bf..75994e889 100644
|
|
|
4073ae |
--- a/docs/reference/glib/glib-sections.txt
|
|
|
4073ae |
+++ b/docs/reference/glib/glib-sections.txt
|
|
|
4073ae |
@@ -138,6 +138,7 @@ GLIB_VERSION_2_62
|
|
|
4073ae |
GLIB_VERSION_2_64
|
|
|
4073ae |
GLIB_VERSION_2_66
|
|
|
4073ae |
GLIB_VERSION_2_68
|
|
|
4073ae |
+GLIB_VERSION_2_70
|
|
|
4073ae |
GLIB_VERSION_CUR_STABLE
|
|
|
4073ae |
GLIB_VERSION_PREV_STABLE
|
|
|
4073ae |
GLIB_VERSION_MIN_REQUIRED
|
|
|
4073ae |
@@ -168,6 +169,7 @@ GLIB_AVAILABLE_ENUMERATOR_IN_2_62
|
|
|
4073ae |
GLIB_AVAILABLE_ENUMERATOR_IN_2_64
|
|
|
4073ae |
GLIB_AVAILABLE_ENUMERATOR_IN_2_66
|
|
|
4073ae |
GLIB_AVAILABLE_ENUMERATOR_IN_2_68
|
|
|
4073ae |
+GLIB_AVAILABLE_ENUMERATOR_IN_2_70
|
|
|
4073ae |
GLIB_AVAILABLE_IN_ALL
|
|
|
4073ae |
GLIB_AVAILABLE_IN_2_26
|
|
|
4073ae |
GLIB_AVAILABLE_IN_2_28
|
|
|
4073ae |
@@ -191,6 +193,7 @@ GLIB_AVAILABLE_IN_2_62
|
|
|
4073ae |
GLIB_AVAILABLE_IN_2_64
|
|
|
4073ae |
GLIB_AVAILABLE_IN_2_66
|
|
|
4073ae |
GLIB_AVAILABLE_IN_2_68
|
|
|
4073ae |
+GLIB_AVAILABLE_IN_2_70
|
|
|
4073ae |
GLIB_AVAILABLE_MACRO_IN_2_26
|
|
|
4073ae |
GLIB_AVAILABLE_MACRO_IN_2_28
|
|
|
4073ae |
GLIB_AVAILABLE_MACRO_IN_2_30
|
|
|
4073ae |
@@ -213,12 +216,14 @@ GLIB_AVAILABLE_MACRO_IN_2_62
|
|
|
4073ae |
GLIB_AVAILABLE_MACRO_IN_2_64
|
|
|
4073ae |
GLIB_AVAILABLE_MACRO_IN_2_66
|
|
|
4073ae |
GLIB_AVAILABLE_MACRO_IN_2_68
|
|
|
4073ae |
+GLIB_AVAILABLE_MACRO_IN_2_70
|
|
|
4073ae |
GLIB_AVAILABLE_STATIC_INLINE_IN_2_44
|
|
|
4073ae |
GLIB_AVAILABLE_STATIC_INLINE_IN_2_60
|
|
|
4073ae |
GLIB_AVAILABLE_STATIC_INLINE_IN_2_62
|
|
|
4073ae |
GLIB_AVAILABLE_STATIC_INLINE_IN_2_64
|
|
|
4073ae |
GLIB_AVAILABLE_STATIC_INLINE_IN_2_66
|
|
|
4073ae |
GLIB_AVAILABLE_STATIC_INLINE_IN_2_68
|
|
|
4073ae |
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_70
|
|
|
4073ae |
GLIB_AVAILABLE_TYPE_IN_2_26
|
|
|
4073ae |
GLIB_AVAILABLE_TYPE_IN_2_28
|
|
|
4073ae |
GLIB_AVAILABLE_TYPE_IN_2_30
|
|
|
4073ae |
@@ -241,6 +246,7 @@ GLIB_AVAILABLE_TYPE_IN_2_62
|
|
|
4073ae |
GLIB_AVAILABLE_TYPE_IN_2_64
|
|
|
4073ae |
GLIB_AVAILABLE_TYPE_IN_2_66
|
|
|
4073ae |
GLIB_AVAILABLE_TYPE_IN_2_68
|
|
|
4073ae |
+GLIB_AVAILABLE_TYPE_IN_2_70
|
|
|
4073ae |
GLIB_DEPRECATED_ENUMERATOR
|
|
|
4073ae |
GLIB_DEPRECATED_ENUMERATOR_FOR
|
|
|
4073ae |
GLIB_DEPRECATED_ENUMERATOR_IN_2_26
|
|
|
4073ae |
@@ -287,6 +293,8 @@ GLIB_DEPRECATED_ENUMERATOR_IN_2_66
|
|
|
4073ae |
GLIB_DEPRECATED_ENUMERATOR_IN_2_66_FOR
|
|
|
4073ae |
GLIB_DEPRECATED_ENUMERATOR_IN_2_68
|
|
|
4073ae |
GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR
|
|
|
4073ae |
+GLIB_DEPRECATED_ENUMERATOR_IN_2_70
|
|
|
4073ae |
+GLIB_DEPRECATED_ENUMERATOR_IN_2_70_FOR
|
|
|
4073ae |
GLIB_DEPRECATED_IN_2_26
|
|
|
4073ae |
GLIB_DEPRECATED_IN_2_26_FOR
|
|
|
4073ae |
GLIB_DEPRECATED_IN_2_28
|
|
|
4073ae |
@@ -331,6 +339,8 @@ GLIB_DEPRECATED_IN_2_66
|
|
|
4073ae |
GLIB_DEPRECATED_IN_2_66_FOR
|
|
|
4073ae |
GLIB_DEPRECATED_IN_2_68
|
|
|
4073ae |
GLIB_DEPRECATED_IN_2_68_FOR
|
|
|
4073ae |
+GLIB_DEPRECATED_IN_2_70
|
|
|
4073ae |
+GLIB_DEPRECATED_IN_2_70_FOR
|
|
|
4073ae |
GLIB_DEPRECATED_MACRO
|
|
|
4073ae |
GLIB_DEPRECATED_MACRO_FOR
|
|
|
4073ae |
GLIB_DEPRECATED_MACRO_IN_2_26
|
|
|
4073ae |
@@ -377,6 +387,8 @@ GLIB_DEPRECATED_MACRO_IN_2_66
|
|
|
4073ae |
GLIB_DEPRECATED_MACRO_IN_2_66_FOR
|
|
|
4073ae |
GLIB_DEPRECATED_MACRO_IN_2_68
|
|
|
4073ae |
GLIB_DEPRECATED_MACRO_IN_2_68_FOR
|
|
|
4073ae |
+GLIB_DEPRECATED_MACRO_IN_2_70
|
|
|
4073ae |
+GLIB_DEPRECATED_MACRO_IN_2_70_FOR
|
|
|
4073ae |
GLIB_DEPRECATED_TYPE
|
|
|
4073ae |
GLIB_DEPRECATED_TYPE_FOR
|
|
|
4073ae |
GLIB_DEPRECATED_TYPE_IN_2_26
|
|
|
4073ae |
@@ -423,6 +435,8 @@ GLIB_DEPRECATED_TYPE_IN_2_66
|
|
|
4073ae |
GLIB_DEPRECATED_TYPE_IN_2_66_FOR
|
|
|
4073ae |
GLIB_DEPRECATED_TYPE_IN_2_68
|
|
|
4073ae |
GLIB_DEPRECATED_TYPE_IN_2_68_FOR
|
|
|
4073ae |
+GLIB_DEPRECATED_TYPE_IN_2_70
|
|
|
4073ae |
+GLIB_DEPRECATED_TYPE_IN_2_70_FOR
|
|
|
4073ae |
GLIB_VERSION_CUR_STABLE
|
|
|
4073ae |
GLIB_VERSION_PREV_STABLE
|
|
|
4073ae |
</SECTION>
|
|
|
4073ae |
diff --git a/docs/reference/gobject/gobject-docs.xml b/docs/reference/gobject/gobject-docs.xml
|
|
|
4073ae |
index ddbc9f274..e8e7c76d9 100644
|
|
|
4073ae |
--- a/docs/reference/gobject/gobject-docs.xml
|
|
|
4073ae |
+++ b/docs/reference/gobject/gobject-docs.xml
|
|
|
4073ae |
@@ -208,6 +208,10 @@
|
|
|
4073ae |
<title>Index of new symbols in 2.68</title>
|
|
|
4073ae |
<xi:include href="xml/api-index-2.68.xml"><xi:fallback /></xi:include>
|
|
|
4073ae |
</index>
|
|
|
4073ae |
+ <index id="api-index-2-70" role="2.70">
|
|
|
4073ae |
+ <title>Index of new symbols in 2.70</title>
|
|
|
4073ae |
+ <xi:include href="xml/api-index-2.70.xml"><xi:fallback /></xi:include>
|
|
|
4073ae |
+ </index>
|
|
|
4073ae |
|
|
|
4073ae |
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
|
|
|
4073ae |
|
|
|
4073ae |
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
|
|
|
4073ae |
index 3f09be555..53ca12ff8 100644
|
|
|
4073ae |
--- a/docs/reference/meson.build
|
|
|
4073ae |
+++ b/docs/reference/meson.build
|
|
|
4073ae |
@@ -7,7 +7,7 @@
|
|
|
4073ae |
stable_2_series_versions = [
|
|
|
4073ae |
'26', '28', '30', '32', '34', '36', '38',
|
|
|
4073ae |
'40', '42', '44', '46', '48', '50', '52', '54', '56', '58',
|
|
|
4073ae |
- '60', '62', '64', '66', '68',
|
|
|
4073ae |
+ '60', '62', '64', '66', '68', '70',
|
|
|
4073ae |
]
|
|
|
4073ae |
|
|
|
4073ae |
ignore_decorators = [
|
|
|
4073ae |
diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h
|
|
|
4073ae |
index 77486eafb..d052709cf 100644
|
|
|
4073ae |
--- a/glib/gversionmacros.h
|
|
|
4073ae |
+++ b/glib/gversionmacros.h
|
|
|
4073ae |
@@ -255,6 +255,16 @@
|
|
|
4073ae |
*/
|
|
|
4073ae |
#define GLIB_VERSION_2_68 (G_ENCODE_VERSION (2, 68))
|
|
|
4073ae |
|
|
|
4073ae |
+/**
|
|
|
4073ae |
+ * GLIB_VERSION_2_70:
|
|
|
4073ae |
+ *
|
|
|
4073ae |
+ * A macro that evaluates to the 2.70 version of GLib, in a format
|
|
|
4073ae |
+ * that can be used by the C pre-processor.
|
|
|
4073ae |
+ *
|
|
|
4073ae |
+ * Since: 2.70
|
|
|
4073ae |
+ */
|
|
|
4073ae |
+#define GLIB_VERSION_2_70 (G_ENCODE_VERSION (2, 70))
|
|
|
4073ae |
+
|
|
|
4073ae |
/**
|
|
|
4073ae |
* GLIB_VERSION_CUR_STABLE:
|
|
|
4073ae |
*
|
|
|
4073ae |
@@ -1076,4 +1086,38 @@
|
|
|
4073ae |
# define GLIB_AVAILABLE_TYPE_IN_2_68
|
|
|
4073ae |
#endif
|
|
|
4073ae |
|
|
|
4073ae |
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_70
|
|
|
4073ae |
+# define GLIB_DEPRECATED_IN_2_70 GLIB_DEPRECATED
|
|
|
4073ae |
+# define GLIB_DEPRECATED_IN_2_70_FOR(f) GLIB_DEPRECATED_FOR(f)
|
|
|
4073ae |
+# define GLIB_DEPRECATED_MACRO_IN_2_70 GLIB_DEPRECATED_MACRO
|
|
|
4073ae |
+# define GLIB_DEPRECATED_MACRO_IN_2_70_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f)
|
|
|
4073ae |
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70 GLIB_DEPRECATED_ENUMERATOR
|
|
|
4073ae |
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f)
|
|
|
4073ae |
+# define GLIB_DEPRECATED_TYPE_IN_2_70 GLIB_DEPRECATED_TYPE
|
|
|
4073ae |
+# define GLIB_DEPRECATED_TYPE_IN_2_70_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f)
|
|
|
4073ae |
+#else
|
|
|
4073ae |
+# define GLIB_DEPRECATED_IN_2_70 _GLIB_EXTERN
|
|
|
4073ae |
+# define GLIB_DEPRECATED_IN_2_70_FOR(f) _GLIB_EXTERN
|
|
|
4073ae |
+# define GLIB_DEPRECATED_MACRO_IN_2_70
|
|
|
4073ae |
+# define GLIB_DEPRECATED_MACRO_IN_2_70_FOR(f)
|
|
|
4073ae |
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70
|
|
|
4073ae |
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70_FOR(f)
|
|
|
4073ae |
+# define GLIB_DEPRECATED_TYPE_IN_2_70
|
|
|
4073ae |
+# define GLIB_DEPRECATED_TYPE_IN_2_70_FOR(f)
|
|
|
4073ae |
+#endif
|
|
|
4073ae |
+
|
|
|
4073ae |
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_70
|
|
|
4073ae |
+# define GLIB_AVAILABLE_IN_2_70 GLIB_UNAVAILABLE(2, 70)
|
|
|
4073ae |
+# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_70 GLIB_UNAVAILABLE_STATIC_INLINE(2, 70)
|
|
|
4073ae |
+# define GLIB_AVAILABLE_MACRO_IN_2_70 GLIB_UNAVAILABLE_MACRO(2, 70)
|
|
|
4073ae |
+# define GLIB_AVAILABLE_ENUMERATOR_IN_2_70 GLIB_UNAVAILABLE_ENUMERATOR(2, 70)
|
|
|
4073ae |
+# define GLIB_AVAILABLE_TYPE_IN_2_70 GLIB_UNAVAILABLE_TYPE(2, 70)
|
|
|
4073ae |
+#else
|
|
|
4073ae |
+# define GLIB_AVAILABLE_IN_2_70 _GLIB_EXTERN
|
|
|
4073ae |
+# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_70
|
|
|
4073ae |
+# define GLIB_AVAILABLE_MACRO_IN_2_70
|
|
|
4073ae |
+# define GLIB_AVAILABLE_ENUMERATOR_IN_2_70
|
|
|
4073ae |
+# define GLIB_AVAILABLE_TYPE_IN_2_70
|
|
|
4073ae |
+#endif
|
|
|
4073ae |
+
|
|
|
4073ae |
#endif /* __G_VERSION_MACROS_H__ */
|
|
|
4073ae |
--
|
|
|
4073ae |
GitLab
|