On Wed, 07 Jun 2023 at 21:33:29 +0100, Simon McVittie wrote:
> [x] attach debdiff against the package in (old)stable
That was, in fact, a lie. See attached (or the nmudiff on #1037206 if
you'd prefer the unfiltered version).
smcv
debdiff appstream-glib_0.7.18-1{,+deb11u1}.dsc | filterdiff -p1 -x'debian/patches/*.patch'
diffstat for appstream-glib-0.7.18 appstream-glib-0.7.18
debian/.gitignore |1
debian/changelog | 10
debian/patches/Improve-handling-of-em-and-code-tags.patch | 220 ++
debian/patches/Properly-initialize-AsNodeToXmlHelper.patch| 34 +
debian/patches/Support-em-code-tags.patch | 118 +
debian/patches/series |4
debian/patches/trivial-Turn-is_-em-code-_text-fields-into-bitfields.patch | 26 +
libappstream-glib/as-node.c | 120 -
libappstream-glib/as-self-test.c | 51 ++
9 files changed, 552 insertions(+), 32 deletions(-)
diff -Nru appstream-glib-0.7.18/debian/changelog appstream-glib-0.7.18/debian/changelog
--- appstream-glib-0.7.18/debian/changelog 2020-12-21 23:14:10.0 +
+++ appstream-glib-0.7.18/debian/changelog 2023-06-07 19:25:59.0 +0100
@@ -1,3 +1,13 @@
+appstream-glib (0.7.18-1+deb11u1) bullseye; urgency=medium
+
+ * Add patches from upstream to cope with and in metadata.
+Older versions of appstream-glib mis-parse upstream metadata that
+contains and , causing flatpak 1.12.x or older to fail
+to load the metadata now published by Flathub. The symptom is that
+`flatpak search` fails. (Closes: #1037206, LP: #2023215)
+
+ -- Simon McVittie Wed, 07 Jun 2023 19:25:59 +0100
+
appstream-glib (0.7.18-1) unstable; urgency=medium
[ Matthias Klumpp ]
diff -Nru appstream-glib-0.7.18/debian/.gitignore appstream-glib-0.7.18/debian/.gitignore
--- appstream-glib-0.7.18/debian/.gitignore 1970-01-01 01:00:00.0 +0100
+++ appstream-glib-0.7.18/debian/.gitignore 2023-06-07 19:25:59.0 +0100
@@ -0,0 +1 @@
+*~
diff -Nru appstream-glib-0.7.18/debian/patches/series appstream-glib-0.7.18/debian/patches/series
--- appstream-glib-0.7.18/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ appstream-glib-0.7.18/debian/patches/series 2023-06-07 19:25:59.0 +0100
@@ -0,0 +1,4 @@
+Support-em-code-tags.patch
+Properly-initialize-AsNodeToXmlHelper.patch
+trivial-Turn-is_-em-code-_text-fields-into-bitfields.patch
+Improve-handling-of-em-and-code-tags.patch
diff -Nru appstream-glib-0.7.18/libappstream-glib/as-node.c appstream-glib-0.7.18/libappstream-glib/as-node.c
--- appstream-glib-0.7.18/libappstream-glib/as-node.c 2020-09-07 11:20:43.894573000 +0100
+++ appstream-glib-0.7.18/libappstream-glib/as-node.c 2023-06-07 20:58:11.0 +0100
@@ -555,6 +555,8 @@
AsNode *current;
AsNodeFromXmlFlags flags;
const gchar * const *locales;
+ guint8 is_em_text:1;
+ guint8 is_code_text:1;
} AsNodeToXmlHelper;
/**
@@ -604,6 +606,16 @@
AsNode *current;
guint i;
+ /* do not create a child node for em and code tags */
+ if (g_strcmp0 (element_name, "em") == 0) {
+ helper->is_em_text = 1;
+ return;
+ }
+ if (g_strcmp0 (element_name, "code") == 0) {
+ helper->is_code_text = 1;
+ return;
+ }
+
/* check if we should ignore the locale */
data = g_slice_new0 (AsNodeData);
@@ -662,6 +674,53 @@
GError **error)
{
AsNodeToXmlHelper *helper = (AsNodeToXmlHelper *) user_data;
+ AsNodeData *data = helper->current->data;
+
+ /* do not create a child node for em and code tags */
+ if (g_strcmp0 (element_name, "em") == 0) {
+ helper->is_em_text = 0;
+ return;
+ }
+ if (g_strcmp0 (element_name, "code") == 0) {
+ helper->is_code_text = 0;
+ return;
+ }
+
+ if (data->cdata != NULL) {
+ /* split up into lines and add each with spaces stripped */
+ if ((helper->flags & AS_NODE_FROM_XML_FLAG_LITERAL_TEXT) == 0) {
+ AsRefString *cdata = data->cdata;
+ data->cdata = as_node_reflow_text (cdata, strlen (cdata));
+ as_ref_string_unref (cdata);
+ }
+
+ /* intern commonly duplicated tag values and save a bit of memory */
+ if (data->is_tag_valid) {
+ AsNode *root = g_node_get_root (helper->current);
+ switch (data->tag) {
+ case AS_TAG_CATEGORY:
+ case AS_TAG_COMPULSORY_FOR_DESKTOP:
+ case AS_TAG_CONTENT_ATTRIBUTE:
+ case AS_TAG_DEVELOPER_NAME:
+ case AS_TAG_EXTENDS:
+ case AS_TAG_ICON:
+ case AS_TAG_ID:
+ case AS_TAG_KUDO:
+ case AS_TAG_LANG:
+ case AS_TAG_METADATA_LICENSE:
+ case AS_TAG_MIMETYPE:
+ case AS_TAG_PROJECT_GROUP:
+ case AS_TAG_PROJECT_LICENSE:
+ case AS_TAG_SOURCE_PKGNAME:
+ case AS_TAG_URL:
+as_node_cdata_to_intern (root, data);
+break;
+ default:
+break;
+ }
+ }
+ }
+
helper->current =
