From ab4b85f88cf822d6dbb9cda9c4d71fd10a5d3d99 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 28 Jun 2020 16:55:23 -0400
Subject: [PATCH] 3.24.21

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

diff --git a/NEWS b/NEWS
index 062a77e208..1eb969e5bf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,54 @@
+Overview of Changes in GTK+ 3.24.21
+===================================
+
+* Wayland:
+ - Prevent crashes with offscreen windows
+ - Handle disorderly tablet/pad disconnects
+
+* GtkFileChooser:
+ - Translate the type column
+ - Add a tracker3 search engine
+ - Rate-limit trash monitoring
+ - Make get_filter work for native chooser
+
+* GtkGLArea:
+ - Fix a redraw problem
+
+* GtkScrolledWindow:
+ - Fix kinetic scrolling
+
+* Add a gtk-cursor-aspect-ratio setting
+
+* GDK:
+ - Improve frame clock smoothness
+ - Fix frame clock monotonicity
+
+* OS X:
+ - Support Pen / Eraser input
+ - Support openfiles in GtkApplication
+
+* Adwaita:
+ - Improve notebook tab legibility
+
+* Translation updates:
+ Basque
+ Brazilian Portuguese
+ Catalan
+ Chinese (Taiwan)
+ German
+ Indonesian
+ Italian
+ Japanese
+ Kazakh
+ Lithuanian
+ Polish
+ Romanian
+ Slovak
+ Slovenian
+ Swedish
+ Ukrainian
+
+
 Overview of Changes in GTK+ 3.24.20
 ===================================
 
diff --git a/configure.ac b/configure.ac
index c0a3c7a024..3e7a846e33 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], [20])
-m4_define([gtk_interface_age], [16])
+m4_define([gtk_micro_version], [21])
+m4_define([gtk_interface_age], [17])
 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 e5e2eba05c..945c5de87b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gtk+-3.0', 'c',
-        version: '3.24.20',
+        version: '3.24.21',
         default_options: [
           'buildtype=debugoptimized',
           'warning_level=1'
@@ -51,7 +51,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 = 16
+gtk_interface_age = 17
 add_project_arguments('-DGTK_VERSION="@0@"'.format(meson.project_version()), language: 'c')
 
 add_project_arguments('-D_GNU_SOURCE', language: 'c')