mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-01-19 23:51:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

community/gtk4.0: backport fix for gtktreeviewmodel

Browse Source
This commit is contained in:
psykose 2023-05-12 20:22:36 +00:00
parent 0b0f1a9ffd
commit eeddf29b92
3 changed files with 217 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
community/gtk4.0/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Pablo Correa Gomez <ablocorrea@hotmail.com>
pkgname=gtk4.0
pkgver=4.10.3
pkgrel=0
pkgrel=1
pkgdesc="The GTK Toolkit (v4)"
url="https://www.gtk.org/"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
@ -56,7 +56,10 @@ makedepends="
vulkan-loader-dev
zlib-dev
"
source="https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-$pkgver.tar.xz"
source="https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-$pkgver.tar.xz
gtktreeviewmodel-1.patch
gtktreeviewmodel-2.patch
"
builddir="$srcdir/gtk-$pkgver"
build() {
@ -122,4 +125,6 @@ lang() {
sha512sums="
aac4703f9c135271febdd373b24995dabcd08fb0cea2d6014c812f2839ae88926c1939ddcc64ab9728ba3248a1f58260ce73fa6ef5679e54dbb798021adfa324 gtk-4.10.3.tar.xz
f8798c584b77df87132d76cbc7bb4d2109aa2b2a5077496705c193f4de2a0d8794b986ffed91fcb35707b5e66a70b6fe59a4e98b1323f4fad2ed37630bd8c82f gtktreeviewmodel-1.patch
afdea0f061668a28a96f0d60aae4bfcb15a4399a1fb96ffd86bc47bca7c931fcfe6c577ed106ff3f680138e73a3127d1d4ef0d52ab4e0f0e4b7e89c4fb867c90 gtktreeviewmodel-2.patch
"

102
community/gtk4.0/gtktreeviewmodel-1.patch Normal file
View File

@ -0,0 +1,102 @@
Patch-Source: https://gitlab.gnome.org/GNOME/gtk/-/commit/4f47683710bbb4b56c286c6ee6a5c394fcf2b755
--
From 4f47683710bbb4b56c286c6ee6a5c394fcf2b755 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 29 Mar 2023 02:23:46 +0000
Subject: [PATCH] Merge branch 'wip/otte/trelistmodel-fixage' into 'main'
treelistmodel: Don't add items in reverse
Closes #5707
See merge request GNOME/gtk!5744
(cherry picked from commit c5a53f235a2ed1b0acd0a8c29153e62377262d04)
1718db14 treelistmodel: Don't add items in reverse
cd860beb Add a test for splicing treelistmodel
---
gtk/gtktreelistmodel.c | 2 +-
testsuite/gtk/treelistmodel.c | 46 +++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/gtk/gtktreelistmodel.c b/gtk/gtktreelistmodel.c
index dd3b3009ccc..1e55323c0a4 100644
--- a/gtk/gtktreelistmodel.c
+++ b/gtk/gtktreelistmodel.c
@@ -357,7 +357,7 @@ gtk_tree_list_model_items_changed_cb (GListModel *model,
}
tree_added = added;
- for (i = 0; i < added; i++)
+ for (i = added; i-- > 0;)
{
child = gtk_rb_tree_insert_before (node->children, child);
child->parent = node;
diff --git a/testsuite/gtk/treelistmodel.c b/testsuite/gtk/treelistmodel.c
index 941ac3d306b..98493a3ba56 100644
--- a/testsuite/gtk/treelistmodel.c
+++ b/testsuite/gtk/treelistmodel.c
@@ -261,6 +261,51 @@ test_remove_some (void)
g_object_unref (tree);
}
+static void
+splice (GListStore *store,
+ guint pos,
+ guint removed,
+ guint *numbers,
+ guint added)
+{
+ GObject **objects = g_newa (GObject *, added);
+ guint i;
+
+ for (i = 0; i < added; i++)
+ {
+ /* 0 cannot be differentiated from NULL, so don't use it */
+ g_assert_cmpint (numbers[i], !=, 0);
+ objects[i] = g_object_new (G_TYPE_OBJECT, NULL);
+ g_object_set_qdata (objects[i], number_quark, GUINT_TO_POINTER (numbers[i]));
+ }
+
+ g_list_store_splice (store, pos, removed, (gpointer *) objects, added);
+
+ for (i = 0; i < added; i++)
+ g_object_unref (objects[i]);
+}
+
+static void
+test_splice (void)
+{
+ GtkTreeListModel *tree = new_model (100, TRUE);
+ gpointer item;
+
+ assert_model (tree, "100 100 100 99 98 97 96 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
+ assert_changes (tree, "");
+
+ item = g_list_model_get_item (G_LIST_MODEL (tree), 1);
+ g_assert_true (G_IS_LIST_MODEL (item));
+ splice (item, 0, 5, (guint[5]) { 300, 301, 302, 303, 304 }, 5);
+ /* expected */
+ assert_model (tree, "100 100 300 301 302 303 304 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
+ /* real outcome */
+ // assert_model (tree, "100 100 304 303 302 301 300 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
+ assert_changes (tree, "2-5+5");
+
+ g_object_unref (tree);
+}
+
/* Test for https://gitlab.gnome.org/GNOME/gtk/-/issues/4595 */
typedef struct _DemoNode DemoNode;
@@ -391,6 +436,7 @@ main (int argc, char *argv[])
g_test_add_func ("/treelistmodel/expand", test_expand);
g_test_add_func ("/treelistmodel/remove_some", test_remove_some);
+ g_test_add_func ("/treelistmodel/remove_splice", test_splice);
g_test_add_func ("/treelistmodel/collapse-change", test_collapse_change);
return g_test_run ();
--
GitLab

108
community/gtk4.0/gtktreeviewmodel-2.patch Normal file
View File

@ -0,0 +1,108 @@
Patch-Source: https://gitlab.gnome.org/GNOME/gtk/-/commit/541de3451cdaef589ab724ccf612d868455f2b31
--
From 541de3451cdaef589ab724ccf612d868455f2b31 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte.benjamin@googlemail.com>
Date: Wed, 26 Apr 2023 22:06:40 +0000
Subject: [PATCH] Merge branch 'wip/otte/treelistmodel-madness' into 'main'
treelistmodel: Be safer during collapsing
See merge request GNOME/gtk!5875
(cherry picked from commit 29e71868298448eb7fa570ed0a75935c235262de)
8766a6fa treelistmodel: Be safer during collapsing
3c76f3fb treelistmodel: Delay notifies from TreeListRow
---
gtk/gtktreelistmodel.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/gtk/gtktreelistmodel.c b/gtk/gtktreelistmodel.c
index 1e55323c0a4..a4f0fa1d4b9 100644
--- a/gtk/gtktreelistmodel.c
+++ b/gtk/gtktreelistmodel.c
@@ -101,8 +101,15 @@ static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
static GtkTreeListModel *
tree_node_get_tree_list_model (TreeNode *node)
{
- for (; !node->is_root; node = node->parent)
- { }
+ if (node->is_root)
+ return node->list;
+
+ for (node = node->parent; !node->is_root; node = node->parent)
+ {
+ /* This can happen during collapsing of a parent node */
+ if (node->children == NULL)
+ return NULL;
+ }
return node->list;
}
@@ -316,6 +323,9 @@ gtk_tree_list_model_items_changed_cb (GListModel *model,
guint i, tree_position, tree_removed, tree_added, n_local;
self = tree_node_get_tree_list_model (node);
+ if (self == NULL)
+ return;
+
n_local = g_list_model_get_n_items (model) - added + removed;
if (position < n_local)
@@ -405,10 +415,16 @@ gtk_tree_list_model_clear_node (gpointer data)
TreeNode *node = data;
if (node->row)
- gtk_tree_list_row_destroy (node->row);
+ {
+ g_object_freeze_notify (G_OBJECT (node->row));
+ gtk_tree_list_row_destroy (node->row);
+ }
gtk_tree_list_model_clear_node_children (node);
+ if (node->row)
+ g_object_thaw_notify (G_OBJECT (node->row));
+
g_clear_object (&node->item);
}
@@ -945,16 +961,12 @@ G_DEFINE_TYPE (GtkTreeListRow, gtk_tree_list_row, G_TYPE_OBJECT)
static void
gtk_tree_list_row_destroy (GtkTreeListRow *self)
{
- g_object_freeze_notify (G_OBJECT (self));
-
self->node = NULL;
/* FIXME: We could check some properties to avoid excess notifies */
g_object_notify_by_pspec (G_OBJECT (self), row_properties[ROW_PROP_DEPTH]);
g_object_notify_by_pspec (G_OBJECT (self), row_properties[ROW_PROP_EXPANDABLE]);
g_object_notify_by_pspec (G_OBJECT (self), row_properties[ROW_PROP_EXPANDED]);
-
- g_object_thaw_notify (G_OBJECT (self));
}
static void
@@ -1180,6 +1192,8 @@ gtk_tree_list_row_set_expanded (GtkTreeListRow *self,
return;
list = tree_node_get_tree_list_model (self->node);
+ if (list == NULL)
+ return;
if (expanded)
{
@@ -1255,6 +1269,9 @@ gtk_tree_list_row_is_expandable (GtkTreeListRow *self)
return TRUE;
list = tree_node_get_tree_list_model (self->node);
+ if (list == NULL)
+ return FALSE;
+
model = tree_node_create_model (list, self->node);
if (model)
{
--
GitLab