diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml index 565c20c71..9cd3d0e39 100644 --- a/docs/reference/gio/gio-docs.xml +++ b/docs/reference/gio/gio-docs.xml @@ -385,6 +385,10 @@ Index of new symbols in 2.66 + + Index of new symbols in 2.68 + + diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml index 38228ca0a..e464fb792 100644 --- a/docs/reference/glib/glib-docs.xml +++ b/docs/reference/glib/glib-docs.xml @@ -284,6 +284,10 @@ Index of new symbols in 2.66 + + Index of new symbols in 2.68 + + diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index d38fccf40..39a4e1401 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -137,6 +137,7 @@ GLIB_VERSION_2_60 GLIB_VERSION_2_62 GLIB_VERSION_2_64 GLIB_VERSION_2_66 +GLIB_VERSION_2_68 GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_MAX_ALLOWED GLIB_DISABLE_DEPRECATION_WARNINGS @@ -164,6 +165,7 @@ GLIB_AVAILABLE_ENUMERATOR_IN_2_60 GLIB_AVAILABLE_ENUMERATOR_IN_2_62 GLIB_AVAILABLE_ENUMERATOR_IN_2_64 GLIB_AVAILABLE_ENUMERATOR_IN_2_66 +GLIB_AVAILABLE_ENUMERATOR_IN_2_68 GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_2_26 GLIB_AVAILABLE_IN_2_28 @@ -186,6 +188,7 @@ GLIB_AVAILABLE_IN_2_60 GLIB_AVAILABLE_IN_2_62 GLIB_AVAILABLE_IN_2_64 GLIB_AVAILABLE_IN_2_66 +GLIB_AVAILABLE_IN_2_68 GLIB_AVAILABLE_MACRO_IN_2_26 GLIB_AVAILABLE_MACRO_IN_2_28 GLIB_AVAILABLE_MACRO_IN_2_30 @@ -207,11 +210,13 @@ GLIB_AVAILABLE_MACRO_IN_2_60 GLIB_AVAILABLE_MACRO_IN_2_62 GLIB_AVAILABLE_MACRO_IN_2_64 GLIB_AVAILABLE_MACRO_IN_2_66 +GLIB_AVAILABLE_MACRO_IN_2_68 GLIB_AVAILABLE_STATIC_INLINE_IN_2_44 GLIB_AVAILABLE_STATIC_INLINE_IN_2_60 GLIB_AVAILABLE_STATIC_INLINE_IN_2_62 GLIB_AVAILABLE_STATIC_INLINE_IN_2_64 GLIB_AVAILABLE_STATIC_INLINE_IN_2_66 +GLIB_AVAILABLE_STATIC_INLINE_IN_2_68 GLIB_AVAILABLE_TYPE_IN_2_26 GLIB_AVAILABLE_TYPE_IN_2_28 GLIB_AVAILABLE_TYPE_IN_2_30 @@ -233,6 +238,7 @@ GLIB_AVAILABLE_TYPE_IN_2_60 GLIB_AVAILABLE_TYPE_IN_2_62 GLIB_AVAILABLE_TYPE_IN_2_64 GLIB_AVAILABLE_TYPE_IN_2_66 +GLIB_AVAILABLE_TYPE_IN_2_68 GLIB_DEPRECATED_ENUMERATOR GLIB_DEPRECATED_ENUMERATOR_FOR GLIB_DEPRECATED_ENUMERATOR_IN_2_26 @@ -277,6 +283,8 @@ GLIB_DEPRECATED_ENUMERATOR_IN_2_64 GLIB_DEPRECATED_ENUMERATOR_IN_2_64_FOR GLIB_DEPRECATED_ENUMERATOR_IN_2_66 GLIB_DEPRECATED_ENUMERATOR_IN_2_66_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_68 +GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR GLIB_DEPRECATED_IN_2_26 GLIB_DEPRECATED_IN_2_26_FOR GLIB_DEPRECATED_IN_2_28 @@ -319,6 +327,8 @@ GLIB_DEPRECATED_IN_2_64 GLIB_DEPRECATED_IN_2_64_FOR GLIB_DEPRECATED_IN_2_66 GLIB_DEPRECATED_IN_2_66_FOR +GLIB_DEPRECATED_IN_2_68 +GLIB_DEPRECATED_IN_2_68_FOR GLIB_DEPRECATED_MACRO GLIB_DEPRECATED_MACRO_FOR GLIB_DEPRECATED_MACRO_IN_2_26 @@ -363,6 +373,8 @@ GLIB_DEPRECATED_MACRO_IN_2_64 GLIB_DEPRECATED_MACRO_IN_2_64_FOR GLIB_DEPRECATED_MACRO_IN_2_66 GLIB_DEPRECATED_MACRO_IN_2_66_FOR +GLIB_DEPRECATED_MACRO_IN_2_68 +GLIB_DEPRECATED_MACRO_IN_2_68_FOR GLIB_DEPRECATED_TYPE GLIB_DEPRECATED_TYPE_FOR GLIB_DEPRECATED_TYPE_IN_2_26 @@ -407,6 +419,8 @@ GLIB_DEPRECATED_TYPE_IN_2_64 GLIB_DEPRECATED_TYPE_IN_2_64_FOR GLIB_DEPRECATED_TYPE_IN_2_66 GLIB_DEPRECATED_TYPE_IN_2_66_FOR +GLIB_DEPRECATED_TYPE_IN_2_68 +GLIB_DEPRECATED_TYPE_IN_2_68_FOR GLIB_VERSION_CUR_STABLE GLIB_VERSION_PREV_STABLE diff --git a/docs/reference/gobject/gobject-docs.xml b/docs/reference/gobject/gobject-docs.xml index 74cfcd976..ddbc9f274 100644 --- a/docs/reference/gobject/gobject-docs.xml +++ b/docs/reference/gobject/gobject-docs.xml @@ -204,6 +204,10 @@ Index of new symbols in 2.66 + + Index of new symbols in 2.68 + + diff --git a/docs/reference/meson.build b/docs/reference/meson.build index a676af12d..3f09be555 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', '64', '66', + '60', '62', '64', '66', '68', ] ignore_decorators = [ diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h index 08bf7d042..c2e8f1d90 100644 --- a/glib/gversionmacros.h +++ b/glib/gversionmacros.h @@ -245,6 +245,16 @@ */ #define GLIB_VERSION_2_66 (G_ENCODE_VERSION (2, 66)) +/** + * GLIB_VERSION_2_68: + * + * A macro that evaluates to the 2.68 version of GLib, in a format + * that can be used by the C pre-processor. + * + * Since: 2.68 + */ +#define GLIB_VERSION_2_68 (G_ENCODE_VERSION (2, 68)) + /* evaluates to the current stable version; for development cycles, * this means the next stable target */ @@ -1014,4 +1024,38 @@ # define GLIB_AVAILABLE_TYPE_IN_2_66 #endif +#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68 +# define GLIB_DEPRECATED_IN_2_68 GLIB_DEPRECATED +# define GLIB_DEPRECATED_IN_2_68_FOR(f) GLIB_DEPRECATED_FOR(f) +# define GLIB_DEPRECATED_MACRO_IN_2_68 GLIB_DEPRECATED_MACRO +# define GLIB_DEPRECATED_MACRO_IN_2_68_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) +# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68 GLIB_DEPRECATED_ENUMERATOR +# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) +# define GLIB_DEPRECATED_TYPE_IN_2_68 GLIB_DEPRECATED_TYPE +# define GLIB_DEPRECATED_TYPE_IN_2_68_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) +#else +# define GLIB_DEPRECATED_IN_2_68 _GLIB_EXTERN +# define GLIB_DEPRECATED_IN_2_68_FOR(f) _GLIB_EXTERN +# define GLIB_DEPRECATED_MACRO_IN_2_68 +# define GLIB_DEPRECATED_MACRO_IN_2_68_FOR(f) +# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68 +# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR(f) +# define GLIB_DEPRECATED_TYPE_IN_2_68 +# define GLIB_DEPRECATED_TYPE_IN_2_68_FOR(f) +#endif + +#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_68 +# define GLIB_AVAILABLE_IN_2_68 GLIB_UNAVAILABLE(2, 68) +# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_68 GLIB_UNAVAILABLE_STATIC_INLINE(2, 68) +# define GLIB_AVAILABLE_MACRO_IN_2_68 GLIB_UNAVAILABLE_MACRO(2, 68) +# define GLIB_AVAILABLE_ENUMERATOR_IN_2_68 GLIB_UNAVAILABLE_ENUMERATOR(2, 68) +# define GLIB_AVAILABLE_TYPE_IN_2_68 GLIB_UNAVAILABLE_TYPE(2, 68) +#else +# define GLIB_AVAILABLE_IN_2_68 _GLIB_EXTERN +# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_68 +# define GLIB_AVAILABLE_MACRO_IN_2_68 +# define GLIB_AVAILABLE_ENUMERATOR_IN_2_68 +# define GLIB_AVAILABLE_TYPE_IN_2_68 +#endif + #endif /* __G_VERSION_MACROS_H__ */ diff --git a/meson.build b/meson.build index 7765a40a1..b27ce9b00 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('glib', 'c', 'cpp', - version : '2.66.0', + version : '2.67.0', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', default_options : [