From 889b6a0693ae85bd7ea5ab56aec185ffa326a2ec9a98f095855f06b9ea5e80eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 15 Jan 2019 21:46:30 +0000 Subject: [PATCH 1/3] Accepting request 666065 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/666065 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=340 --- gtk+-3.24.2.tar.xz | 3 - gtk+-3.24.3.tar.xz | 3 + gtk3-atk-table-cell.patch | 491 --------------------- gtk3-boo1121456-a11y-export.patch | 32 ++ gtk3-revert-Fix-deprecation-warnings.patch | 33 -- gtk3-x11-fix-deprecation-macro-use.patch | 41 -- gtk3.changes | 36 ++ gtk3.spec | 16 +- 8 files changed, 76 insertions(+), 579 deletions(-) delete mode 100644 gtk+-3.24.2.tar.xz create mode 100644 gtk+-3.24.3.tar.xz delete mode 100644 gtk3-atk-table-cell.patch create mode 100644 gtk3-boo1121456-a11y-export.patch delete mode 100644 gtk3-revert-Fix-deprecation-warnings.patch delete mode 100644 gtk3-x11-fix-deprecation-macro-use.patch diff --git a/gtk+-3.24.2.tar.xz b/gtk+-3.24.2.tar.xz deleted file mode 100644 index 1ae95f5..0000000 --- a/gtk+-3.24.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b3b05e427cc928d103561ed2e91b2b2881fe88b1f167b0b1c9990da6aac8892 -size 21731348 diff --git a/gtk+-3.24.3.tar.xz b/gtk+-3.24.3.tar.xz new file mode 100644 index 0000000..e1ab240 --- /dev/null +++ b/gtk+-3.24.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5708fa534d964b1fb9a69d15758729d51b9a438471d4612dc153f595904803bd +size 21099144 diff --git a/gtk3-atk-table-cell.patch b/gtk3-atk-table-cell.patch deleted file mode 100644 index e44d92f..0000000 --- a/gtk3-atk-table-cell.patch +++ /dev/null @@ -1,491 +0,0 @@ -From f7b0e26b427f42d312dc84c4197181a364da88f0 Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Thu, 8 Nov 2018 10:26:02 -0600 -Subject: [PATCH] A11y: Add support for AtkTableCell - ---- - gtk/a11y/gtkcellaccessible.c | 88 ++++++++++++++++++++++++++++- - gtk/a11y/gtkcellaccessibleparent.c | 66 ++++++++++++++++++++++ - gtk/a11y/gtkcellaccessibleparent.h | 19 +++++++ - gtk/a11y/gtktreeviewaccessible.c | 52 +++++++++++++++++ - testsuite/a11y/accessibility-dump.c | 51 +++++++++++++++++ - 5 files changed, 275 insertions(+), 1 deletion(-) - -diff --git a/gtk/a11y/gtkcellaccessible.c b/gtk/a11y/gtkcellaccessible.c -index ad7601405f..ebbf096b3b 100644 ---- a/gtk/a11y/gtkcellaccessible.c -+++ b/gtk/a11y/gtkcellaccessible.c -@@ -46,11 +46,13 @@ static const struct { - static GtkCellRendererState gtk_cell_accessible_get_state (GtkCellAccessible *cell); - static void atk_action_interface_init (AtkActionIface *iface); - static void atk_component_interface_init (AtkComponentIface *iface); -+static void atk_table_cell_interface_init (AtkTableCellIface *iface); - - G_DEFINE_TYPE_WITH_CODE (GtkCellAccessible, gtk_cell_accessible, GTK_TYPE_ACCESSIBLE, - G_ADD_PRIVATE (GtkCellAccessible) - G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) -- G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) -+ G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init) -+ G_IMPLEMENT_INTERFACE (ATK_TYPE_TABLE_CELL, atk_table_cell_interface_init)) - - static gint - gtk_cell_accessible_get_index_in_parent (AtkObject *obj) -@@ -366,6 +368,90 @@ atk_component_interface_init (AtkComponentIface *iface) - iface->grab_focus = gtk_cell_accessible_grab_focus; - } - -+static gboolean -+gtk_cell_accessible_get_column_span (AtkTableCell *table_cell) -+{ -+ return 1; -+} -+ -+static GPtrArray * -+gtk_cell_accessible_get_column_header_cells (AtkTableCell *table_cell) -+{ -+ GtkCellAccessible *cell; -+ AtkObject *parent; -+ -+ cell = GTK_CELL_ACCESSIBLE (table_cell); -+ parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell))); -+ -+ return gtk_cell_accessible_parent_get_column_header_cells (GTK_CELL_ACCESSIBLE_PARENT (parent), -+ cell); -+} -+ -+static gboolean -+gtk_cell_accessible_get_position (AtkTableCell *table_cell, -+ gint *row, -+ gint *column) -+{ -+ GtkCellAccessible *cell; -+ AtkObject *parent; -+ -+ cell = GTK_CELL_ACCESSIBLE (table_cell); -+ parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell))); -+ -+ gtk_cell_accessible_parent_get_cell_position (GTK_CELL_ACCESSIBLE_PARENT (parent), -+ cell, -+ row, column); -+ return ((row && *row > 0) || (column && *column > 0)); -+} -+ -+static gboolean -+gtk_cell_accessible_get_row_span (AtkTableCell *table_cell) -+{ -+ return 1; -+} -+ -+static GPtrArray * -+gtk_cell_accessible_get_row_header_cells (AtkTableCell *table_cell) -+{ -+ GtkCellAccessible *cell; -+ AtkObject *parent; -+ -+ cell = GTK_CELL_ACCESSIBLE (table_cell); -+ parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell))); -+ -+ return gtk_cell_accessible_parent_get_row_header_cells (GTK_CELL_ACCESSIBLE_PARENT (parent), -+ cell); -+} -+ -+static gboolean -+gtk_cell_accessible_get_table (AtkTableCell *table_cell) -+{ -+ AtkObject *obj; -+ -+ obj = ATK_OBJECT (table_cell); -+ do -+ { -+ AtkRole role; -+ obj = atk_object_get_parent (obj); -+ role = atk_object_get_role (obj); -+ if (role == ATK_ROLE_TABLE || role == ATK_ROLE_TREE_TABLE) -+ break; -+ } -+ while (obj); -+ return obj; -+} -+ -+static void -+atk_table_cell_interface_init (AtkTableCellIface *iface) -+{ -+ iface->get_column_span = gtk_cell_accessible_get_column_span; -+ iface->get_column_header_cells = gtk_cell_accessible_get_column_header_cells; -+ iface->get_position = gtk_cell_accessible_get_position; -+ iface->get_row_span = gtk_cell_accessible_get_row_span; -+ iface->get_row_header_cells = gtk_cell_accessible_get_row_header_cells; -+ iface->get_table = gtk_cell_accessible_get_table; -+} -+ - static GtkCellRendererState - gtk_cell_accessible_get_state (GtkCellAccessible *cell) - { -diff --git a/gtk/a11y/gtkcellaccessibleparent.c b/gtk/a11y/gtkcellaccessibleparent.c -index e4ad784a27..1f9dcd75f9 100644 ---- a/gtk/a11y/gtkcellaccessibleparent.c -+++ b/gtk/a11y/gtkcellaccessibleparent.c -@@ -187,3 +187,69 @@ gtk_cell_accessible_parent_update_relationset (GtkCellAccessibleParent *parent, - if (iface->update_relationset) - (iface->update_relationset) (parent, cell, relationset); - } -+ -+void -+gtk_cell_accessible_parent_get_cell_position (GtkCellAccessibleParent *parent, -+ GtkCellAccessible *cell, -+ gint *row, -+ gint *column) -+{ -+ GtkCellAccessibleParentIface *iface; -+ -+ g_return_if_fail (GTK_IS_CELL_ACCESSIBLE_PARENT (parent)); -+ g_return_if_fail (GTK_IS_CELL_ACCESSIBLE (cell)); -+ -+ iface = GTK_CELL_ACCESSIBLE_PARENT_GET_IFACE (parent); -+ -+ if (iface->get_cell_position) -+ (iface->get_cell_position) (parent, cell, row, column); -+ else -+ { -+ if (row) -+ *row = -1; -+ if (column) -+ *column = -1; -+ } -+} -+ -+/** -+ * gtk_cell_accessible_parent_get_column_header_cells: -+ * Returns: (transfer full) (element-type AtkObject) -+ */ -+GPtrArray * -+gtk_cell_accessible_parent_get_column_header_cells (GtkCellAccessibleParent *parent, -+ GtkCellAccessible *cell) -+{ -+ GtkCellAccessibleParentIface *iface; -+ -+ g_return_val_if_fail (GTK_IS_CELL_ACCESSIBLE_PARENT (parent), NULL); -+ g_return_val_if_fail (GTK_IS_CELL_ACCESSIBLE (cell), NULL); -+ -+ iface = GTK_CELL_ACCESSIBLE_PARENT_GET_IFACE (parent); -+ -+ if (iface->get_column_header_cells) -+ return (iface->get_column_header_cells) (parent, cell); -+ else -+ return NULL; -+} -+ -+/** -+ * gtk_cell_accessible_parent_get_row_header_cells: -+ * Returns: (transfer full) (element-type AtkObject) -+ */ -+GPtrArray * -+gtk_cell_accessible_parent_get_row_header_cells (GtkCellAccessibleParent *parent, -+ GtkCellAccessible *cell) -+{ -+ GtkCellAccessibleParentIface *iface; -+ -+ g_return_val_if_fail (GTK_IS_CELL_ACCESSIBLE_PARENT (parent), NULL); -+ g_return_val_if_fail (GTK_IS_CELL_ACCESSIBLE (cell), NULL); -+ -+ iface = GTK_CELL_ACCESSIBLE_PARENT_GET_IFACE (parent); -+ -+ if (iface->get_row_header_cells) -+ return (iface->get_row_header_cells) (parent, cell); -+ else -+ return NULL; -+} -diff --git a/gtk/a11y/gtkcellaccessibleparent.h b/gtk/a11y/gtkcellaccessibleparent.h -index 7cece0e778..a773f37288 100644 ---- a/gtk/a11y/gtkcellaccessibleparent.h -+++ b/gtk/a11y/gtkcellaccessibleparent.h -@@ -75,6 +75,14 @@ struct _GtkCellAccessibleParentIface - void ( *update_relationset) (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell, - AtkRelationSet *relationset); -+ void ( *get_cell_position) (GtkCellAccessibleParent *parent, -+ GtkCellAccessible *cell, -+ gint *row, -+ gint *column); -+ GPtrArray * ( *get_column_header_cells) (GtkCellAccessibleParent *parent, -+ GtkCellAccessible *cell); -+ GPtrArray * ( *get_row_header_cells) (GtkCellAccessibleParent *parent, -+ GtkCellAccessible *cell); - }; - - GDK_AVAILABLE_IN_ALL -@@ -115,6 +123,17 @@ GDK_AVAILABLE_IN_ALL - void gtk_cell_accessible_parent_update_relationset (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell, - AtkRelationSet *relationset); -+GDK_AVAILABLE_IN_ALL -+void gtk_cell_accessible_parent_get_cell_position(GtkCellAccessibleParent *parent, -+ GtkCellAccessible *cell, -+ gint *row, -+ gint *column); -+ -+GPtrArray *gtk_cell_accessible_parent_get_column_header_cells (GtkCellAccessibleParent *parent, -+ GtkCellAccessible *cell); -+ -+GPtrArray *gtk_cell_accessible_parent_get_row_header_cells (GtkCellAccessibleParent *parent, -+ GtkCellAccessible *cell); - - G_END_DECLS - -diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c -index f32acee10b..37339ceb14 100644 ---- a/gtk/a11y/gtktreeviewaccessible.c -+++ b/gtk/a11y/gtktreeviewaccessible.c -@@ -1391,6 +1391,56 @@ gtk_tree_view_accessible_update_relationset (GtkCellAccessibleParent *parent, - } - } - -+static void -+gtk_tree_view_accessible_get_cell_position (GtkCellAccessibleParent *parent, -+ GtkCellAccessible *cell, -+ gint *row, -+ gint *column) -+{ -+ GtkWidget *widget; -+ GtkTreeView *tree_view; -+ GtkTreeViewAccessibleCellInfo *cell_info; -+ GtkTreeViewAccessible *accessible; -+ -+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent)); -+ if (widget == NULL) -+ return; -+ -+ tree_view = GTK_TREE_VIEW (widget); -+ accessible = GTK_TREE_VIEW_ACCESSIBLE (parent); -+ cell_info = find_cell_info (accessible, cell); -+ if (!cell_info) -+ return; -+ -+ if (row) -+ (*row) = _gtk_rbtree_node_get_index (cell_info->tree, cell_info->node); -+ if (column) -+ (*column) = get_column_number (tree_view, cell_info->cell_col_ref); -+} -+ -+static GPtrArray * -+gtk_tree_view_accessible_get_column_header_cells (GtkCellAccessibleParent *parent, -+ GtkCellAccessible *cell) -+{ -+ GtkWidget *widget; -+ GtkTreeViewAccessibleCellInfo *cell_info; -+ GtkTreeViewAccessible *accessible; -+ GPtrArray *array; -+ -+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent)); -+ if (widget == NULL) -+ return NULL; -+ -+ accessible = GTK_TREE_VIEW_ACCESSIBLE (parent); -+ cell_info = find_cell_info (accessible, cell); -+ if (!cell_info) -+ return NULL; -+ -+ array = g_ptr_array_new_full (1, g_object_unref); -+ g_ptr_array_add (array, g_object_ref (get_header_from_column ( (cell_info->cell_col_ref)))); -+ return array; -+} -+ - static void - gtk_cell_accessible_parent_interface_init (GtkCellAccessibleParentIface *iface) - { -@@ -1403,6 +1453,8 @@ gtk_cell_accessible_parent_interface_init (GtkCellAccessibleParentIface *iface) - iface->activate = gtk_tree_view_accessible_activate; - iface->edit = gtk_tree_view_accessible_edit; - iface->update_relationset = gtk_tree_view_accessible_update_relationset; -+ iface->get_cell_position = gtk_tree_view_accessible_get_cell_position; -+ iface->get_column_header_cells = gtk_tree_view_accessible_get_column_header_cells; - } - - void -diff --git a/testsuite/a11y/accessibility-dump.c b/testsuite/a11y/accessibility-dump.c -index 5f848fb96a..96da1af98b 100644 ---- a/testsuite/a11y/accessibility-dump.c -+++ b/testsuite/a11y/accessibility-dump.c -@@ -626,6 +626,54 @@ G_GNUC_END_IGNORE_DEPRECATIONS - } - } - -+static void -+dump_atk_table_cell (AtkTableCell *table_cell, -+ guint depth, -+ GString *string) -+{ -+ gint i; -+ AtkObject *obj; -+ GPtrArray *cells; -+ gint row = -1, column = -1; -+ -+ g_string_append_printf (string, "%*s\n", depth, ""); -+ -+ obj = atk_table_cell_get_table (table_cell); -+ if (obj) -+ g_string_append_printf (string, "%*stable: %s\n", depth, "", get_name (obj)); -+ -+ cells = atk_table_cell_get_column_header_cells (table_cell); -+ if (cells) -+ { -+ for (i = 0; i < cells->len; i++) -+ { -+ obj = g_ptr_array_index (cells, i); -+ if (obj) -+ g_string_append_printf (string, "%*scolumn-header[%d]: %s\n", depth, "", i, get_name (obj)); -+ } -+ g_ptr_array_free (cells, TRUE); -+ } -+ -+ cells = atk_table_cell_get_row_header_cells (table_cell); -+ if (cells) -+ { -+ for (i = 0; i < cells->len; i++) -+ { -+ obj = g_ptr_array_index (cells, i); -+ if (obj) -+ g_string_append_printf (string, "%*srow-header[%d]: %s\n", depth, "", i, get_name (obj)); -+ } -+ g_ptr_array_free (cells, TRUE); -+ } -+ -+ g_string_append_printf (string, "%*scolumn-span: %d\n", depth, "", atk_table_cell_get_column_span (table_cell)); -+ g_string_append_printf (string, "%*srow-span: %d\n", depth, "", atk_table_cell_get_row_span (table_cell)); -+ if (atk_table_cell_get_position (table_cell, &row, &column)) -+ { -+ g_string_append_printf (string, "%*sposition: %d %d\n", depth, "", row, column); -+ } -+} -+ - static void - dump_accessible (AtkObject *accessible, - guint depth, -@@ -679,6 +727,9 @@ dump_accessible (AtkObject *accessible, - if (ATK_IS_TABLE (accessible)) - dump_atk_table (ATK_TABLE (accessible), depth, string); - -+ if (ATK_IS_TABLE_CELL (accessible)) -+ dump_atk_table_cell (ATK_TABLE_CELL (accessible), depth, string); -+ - for (i = 0; i < atk_object_get_n_accessible_children (accessible); i++) - { - AtkObject *child = atk_object_ref_accessible_child (accessible, i); -diff --git a/testsuite/a11y/tree.txt b/testsuite/a11y/tree.txt -index 4b0bb681db..c26c1a9c84 100644 ---- a/testsuite/a11y/tree.txt -+++ b/testsuite/a11y/tree.txt -@@ -59,6 +59,11 @@ window1 - action 1 description: Creates a widget in which the contents of the cell can be edited - action 2 name: activate - action 2 description: Activates the cell -+ -+ table: tv -+ column-header[0]: unnamed-GtkButtonAccessible-0 -+ column-span: 1 -+ row-span: 1 - tv - "table cell" - parent: tv -@@ -103,6 +108,11 @@ window1 - action 1 description: Creates a widget in which the contents of the cell can be edited - action 2 name: activate - action 2 description: Activates the cell -+ -+ table: tv -+ column-header[0]: unnamed-GtkButtonAccessible-0 -+ column-span: 1 -+ row-span: 1 - tv - "table cell" - parent: tv -@@ -147,6 +157,11 @@ window1 - action 1 description: Creates a widget in which the contents of the cell can be edited - action 2 name: activate - action 2 description: Activates the cell -+ -+ table: tv -+ column-header[0]: unnamed-GtkButtonAccessible-0 -+ column-span: 1 -+ row-span: 1 - tv - "table cell" - parent: tv -@@ -162,6 +177,12 @@ window1 - action 1 description: Creates a widget in which the contents of the cell can be edited - action 2 name: activate - action 2 description: Activates the cell -+ -+ table: tv -+ column-header[0]: unnamed-GtkButtonAccessible-0 -+ column-span: 1 -+ row-span: 1 -+ position: 1 0 - tv - "table cell" - parent: tv -@@ -206,6 +227,12 @@ window1 - action 1 description: Creates a widget in which the contents of the cell can be edited - action 2 name: activate - action 2 description: Activates the cell -+ -+ table: tv -+ column-header[0]: unnamed-GtkButtonAccessible-0 -+ column-span: 1 -+ row-span: 1 -+ position: 1 0 - tv - "table cell" - parent: tv -@@ -250,6 +277,12 @@ window1 - action 1 description: Creates a widget in which the contents of the cell can be edited - action 2 name: activate - action 2 description: Activates the cell -+ -+ table: tv -+ column-header[0]: unnamed-GtkButtonAccessible-0 -+ column-span: 1 -+ row-span: 1 -+ position: 1 0 - tv - "table cell" - parent: tv -@@ -265,6 +298,12 @@ window1 - action 1 description: Creates a widget in which the contents of the cell can be edited - action 2 name: activate - action 2 description: Activates the cell -+ -+ table: tv -+ column-header[0]: unnamed-GtkButtonAccessible-0 -+ column-span: 1 -+ row-span: 1 -+ position: 2 0 - tv - "table cell" - parent: tv -@@ -309,6 +348,12 @@ window1 - action 1 description: Creates a widget in which the contents of the cell can be edited - action 2 name: activate - action 2 description: Activates the cell -+ -+ table: tv -+ column-header[0]: unnamed-GtkButtonAccessible-0 -+ column-span: 1 -+ row-span: 1 -+ position: 2 0 - tv - "table cell" - parent: tv -@@ -353,3 +398,9 @@ window1 - action 1 description: Creates a widget in which the contents of the cell can be edited - action 2 name: activate - action 2 description: Activates the cell -+ -+ table: tv -+ column-header[0]: unnamed-GtkButtonAccessible-0 -+ column-span: 1 -+ row-span: 1 -+ position: 2 0 --- -2.18.0 - diff --git a/gtk3-boo1121456-a11y-export.patch b/gtk3-boo1121456-a11y-export.patch new file mode 100644 index 0000000..2d10a5a --- /dev/null +++ b/gtk3-boo1121456-a11y-export.patch @@ -0,0 +1,32 @@ +From 3313213d61b2fdca96230223393c1c5054b2de49 Mon Sep 17 00:00:00 2001 +From: Mike Gorse +Date: Fri, 11 Jan 2019 16:21:21 -0600 +Subject: [PATCH] A11y: export + gtk_cell_accessible_parent_get_(row|column)_header_cells + +These functions were missing GDK_AVAILABLE_IN macros, so they were +listed in the gir but not exported. +--- + gtk/a11y/gtkcellaccessibleparent.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gtk/a11y/gtkcellaccessibleparent.h b/gtk/a11y/gtkcellaccessibleparent.h +index 8406574dcb..5e99a28c56 100644 +--- a/gtk/a11y/gtkcellaccessibleparent.h ++++ b/gtk/a11y/gtkcellaccessibleparent.h +@@ -128,10 +128,10 @@ void gtk_cell_accessible_parent_get_cell_position(GtkCellAccessibleParent *p + GtkCellAccessible *cell, + gint *row, + gint *column); +- ++GDK_AVAILABLE_IN_3_24 + GPtrArray *gtk_cell_accessible_parent_get_column_header_cells (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell); +- ++GDK_AVAILABLE_IN_3_24 + GPtrArray *gtk_cell_accessible_parent_get_row_header_cells (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell); + +-- +2.18.0 + diff --git a/gtk3-revert-Fix-deprecation-warnings.patch b/gtk3-revert-Fix-deprecation-warnings.patch deleted file mode 100644 index b6664a5..0000000 --- a/gtk3-revert-Fix-deprecation-warnings.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2905fc861acda3d134a198e56ef2f6c962ad3061 Mon Sep 17 00:00:00 2001 -From: Daniel Boles -Date: Wed, 12 Dec 2018 19:03:11 +0000 -Subject: [PATCH] Revert "Fix deprecation warnings" - -This reverts commit 5aedfe048b0fe07382433f1a78ec5bd26acd82dd. - -It had a typo that broke the build, only replaced half of the uses, and -replaced them with other functions that are also deprecated anyway. ---- - docs/tools/shooter.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/docs/tools/shooter.c b/docs/tools/shooter.c -index 3d910c6ab8..8cefa8bbf7 100644 ---- a/docs/tools/shooter.c -+++ b/docs/tools/shooter.c -@@ -170,10 +170,10 @@ take_window_shot (Window child, - y_orig = 0; - } - -- if (x_orig + width > gdk_screen_get_width (gdk_screen_get_dfeault ())) -+ if (x_orig + width > gdk_screen_width ()) - width = gdk_screen_width () - x_orig; - -- if (y_orig + height > gdk_screen_get_height (gdk_screen_get_default ())) -+ if (y_orig + height > gdk_screen_height ()) - height = gdk_screen_height () - y_orig; - - tmp = gdk_pixbuf_get_from_window (window, --- -2.18.1 - diff --git a/gtk3-x11-fix-deprecation-macro-use.patch b/gtk3-x11-fix-deprecation-macro-use.patch deleted file mode 100644 index 437610b..0000000 --- a/gtk3-x11-fix-deprecation-macro-use.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e3a1593a0984cc0156ec1892a46af8f256a64878 Mon Sep 17 00:00:00 2001 -From: Daniel Boles -Date: Thu, 13 Dec 2018 17:20:13 +0100 -Subject: [PATCH] x11: Fix deprecation macro use - -G_GNUC_END_IGNORE_DEPRECATIONS terminates the if statement and does not -consider the following block to be part of the if. So that block was -always taken irregardless of the pattern. - -Fixes #1280 ---- - gdk/x11/gdkwindow-x11.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c -index 97ada6d739..764e39495f 100644 ---- a/gdk/x11/gdkwindow-x11.c -+++ b/gdk/x11/gdkwindow-x11.c -@@ -2985,6 +2985,7 @@ gdk_window_x11_set_background (GdkWindow *window, - double r, g, b, a; - cairo_surface_t *surface; - cairo_matrix_t matrix; -+ cairo_pattern_t *parent_relative_pattern; - - if (GDK_WINDOW_DESTROYED (window)) - return; -@@ -2997,8 +2998,10 @@ gdk_window_x11_set_background (GdkWindow *window, - } - - G_GNUC_BEGIN_IGNORE_DEPRECATIONS -- if (pattern == gdk_x11_get_parent_relative_pattern ()) -+ parent_relative_pattern = gdk_x11_get_parent_relative_pattern (); - G_GNUC_END_IGNORE_DEPRECATIONS -+ -+ if (pattern == parent_relative_pattern) - { - GdkWindow *parent; - --- -2.20.1 - diff --git a/gtk3.changes b/gtk3.changes index eb4d6e8..ad6b188 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Mon Jan 14 21:32:19 UTC 2019 - mgorse@suse.com + +- Replace gtk3-atk-table-cell.patch with + gtk3-boo1121456-a11y-export.patch: the feature made it into + 3.24.3, without this bug fix (boo#1121456 glgo#GNOME/gtk!506). + +------------------------------------------------------------------- +Mon Jan 14 18:29:04 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 3.24.3: + + Bugs fixed: + - wayland: + . Respect length limits in text protocol. + . Support key themes. + . Fix hi-dpi cursor scaling. + - placessidebar: Insert drops in the right place. + - x11: + . Fix problems gdk_x11_get_parent_relative. + . Fix Wacom tool types. + - icons: Recolor polygons as well in symbolic icons. + - switch: Use Unicode symbols for I/O instead of translations. + + Updated translations. +- Drop upstream applied patches: + + gtk3-revert-Fix-deprecation-warnings.patch. + + gtk3-x11-fix-deprecation-macro-use.patch. +- Disable gtk3-atk-table-cell.patch: It was partly applied + upstream, and needs a rebase. + +------------------------------------------------------------------- +Sat Jan 12 19:47:39 UTC 2019 - Andrei Dziahel + +- Update gtk3-atk-table-cell.patch to export + gtk_cell_accessible_parent_get_(row|column)_header_cells + functions (boo#1121456 glgo#GNOME/gtk!505) + ------------------------------------------------------------------- Wed Jan 9 16:36:50 UTC 2019 - mgorse@suse.com diff --git a/gtk3.spec b/gtk3.spec index 550d52d..17410ca 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -22,7 +22,7 @@ %define _name gtk+ %bcond_without broadway Name: gtk3 -Version: 3.24.2 +Version: 3.24.3 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1-or-later @@ -33,16 +33,13 @@ Source1: README.SUSE Source2: settings.ini Source3: macros.gtk3 Source99: baselibs.conf + # PATCH-FIX-OPENSUSE gtk3-GTK_PATH64.patch sbrabec@novell.com - 64-bit dual install. Use GTK_PATH64 environment variable instead of GTK_PATH Patch0: gtk3-GTK_PATH64.patch # PATCH-FIX-OPENSUSE gtk3-revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96 Patch1: gtk3-revert-forced-xftdpi.patch -# PATCH-FEATURE-UPSTREAM gtk3-atk-table-cell.patch fate#326548 mgorse@suse.com -- a11y: add support for AtkTableCell. -Patch2: gtk3-atk-table-cell.patch -# PATCH-FIX-UPSTREAM gtk3-revert-Fix-deprecation-warnings.patch -- Revert "Fix deprecation warnings", fixes build. -Patch3: gtk3-revert-Fix-deprecation-warnings.patch -# PATCH-FIX-UPSTREAM gtk3-x11-fix-deprecation-macro-use.patch -- x11: Fix deprecation macro use -Patch4: gtk3-x11-fix-deprecation-macro-use.patch +# PATCH-FIX-UPSTREAM gtk3-boo1121456-a11y-export.patch boo#1121456 mgorse@suse.com -- export gtk_cell_accessible_parent_get_(row|column)_header_cells functions. +Patch2: gtk3-boo1121456-a11y-export.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets @@ -118,7 +115,7 @@ Recommends: %{name}-immodule-tigrigna = %{version} Recommends: %{name}-immodule-vietnamese = %{version} Recommends: %{name}-lang Recommends: gvfs -# Provide %{name} to make the lang and immodules packages installable +# Provide %%{name} to make the lang and immodules packages installable Provides: %{name} = %{version} # Before 3.0, the package was actually libgtk-3_0-0 and files might # conflict @@ -358,7 +355,6 @@ This package enhances gettext with an International Tag Set for GTK+ 3 %prep %setup -q -n gtk+-%{version} -# Translation this time intentionally disabled.. they fail translation-update-upstream translation-update-upstream po-properties gtk30-properties # remove incomplete translations caused by translation-update-upstream (global LINGUAS file, two domains) @@ -375,8 +371,6 @@ cp -a %{SOURCE1} . %endif %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %configure \ From 9c734a4c1ad442a9869978a339c2a25948fe726d96d1ee4bb0f4f8f9b9e9c6de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 18 Jan 2019 09:17:26 +0000 Subject: [PATCH 2/3] Accepting request 666905 from GNOME:Next Add upstream patch, I was waiting for upstream to do a brown paper bag release, but it seems it won't happen... - Add gtk3-Add-fallbacks-GtkSwitch-labels.patch: Add fallbacks for GtkSwitch state labels. OBS-URL: https://build.opensuse.org/request/show/666905 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=341 --- gtk3-Add-fallbacks-GtkSwitch-labels.patch | 72 +++++++++++++++++++++++ gtk3.changes | 6 ++ gtk3.spec | 3 + 3 files changed, 81 insertions(+) create mode 100644 gtk3-Add-fallbacks-GtkSwitch-labels.patch diff --git a/gtk3-Add-fallbacks-GtkSwitch-labels.patch b/gtk3-Add-fallbacks-GtkSwitch-labels.patch new file mode 100644 index 0000000..038cd1f --- /dev/null +++ b/gtk3-Add-fallbacks-GtkSwitch-labels.patch @@ -0,0 +1,72 @@ +From ed39721aa7435860f46da69998cf6cac4ae7e735 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 15 Jan 2019 15:22:09 +0000 +Subject: [PATCH] Add fallbacks for GtkSwitch state labels + +While the IEC power symbols have been part of Unicode since version 9.0, +released in 2016, not every font supports them. + +We can use the old symbols as a fallback, as they seem to have the +better coverage, if not the best appearance. +--- + gtk/gtkswitch.c | 41 +++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 39 insertions(+), 2 deletions(-) + +diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c +index bf63f34fd2..1d42f572a9 100644 +--- a/gtk/gtkswitch.c ++++ b/gtk/gtkswitch.c +@@ -298,11 +298,48 @@ gtk_switch_create_pango_layouts (GtkSwitch *self) + { + GtkSwitchPrivate *priv = self->priv; + ++ /* Glyphs for the ON state, in descending order of preference */ ++ const char *on_glyphs[] = { ++ "⏽", /* U+23FD POWER ON SYMBOL */ ++ "❙", /* U+2759 MEDIUM VERTICAL BAR */ ++ }; ++ ++ /* Glyphs for the OFF state, in descending order of preference */ ++ const char *off_glyphs[] = { ++ "⭘", /* U+2B58 HEAVY CIRCLE */ ++ "○", /* U+25CB WHITE CIRCLE */ ++ }; ++ int i; ++ + g_clear_object (&priv->on_layout); +- priv->on_layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "⏽"); ++ ++ for (i = 0; i < G_N_ELEMENTS (on_glyphs); i++) ++ { ++ PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), on_glyphs[i]); ++ ++ if (pango_layout_get_unknown_glyphs_count (layout) == 0) ++ { ++ priv->on_layout = layout; ++ break; ++ } ++ ++ g_object_unref (layout); ++ } + + g_clear_object (&priv->off_layout); +- priv->off_layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "⭘"); ++ ++ for (i = 0; i < G_N_ELEMENTS (off_glyphs); i++) ++ { ++ PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), off_glyphs[i]); ++ ++ if (pango_layout_get_unknown_glyphs_count (layout) == 0) ++ { ++ priv->off_layout = layout; ++ break; ++ } ++ ++ g_object_unref (layout); ++ } + } + + static void +-- +2.18.1 + diff --git a/gtk3.changes b/gtk3.changes index ad6b188..e691aea 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 18 06:18:01 UTC 2019 - bjorn.lie@gmail.com + +- Add gtk3-Add-fallbacks-GtkSwitch-labels.patch: Add fallbacks for + GtkSwitch state labels. + ------------------------------------------------------------------- Mon Jan 14 21:32:19 UTC 2019 - mgorse@suse.com diff --git a/gtk3.spec b/gtk3.spec index 17410ca..b669192 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -40,6 +40,8 @@ Patch0: gtk3-GTK_PATH64.patch Patch1: gtk3-revert-forced-xftdpi.patch # PATCH-FIX-UPSTREAM gtk3-boo1121456-a11y-export.patch boo#1121456 mgorse@suse.com -- export gtk_cell_accessible_parent_get_(row|column)_header_cells functions. Patch2: gtk3-boo1121456-a11y-export.patch +# PATCH-FIX-UPSTREAM gtk3-Add-fallbacks-GtkSwitch-labels.patch -- Add fallbacks for GtkSwitch state labels +Patch3: gtk3-Add-fallbacks-GtkSwitch-labels.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets @@ -371,6 +373,7 @@ cp -a %{SOURCE1} . %endif %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure \ From f52546e89b4e4f8361d67df4099caffeb27ea023ba3234f89f61d8215f27d1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 22 Jan 2019 08:43:43 +0000 Subject: [PATCH 3/3] Accepting request 667654 from GNOME:Next New stable release OBS-URL: https://build.opensuse.org/request/show/667654 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=342 --- gtk+-3.24.3.tar.xz | 3 - gtk+-3.24.4.tar.xz | 3 + gtk3-Add-fallbacks-GtkSwitch-labels.patch | 72 ----------------------- gtk3.changes | 13 ++++ gtk3.spec | 5 +- 5 files changed, 17 insertions(+), 79 deletions(-) delete mode 100644 gtk+-3.24.3.tar.xz create mode 100644 gtk+-3.24.4.tar.xz delete mode 100644 gtk3-Add-fallbacks-GtkSwitch-labels.patch diff --git a/gtk+-3.24.3.tar.xz b/gtk+-3.24.3.tar.xz deleted file mode 100644 index e1ab240..0000000 --- a/gtk+-3.24.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5708fa534d964b1fb9a69d15758729d51b9a438471d4612dc153f595904803bd -size 21099144 diff --git a/gtk+-3.24.4.tar.xz b/gtk+-3.24.4.tar.xz new file mode 100644 index 0000000..e4eea51 --- /dev/null +++ b/gtk+-3.24.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d84f59ff02a87cc90c9df4a572a13eca4e3506e2bf511e2b9cbdb4526fa0cb9c +size 21102236 diff --git a/gtk3-Add-fallbacks-GtkSwitch-labels.patch b/gtk3-Add-fallbacks-GtkSwitch-labels.patch deleted file mode 100644 index 038cd1f..0000000 --- a/gtk3-Add-fallbacks-GtkSwitch-labels.patch +++ /dev/null @@ -1,72 +0,0 @@ -From ed39721aa7435860f46da69998cf6cac4ae7e735 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Tue, 15 Jan 2019 15:22:09 +0000 -Subject: [PATCH] Add fallbacks for GtkSwitch state labels - -While the IEC power symbols have been part of Unicode since version 9.0, -released in 2016, not every font supports them. - -We can use the old symbols as a fallback, as they seem to have the -better coverage, if not the best appearance. ---- - gtk/gtkswitch.c | 41 +++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 39 insertions(+), 2 deletions(-) - -diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c -index bf63f34fd2..1d42f572a9 100644 ---- a/gtk/gtkswitch.c -+++ b/gtk/gtkswitch.c -@@ -298,11 +298,48 @@ gtk_switch_create_pango_layouts (GtkSwitch *self) - { - GtkSwitchPrivate *priv = self->priv; - -+ /* Glyphs for the ON state, in descending order of preference */ -+ const char *on_glyphs[] = { -+ "⏽", /* U+23FD POWER ON SYMBOL */ -+ "❙", /* U+2759 MEDIUM VERTICAL BAR */ -+ }; -+ -+ /* Glyphs for the OFF state, in descending order of preference */ -+ const char *off_glyphs[] = { -+ "⭘", /* U+2B58 HEAVY CIRCLE */ -+ "○", /* U+25CB WHITE CIRCLE */ -+ }; -+ int i; -+ - g_clear_object (&priv->on_layout); -- priv->on_layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "⏽"); -+ -+ for (i = 0; i < G_N_ELEMENTS (on_glyphs); i++) -+ { -+ PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), on_glyphs[i]); -+ -+ if (pango_layout_get_unknown_glyphs_count (layout) == 0) -+ { -+ priv->on_layout = layout; -+ break; -+ } -+ -+ g_object_unref (layout); -+ } - - g_clear_object (&priv->off_layout); -- priv->off_layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "⭘"); -+ -+ for (i = 0; i < G_N_ELEMENTS (off_glyphs); i++) -+ { -+ PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), off_glyphs[i]); -+ -+ if (pango_layout_get_unknown_glyphs_count (layout) == 0) -+ { -+ priv->off_layout = layout; -+ break; -+ } -+ -+ g_object_unref (layout); -+ } - } - - static void --- -2.18.1 - diff --git a/gtk3.changes b/gtk3.changes index e691aea..2f22c1e 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jan 21 15:48:19 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 3.24.4: + + Support gtk_file_chooser_set_filter in GtkFileChooserNative. + + Bugs fixed: + - wayland: Fix long combobox positioning. + - about dialog: Activate all links in the same way. + - switch: Add fallbacks for symbols. + - spinbutton: Fix background color. + + Updated translations. +- Drop gtk3-Add-fallbacks-GtkSwitch-labels.patch: Fixed upstream. + ------------------------------------------------------------------- Fri Jan 18 06:18:01 UTC 2019 - bjorn.lie@gmail.com diff --git a/gtk3.spec b/gtk3.spec index b669192..0f6a3ed 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -22,7 +22,7 @@ %define _name gtk+ %bcond_without broadway Name: gtk3 -Version: 3.24.3 +Version: 3.24.4 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1-or-later @@ -40,8 +40,6 @@ Patch0: gtk3-GTK_PATH64.patch Patch1: gtk3-revert-forced-xftdpi.patch # PATCH-FIX-UPSTREAM gtk3-boo1121456-a11y-export.patch boo#1121456 mgorse@suse.com -- export gtk_cell_accessible_parent_get_(row|column)_header_cells functions. Patch2: gtk3-boo1121456-a11y-export.patch -# PATCH-FIX-UPSTREAM gtk3-Add-fallbacks-GtkSwitch-labels.patch -- Add fallbacks for GtkSwitch state labels -Patch3: gtk3-Add-fallbacks-GtkSwitch-labels.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets @@ -373,7 +371,6 @@ cp -a %{SOURCE1} . %endif %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build %configure \