Merge branch 'since-2-64' into 'master'

Add version macros for GLib 2.64

See merge request GNOME/glib!1112

5 files changed, 61 insertions, 2 deletions

diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml
index fa43eaff7..186543f06 100644
--- a/docs/reference/glib/glib-docs.xml
+++ b/docs/reference/glib/glib-docs.xml
@@ -276,6 +276,10 @@
     <title>Index of new symbols in 2.62</title>
     <xi:include href="xml/api-index-2.62.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-64" role="2.64">
+    <title>Index of new symbols in 2.64</title>
+    <xi:include href="xml/api-index-2.64.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index a5e64a1c1..63457a1ad 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -135,6 +135,7 @@ GLIB_VERSION_2_56
 GLIB_VERSION_2_58
 GLIB_VERSION_2_60
 GLIB_VERSION_2_62
+GLIB_VERSION_2_64
 GLIB_VERSION_MIN_REQUIRED
 GLIB_VERSION_MAX_ALLOWED
 GLIB_DISABLE_DEPRECATION_WARNINGS
@@ -160,6 +161,7 @@ GLIB_AVAILABLE_ENUMERATOR_IN_2_56
 GLIB_AVAILABLE_ENUMERATOR_IN_2_58
 GLIB_AVAILABLE_ENUMERATOR_IN_2_60
 GLIB_AVAILABLE_ENUMERATOR_IN_2_62
+GLIB_AVAILABLE_ENUMERATOR_IN_2_64
 GLIB_AVAILABLE_IN_ALL
 GLIB_AVAILABLE_IN_2_26
 GLIB_AVAILABLE_IN_2_28
@@ -180,6 +182,7 @@ GLIB_AVAILABLE_IN_2_56
 GLIB_AVAILABLE_IN_2_58
 GLIB_AVAILABLE_IN_2_60
 GLIB_AVAILABLE_IN_2_62
+GLIB_AVAILABLE_IN_2_64
 GLIB_AVAILABLE_MACRO_IN_2_26
 GLIB_AVAILABLE_MACRO_IN_2_28
 GLIB_AVAILABLE_MACRO_IN_2_30
@@ -199,6 +202,7 @@ GLIB_AVAILABLE_MACRO_IN_2_56
 GLIB_AVAILABLE_MACRO_IN_2_58
 GLIB_AVAILABLE_MACRO_IN_2_60
 GLIB_AVAILABLE_MACRO_IN_2_62
+GLIB_AVAILABLE_MACRO_IN_2_64
 GLIB_AVAILABLE_TYPE_IN_2_26
 GLIB_AVAILABLE_TYPE_IN_2_28
 GLIB_AVAILABLE_TYPE_IN_2_30
@@ -218,6 +222,7 @@ GLIB_AVAILABLE_TYPE_IN_2_56
 GLIB_AVAILABLE_TYPE_IN_2_58
 GLIB_AVAILABLE_TYPE_IN_2_60
 GLIB_AVAILABLE_TYPE_IN_2_62
+GLIB_AVAILABLE_TYPE_IN_2_64
 GLIB_DEPRECATED_ENUMERATOR
 GLIB_DEPRECATED_ENUMERATOR_FOR
 GLIB_DEPRECATED_ENUMERATOR_IN_2_26
@@ -258,6 +263,8 @@ GLIB_DEPRECATED_ENUMERATOR_IN_2_60
 GLIB_DEPRECATED_ENUMERATOR_IN_2_60_FOR
 GLIB_DEPRECATED_ENUMERATOR_IN_2_62
 GLIB_DEPRECATED_ENUMERATOR_IN_2_62_FOR
+GLIB_DEPRECATED_ENUMERATOR_IN_2_64
+GLIB_DEPRECATED_ENUMERATOR_IN_2_64_FOR
 GLIB_DEPRECATED_IN_2_26
 GLIB_DEPRECATED_IN_2_26_FOR
 GLIB_DEPRECATED_IN_2_28
@@ -296,6 +303,8 @@ GLIB_DEPRECATED_IN_2_60
 GLIB_DEPRECATED_IN_2_60_FOR
 GLIB_DEPRECATED_IN_2_62
 GLIB_DEPRECATED_IN_2_62_FOR
+GLIB_DEPRECATED_IN_2_64
+GLIB_DEPRECATED_IN_2_64_FOR
 GLIB_DEPRECATED_MACRO
 GLIB_DEPRECATED_MACRO_FOR
 GLIB_DEPRECATED_MACRO_IN_2_26
@@ -336,6 +345,8 @@ GLIB_DEPRECATED_MACRO_IN_2_60
 GLIB_DEPRECATED_MACRO_IN_2_60_FOR
 GLIB_DEPRECATED_MACRO_IN_2_62
 GLIB_DEPRECATED_MACRO_IN_2_62_FOR
