pool/AppStream
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 681558 from home:elimat:branches:KDE:Frameworks5

Browse Source 
- Update to 0.12.6:
  Features:
   * Implement artifacts (Matthias Klumpp)
   * Search improvements (Matthias Klumpp)
  Specification:
   * doc: help distinguish the 2 'languages' tags (Beuc)
   * spec: Document the new artifacts tag (Matthias Klumpp)
- Update to 0.12.5:
  Features:
   * qt: expose the spdx parser to Qt users (Aleix Pol)
   * Implement operating-system component and add convenience functions (Matthias Klumpp)
   * qt: Add operating-system component type and a few utility functions (Matthias Klumpp)
   * Allow fetching the ISO8601 date directly alongside the timestamp in AsRelease (Matthias Klumpp)
   * Implement date_eol for AsRelease (Matthias Klumpp)
   * Add convenience methods for retrieving date_eol as UNIX timestamp (Matthias Klumpp)
   * qt: Allow retrieving the EOL timestamp for releases (Matthias Klumpp)
   * Implement new release details URL (Matthias Klumpp)
   * Make rDNS conversion function more generic and add more extensive tests (Matthias Klumpp)
  Specification:
   * docs: <release> tag can have details url (Jehan)
   * spec: Specify the operating-system component (Matthias Klumpp)
   * spec: Specify date_eol for releases (Matthias Klumpp)
   * docs: Explicitly state list items are allowed in ol/ul lists (Matthias Klumpp)
  Bugfixes:
   * Don't warn about issues in a cache refresh if there weren't any (Matthias Klumpp)
   * Ensure releases are always sorted in descending order (Matthias Klumpp)
   * pool: Fix g-i for get_components_*() while GPtrArray owns its elements (Rico Tzschichholz)
- Update to 0.12.4:
  Features:
   * pool: Be a lot more forgiving when encountering invalid components (Matthias Klumpp)
   * Implement component removal via remove-component merges (Matthias Klumpp)
   * validator: Warn about insecure URLs, handle mailto: URLs (Matthias Klumpp)
   * Add a contact URL type (Robert Ancell)
  Specification:
   * Document new remove-component merge type (Matthias Klumpp)
  Bugfixes:
   * as-pool: fix GObject annotation for GPtrArray owning the elements (Corentin Noël)
   * Make invalid components ratio check more accurate (Matthias Klumpp)
   * Ensure description paragraphs contain no invalid XML tags (Matthias Klumpp)
- Update to 0.12.3:
  Notes:
   * Beginning with this release, data from local .desktop files will not be loaded into
     the pool automatically, unless a metainfo file also exists.
     This should ensure less duplicated components in general higher-quality data to be
     displayed. It also provides another incentive to add/fix metainfo files.
     If you prefer the previous behavior, set the AS_POOL_FLAG_READ_DESKTOP_FILES flag
     on your AsPool instance.
  Features:
   * apt: Ignore errors post-update (Matthias Klumpp)
   * validator: Allow content_rating to be empty (Matthias Klumpp)
   * ascli: Display stock icon name if no suitable icon was found for details view (Matthias Klumpp)
   * Refactor loading of local metainfo files (Matthias Klumpp)
  Specification:
   * spec: Clarify the requirement for content_attribute tags in content_rating (Matthias Klumpp)
   * docs: Write intro for addon quickstart (Matthias Klumpp)
   * docs: Replace hyphens in component-IDs of XML examples (Matthias Klumpp)
  Bugfixes:
   * Ensure all addons are linked to a component (David Hewitt)
   * Annotate nullable return types (David Hewitt)
   * cache: Set explicit variant types for cases where they can not be inferred (Matthias Klumpp)
   * utils: Handle NULL strings when comparing versions (Matthias Klumpp)
   * Explicitly include string.h in as-tag.c (Matthias Klumpp)
   * Properly ignore desktop-entry components if we have better data (Matthias Klumpp)
   * Remove AppStream XSD schema (Matthias Klumpp)
   * Update static data (Matthias Klumpp)
   * Set error variable if there were some errors during refinement (Stefan Bruens)
- Remove patches, now upstream:
  * explicit-variant-types.patch
  * workaround-hidden-symbols.patch

OBS-URL: https://build.opensuse.org/request/show/681558
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=43
This commit is contained in:
Luca Beltrame 2019-03-05 08:57:48 +00:00 committed by Git OBS Bridge
parent 7b2f1bdcda
commit e3cffceaee
8 changed files with 95 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AppStream-0.12.2.tar.xz
View File

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

