From 77f32a69c0a35ffd3a1a542a6057c1c6d13c793d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 22 Apr 2021 21:40:00 -0400
Subject: [PATCH] 3.24.29

---
 NEWS         | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 meson.build  |  4 ++--
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index e0cf123147..f268185068 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,52 @@
+Overview of Changes in GTK+ 3.24.29
+===================================
+
+* Input:
+ - Look for a Compose file in the right place (~/.config/gtk-3.0)
+ - Revert some Compose sequence changes (mainly around dead
+   acute and apostrophe)
+ - Consume all key events during preedit, to avoid unexpected
+   interactions
+ - Ignore more modifiers during preedit, to allow using 3rd and
+   5th level choosers
+ - Fix handling of cursor positions in non-ASCII preedit text
+
+* GtkSpinButton:
+ - Interpret localized digits
+
+* GtkScale:
+ - Fix sporadic criticals
+
+* GtkScrolledWindow:
+ - Cancel overshoot on size changes
+ - Avoid criticals with non-overlay scrollbars
+
+* GtkFileChooser:
+ - Handle smb mounts better
+
+* GtkListBox:
+ - Fix extending multi-selections
+
+* Fix a possible crash in gtk_show_uri
+
+* Wayland:
+ - Improve font settings fallback
+
+* X11:
+ - Avoid log spam on exit
+ - Don't beep on untrusted displays
+
+* OS X:
+ - Fix building on OS X 10.11
+ - Add gdk-quartz-cocoa-access.h with api that provides
+   access to native objects
+
+* Translation updates:
+ Dutch
+ Nepali
+ Swedish
+
+
 Overview of Changes in GTK+ 3.24.28
 ===================================
 
diff --git a/configure.ac b/configure.ac
index 22cba6453e..5455af6a2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [24])
-m4_define([gtk_micro_version], [28])
-m4_define([gtk_interface_age], [24])
+m4_define([gtk_micro_version], [29])
+m4_define([gtk_interface_age], [25])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
diff --git a/meson.build b/meson.build
index 06ac4973d9..cbd820da44 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gtk+-3.0', 'c',
-        version: '3.24.28',
+        version: '3.24.29',
         default_options: [
           'buildtype=debugoptimized',
           'warning_level=1'
@@ -52,7 +52,7 @@ gtk_version       = meson.project_version()
 gtk_major_version = gtk_version.split('.')[0].to_int()
 gtk_minor_version = gtk_version.split('.')[1].to_int()
 gtk_micro_version = gtk_version.split('.')[2].to_int()
-gtk_interface_age = 24
+gtk_interface_age = 25
 add_project_arguments('-DGTK_VERSION="@0@"'.format(meson.project_version()), language: 'c')
 
 add_project_arguments('-D_GNU_SOURCE', language: 'c')