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
This commit is contained in:
parent
5febfd3da9
commit
4fdced5624
39
debian/patches/action-Annotate-sensitive-visible-getters.patch
vendored
Normal file
39
debian/patches/action-Annotate-sensitive-visible-getters.patch
vendored
Normal file
@ -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.
|
||||||
|
*
|
27
debian/patches/gtksocket-Fix-wrong-sanity-check.patch
vendored
Normal file
27
debian/patches/gtksocket-Fix-wrong-sanity-check.patch
vendored
Normal file
@ -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);
|
BIN
debian/patches/icons-add-spinner-icon.patch
vendored
Normal file
BIN
debian/patches/icons-add-spinner-icon.patch
vendored
Normal file
Binary file not shown.
6
debian/patches/series
vendored
6
debian/patches/series
vendored
@ -4,3 +4,9 @@ printing-Default-to-papers-previewer-and-fallback-to-evin.patch
|
|||||||
060_ignore-random-icons.patch
|
060_ignore-random-icons.patch
|
||||||
reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
|
reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
|
||||||
reftests-Allow-minor-differences-to-be-tolerated.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
|
||||||
|
33
debian/patches/widget-Explicitly-annotate-sensitive-s-getter.patch
vendored
Normal file
33
debian/patches/widget-Explicitly-annotate-sensitive-s-getter.patch
vendored
Normal file
@ -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"),
|
32
debian/patches/widget-Explicitly-annotate-visible-s-getter.patch
vendored
Normal file
32
debian/patches/widget-Explicitly-annotate-visible-s-getter.patch
vendored
Normal file
@ -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"),
|
26
debian/patches/widget-Fix-typo-in-docstring-s-property-name.patch
vendored
Normal file
26
debian/patches/widget-Fix-typo-in-docstring-s-property-name.patch
vendored
Normal file
@ -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",
|
1
debian/source/include-binaries
vendored
Normal file
1
debian/source/include-binaries
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
debian/patches/icons-add-spinner-icon.patch
|
Loading…
Reference in New Issue
Block a user