From 4fdced56241d1ad01df63d69b6222824027996ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jeremy.bicha@canonical.com>
Date: Sat, 29 Mar 2025 17:55:07 -0400
Subject: [PATCH] Cherry-pick fixes from gtk-3-24 branch including

- Fixes needed for gjs's build tests
- Restore a spinner icon removed from adwaita-icon-theme

Gbp-Dch: Full
---
 ...n-Annotate-sensitive-visible-getters.patch |  39 ++++++++++++++++++
 .../gtksocket-Fix-wrong-sanity-check.patch    |  27 ++++++++++++
 debian/patches/icons-add-spinner-icon.patch   | Bin 0 -> 4540 bytes
 debian/patches/series                         |   6 +++
 ...plicitly-annotate-sensitive-s-getter.patch |  33 +++++++++++++++
 ...Explicitly-annotate-visible-s-getter.patch |  32 ++++++++++++++
 ...ix-typo-in-docstring-s-property-name.patch |  26 ++++++++++++
 debian/source/include-binaries                |   1 +
 8 files changed, 164 insertions(+)
 create mode 100644 debian/patches/action-Annotate-sensitive-visible-getters.patch
 create mode 100644 debian/patches/gtksocket-Fix-wrong-sanity-check.patch
 create mode 100644 debian/patches/icons-add-spinner-icon.patch
 create mode 100644 debian/patches/widget-Explicitly-annotate-sensitive-s-getter.patch
 create mode 100644 debian/patches/widget-Explicitly-annotate-visible-s-getter.patch
 create mode 100644 debian/patches/widget-Fix-typo-in-docstring-s-property-name.patch
 create mode 100644 debian/source/include-binaries

diff --git a/debian/patches/action-Annotate-sensitive-visible-getters.patch b/debian/patches/action-Annotate-sensitive-visible-getters.patch
new file mode 100644
index 0000000000..29d5e5083c
--- /dev/null
+++ b/debian/patches/action-Annotate-sensitive-visible-getters.patch
@@ -0,0 +1,39 @@
+From: Maximiliano Sandoval <msandova@gnome.org>
+Date: Thu, 20 Mar 2025 19:01:20 +0100
+Subject: action: Annotate sensitive & visible getters
+
+Since
+https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/473
+g-i will pick up gtk_widget_is_visible as the getter for this property.
+
+See https://gitlab.gnome.org/GNOME/gjs/-/issues/681.
+
+(cherry picked from commit 52e2b8555f56dabdb0056e1d375fdacd4081c2df)
+
+Origin: upstream gtk-3-24 after 3.24.49
+---
+ gtk/deprecated/gtkaction.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gtk/deprecated/gtkaction.c b/gtk/deprecated/gtkaction.c
+index b89ae77..4c1abf2 100644
+--- a/gtk/deprecated/gtkaction.c
++++ b/gtk/deprecated/gtkaction.c
+@@ -453,7 +453,7 @@ gtk_action_class_init (GtkActionClass *klass)
+ 							 TRUE,
+ 							 GTK_PARAM_READWRITE));
+   /**
+-   * GtkAction:sensitive:
++   * GtkAction:sensitive: (getter get_sensitive)
+    *
+    * Whether the action is enabled.
+    *
+@@ -468,7 +468,7 @@ gtk_action_class_init (GtkActionClass *klass)
+ 							 TRUE,
+ 							 GTK_PARAM_READWRITE));
+   /**
+-   * GtkAction:visible:
++   * GtkAction:visible: (getter get_visible)
+    *
+    * Whether the action is visible.
+    *
diff --git a/debian/patches/gtksocket-Fix-wrong-sanity-check.patch b/debian/patches/gtksocket-Fix-wrong-sanity-check.patch
new file mode 100644
index 0000000000..f17673fef9
--- /dev/null
+++ b/debian/patches/gtksocket-Fix-wrong-sanity-check.patch
@@ -0,0 +1,27 @@
+From: =?utf-8?q?Ga=C3=ABl_Bonithon?= <gael@xfce.org>
+Date: Sat, 3 Feb 2024 22:33:57 +0100
+Subject: gtksocket: Fix wrong sanity check
+
+This avoids a critical warning from gtk_widget_get_parent() if
+focus_widget == NULL.
+
+(cherry picked from commit 1d29335cbfbd4a6d3c39664c68145a7966fdbd14)
+
+Origin: upstream gtk-3-24 after 3.24.49
+---
+ gtk/gtksocket.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
+index ffdaf8b..7b87b4d 100644
+--- a/gtk/gtksocket.c
++++ b/gtk/gtksocket.c
+@@ -1260,7 +1260,7 @@ gtk_socket_advance_toplevel_focus (GtkSocket        *socket,
+     }
+ 
+   focus_widget = gtk_window_get_focus (window);
+-  if (window)
++  if (focus_widget)
+     {
+       /* Wrapped off the end, clear the focus setting for the toplevel */
+       parent = gtk_widget_get_parent (focus_widget);
diff --git a/debian/patches/icons-add-spinner-icon.patch b/debian/patches/icons-add-spinner-icon.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ebd9c5a879bcc9e467f45c93f984c9696fe1f4c0
GIT binary patch
literal 4540
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
GC;tZH_joJ-