16
AppStream-0.12.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAltlWEMACgkQSUyKX79N
7OuhyhAAqTuITpiJ9uRApRsz70R5FjO2gQo6f9oxAELttugDQTv3Dr/7zh+RQNwB
deRocRfVo5bsYQMXT181yJ486HWjLmbYpaQ18nHoVf8ocUi0TL87VKfEg9afDA3g
7kd0rvb0Ri6ciUH2Yj9CYraHI33yF25+nVgA/zl4AqU31ORAc56Tkg6HWeM1A8iW
roWB4PgudIzYa8155pTPHviMKrCSfdcjzqR1eA2wWbAWZhO0IiKyl440NtH8HOm9
Y9DkdGvaVCzZRzI/EhWwM8whoybZ4RKpEloU8U9Io5Nw0m2X6lwdN9tpZlgyopRF
Ag4GLSV19mckOQqVYku79WnQJpP2PA5kWkBsm4ALEEcIT97vGkw+KyFHr2zseg2m
yIbVaoN5nm3U7ccMrt6+TJb0oa5V6o0GGybqhZOEY1TqjiRd5PxWYTIB8KW2F6bX
NZUrl5PhA6zw6YqEuG7jn8hcEZ5iJixfxZrOPM5m1hmglab+Y21nr0ABZTYqEUwO
mEA+amj+Aun7HLfH4f4zgU2xag+De5pniJpMlhAvwOBvkMnWFeeK6/tGaNd576n4
jZawntYV4eSWZuBoHsW7bQathwJlKyi9fxC6Apqgd7dHSP6Pcyb8TDaxqGqDEcC2
wDXwfKKBssNe1pIOt0yPohY+Kh8/H8mF7+Yr1IvFp7XNnovowzk=
=fMze
-----END PGP SIGNATURE-----

3
AppStream-0.12.6.tar.xz Normal file
View File

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

16
AppStream-0.12.6.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAlx6ut0ACgkQSUyKX79N
7OtKuxAAn7+ZNwxFZF1zuLm6pE/7ZWnALca3MrkA6//lgMkcovYC2vqZLM3oEdcq
9TOj7yUTygya4TaVxVa9Zl3871vxZcJoYTR5ZdTysvZMgP/QKbsMvlb+Yw1Pb9SW
uYrNya8jN85HxfsOQy8SqRSAMz6ncesvpgzQAnEcSTT8A3QcBKHjCaFxR9eGfx/a
Ft7+Y9XDdU7ufqURQDBYbamWNu6xKrS2qgTdaEoCBiYzqOIVUsbSjCSiJdUk9MO0
pYzy8w6JjJKuaNqvGExbwZIm80dWmWL0/0u6rL7ubxI2oeFtTieFtTmG+mudtgGF
cRLWn6J35yF/1jn3DE0hs2ANHOq6Cp/aAoh77QwrMEiy/l+nLEYdVzBmGCZmFE74
H5k2JDyzsUaQpOrYSwnKl8M5QHZy1+U92EWX+CVwcUpafCxLSccagP062OAw0guU
qb2xWr1nl5JpqVRI1xw1wIDi++tUkNXRJjr/cjjb2SJ3nXl9dL9GEgdvwTAFPX83
UgF1mDY+tx8QnLqMz/exzdENfbKceF4BZ2X3oK0tuTNLRDL6eodoS4UqLQwm8YcV
HiQTeWuv/A8GqOmxy4Yd+oD+6nws0yz5Nrd0d9Hp2VbHsW6DMJDHMZHSufg4pBcY
X7JJuIHwUOtCfZ808IfutsdQscsiRZpTyiPUOXmQHegLiUjZW8E=
=Ww4Z
-----END PGP SIGNATURE-----

73
AppStream.changes
View File

