From ee43a6a60386c8fdcb79cd12b7acec7498e4ecd6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 11 Jan 2021 19:00:04 -0500 Subject: [PATCH 1/2] Bump version to 4.1 master is now open for 4.2 API additions. Includes an update for the one test we have that has the version number in its expected output. --- meson.build | 2 +- testsuite/tools/validate-data/invalid5.expected | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index d546c00b91..b3b5291c90 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gtk', 'c', - version: '4.0.2', + version: '4.1.0', default_options: [ 'buildtype=debugoptimized', 'warning_level=1', diff --git a/testsuite/tools/validate-data/invalid5.expected b/testsuite/tools/validate-data/invalid5.expected index 615264a579..c6a9ca68d0 100644 --- a/testsuite/tools/validate-data/invalid5.expected +++ b/testsuite/tools/validate-data/invalid5.expected @@ -1 +1 @@ -invalid5.ui:3:1 Required GTK version 5.10, current version is 4.0 +invalid5.ui:3:1 Required GTK version 5.10, current version is 4.1 From cbaad3dbd9fa7676f3bf081e9e258b5e1de99367 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 11 Jan 2021 18:17:59 -0500 Subject: [PATCH 2/2] Add version macros for 4.2 These will be needed for adding new API. --- gdk/gdkversionmacros.h.in | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gdk/gdkversionmacros.h.in b/gdk/gdkversionmacros.h.in index 3c6d6fbf05..b6d0960a7f 100644 --- a/gdk/gdkversionmacros.h.in +++ b/gdk/gdkversionmacros.h.in @@ -78,6 +78,14 @@ */ #define GDK_VERSION_4_0 (G_ENCODE_VERSION (4, 0)) +/** + * GDK_VERSION_4_2: + * + * A macro that evaluates to the 4.2 version of GDK, in a format + * that can be used by the C pre-processor. + */ +#define GDK_VERSION_4_2 (G_ENCODE_VERSION (4, 2)) + /* evaluates to the current stable version; for development cycles, * this means the next stable target, with a hard backstop to the @@ -175,4 +183,19 @@ # define GDK_DEPRECATED_IN_4_0_FOR(f) _GDK_EXTERN #endif + +#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_4_2 +# define GDK_AVAILABLE_IN_4_2 GDK_UNAVAILABLE(4, 2) +#else +# define GDK_AVAILABLE_IN_4_2 _GDK_EXTERN +#endif + +#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_2 +# define GDK_DEPRECATED_IN_4_2 GDK_DEPRECATED +# define GDK_DEPRECATED_IN_4_2_FOR(f) GDK_DEPRECATED_FOR(f) +#else +# define GDK_DEPRECATED_IN_4_2 _GDK_EXTERN +# define GDK_DEPRECATED_IN_4_2_FOR(f) _GDK_EXTERN +#endif + #endif /* __GDK_VERSION_MACROS_H__ */