From e47506504c6d3f4be4f48af722c50410ca6e928b Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Tue, 30 Jun 2020 10:20:47 +0000
Subject: [PATCH] Update to gtk+3-3.24.21.

---
 x11/gtk+3/Makefile                                 | 8 ++++----
 x11/gtk+3/distinfo                                 | 4 ++--
 x11/gtk+3/patches/patch-gtk_gtkfilechooserwidget_c | 4 ++--
 x11/gtk+3/patches/patch-gtk_gtksettings_c          | 4 ++--
 x11/gtk+3/pkg/PLIST-main                           | 4 +---
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/x11/gtk+3/Makefile b/x11/gtk+3/Makefile
index 0f69ee44131..6744b40214b 100644
--- a/x11/gtk+3/Makefile
+++ b/x11/gtk+3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.231 2020/06/07 16:08:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.232 2020/06/30 10:20:47 ajacoutot Exp $
 
 # XXX never versions require pango>=1.45
 # XXX add support for libcloudproviders?
@@ -11,7 +11,7 @@ COMMENT-cloudprint=	gtk+3 Google Cloud Print backend
 COMMENT-guic=		gtk+ icon theme caching utility
 
 GNOME_PROJECT=		gtk+
-GNOME_VERSION=		3.24.20
+GNOME_VERSION=		3.24.21
 
 PKGNAME-main=		gtk+3-${GNOME_VERSION}
 PKGNAME-cups=		gtk+3-cups-${GNOME_VERSION}
@@ -20,8 +20,8 @@ PKGNAME-guic=		gtk-update-icon-cache-${GNOME_VERSION}
 
 CATEGORIES=		x11 devel
 
-SHARED_LIBS +=  gdk-3                2201.1   # 2404.16
-SHARED_LIBS +=  gtk-3                2201.0   # 2404.16
+SHARED_LIBS +=  gdk-3                2201.1   # 2404.17
+SHARED_LIBS +=  gtk-3                2201.0   # 2404.17
 SHARED_LIBS +=  gailutil-3           0.0      # 0.0
 
 HOMEPAGE=		http://www.gtk.org/
diff --git a/x11/gtk+3/distinfo b/x11/gtk+3/distinfo
index 23c9b3122e2..7e3c3529af0 100644
--- a/x11/gtk+3/distinfo
+++ b/x11/gtk+3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk+-3.24.20.tar.xz) = Laxp9xbo0EunqVCRWJ4rquyV3KzpMssVg5Fj20ebHfM=
-SIZE (gtk+-3.24.20.tar.xz) = 22726768
+SHA256 (gtk+-3.24.21.tar.xz) = rupq58016D38dpm+cWUZ+u/KNGxi54TdGjfZ35TAj1I=
+SIZE (gtk+-3.24.21.tar.xz) = 21353740
diff --git a/x11/gtk+3/patches/patch-gtk_gtkfilechooserwidget_c b/x11/gtk+3/patches/patch-gtk_gtkfilechooserwidget_c
index a1d3d366746..0a7a0ef228d 100644
--- a/x11/gtk+3/patches/patch-gtk_gtkfilechooserwidget_c
+++ b/x11/gtk+3/patches/patch-gtk_gtkfilechooserwidget_c
@@ -1,11 +1,11 @@
-$OpenBSD: patch-gtk_gtkfilechooserwidget_c,v 1.6 2020/04/27 20:00:37 ajacoutot Exp $
+$OpenBSD: patch-gtk_gtkfilechooserwidget_c,v 1.7 2020/06/30 10:20:47 ajacoutot Exp $
 
 unveil(2): check if the XDG directories exist before showing them on the sidebar
 
 Index: gtk/gtkfilechooserwidget.c
 --- gtk/gtkfilechooserwidget.c.orig
 +++ gtk/gtkfilechooserwidget.c
-@@ -8217,7 +8217,8 @@ desktop_folder_handler (GtkFileChooserWidget *impl)
+@@ -8228,7 +8228,8 @@ desktop_folder_handler (GtkFileChooserWidget *impl)
     * See http://freedesktop.org/wiki/Software/xdg-user-dirs
     */
    name = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
diff --git a/x11/gtk+3/patches/patch-gtk_gtksettings_c b/x11/gtk+3/patches/patch-gtk_gtksettings_c
index fc900ece48e..d03b27b8261 100644
--- a/x11/gtk+3/patches/patch-gtk_gtksettings_c
+++ b/x11/gtk+3/patches/patch-gtk_gtksettings_c
@@ -1,9 +1,9 @@
-$OpenBSD: patch-gtk_gtksettings_c,v 1.23 2019/06/22 14:11:11 ajacoutot Exp $
+$OpenBSD: patch-gtk_gtksettings_c,v 1.24 2020/06/30 10:20:47 ajacoutot Exp $
 
 Index: gtk/gtksettings.c
 --- gtk/gtksettings.c.orig
 +++ gtk/gtksettings.c
-@@ -493,7 +493,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
+@@ -503,7 +503,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                               g_param_spec_string ("gtk-key-theme-name",
                                                                    P_("Key Theme Name"),
                                                                    P_("Name of key theme to load"),
diff --git a/x11/gtk+3/pkg/PLIST-main b/x11/gtk+3/pkg/PLIST-main
index 1cf5bda149f..778336ac3af 100644
--- a/x11/gtk+3/pkg/PLIST-main
+++ b/x11/gtk+3/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.56 2020/04/10 07:55:00 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.57 2020/06/30 10:20:47 ajacoutot Exp $
 @conflict gtk+3-docs-*
 @conflict gettext-tools-<0.19.7p1
 @pkgpath x11/gtk+3,-docs
@@ -1221,8 +1221,6 @@ share/locale/ca/LC_MESSAGES/gtk30-properties.mo
 share/locale/ca/LC_MESSAGES/gtk30.mo
 share/locale/ca@valencia/LC_MESSAGES/gtk30-properties.mo
 share/locale/ca@valencia/LC_MESSAGES/gtk30.mo
-share/locale/ckb/
-share/locale/ckb/LC_MESSAGES/
 share/locale/ckb/LC_MESSAGES/gtk30-properties.mo
 share/locale/ckb/LC_MESSAGES/gtk30.mo
 share/locale/crh/LC_MESSAGES/gtk30-properties.mo