Merge branch 'version-bump' into 'master'

Version bump

See merge request GNOME/gtk!3093

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__ */

meson.build

@@ -1,5 +1,5 @@
 project('gtk', 'c',
-        version: '4.0.2',
+        version: '4.1.0',
         default_options: [
           'buildtype=debugoptimized',
           'warning_level=1',

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