Dominique Leuenberger 2022-02-09 09:03:18 +00:00 committed by Git OBS Bridge
parent 3b620608f5
commit 5c188c8479
8 changed files with 46 additions and 45 deletions

View File

@ -1,33 +0,0 @@
From 004a4e60e2433c404e7c36b94770c94e592db0fc Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
Date: Tue, 8 Feb 2022 15:50:40 +0100
Subject: [PATCH] as-app: Also unwrap description in metainfo files
According to the specification, there is no difference between both kinds
of upstream metainfo files.
Fixes #381
---
libappstream-glib/as-app.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libappstream-glib/as-app.c b/libappstream-glib/as-app.c
index b65f08d..76c0727 100644
--- a/libappstream-glib/as-app.c
+++ b/libappstream-glib/as-app.c
@@ -4972,8 +4972,11 @@ as_app_node_parse_child (AsApp *app, GNode *n, guint32 flags,
/* <description> */
case AS_TAG_DESCRIPTION:
{
- /* unwrap appdata inline */
+ /* unwrap appdata and metainfo inline */
AsFormat *format = as_app_get_format_by_kind (app, AS_FORMAT_KIND_APPDATA);
+ if (format == NULL)
+ format = as_app_get_format_by_kind (app, AS_FORMAT_KIND_METAINFO);
+
if (format != NULL) {
GError *error_local = NULL;
g_autoptr(GHashTable) unwrapped = NULL;
--
2.34.1

View File

@ -2,11 +2,14 @@
<service name="obs_scm" mode="disabled"> <service name="obs_scm" mode="disabled">
<param name="url">https://github.com/hughsie/appstream-glib.git</param> <param name="url">https://github.com/hughsie/appstream-glib.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="versionformat">@PARENT_TAG@</param> <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">appstream_glib_(\d+)_(\d+)_(\d+)</param> <param name="versionrewrite-pattern">appstream_glib_(\d+)_(\d+)_(\d+)</param>
<param name="versionrewrite-replacement">\1.\2.\3</param> <param name="versionrewrite-replacement">\1.\2.\3</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>
<param name="revision">004a4e60e2433c404e7c36b94770c94e592db0fc</param>
<!--
<param name="revision">refs/tags/appstream_glib_0_7_18</param> <param name="revision">refs/tags/appstream_glib_0_7_18</param>
-->
</service> </service>
<service name="tar" mode="buildtime"/> <service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime"> <service name="recompress" mode="buildtime">

View File

@ -1,4 +1,4 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">https://github.com/hughsie/appstream-glib.git</param> <param name="url">https://github.com/hughsie/appstream-glib.git</param>
<param name="changesrevision">705e8e2061e9c9ef741792b1de56c6529fb57082</param></service></servicedata> <param name="changesrevision">004a4e60e2433c404e7c36b94770c94e592db0fc</param></service></servicedata>

View File

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

View File

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

View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
Tue Feb 08 15:58:58 UTC 2022 - bjorn.lie@gmail.com
- Update to version 0.7.18+28:
* as-app: Also unwrap description in metainfo files
* Fix validation of translated captions when LANG is not C
* Revert "Don't emit legacy component type values"
* Don't emit legacy component type values
* its: Sync with appstream
* Consider AppStream version as a string
* meson: Check --version-script linker option before using.
* Update current newest version in AsStore
* Support em/code tags Some appstream-data packages add <em> and
</em> or <code> and </code> to the files. Not all package
manager can handle that. An example would be pamac from Manjaro
* Update asb-self-test to match current behavior
* Add validation for duplicate license xml elements
* builder: make directories as 0755 && umask
* Do not show a critical warning on <suggests><id/></suggests>
* libappstream-builder: Fix paths for cached icons
* as-util: Fix Markdown underlining in appdata-to-news
* Replace links http://standards.freedesktop.org/... by https in
README.md
* Replace a link http://www.freedesktop.org/wiki/... by https in
README.md
* as-app: Parse launchables from DEP-11
* as-app: Parse custom tags from DEP-11
* as-content-rating: Align the OARS/CSM mappings of sex-*
* Updated translations.
- Switch to current git head, upstream is not making releases.
- Drop 0001-as-app-Also-unwrap-description-in-metainfo-files.patch:
Fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 8 15:25:24 UTC 2022 - Fabian Vogt <fvogt@suse.com> Tue Feb 8 15:25:24 UTC 2022 - Fabian Vogt <fvogt@suse.com>

View File

@ -1,5 +1,4 @@
name: appstream-glib name: appstream-glib
version: 0.7.18 version: 0.7.18+28
mtime: 1599473586 mtime: 1644332535
commit: 705e8e2061e9c9ef741792b1de56c6529fb57082 commit: 004a4e60e2433c404e7c36b94770c94e592db0fc

View File

@ -18,15 +18,14 @@
Name: appstream-glib Name: appstream-glib
Version: 0.7.18 Version: 0.7.18+28
Release: 0 Release: 0
Summary: AppStream Abstraction Library Summary: AppStream Abstraction Library
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://people.freedesktop.org/~hughsient/appstream-glib/ URL: https://people.freedesktop.org/~hughsient/appstream-glib/
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Source1: openSUSE-appstream-process Source1: openSUSE-appstream-process
# PATCH-FIX-UPSTREAM
Patch1: 0001-as-app-Also-unwrap-description-in-metainfo-files.patch
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcab >= 0.6 BuildRequires: gcab >= 0.6
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel