Accepting request 1093607 from home:krop:branches:KDE:Frameworks5
Update to 0.16.2 OBS-URL: https://build.opensuse.org/request/show/1093607 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=94
This commit is contained in:
Christophe Marin
Git OBS Bridge
parent
d0a4252cc6
commit
1e51766e32
@ -0,0 +1,45 @@
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:77e274e163db1f0a1bec8f4134b1d0f31e9c0a8c54cd37f724a7d30a71cf41d2
|
||||
size 2558188
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAmPmoOgACgkQSUyKX79N
|
||||
7OtQtA//Yx8GDbWYVfV3/aA20G7EyyBN1soZ3Heq4oqdAkkVzpl/prt2IUMoDsRB
|
||||
dCTX96rIYeA0NgzXYe6ByFaKLjC9yHD0Qazp7r2z5x+Oiv7bJvf8J/rzEDdO4pK/
|
||||
y/0T/FLX6nQR+OEmT6IPawQgDvqTMWltWKUFL1hl5EmFLDvc5EJnFXajU9sz2vd/
|
||||
uWHkviy2kN3eIz3OCo45LdolPKNAQa5u9c/ADjEInJyjugI4xVxZ2/8FPINkWEBW
|
||||
jfa1HpxDzk4NWTTEwg+RWvbNxDyciux1cJ+KJr6cCKiOo99AZ9GbTmi/Y4THbHdK
|
||||
gcElHpT2r2EnqCByuWZ+JxSA4Bq677SbEj5agX+kqLIfP4kfGEZFSu/jH/mSk4tk
|
||||
jpXrowxnPplK0847ExsLeAOkfyyw8L9vzzaT8UkagLlFKu//7uLTrKoFUWtATGHI
|
||||
1NbVpQb1LE/RGpSBaHE3PT7mOoEhol99Nua14JRVm3fgZUtRISGb5AlSDdLC/UWW
|
||||
NxFSiBIUgU3A4v+Z6fTWE+KkjNAwdkLtZ+hj5fl9O5pkkUS6ahphTnMWIeUzOX/Y
|
||||
y32Ip7NiwUZbMTEj06OgsUCq70NzvlRalpxLB3LFJ1pl5mgC7y89zNv3NOnJ+RQe
|
||||
g7yC/PwJqIO92lx6bUhvWGQF5G7t2hI81C7GPc+R/3Sz+IpQMrs=
|
||||
=svp2
|
||||
-----END PGP SIGNATURE-----
|
||||
3
AppStream-0.16.2.tar.xz
Normal file
3
AppStream-0.16.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f9cb80bd388fbf06be268afa7f2d65863c85d605ad874b905094f3982d03f232
|
||||
size 2567136
|
||||
16
AppStream-0.16.2.tar.xz.asc
Normal file
16
AppStream-0.16.2.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----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-----
|
||||
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 2 06:19:52 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 0.16.2:
|
||||
Features:
|
||||
* Add API for asking whether the pool is empty
|
||||
* Add DDE to known desktop-environment list
|
||||
* validator: Check if Release Description is inside description tag
|
||||
* Make AppStream use BCP47 for locale in XML data
|
||||
Bugfixes:
|
||||
* Add missing standard::is-hidden attribute to file search enumerator
|
||||
* spdx: Accept brackets in spdx license expression check
|
||||
* introspection: Bring back AS_FORMAT_STYLE_COLLECTION into its enum
|
||||
* compose: Fix crash in asc_l10n_search_translations_qt()
|
||||
* compose: Set lower-cased CID for synthesized components again
|
||||
* Don't crash when non-YAML documents are read as YAML
|
||||
Miscellaneous:
|
||||
* sanitizers: Allow null-dereference check again
|
||||
- Drop patch, merged upstream:
|
||||
* bfa8fa6ac4ef645368a93384a6c16ac551a40922.patch
|
||||
- Add upstream change:
|
||||
* 0001-Do-not-override-default-priority-when-parsing-multip.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 22 06:35:40 UTC 2023 - Jiri Srain <jsrain@suse.com>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
%bcond_without vala
|
||||
%endif
|
||||
Name: AppStream
|
||||
Version: 0.16.1
|
||||
Version: 0.16.2
|
||||
Release: 0
|
||||
Summary: Tools and libraries to work with AppStream metadata
|
||||
License: LGPL-2.1-or-later
|
||||
@ -33,7 +33,8 @@ 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
|
||||
Patch1: https://github.com/ximion/appstream/commit/bfa8fa6ac4ef645368a93384a6c16ac551a40922.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
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From bfa8fa6ac4ef645368a93384a6c16ac551a40922 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Klumpp <matthias@tenstral.net>
|
||||
Date: Sun, 12 Mar 2023 17:36:11 +0100
|
||||
Subject: [PATCH] Add missing standard::is-hidden attribute to file search
|
||||
enumerator
|
||||
|
||||
Resolves: #470
|
||||
---
|
||||
src/as-utils.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/as-utils.c b/src/as-utils.c
|
||||
index 260f3cbf4..b983e7ec8 100644
|
||||
--- a/src/as-utils.c
|
||||
+++ b/src/as-utils.c
|
||||
@@ -511,7 +511,12 @@ as_utils_find_files_matching (const gchar* dir, const gchar* pattern, gboolean r
|
||||
|
||||
list = g_ptr_array_new_with_free_func (g_free);
|
||||
fdir = g_file_new_for_path (dir);
|
||||
- enumerator = g_file_enumerate_children (fdir, G_FILE_ATTRIBUTE_STANDARD_NAME, 0, NULL, &tmp_error);
|
||||
+ enumerator = g_file_enumerate_children (fdir,
|
||||
+ G_FILE_ATTRIBUTE_STANDARD_NAME ","
|
||||
+ G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
|
||||
+ 0,
|
||||
+ NULL,
|
||||
+ &tmp_error);
|
||||
if (tmp_error != NULL)
|
||||
goto out;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user