@ -1,3 +1,76 @@
-------------------------------------------------------------------
Mon Mar 4 21:07:15 UTC 2019 - Matthias Eliasson <elimat@opensuse.org>
- Update to 0.12.6:
Features:
* Implement artifacts (Matthias Klumpp)
* Search improvements (Matthias Klumpp)
Specification:
* doc: help distinguish the 2 'languages' tags (Beuc)
* spec: Document the new artifacts tag (Matthias Klumpp)
- Update to 0.12.5:
Features:
* qt: expose the spdx parser to Qt users (Aleix Pol)
* Implement operating-system component and add convenience functions (Matthias Klumpp)
* qt: Add operating-system component type and a few utility functions (Matthias Klumpp)
* Allow fetching the ISO8601 date directly alongside the timestamp in AsRelease (Matthias Klumpp)
* Implement date_eol for AsRelease (Matthias Klumpp)
* Add convenience methods for retrieving date_eol as UNIX timestamp (Matthias Klumpp)
* qt: Allow retrieving the EOL timestamp for releases (Matthias Klumpp)
* Implement new release details URL (Matthias Klumpp)
* Make rDNS conversion function more generic and add more extensive tests (Matthias Klumpp)
Specification:
* docs: <release> tag can have details url (Jehan)
* spec: Specify the operating-system component (Matthias Klumpp)
* spec: Specify date_eol for releases (Matthias Klumpp)
* docs: Explicitly state list items are allowed in ol/ul lists (Matthias Klumpp)
Bugfixes:
* Don't warn about issues in a cache refresh if there weren't any (Matthias Klumpp)
* Ensure releases are always sorted in descending order (Matthias Klumpp)
* pool: Fix g-i for get_components_*() while GPtrArray owns its elements (Rico Tzschichholz)
- Update to 0.12.4:
Features:
* pool: Be a lot more forgiving when encountering invalid components (Matthias Klumpp)
* Implement component removal via remove-component merges (Matthias Klumpp)
* validator: Warn about insecure URLs, handle mailto: URLs (Matthias Klumpp)
* Add a contact URL type (Robert Ancell)
Specification:
* Document new remove-component merge type (Matthias Klumpp)
Bugfixes:
* as-pool: fix GObject annotation for GPtrArray owning the elements (Corentin Noël)
* Make invalid components ratio check more accurate (Matthias Klumpp)
* Ensure description paragraphs contain no invalid XML tags (Matthias Klumpp)
- Update to 0.12.3:
Notes:
* Beginning with this release, data from local .desktop files will not be loaded into
the pool automatically, unless a metainfo file also exists.
This should ensure less duplicated components in general higher-quality data to be
displayed. It also provides another incentive to add/fix metainfo files.
If you prefer the previous behavior, set the AS_POOL_FLAG_READ_DESKTOP_FILES flag
on your AsPool instance.
Features:
* apt: Ignore errors post-update (Matthias Klumpp)
* validator: Allow content_rating to be empty (Matthias Klumpp)
* ascli: Display stock icon name if no suitable icon was found for details view (Matthias Klumpp)
* Refactor loading of local metainfo files (Matthias Klumpp)
Specification:
* spec: Clarify the requirement for content_attribute tags in content_rating (Matthias Klumpp)
* docs: Write intro for addon quickstart (Matthias Klumpp)
* docs: Replace hyphens in component-IDs of XML examples (Matthias Klumpp)
Bugfixes:
* Ensure all addons are linked to a component (David Hewitt)
* Annotate nullable return types (David Hewitt)
* cache: Set explicit variant types for cases where they can not be inferred (Matthias Klumpp)
* utils: Handle NULL strings when comparing versions (Matthias Klumpp)
* Explicitly include string.h in as-tag.c (Matthias Klumpp)
* Properly ignore desktop-entry components if we have better data (Matthias Klumpp)
* Remove AppStream XSD schema (Matthias Klumpp)
* Update static data (Matthias Klumpp)
* Set error variable if there were some errors during refinement (Stefan Bruens)
- Remove patches, now upstream:
* explicit-variant-types.patch
* workaround-hidden-symbols.patch
-------------------------------------------------------------------
Tue Oct 16 07:50:17 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>

10
AppStream.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package AppStream
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,7 +19,7 @@
%define libappstream_sover 4
%define libAppStreamQt_sover 2
Name: AppStream
Version: 0.12.2
Version: 0.12.6
Release: 0
Summary: Utilities to generate, maintain and access the AppStream Xapian database
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -28,10 +28,6 @@ URL: https://www.freedesktop.org/software/appstream/docs/
Source0: http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz
Source1: http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz.asc
Source2: %{name}.keyring
# PATCH-FIX-UPSTREAM
Patch1: explicit-variant-types.patch
# PATCH-FIX-UPSTREAM (or equivalent)
Patch2: workaround-hidden-symbols.patch
BuildRequires: gettext
BuildRequires: gperf
BuildRequires: intltool
@ -121,7 +117,7 @@ suck less.
%lang_package
%prep
%autosetup -p1
%autosetup
%build
%if "%{?_lib}" == "lib64"

77
explicit-variant-types.patch
View File

