diff --git a/extra/gtk+3/checksums b/extra/gtk+3/checksums index 5ac51607..b066b360 100644 --- a/extra/gtk+3/checksums +++ b/extra/gtk+3/checksums @@ -1,3 +1,3 @@ -46777a428699d6e2643a6d4c0929168912b760011706cb95b67807bd777e005fe5 +4c48074ac84aa02cde9ae09b640216cfbf5e2503a0d6f7ca2e6b6e0b0d22f524f4 8b8bf563e74f720990030791f8e408db6099813a6290c38ab812231dbd10eb0cb8 -09d6f9e59422724a1fead2bd2103ab0569f823da04e1411a338ae9892bedb2652e +ae2adb1436f0ae97532b534673a14c4e2fe50e4397554e00fd58fa51c9a6bf2841 diff --git a/extra/gtk+3/patches/02-no-accessibility.patch b/extra/gtk+3/patches/02-no-accessibility.patch index eb83a179..d27597af 100644 --- a/extra/gtk+3/patches/02-no-accessibility.patch +++ b/extra/gtk+3/patches/02-no-accessibility.patch @@ -1721,7 +1721,7 @@ g_object_notify (G_OBJECT (dialog), "message-type"); --- a/gtk/gtkmodelbutton.c +++ b/gtk/gtkmodelbutton.c -@@ -247,15 +247,6 @@ +@@ -248,16 +248,6 @@ gtk_model_button_update_state (GtkModelButton *button, gtk_css_gadget_set_state (button->gadget, state); gtk_css_gadget_set_state (button->indicator_gadget, indicator_state); @@ -1730,14 +1730,15 @@ - button->role == GTK_BUTTON_ROLE_RADIO) - { - AtkObject *object = _gtk_widget_peek_accessible (GTK_WIDGET (button)); -- if (object) -- atk_object_notify_state_change (object, ATK_STATE_CHECKED, -- (indicator_state & GTK_STATE_FLAG_CHECKED)); +- gboolean was_checked = (previous_flags & GTK_STATE_FLAG_CHECKED) != 0; +- gboolean is_checked = (indicator_state & GTK_STATE_FLAG_CHECKED) != 0; +- if (object && (was_checked != is_checked)) +- atk_object_notify_state_change (object, ATK_STATE_CHECKED, is_checked); - } } static void -@@ -310,17 +301,13 @@ +@@ -312,17 +302,13 @@ gtk_model_button_direction_changed (GtkWidget *widget, static void update_node_name (GtkModelButton *button) { @@ -1755,7 +1756,7 @@ if (button->menu_name) { indicator_name = I_("arrow"); -@@ -334,13 +321,11 @@ +@@ -336,13 +322,11 @@ update_node_name (GtkModelButton *button) break; case GTK_BUTTON_ROLE_CHECK: @@ -1769,7 +1770,7 @@ indicator_name = I_("radio"); indicator_visible = TRUE; break; -@@ -352,8 +337,6 @@ +@@ -354,8 +338,6 @@ update_node_name (GtkModelButton *button) if (button->iconic) indicator_visible = FALSE; @@ -1778,7 +1779,7 @@ indicator_node = gtk_css_gadget_get_node (button->indicator_gadget); gtk_css_node_set_name (indicator_node, indicator_name); gtk_css_node_set_visible (indicator_node, indicator_visible); -@@ -1099,18 +1082,6 @@ +@@ -1101,18 +1083,6 @@ gtk_model_button_finalize (GObject *object) G_OBJECT_CLASS (gtk_model_button_parent_class)->finalize (object); } @@ -1789,7 +1790,7 @@ - - object = GTK_WIDGET_CLASS (gtk_model_button_parent_class)->get_accessible (widget); - -- gtk_model_button_update_state (GTK_MODEL_BUTTON (widget)); +- gtk_model_button_update_state (GTK_MODEL_BUTTON (widget), GTK_STATE_FLAG_NORMAL); - - return object; -} @@ -1797,7 +1798,7 @@ static void gtk_model_button_class_init (GtkModelButtonClass *class) { -@@ -1132,7 +1103,6 @@ +@@ -1134,7 +1104,6 @@ gtk_model_button_class_init (GtkModelButtonClass *class) widget_class->destroy = gtk_model_button_destroy; widget_class->state_flags_changed = gtk_model_button_state_flags_changed; widget_class->direction_changed = gtk_model_button_direction_changed; @@ -1805,7 +1806,7 @@ button_class->clicked = gtk_model_button_clicked; -@@ -1276,7 +1246,6 @@ +@@ -1278,7 +1247,6 @@ gtk_model_button_class_init (GtkModelButtonClass *class) G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, LAST_PROPERTY, properties); diff --git a/extra/gtk+3/sources b/extra/gtk+3/sources index 5d53c9a1..b07e205f 100644 --- a/extra/gtk+3/sources +++ b/extra/gtk+3/sources @@ -1,3 +1,3 @@ -https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.41.tar.xz +https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.42.tar.xz patches/01-no-fribidi.patch patches/02-no-accessibility.patch diff --git a/extra/gtk+3/version b/extra/gtk+3/version index 852dd74d..71f24c70 100644 --- a/extra/gtk+3/version +++ b/extra/gtk+3/version @@ -1 +1 @@ -3.24.41 1 +3.24.42 1