Accepting request 1106082 from KDE:Frameworks5

OBS-URL: https://build.opensuse.org/request/show/1106082
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/AppStream?expand=0&rev=37

0001-Do-not-override-default-priority-when-parsing-multip.patch

@@ -1,45 +0,0 @@
-From aba40b41f9deb56ca533af0900c8ecc77835d468 Mon Sep 17 00:00:00 2001
-From: Matthias Klumpp <matthias@tenstral.net>
-Date: Sat, 17 Jun 2023 19:15:39 +0200
-Subject: [PATCH] Do not override default-priority when parsing multiple
- metadata files
-
-The default priority should not be changed when a XML/YAML file is
-parsed, because otherwise it will be applied to all subsequently parsed
-files if those do not set a priority. This leads to merges being applied
-in the wrong order.
-
-Resolves: #495
----
- src/as-metadata.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/src/as-metadata.c b/src/as-metadata.c
-index 5df20f2..da27632 100644
---- a/src/as-metadata.c
-+++ b/src/as-metadata.c
-@@ -213,10 +213,9 @@ as_metadata_xml_parse_components_node (AsMetadata *metad, AsContext *context, xm
- 	/* catalog metadata allows setting a priority for components */
- 	priority_str = as_xml_get_prop_value (node, "priority");
- 	if (priority_str != NULL) {
--		gint default_priority;
--		default_priority = g_ascii_strtoll (priority_str, NULL, 10);
--		as_context_set_priority (context, default_priority);
--		priv->default_priority = default_priority;
-+		gint priority;
-+		priority = g_ascii_strtoll (priority_str, NULL, 10);
-+		as_context_set_priority (context, priority);
- 	}
- 	g_free (priority_str);
- 
-@@ -354,7 +353,6 @@ as_metadata_yaml_parse_catalog_doc (AsMetadata *metad, AsContext *context, const
- 						if (value != NULL) {
- 							gint priority = g_ascii_strtoll (value, NULL, 10);
- 							as_context_set_priority (context, priority);
--							priv->default_priority = priority;
- 						}
- 					} else if (g_strcmp0 (key, "MediaBaseUrl") == 0) {
- 						if (value != NULL &&
--- 
-2.41.0
-

AppStream-0.16.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f9cb80bd388fbf06be268afa7f2d65863c85d605ad874b905094f3982d03f232
-size 2567136

AppStream-0.16.2.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAmRJdvAACgkQSUyKX79N
-7OslvQ//ada5ML3D50SuaUELw9O2KdLWcL1fay7AurFYxnVqQiGa40lmZCPxiFpN
-JS0qxG1aBlGOW2fnpvPekL0VlZugmYfcPXQgeMewALRvnXblma+biAUPFVOoAMxa
-AQa7e1/S6vX0AQ2oTdORF5sIVPmJmBCylQMMTXZ7ZjLJw4YCoZJccmokgfwGntxX
-dHMSEUUZ39n0blFXZ/FEwPStvxLSO3UlqWpAT+UYrq7tiGhH6u9SiNYgtVk2kc/f
-hw2oa+yeJtzmy5HuT09YpqoJM9wa4//86H1khrwKBKSIj+kPOpVTjnVSxXZ0e+DU
-3r9d19DsuDKIrN76+xWfAonIW2JP3C0Z4Yk+ENFh0TaePUM4HwoTVUy5Rn9WdxQU
-hufk+H/dDxFogeLQvJzAQAtaqFkj9gPkcM5k0X8TPILjG6unrQqZKPS6owSlaJgQ
-C6fBq0tbB3N+IhheH0y5ERMyUV7o6prodPRklKnV7woTLy3HbOrJc3a9Zf0PPW+l
-G0ZndTSDO5+kOs9tg5zoBAyyoEccrCY326qwMmGYMGIc1FomF0Es7ivsH/YjMUc8
-SmSgZme7MKsCo8nYzDkhldyNg/0IVITzTaTjxSyMjr6QYldybaO8kdRgNGT7TCUY
-bt23CNMlYxWaMADVZqOwZPex3Psr4Y92DTM8iyX5MlvYy5v+OnA=
-=RxFG
------END PGP SIGNATURE-----

AppStream-0.16.3.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAmTlLiEACgkQSUyKX79N
+7OvoBhAAkVsi9+esa/0cm8kwSdI8CvS7Kt+ep37QBm9jJCFr9/RrANnZ8BqQa42/
+Fu1dbX9LC6zzkPjySvLcc8nPsyD1jp6hQ/zj1negeCwru8OTTATI9uCdNKCkeTYI
+2Ott6IpQ6yisI2Xj5wBUFcvepfQU3iJ1X37CN0AfFPfL9pfKehd+yuIAfMmAVmxr
+sdpNS5Y1J6a7wxEByc97eKKJa+ahTtluNdJM+TVxMa9/gzCE4wmMIWDqHLYXM2lT
+Pg7T33YWjHY3+kjGT6INNjobNN779T4JF6Ve01UyzakXxXbuJdxr8zdQvHfPJdg9
+fvL4PmU63WkdheVO2fv625MAhFYlxc86Z1rsumuQ87AQOPDFRHhPSTQEj/IEOKIX
+9c4ZwAdriGacRlUk+yXBLdIFUvDFOTxW95wL5iDw5zRCHvjq+g/pJQzr5oLCWCyV
+aHBPkfHMZFNwoJgFQCd4qTEXVqD69kTvQg0bIeMh1rC9wyWCV8ydlXjrnGdkSg39
+4gIRR3swQFa5F0oFmhjC/iYn14c/0Cxn8jBlVrZ/IA3cLEA8wkCLbLVdffaOUE6q
+mMOd1jsODiePW9bYcrU8H3ZbFXfRTs+PXzv5qUSATBj2d9WO9kCTbKnMcAaxjDO5
+wMXnAVCVnoU5Z67Re1pjGeV6eUY4THoXfcETff1irXrRLWtr/CY=
+=vRIK
+-----END PGP SIGNATURE-----

AppStream.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Aug 26 13:12:31 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Update to 0.16.3:
+  Features:
+  * compose: Allow creating metadata with complete URLs and no base URL
+  Bugfixes:
+  * Fix tweaking of appstream.pc when building as subproject
+  * Do not override default-priority when parsing multiple metadata files
+  * Ensure stemmer always has the right locale and token-search works
+  * Require a more recent libxmlb to avoid crashes
+  Miscellaneous:
+  * Work around invalid null-dereference warning in GCC 13
+- Drop patch, merged upstream:
+  * 0001-Do-not-override-default-priority-when-parsing-multip.patch
+
 -------------------------------------------------------------------
 Fri Jun  2 06:19:52 UTC 2023 - Christophe Marin <christophe@krop.fr>
 

AppStream.spec

@@ -23,7 +23,7 @@
 %bcond_without vala
 %endif
 Name:           AppStream
-Version:        0.16.2
+Version:        0.16.3
 Release:        0
 Summary:        Tools and libraries to work with AppStream metadata
 License:        LGPL-2.1-or-later
@@ -33,8 +33,6 @@ Source0:        http://www.freedesktop.org/software/appstream/releases/%{name}-%
 Source1:        http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
 Patch0:         support-meson0.59.patch
-# PATCH-FIX-UPSTREAM
-Patch1:         0001-Do-not-override-default-priority-when-parsing-multip.patch
 BuildRequires:  cairo-devel
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  gdk-pixbuf-loader-rsvg
@@ -55,7 +53,7 @@ BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(pango)
-BuildRequires:  pkgconfig(xmlb) >= 0.3.6
+BuildRequires:  pkgconfig(xmlb) >= 0.3.13
 BuildRequires:  pkgconfig(yaml-0.1)
 Recommends:     curl
 %if %{with vala}