From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 14 Mar 2023 12:21:35 +0000 (-0400)
Subject: Start 4.12 development
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~556^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=93edb0809471419accf13fc40bacb6eaea374ae3;p=gtk4.git

Start 4.12 development
---

diff --git a/NEWS b/NEWS
index 67147068e9..a3b5be8815 100644
--- 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 9c25dab76d..e8dd30eeb9 100644
--- 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 242dff30f3..9d8bf1db63 100644
--- 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 7f2c04d827..a64a1ee8d4 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.10
+invalid5.ui:3:1 Required GTK version 5.10, current version is 4.11