Start 4.12 development

diff --git a/NEWS b/NEWS
index 67147068e96a30aba4883b0942e91cb406512bf8..a3b5be8815b74f728e2baed7304f2314b5808e49 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Overview of Changes in 4.10.2, xx-xx-xxxx
+Overview of Changes in 4.11.1, xx-xx-xxxx
 =========================================
 
 Overview of Changes in 4.10.1, 14-03-2023

diff --git a/gdk/gdkversionmacros.h.in b/gdk/gdkversionmacros.h.in
index 9c25dab76deb2e6f0215bfc50052c97879dd47ae..e8dd30eeb994a2a0fb130f7fc419532c7db4effe 100644 (file)
--- a/gdk/gdkversionmacros.h.in
+++ b/gdk/gdkversionmacros.h.in
@@ -128,6 +128,16 @@
  */
 #define GDK_VERSION_4_10        (G_ENCODE_VERSION (4, 10))
 
+/**
+ * GDK_VERSION_4_12:
+ *
+ * A macro that evaluates to the 4.12 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 4.12
+ */
+#define GDK_VERSION_4_12        (G_ENCODE_VERSION (4, 12))
+
 
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target, with a hard backstop to the
@@ -297,4 +307,18 @@
 # define GDK_DEPRECATED_IN_4_10_FOR(f)          _GDK_EXTERN
 #endif
 
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_4_12
+# define GDK_AVAILABLE_IN_4_12                  GDK_UNAVAILABLE(4, 12)
+#else
+# define GDK_AVAILABLE_IN_4_12                  _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_12
+# define GDK_DEPRECATED_IN_4_12                 GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_4_12_FOR(f)          GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_4_12                 _GDK_EXTERN
+# define GDK_DEPRECATED_IN_4_12_FOR(f)          _GDK_EXTERN
+#endif
+
 #endif  /* __GDK_VERSION_MACROS_H__ */

diff --git a/meson.build b/meson.build
index 242dff30f3d6d41a4dd93255f2d2fd0c3ac7c3e0..9d8bf1db6366ee6f660f76fb697c9b48fecca895 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gtk', 'c',
-        version: '4.10.2',
+        version: '4.11.1',
         default_options: [
           'buildtype=debugoptimized',
           'warning_level=1',

diff --git a/testsuite/tools/validate-data/invalid5.expected b/testsuite/tools/validate-data/invalid5.expected
index 7f2c04d827af705a1bcb54d2f23d125e26a7fe8a..a64a1ee8d407aefa0c90f8834ae645dd60ae6b41 100644 (file)
--- 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.10
+invalid5.ui:3:1 Required GTK version 5.10, current version is 4.11