diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-19 04:48:26 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-19 04:48:26 +0000 |
| commit | e6f0103940e2dbec15fb46138f936ab7400b80f8 (patch) | |
| tree | eb116ec2d05c8ec40506c6652fd1ebb7f879145f | |
| parent | 1ac1147ecbc7c4c57f94d25472d6815eb3522b9a (diff) | |
| parent | cbaad3dbd9fa7676f3bf081e9e258b5e1de99367 (diff) | |
| download | gtk+-e6f0103940e2dbec15fb46138f936ab7400b80f8.tar.gz | |
Merge branch 'version-bump' into 'master'
Version bump
See merge request GNOME/gtk!3093
| -rw-r--r-- | gdk/gdkversionmacros.h.in | 23 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | testsuite/tools/validate-data/invalid5.expected | 2 |
3 files changed, 25 insertions, 2 deletions
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__ */ diff --git a/meson.build b/meson.build index a1c58c7abf..d899561a33 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 |