diff --git a/backport-gkeyfile-Ensure-we-don-t-add-extra-blank-line-above-new-group.patch b/backport-gkeyfile-Ensure-we-don-t-add-extra-blank-line-above-new-group.patch new file mode 100644 index 0000000000000000000000000000000000000000..d8d0080cc4191ce79c153828b85ab7bc1dc7d813 --- /dev/null +++ b/backport-gkeyfile-Ensure-we-don-t-add-extra-blank-line-above-new-group.patch @@ -0,0 +1,59 @@ +From c49502582faedecc7020155d95b16c7a1d78d432 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= +Date: Thu, 13 Jul 2023 10:06:21 +0200 +Subject: [PATCH] gkeyfile: Ensure we don't add extra blank line above new + group + +A forgotten edge case in 86b4b045: when the last value of the last group +has been added via g_key_file_set_value() and it contains line breaks. +The best we can do in this case is probably to do nothing. + +Closes: #3047 +Fixes: 86b4b0453ea3a814167d4a5f7a4031d467543716 +--- + glib/gkeyfile.c | 6 +++++- + glib/tests/keyfile.c | 10 ++++++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c +index 145136706f..0e21ab4f14 100644 +--- a/glib/gkeyfile.c ++++ b/glib/gkeyfile.c +@@ -3858,8 +3858,12 @@ g_key_file_add_group (GKeyFile *key_file, + { + /* separate groups by a blank line if we don't keep comments or group is created */ + GKeyFileGroup *next_group = key_file->groups->next->data; ++ GKeyFileKeyValuePair *pair; ++ if (next_group->key_value_pairs != NULL) ++ pair = next_group->key_value_pairs->data; ++ + if (next_group->key_value_pairs == NULL || +- ((GKeyFileKeyValuePair *) next_group->key_value_pairs->data)->key != NULL) ++ (pair->key != NULL && !g_strstr_len (pair->value, -1, "\n"))) + { + GKeyFileKeyValuePair *pair = g_new (GKeyFileKeyValuePair, 1); + pair->key = NULL; +diff --git a/glib/tests/keyfile.c b/glib/tests/keyfile.c +index d3eed29841..80cdc93d8f 100644 +--- a/glib/tests/keyfile.c ++++ b/glib/tests/keyfile.c +@@ -480,6 +480,16 @@ test_comments (void) + G_KEY_FILE_ERROR_GROUP_NOT_FOUND); + g_assert_null (comment); + ++ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/3047"); ++ ++ /* check if we don't add a blank line above new group if last value of preceding ++ * group was added via g_key_file_set_value() and contains line breaks */ ++ g_key_file_set_value (keyfile, "group4", "key1", "value1\n\n# group comment"); ++ g_key_file_set_string (keyfile, "group5", "key1", "value1"); ++ comment = g_key_file_get_comment (keyfile, "group5", NULL, &error); ++ check_no_error (&error); ++ g_assert_null (comment); ++ + g_key_file_free (keyfile); + } + +-- +GitLab + diff --git a/backport-gkeyfile-Fix-group-comment-management.patch b/backport-gkeyfile-Fix-group-comment-management.patch new file mode 100644 index 0000000000000000000000000000000000000000..c13ab67dc047073806830c604e1a1fba3988dd2b --- /dev/null +++ b/backport-gkeyfile-Fix-group-comment-management.patch @@ -0,0 +1,530 @@ +From f74589f53041abff29d538a5d9884c3202f2c00a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= +Date: Thu, 20 Apr 2023 16:52:19 +0200 +Subject: [PATCH 1/2] gkeyfile: Replace g_slice_*() with + g_new*()/g_free_sized() + +--- + glib/gkeyfile.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c +index 9a4821bc5a..d76335653f 100644 +--- a/glib/gkeyfile.c ++++ b/glib/gkeyfile.c +@@ -638,7 +638,7 @@ G_DEFINE_QUARK (g-key-file-error-quark, g_key_file_error) + static void + g_key_file_init (GKeyFile *key_file) + { +- key_file->current_group = g_slice_new0 (GKeyFileGroup); ++ key_file->current_group = g_new0 (GKeyFileGroup, 1); + key_file->groups = g_list_prepend (NULL, key_file->current_group); + key_file->group_hash = NULL; + key_file->start_group = NULL; +@@ -700,7 +700,7 @@ g_key_file_new (void) + { + GKeyFile *key_file; + +- key_file = g_slice_new0 (GKeyFile); ++ key_file = g_new0 (GKeyFile, 1); + key_file->ref_count = 1; + g_key_file_init (key_file); + +@@ -1205,7 +1205,7 @@ g_key_file_free (GKeyFile *key_file) + g_key_file_clear (key_file); + + if (g_atomic_int_dec_and_test (&key_file->ref_count)) +- g_slice_free (GKeyFile, key_file); ++ g_free_sized (key_file, sizeof (GKeyFile)); + else + g_key_file_init (key_file); + } +@@ -1227,7 +1227,7 @@ g_key_file_unref (GKeyFile *key_file) + if (g_atomic_int_dec_and_test (&key_file->ref_count)) + { + g_key_file_clear (key_file); +- g_slice_free (GKeyFile, key_file); ++ g_free_sized (key_file, sizeof (GKeyFile)); + } + } + +@@ -1317,7 +1317,7 @@ g_key_file_parse_comment (GKeyFile *key_file, + + g_warn_if_fail (key_file->current_group != NULL); + +- pair = g_slice_new (GKeyFileKeyValuePair); ++ pair = g_new (GKeyFileKeyValuePair, 1); + pair->key = NULL; + pair->value = g_strndup (line, length); + +@@ -1442,7 +1442,7 @@ g_key_file_parse_key_value_pair (GKeyFile *key_file, + { + GKeyFileKeyValuePair *pair; + +- pair = g_slice_new (GKeyFileKeyValuePair); ++ pair = g_new (GKeyFileKeyValuePair, 1); + pair->key = g_steal_pointer (&key); + pair->value = g_strndup (value_start, value_len); + +@@ -3339,7 +3339,7 @@ g_key_file_set_key_comment (GKeyFile *key_file, + + /* Now we can add our new comment + */ +- pair = g_slice_new (GKeyFileKeyValuePair); ++ pair = g_new (GKeyFileKeyValuePair, 1); + pair->key = NULL; + pair->value = g_key_file_parse_comment_as_value (key_file, comment); + +@@ -3383,7 +3383,7 @@ g_key_file_set_group_comment (GKeyFile *key_file, + + /* Now we can add our new comment + */ +- group->comment = g_slice_new (GKeyFileKeyValuePair); ++ group->comment = g_new (GKeyFileKeyValuePair, 1); + group->comment->key = NULL; + group->comment->value = g_key_file_parse_comment_as_value (key_file, comment); + +@@ -3416,7 +3416,7 @@ g_key_file_set_top_comment (GKeyFile *key_file, + if (comment == NULL) + return TRUE; + +- pair = g_slice_new (GKeyFileKeyValuePair); ++ pair = g_new (GKeyFileKeyValuePair, 1); + pair->key = NULL; + pair->value = g_key_file_parse_comment_as_value (key_file, comment); + +@@ -3840,7 +3840,7 @@ g_key_file_add_group (GKeyFile *key_file, + return; + } + +- group = g_slice_new0 (GKeyFileGroup); ++ group = g_new0 (GKeyFileGroup, 1); + group->name = g_strdup (group_name); + group->lookup_map = g_hash_table_new (g_str_hash, g_str_equal); + key_file->groups = g_list_prepend (key_file->groups, group); +@@ -3862,7 +3862,7 @@ g_key_file_key_value_pair_free (GKeyFileKeyValuePair *pair) + { + g_free (pair->key); + g_free (pair->value); +- g_slice_free (GKeyFileKeyValuePair, pair); ++ g_free_sized (pair, sizeof (GKeyFileKeyValuePair)); + } + } + +@@ -3971,7 +3971,7 @@ g_key_file_remove_group_node (GKeyFile *key_file, + } + + g_free ((gchar *) group->name); +- g_slice_free (GKeyFileGroup, group); ++ g_free_sized (group, sizeof (GKeyFileGroup)); + g_list_free_1 (group_node); + } + +@@ -4031,7 +4031,7 @@ g_key_file_add_key (GKeyFile *key_file, + { + GKeyFileKeyValuePair *pair; + +- pair = g_slice_new (GKeyFileKeyValuePair); ++ pair = g_new (GKeyFileKeyValuePair, 1); + pair->key = g_strdup (key); + pair->value = g_strdup (value); + +-- +GitLab + + +From 86b4b0453ea3a814167d4a5f7a4031d467543716 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= +Date: Fri, 14 Apr 2023 19:40:30 +0200 +Subject: [PATCH 2/2] gkeyfile: Fix group comment management + +This removes the `comment` member of the GKeyFileGroup structure, which +seemed intended to distinguish comments just above a group from comments +above them, separated by one or more blank lines. Indeed: +* This does not seem to match any specification in the documentation, + where blank lines and lines starting with `#` are indiscriminately + considered comments. In particular, no distinction is made between the + comment above the first group and the comment at the beginning of the + file. +* This distinction was only half implemented, resulting in confusion + between comment above a group and comment at the end of the preceding + group. + +Instead, the same logic is used for groups as for keys: the comment +above a group is simply the sequence of key-value pairs of the preceding +group where the key is null, starting from the bottom. + +The addition of a blank line above groups when writing, involved in +bugs #104 and #2927, is kept, but: +* It is now added as a comment as soon as the group is added (since a + blank line is considered a comment), so that + `g_key_file_get_comment()` returns the correct result right away. +* It is always added if comments are not kept. +* Otherwise it is only added if the group is newly created (not present + in the original data), in order to really keep comments (existing and + not existing). + +Closes: #104, #2927 +--- + glib/gkeyfile.c | 137 +++++++++++++++++++++++-------------------- + glib/tests/keyfile.c | 75 ++++++++++++++++++++++- + 2 files changed, 147 insertions(+), 65 deletions(-) + +diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c +index d76335653f..1fcef9fc91 100644 +--- a/glib/gkeyfile.c ++++ b/glib/gkeyfile.c +@@ -529,8 +529,6 @@ struct _GKeyFileGroup + { + const gchar *name; /* NULL for above first group (which will be comments) */ + +- GKeyFileKeyValuePair *comment; /* Special comment that is stuck to the top of a group */ +- + GList *key_value_pairs; + + /* Used in parallel with key_value_pairs for +@@ -579,7 +577,8 @@ static void g_key_file_add_key (GKeyFile + const gchar *key, + const gchar *value); + static void g_key_file_add_group (GKeyFile *key_file, +- const gchar *group_name); ++ const gchar *group_name, ++ gboolean created); + static gboolean g_key_file_is_group_name (const gchar *name); + static gboolean g_key_file_is_key_name (const gchar *name, + gsize len); +@@ -1354,7 +1353,7 @@ g_key_file_parse_group (GKeyFile *key_file, + return; + } + +- g_key_file_add_group (key_file, group_name); ++ g_key_file_add_group (key_file, group_name, FALSE); + g_free (group_name); + } + +@@ -1610,14 +1609,6 @@ g_key_file_to_data (GKeyFile *key_file, + + group = (GKeyFileGroup *) group_node->data; + +- /* separate groups by at least an empty line */ +- if (data_string->len >= 2 && +- data_string->str[data_string->len - 2] != '\n') +- g_string_append_c (data_string, '\n'); +- +- if (group->comment != NULL) +- g_string_append_printf (data_string, "%s\n", group->comment->value); +- + if (group->name != NULL) + g_string_append_printf (data_string, "[%s]\n", group->name); + +@@ -1902,7 +1893,7 @@ g_key_file_set_value (GKeyFile *key_file, + + if (!group) + { +- g_key_file_add_group (key_file, group_name); ++ g_key_file_add_group (key_file, group_name, TRUE); + group = (GKeyFileGroup *) key_file->groups->data; + + g_key_file_add_key (key_file, group, key, value); +@@ -3349,6 +3340,42 @@ g_key_file_set_key_comment (GKeyFile *key_file, + return TRUE; + } + ++static gboolean ++g_key_file_set_top_comment (GKeyFile *key_file, ++ const gchar *comment, ++ GError **error) ++{ ++ GList *group_node; ++ GKeyFileGroup *group; ++ GKeyFileKeyValuePair *pair; ++ ++ /* The last group in the list should be the top (comments only) ++ * group in the file ++ */ ++ g_warn_if_fail (key_file->groups != NULL); ++ group_node = g_list_last (key_file->groups); ++ group = (GKeyFileGroup *) group_node->data; ++ g_warn_if_fail (group->name == NULL); ++ ++ /* Note all keys must be comments at the top of ++ * the file, so we can just free it all. ++ */ ++ g_list_free_full (group->key_value_pairs, (GDestroyNotify) g_key_file_key_value_pair_free); ++ group->key_value_pairs = NULL; ++ ++ if (comment == NULL) ++ return TRUE; ++ ++ pair = g_new (GKeyFileKeyValuePair, 1); ++ pair->key = NULL; ++ pair->value = g_key_file_parse_comment_as_value (key_file, comment); ++ ++ group->key_value_pairs = ++ g_list_prepend (group->key_value_pairs, pair); ++ ++ return TRUE; ++} ++ + static gboolean + g_key_file_set_group_comment (GKeyFile *key_file, + const gchar *group_name, +@@ -3356,6 +3383,8 @@ g_key_file_set_group_comment (GKeyFile *key_file, + GError **error) + { + GKeyFileGroup *group; ++ GList *group_node; ++ GKeyFileKeyValuePair *pair; + + g_return_val_if_fail (group_name != NULL && g_key_file_is_group_name (group_name), FALSE); + +@@ -3370,12 +3399,22 @@ g_key_file_set_group_comment (GKeyFile *key_file, + return FALSE; + } + ++ if (group == key_file->start_group) ++ return g_key_file_set_top_comment (key_file, comment, error); ++ + /* First remove any existing comment + */ +- if (group->comment) ++ group_node = g_key_file_lookup_group_node (key_file, group_name); ++ group = group_node->next->data; ++ for (GList *lp = group->key_value_pairs; lp != NULL; ) + { +- g_key_file_key_value_pair_free (group->comment); +- group->comment = NULL; ++ GList *lnext = lp->next; ++ pair = lp->data; ++ if (pair->key != NULL) ++ break; ++ ++ g_key_file_remove_key_value_pair_node (key_file, group, lp); ++ lp = lnext; + } + + if (comment == NULL) +@@ -3383,45 +3422,10 @@ g_key_file_set_group_comment (GKeyFile *key_file, + + /* Now we can add our new comment + */ +- group->comment = g_new (GKeyFileKeyValuePair, 1); +- group->comment->key = NULL; +- group->comment->value = g_key_file_parse_comment_as_value (key_file, comment); +- +- return TRUE; +-} +- +-static gboolean +-g_key_file_set_top_comment (GKeyFile *key_file, +- const gchar *comment, +- GError **error) +-{ +- GList *group_node; +- GKeyFileGroup *group; +- GKeyFileKeyValuePair *pair; +- +- /* The last group in the list should be the top (comments only) +- * group in the file +- */ +- g_warn_if_fail (key_file->groups != NULL); +- group_node = g_list_last (key_file->groups); +- group = (GKeyFileGroup *) group_node->data; +- g_warn_if_fail (group->name == NULL); +- +- /* Note all keys must be comments at the top of +- * the file, so we can just free it all. +- */ +- g_list_free_full (group->key_value_pairs, (GDestroyNotify) g_key_file_key_value_pair_free); +- group->key_value_pairs = NULL; +- +- if (comment == NULL) +- return TRUE; +- + pair = g_new (GKeyFileKeyValuePair, 1); + pair->key = NULL; + pair->value = g_key_file_parse_comment_as_value (key_file, comment); +- +- group->key_value_pairs = +- g_list_prepend (group->key_value_pairs, pair); ++ group->key_value_pairs = g_list_prepend (group->key_value_pairs, pair); + + return TRUE; + } +@@ -3629,9 +3633,6 @@ g_key_file_get_group_comment (GKeyFile *key_file, + return NULL; + } + +- if (group->comment) +- return g_strdup (group->comment->value); +- + group_node = g_key_file_lookup_group_node (key_file, group_name); + group_node = group_node->next; + group = (GKeyFileGroup *)group_node->data; +@@ -3826,7 +3827,8 @@ g_key_file_has_key (GKeyFile *key_file, + + static void + g_key_file_add_group (GKeyFile *key_file, +- const gchar *group_name) ++ const gchar *group_name, ++ gboolean created) + { + GKeyFileGroup *group; + +@@ -3847,7 +3849,22 @@ g_key_file_add_group (GKeyFile *key_file, + key_file->current_group = group; + + if (key_file->start_group == NULL) +- key_file->start_group = group; ++ { ++ key_file->start_group = group; ++ } ++ else if (!(key_file->flags & G_KEY_FILE_KEEP_COMMENTS) || created) ++ { ++ /* separate groups by a blank line if we don't keep comments or group is created */ ++ GKeyFileGroup *next_group = key_file->groups->next->data; ++ if (next_group->key_value_pairs == NULL || ++ ((GKeyFileKeyValuePair *) next_group->key_value_pairs->data)->key != NULL) ++ { ++ GKeyFileKeyValuePair *pair = g_new (GKeyFileKeyValuePair, 1); ++ pair->key = NULL; ++ pair->value = g_strdup (""); ++ next_group->key_value_pairs = g_list_prepend (next_group->key_value_pairs, pair); ++ } ++ } + + if (!key_file->group_hash) + key_file->group_hash = g_hash_table_new (g_str_hash, g_str_equal); +@@ -3958,12 +3975,6 @@ g_key_file_remove_group_node (GKeyFile *key_file, + + g_warn_if_fail (group->key_value_pairs == NULL); + +- if (group->comment) +- { +- g_key_file_key_value_pair_free (group->comment); +- group->comment = NULL; +- } +- + if (group->lookup_map) + { + g_hash_table_destroy (group->lookup_map); +diff --git a/glib/tests/keyfile.c b/glib/tests/keyfile.c +index 3d72d9670e..d3eed29841 100644 +--- a/glib/tests/keyfile.c ++++ b/glib/tests/keyfile.c +@@ -382,7 +382,9 @@ test_comments (void) + "key4 = value4\n" + "# group comment\n" + "# group comment, continued\n" +- "[group2]\n"; ++ "[group2]\n\n" ++ "[group3]\n" ++ "[group4]\n"; + + const gchar *top_comment = " top comment\n top comment, continued"; + const gchar *group_comment = " group comment\n group comment, continued"; +@@ -427,6 +429,12 @@ test_comments (void) + check_name ("top comment", comment, top_comment, 0); + g_free (comment); + ++ g_key_file_remove_comment (keyfile, NULL, NULL, &error); ++ check_no_error (&error); ++ comment = g_key_file_get_comment (keyfile, NULL, NULL, &error); ++ check_no_error (&error); ++ g_assert_null (comment); ++ + comment = g_key_file_get_comment (keyfile, "group1", "key2", &error); + check_no_error (&error); + check_name ("key comment", comment, key_comment, 0); +@@ -448,7 +456,25 @@ test_comments (void) + check_name ("group comment", comment, group_comment, 0); + g_free (comment); + ++ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/104"); ++ ++ /* check if comments above another group than the first one are properly removed */ ++ g_key_file_remove_comment (keyfile, "group2", NULL, &error); ++ check_no_error (&error); ++ comment = g_key_file_get_comment (keyfile, "group2", NULL, &error); ++ check_no_error (&error); ++ g_assert_null (comment); ++ + comment = g_key_file_get_comment (keyfile, "group3", NULL, &error); ++ check_no_error (&error); ++ check_name ("group comment", comment, "", 0); ++ g_free (comment); ++ ++ comment = g_key_file_get_comment (keyfile, "group4", NULL, &error); ++ check_no_error (&error); ++ g_assert_null (comment); ++ ++ comment = g_key_file_get_comment (keyfile, "group5", NULL, &error); + check_error (&error, + G_KEY_FILE_ERROR, + G_KEY_FILE_ERROR_GROUP_NOT_FOUND); +@@ -1321,9 +1347,16 @@ test_reload_idempotency (void) + "[fifth]\n"; + GKeyFile *keyfile; + GError *error = NULL; +- gchar *data1, *data2; ++ gchar *data1, *data2, *comment; + gsize len1, len2; + ++ const gchar *key_comment = " A random comment in the first group"; ++ const gchar *top_comment = " Top comment\n\n First comment"; ++ const gchar *group_comment_1 = top_comment; ++ const gchar *group_comment_2 = " Second comment - one line"; ++ const gchar *group_comment_3 = " Third comment - two lines\n Third comment - two lines"; ++ const gchar *group_comment_4 = "\n"; ++ + g_test_bug ("https://bugzilla.gnome.org/show_bug.cgi?id=420686"); + + /* check that we only insert a single new line between groups */ +@@ -1347,6 +1380,44 @@ test_reload_idempotency (void) + + data2 = g_key_file_to_data (keyfile, &len2, &error); + g_assert_nonnull (data2); ++ ++ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2927"); ++ ++ /* check if comments are preserved on reload */ ++ comment = g_key_file_get_comment (keyfile, "first", "anotherkey", &error); ++ check_no_error (&error); ++ g_assert_cmpstr (comment, ==, key_comment); ++ g_free (comment); ++ ++ comment = g_key_file_get_comment (keyfile, NULL, NULL, &error); ++ check_no_error (&error); ++ g_assert_cmpstr (comment, ==, top_comment); ++ g_free (comment); ++ ++ comment = g_key_file_get_comment (keyfile, "first", NULL, &error); ++ check_no_error (&error); ++ g_assert_cmpstr (comment, ==, group_comment_1); ++ g_free (comment); ++ ++ comment = g_key_file_get_comment (keyfile, "second", NULL, &error); ++ check_no_error (&error); ++ g_assert_cmpstr (comment, ==, group_comment_2); ++ g_free (comment); ++ ++ comment = g_key_file_get_comment (keyfile, "third", NULL, &error); ++ check_no_error (&error); ++ g_assert_cmpstr (comment, ==, group_comment_3); ++ g_free (comment); ++ ++ comment = g_key_file_get_comment (keyfile, "fourth", NULL, &error); ++ check_no_error (&error); ++ g_assert_cmpstr (comment, ==, group_comment_4); ++ g_free (comment); ++ ++ comment = g_key_file_get_comment (keyfile, "fifth", NULL, &error); ++ check_no_error (&error); ++ g_assert_null (comment); ++ + g_key_file_free (keyfile); + + g_assert_cmpstr (data1, ==, data2); +-- +GitLab + diff --git a/backport-gkeyfile-Skip-group-comment-when-adding-a-new-key-to-a-group.patch b/backport-gkeyfile-Skip-group-comment-when-adding-a-new-key-to-a-group.patch new file mode 100644 index 0000000000000000000000000000000000000000..225d6e82b73394146660d5639c730258775b4b45 --- /dev/null +++ b/backport-gkeyfile-Skip-group-comment-when-adding-a-new-key-to-a-group.patch @@ -0,0 +1,97 @@ +From 51dfb3c229c0478b3615f486fbbc36de2586bd52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= +Date: Thu, 13 Jul 2023 10:19:04 +0200 +Subject: [PATCH] gkeyfile: Skip group comment when adding a new key to a group + +An oversight in 86b4b045: since the comment of group N now consists of +the last null-key values of group N-1, these keys must obviously be +skipped when adding a new non-null key to group N-1. + +Closes: #3047 +Fixes: 86b4b0453ea3a814167d4a5f7a4031d467543716 +--- + glib/gkeyfile.c | 19 ++++++++++++++----- + glib/tests/keyfile.c | 9 +++++++++ + 2 files changed, 23 insertions(+), 5 deletions(-) + +diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c +index 0e21ab4f14..4759051977 100644 +--- a/glib/gkeyfile.c ++++ b/glib/gkeyfile.c +@@ -573,7 +573,8 @@ static void g_key_file_remove_key_value_pair_node (GKeyFile + + static void g_key_file_add_key_value_pair (GKeyFile *key_file, + GKeyFileGroup *group, +- GKeyFileKeyValuePair *pair); ++ GKeyFileKeyValuePair *pair, ++ GList *sibling); + static void g_key_file_add_key (GKeyFile *key_file, + GKeyFileGroup *group, + const gchar *key, +@@ -1447,7 +1448,8 @@ g_key_file_parse_key_value_pair (GKeyFile *key_file, + pair->key = g_steal_pointer (&key); + pair->value = g_strndup (value_start, value_len); + +- g_key_file_add_key_value_pair (key_file, key_file->current_group, pair); ++ g_key_file_add_key_value_pair (key_file, key_file->current_group, pair, ++ key_file->current_group->key_value_pairs); + } + + g_free (key); +@@ -4034,10 +4036,11 @@ g_key_file_remove_group (GKeyFile *key_file, + static void + g_key_file_add_key_value_pair (GKeyFile *key_file, + GKeyFileGroup *group, +- GKeyFileKeyValuePair *pair) ++ GKeyFileKeyValuePair *pair, ++ GList *sibling) + { + g_hash_table_replace (group->lookup_map, pair->key, pair); +- group->key_value_pairs = g_list_prepend (group->key_value_pairs, pair); ++ group->key_value_pairs = g_list_insert_before (group->key_value_pairs, sibling, pair); + } + + static void +@@ -4047,12 +4050,18 @@ g_key_file_add_key (GKeyFile *key_file, + const gchar *value) + { + GKeyFileKeyValuePair *pair; ++ GList *lp; + + pair = g_new (GKeyFileKeyValuePair, 1); + pair->key = g_strdup (key); + pair->value = g_strdup (value); + +- g_key_file_add_key_value_pair (key_file, group, pair); ++ /* skip group comment */ ++ lp = group->key_value_pairs; ++ while (lp != NULL && ((GKeyFileKeyValuePair *) lp->data)->key == NULL) ++ lp = lp->next; ++ ++ g_key_file_add_key_value_pair (key_file, group, pair, lp); + } + + /** +diff --git a/glib/tests/keyfile.c b/glib/tests/keyfile.c +index 80cdc93d8f..2c8eca4ebc 100644 +--- a/glib/tests/keyfile.c ++++ b/glib/tests/keyfile.c +@@ -456,6 +456,15 @@ test_comments (void) + check_name ("group comment", comment, group_comment, 0); + g_free (comment); + ++ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/3047"); ++ ++ /* check if adding a key to group N preserve group comment of group N+1 */ ++ g_key_file_set_string (keyfile, "group1", "key5", "value5"); ++ comment = g_key_file_get_comment (keyfile, "group2", NULL, &error); ++ check_no_error (&error); ++ check_name ("group comment", comment, group_comment, 0); ++ g_free (comment); ++ + g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/104"); + + /* check if comments above another group than the first one are properly removed */ +-- +GitLab + diff --git a/glib2.spec b/glib2.spec index d850d5726fe7c80762d2b62ce2d673b92a88ed63..8bc0df5a347d7f226e72d64679a23119697ec852 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,12 +1,15 @@ Name: glib2 Version: 2.76.4 -Release: 1 +Release: 2 Summary: The core library that forms the basis for projects such as GTK+ and GNOME License: LGPLv2+ URL: https://www.gtk.org Source0: https://download.gnome.org/sources/glib/2.76/glib-%{version}.tar.xz Patch1: gspawn-eperm.patch +Patch6001: backport-gkeyfile-Fix-group-comment-management.patch +Patch6002: backport-gkeyfile-Ensure-we-don-t-add-extra-blank-line-above-new-group.patch +Patch6003: backport-gkeyfile-Skip-group-comment-when-adding-a-new-key-to-a-group.patch BuildRequires: chrpath gcc gcc-c++ gettext perl-interpreter BUildRequires: glibc-devel libattr-devel libselinux-devel meson @@ -200,6 +203,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %endif %changelog +* Sat Aug 19 2023 hanhuihui - 2.76.4-2 +- fix group comment management + * Mon Jul 24 2023 dillon chen - 2.76.4-1 - Update to 2.76.4