literal 0
HcmV?d00001

diff --git a/debian/patches/series b/debian/patches/series
index cbb71da002..58d903d8ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,9 @@ printing-Default-to-papers-previewer-and-fallback-to-evin.patch
 060_ignore-random-icons.patch
 reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
 reftests-Allow-minor-differences-to-be-tolerated.patch
+gtksocket-Fix-wrong-sanity-check.patch
+widget-Explicitly-annotate-visible-s-getter.patch
+widget-Explicitly-annotate-sensitive-s-getter.patch
+action-Annotate-sensitive-visible-getters.patch
+widget-Fix-typo-in-docstring-s-property-name.patch
+icons-add-spinner-icon.patch
diff --git a/debian/patches/widget-Explicitly-annotate-sensitive-s-getter.patch b/debian/patches/widget-Explicitly-annotate-sensitive-s-getter.patch
new file mode 100644
index 0000000000..111b86cc34
--- /dev/null
+++ b/debian/patches/widget-Explicitly-annotate-sensitive-s-getter.patch
@@ -0,0 +1,33 @@
+From: Maximiliano Sandoval <msandova@gnome.org>
+Date: Thu, 20 Mar 2025 18:44:25 +0100
+Subject: widget: Explicitly annotate sensitive's getter
+
+This is a continuation of 91fe0ee63a66a8244b0fe7f68aa06dd25fb127a2.
+
+Since
+https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/473
+g-i will pick up gtk_widget_is_visible as the getter for this property.
+
+See https://gitlab.gnome.org/GNOME/gjs/-/issues/681.
+
+(cherry picked from commit a11310a40b7444b56823da6bbb44b759f2b15cc8)
+
+Origin: upstream gtk-3-24 after 3.24.49
+---
+ gtk/gtkwidget.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
+index b6d125e..eb16d2e 100644
+--- a/gtk/gtkwidget.c
++++ b/gtk/gtkwidget.c
+@@ -1158,6 +1158,9 @@ gtk_widget_class_init (GtkWidgetClass *klass)
+                             FALSE,
+                             GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+ 
++  /**
++   * GtkWidget:visible: (getter get_sensitive)
++   */
+   widget_props[PROP_SENSITIVE] =
+       g_param_spec_boolean ("sensitive",
+                             P_("Sensitive"),
diff --git a/debian/patches/widget-Explicitly-annotate-visible-s-getter.patch b/debian/patches/widget-Explicitly-annotate-visible-s-getter.patch
new file mode 100644
index 0000000000..a73b905725
--- /dev/null
+++ b/debian/patches/widget-Explicitly-annotate-visible-s-getter.patch
@@ -0,0 +1,32 @@
+From: Maximiliano Sandoval <msandova@gnome.org>
+Date: Tue, 18 Mar 2025 18:06:18 +0100
+Subject: widget: Explicitly annotate visible's getter
+
+Since
+https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/473
+g-i will pick up gtk_widget_is_visible as the getter for this property.
+
+See https://gitlab.gnome.org/GNOME/gjs/-/issues/681.
+
+(cherry picked from commit 9b3476aaf672616d28dbb525e5a6ce39d9a533de)
+
+Origin: upstream gtk-3-24 after 3.24.49
+---
+ gtk/gtkwidget.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
+index a565e58..b6d125e 100644
+--- a/gtk/gtkwidget.c
++++ b/gtk/gtkwidget.c
+@@ -1148,7 +1148,9 @@ gtk_widget_class_init (GtkWidgetClass *klass)
+                         -1, G_MAXINT,
+                         -1,
+                         GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+-
++  /**
++   * GtkWidget:visible: (getter get_visible)
++   */
+   widget_props[PROP_VISIBLE] =
+       g_param_spec_boolean ("visible",
+                             P_("Visible"),
diff --git a/debian/patches/widget-Fix-typo-in-docstring-s-property-name.patch b/debian/patches/widget-Fix-typo-in-docstring-s-property-name.patch
new file mode 100644
index 0000000000..c62e8c30e9
--- /dev/null
+++ b/debian/patches/widget-Fix-typo-in-docstring-s-property-name.patch
@@ -0,0 +1,26 @@
+From: Maximiliano Sandoval <msandova@gnome.org>
+Date: Fri, 21 Mar 2025 18:34:48 +0100
+Subject: widget: Fix typo in docstring's property name
+
+This is a fixup for a11310a40b7444b56823da6bbb44b759f2b15cc8.
+
+(cherry picked from commit 1076a6ef72e007c9d66ecff11638757a6ec68199)
+
+Origin: upstream gtk-3-24 after 3.24.49
+---
+ gtk/gtkwidget.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
+index eb16d2e..4aa6862 100644
+--- a/gtk/gtkwidget.c
++++ b/gtk/gtkwidget.c
+@@ -1159,7 +1159,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
+                             GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+ 
+   /**
+-   * GtkWidget:visible: (getter get_sensitive)
++   * GtkWidget:sensitive: (getter get_sensitive)
+    */
+   widget_props[PROP_SENSITIVE] =
+       g_param_spec_boolean ("sensitive",
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000000..40d565936b
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/patches/icons-add-spinner-icon.patch