+GLIB_DEPRECATED_MACRO_IN_2_64
+GLIB_DEPRECATED_MACRO_IN_2_64_FOR
 GLIB_DEPRECATED_TYPE
 GLIB_DEPRECATED_TYPE_FOR
 GLIB_DEPRECATED_TYPE_IN_2_26
@@ -376,6 +387,8 @@ GLIB_DEPRECATED_TYPE_IN_2_60
 GLIB_DEPRECATED_TYPE_IN_2_60_FOR
 GLIB_DEPRECATED_TYPE_IN_2_62
 GLIB_DEPRECATED_TYPE_IN_2_62_FOR
+GLIB_DEPRECATED_TYPE_IN_2_64
+GLIB_DEPRECATED_TYPE_IN_2_64_FOR
 GLIB_VERSION_CUR_STABLE
 GLIB_VERSION_PREV_STABLE
 </SECTION>
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 8da9665f4..18999a3f3 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -7,7 +7,7 @@
 stable_2_series_versions = [
   '26', '28', '30', '32', '34', '36', '38',
   '40', '42', '44', '46', '48', '50', '52', '54', '56', '58',
-  '60', '62',
+  '60', '62', '64',
 ]
 
 ignore_decorators = [
diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h
index ee91f6d5b..07ce76304 100644
--- a/glib/gversionmacros.h
+++ b/glib/gversionmacros.h
@@ -225,6 +225,16 @@
  */
 #define GLIB_VERSION_2_62       (G_ENCODE_VERSION (2, 62))
 
+/**
+ * GLIB_VERSION_2_64:
+ *
+ * A macro that evaluates to the 2.64 version of GLib, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 2.64
+ */
+#define GLIB_VERSION_2_64       (G_ENCODE_VERSION (2, 64))
+
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target
  */
@@ -920,4 +930,36 @@
 # define GLIB_AVAILABLE_TYPE_IN_2_62
 #endif
 
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_64
+# define GLIB_DEPRECATED_IN_2_64                GLIB_DEPRECATED
+# define GLIB_DEPRECATED_IN_2_64_FOR(f)         GLIB_DEPRECATED_FOR(f)
+# define GLIB_DEPRECATED_MACRO_IN_2_64          GLIB_DEPRECATED_MACRO
+# define GLIB_DEPRECATED_MACRO_IN_2_64_FOR(f)   GLIB_DEPRECATED_MACRO_FOR(f)
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_64          GLIB_DEPRECATED_ENUMERATOR
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_64_FOR(f)   GLIB_DEPRECATED_ENUMERATOR_FOR(f)
+# define GLIB_DEPRECATED_TYPE_IN_2_64           GLIB_DEPRECATED_TYPE
+# define GLIB_DEPRECATED_TYPE_IN_2_64_FOR(f)    GLIB_DEPRECATED_TYPE_FOR(f)
+#else
+# define GLIB_DEPRECATED_IN_2_64                _GLIB_EXTERN
+# define GLIB_DEPRECATED_IN_2_64_FOR(f)         _GLIB_EXTERN
+# define GLIB_DEPRECATED_MACRO_IN_2_64
+# define GLIB_DEPRECATED_MACRO_IN_2_64_FOR(f)
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_64
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_64_FOR(f)
+# define GLIB_DEPRECATED_TYPE_IN_2_64
+# define GLIB_DEPRECATED_TYPE_IN_2_64_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_64
+# define GLIB_AVAILABLE_IN_2_64                 GLIB_UNAVAILABLE(2, 64)
+# define GLIB_AVAILABLE_MACRO_IN_2_64           GLIB_UNAVAILABLE_MACRO(2, 64)
+# define GLIB_AVAILABLE_ENUMERATOR_IN_2_64      GLIB_UNAVAILABLE_ENUMERATOR(2, 64)
+# define GLIB_AVAILABLE_TYPE_IN_2_64            GLIB_UNAVAILABLE_TYPE(2, 64)
+#else
+# define GLIB_AVAILABLE_IN_2_64                 _GLIB_EXTERN
+# define GLIB_AVAILABLE_MACRO_IN_2_64
+# define GLIB_AVAILABLE_ENUMERATOR_IN_2_64
+# define GLIB_AVAILABLE_TYPE_IN_2_64
+#endif
+
 #endif /*  __G_VERSION_MACROS_H__ */
diff --git a/meson.build b/meson.build
index 717d1bccb..d52bb01bd 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('glib', 'c', 'cpp',
-  version : '2.62.0',
+  version : '2.63.0',
   # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships
   meson_version : '>= 0.49.2',
   default_options : [