From: Francois Perrad <fperrad@gmail.com>
Date: Tue, 5 Jan 2021 07:51:05 +0000 (+0100)
Subject: package/libgtk3: bump to version 3.24.24
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=618f5a834d18e48767c5188f297e997bfe68c7e6;p=buildroot.git

package/libgtk3: bump to version 3.24.24

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/libgtk3/0001-no-gtk-doc.patch b/package/libgtk3/0001-no-gtk-doc.patch
index 6dede7348a..db15c6cba7 100644
--- a/package/libgtk3/0001-no-gtk-doc.patch
+++ b/package/libgtk3/0001-no-gtk-doc.patch
@@ -14,7 +14,7 @@ Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
 
 --- a/gtk-doc.make
 +++ b/gtk-doc.make
-@@ -267,7 +267,7 @@
+@@ -299,7 +299,7 @@
  #
  # Require gtk-doc when making dist
  #
diff --git a/package/libgtk3/0002-fix-introspection-check.patch b/package/libgtk3/0002-fix-introspection-check.patch
index 4c2806d819..90f5facbb0 100644
--- a/package/libgtk3/0002-fix-introspection-check.patch
+++ b/package/libgtk3/0002-fix-introspection-check.patch
@@ -14,7 +14,7 @@ Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1621,7 +1621,10 @@
+@@ -1685,7 +1685,10 @@
  # GObject introspection
  ##################################################
 
diff --git a/package/libgtk3/0003-disable-atk-bridge.patch b/package/libgtk3/0003-disable-atk-bridge.patch
index c92174f400..42de83b5bb 100644
--- a/package/libgtk3/0003-disable-atk-bridge.patch
+++ b/package/libgtk3/0003-disable-atk-bridge.patch
@@ -7,7 +7,7 @@ Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1349,11 +1349,7 @@
+@@ -1364,11 +1364,7 @@
  # Check for Accessibility Toolkit flags
  ########################################
 
@@ -23,7 +23,7 @@ Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
 --- a/gtk/a11y/gtkaccessibility.c
 +++ b/gtk/a11y/gtkaccessibility.c
 @@ -37,10 +37,6 @@
- #include <gtk/gtkcombobox.h>
+ #include <gtk/gtktogglebutton.h>
  #include <gtk/gtkaccessible.h>
 
 -#ifdef GDK_WINDOWING_X11
@@ -33,7 +33,7 @@ Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
  static gboolean gail_focus_watcher      (GSignalInvocationHint *ihint,
                                           guint                  n_param_values,
                                           const GValue          *param_values,
-@@ -987,9 +983,5 @@
+@@ -988,9 +984,5 @@
    _gtk_accessibility_override_atk_util ();
    do_window_event_initialization ();
 
diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in
index 8a59fc31e7..093aacac51 100644
--- a/package/libgtk3/Config.in
+++ b/package/libgtk3/Config.in
@@ -38,7 +38,7 @@ config BR2_PACKAGE_LIBGTK3
 	help
 	  The GTK+ version 3 graphical user interface library
 
-	  http://www.gtk.org/
+	  https://www.gtk.org/
 
 if BR2_PACKAGE_LIBGTK3
 
diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash
index dd902624cf..22cf16dad7 100644
--- a/package/libgtk3/libgtk3.hash
+++ b/package/libgtk3/libgtk3.hash
@@ -1,5 +1,5 @@
-# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.24/gtk+-3.24.12.sha256sum
-sha256 1384eba5614fed160044ae0d32369e3df7b4f517b03f4b1f24d383e528f4be83  gtk+-3.24.12.tar.xz
+# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.24.sha256sum
+sha256  cc9d4367c55b724832f6b09ab85481738ea456871f0381768a6a99335a98378a  gtk+-3.24.24.tar.xz
 
 # Hash for license file:
-sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c  COPYING
+sha256  b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c  COPYING
diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
index dbb975dbfd..f7345cf2e9 100644
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBGTK3_VERSION_MAJOR = 3.24
-LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).12
+LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).24
 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
 LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
 LIBGTK3_LICENSE = LGPL-2.0+