@ -1,77 +0,0 @@
From 734e9da66bf12fcaa94c10465db2dcf8bb2b94cb Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Sun, 19 Aug 2018 16:21:15 +0200
Subject: [PATCH] cache: Set explicit variant types for cases where they can
not be inferred
This ensures we do not run into assertion failures in case no array or
dict elements exist from which the final variant type can be
automatically inferred.
This resolves #198
---
src/as-agreement.c | 2 +-
src/as-content-rating.c | 2 +-
src/as-release.c | 4 ++--
src/as-screenshot.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/as-agreement.c b/src/as-agreement.c
index 0deee865..70fa5e67 100644
--- a/src/as-agreement.c
+++ b/src/as-agreement.c
@@ -450,7 +450,7 @@ as_agreement_to_variant (AsAgreement *agreement, GVariantBuilder *builder)
g_variant_builder_add_parsed (&agreement_b, "{'kind', <%u>}", priv->kind);
g_variant_builder_add_parsed (&agreement_b, "{'version_id', %v}", as_variant_mstring_new (priv->version_id));
- g_variant_builder_init (&sections_b, G_VARIANT_TYPE_ARRAY);
+ g_variant_builder_init (&sections_b, (const GVariantType *) "aa{sv}");
for (guint i = 0; i < priv->sections->len; i++) {
as_agreement_section_to_variant (AS_AGREEMENT_SECTION (g_ptr_array_index (priv->sections, i)), &sections_b);
}
diff --git a/src/as-content-rating.c b/src/as-content-rating.c
index 70b4bcde..263a6d01 100644
--- a/src/as-content-rating.c
+++ b/src/as-content-rating.c
@@ -499,7 +499,7 @@ as_content_rating_to_variant (AsContentRating *content_rating, GVariantBuilder *
GVariantBuilder rating_b;
guint j;
- g_variant_builder_init (&values_b, G_VARIANT_TYPE_ARRAY);
+ g_variant_builder_init (&values_b, (const GVariantType *) "a{su}");
for (j = 0; j < priv->keys->len; j++) {
AsContentRatingKey *key = (AsContentRatingKey*) g_ptr_array_index (priv->keys, j);
g_variant_builder_add (&values_b, "{su}", key->id, key->value);
diff --git a/src/as-release.c b/src/as-release.c
index 7a903519..e0908264 100644
--- a/src/as-release.c
+++ b/src/as-release.c
@@ -922,14 +922,14 @@ as_release_to_variant (AsRelease *release, GVariantBuilder *builder)
gboolean have_sizes = FALSE;
/* build checksum info */
- g_variant_builder_init (&checksum_b, G_VARIANT_TYPE_DICTIONARY);
+ g_variant_builder_init (&checksum_b, (const GVariantType *) "a{us}");
for (j = 0; j < priv->checksums->len; j++) {
AsChecksum *cs = AS_CHECKSUM (g_ptr_array_index (priv->checksums, j));
as_checksum_to_variant (cs, &checksum_b);
}
/* build size info */
- g_variant_builder_init (&sizes_b, G_VARIANT_TYPE_DICTIONARY);
+ g_variant_builder_init (&sizes_b, (const GVariantType *) "a{ut}");
for (j = 0; j < AS_SIZE_KIND_LAST; j++) {
if (as_release_get_size (release, (AsSizeKind) j) > 0) {
g_variant_builder_add (&sizes_b, "{ut}",
diff --git a/src/as-screenshot.c b/src/as-screenshot.c
index 7c834413..6569dbe3 100644
--- a/src/as-screenshot.c
+++ b/src/as-screenshot.c
@@ -596,7 +596,7 @@ as_screenshot_to_variant (AsScreenshot *screenshot, GVariantBuilder *builder)
if (priv->images->len == 0)
return FALSE;
- g_variant_builder_init (&images_b, G_VARIANT_TYPE_ARRAY);
+ g_variant_builder_init (&images_b, (const GVariantType *) "aa{sv}");
for (i = 0; i < priv->images->len; i++)
as_image_to_variant (AS_IMAGE (g_ptr_array_index (priv->images, i)), &images_b);

18
workaround-hidden-symbols.patch
View File

@ -1,18 +0,0 @@
From: Fabian Vogt <fabian@ritter-vogt.de>
Subject: Workaround as-tag marking strcmp/strlen/... as hidden
https://github.com/ximion/appstream/issues/207
Index: AppStream-0.12.2/src/as-tag.c
===================================================================
--- AppStream-0.12.2.orig/src/as-tag.c
+++ AppStream-0.12.2/src/as-tag.c
@@ -36,6 +36,8 @@
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
#endif
+#include <string.h>
+
#pragma GCC visibility push(hidden)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"