Accepting request 834161 from home:elimat:branches:GNOME:Factory
- Update to version 0.7.18: * Don't ignore localized strings that are the same as original * Croatian translation 2nd attempt (#373) * Test launchable tags in validation * Add missing dependency to the readme * as-app: Don't initialize mutex twice * as-content-rating: Expand translator comments to link to OARS website * as-content-rating: Lower the OARS/CSM mapping of sex-homosexuality/intense * po: Import gs-content-rating.c translations from gnome-software * po: Update po files * as-content-rating: Add content rating system APIs from gnome-software * Allow timestamp in the future in validate-relax * Fix crash with invalid children of <ul/> * as-app: Properly initialize unique_id_mutex * The AppData files now go to /usr/share/metainfo * util: Complete new validate-version command * util: Add "validate-version" command * trivial: Actually use the correct NEWS contents * trivial: post release version bump - Drop patch as-glib-PR359.patch (fixed upstream) - Run spec-cleaner * Remove rpm groups OBS-URL: https://build.opensuse.org/request/show/834161 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/appstream-glib?expand=0&rev=143
This commit is contained in:
Git OBS Bridge
parent
f32925ba76
commit
de36bd764d
2
_service
2
_service
@ -6,7 +6,7 @@
|
||||
<param name="versionrewrite-pattern">appstream_glib_(\d+)_(\d+)_(\d+)</param>
|
||||
<param name="versionrewrite-replacement">\1.\2.\3</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="revision">refs/tags/appstream_glib_0_7_17</param>
|
||||
<param name="revision">refs/tags/appstream_glib_0_7_18</param>
|
||||
</service>
|
||||
<service name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/hughsie/appstream-glib.git</param>
|
||||
<param name="changesrevision">93f614add2377465bc7bd24a9a99c8ae28e2342f</param></service></servicedata>
|
||||
<param name="changesrevision">705e8e2061e9c9ef741792b1de56c6529fb57082</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9cc5c3683d6c5ff92fd9a7a7001c09d1088378422f2dd141169fabc97111315f
|
||||
size 4333068
|
||||
3
appstream-glib-0.7.18.obscpio
Normal file
3
appstream-glib-0.7.18.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:081f9c5a2435c50833a1f246191894515f4d335e392c0c416f4538406c12f96c
|
||||
size 5147661
|
||||
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 13 19:12:51 UTC 2020 - elimat@opensuse.org
|
||||
|
||||
- Update to version 0.7.18:
|
||||
* Don't ignore localized strings that are the same as original
|
||||
* Croatian translation 2nd attempt (#373)
|
||||
* Test launchable tags in validation
|
||||
* Add missing dependency to the readme
|
||||
* as-app: Don't initialize mutex twice
|
||||
* as-content-rating: Expand translator comments to link to OARS website
|
||||
* as-content-rating: Lower the OARS/CSM mapping of sex-homosexuality/intense
|
||||
* po: Import gs-content-rating.c translations from gnome-software
|
||||
* po: Update po files
|
||||
* as-content-rating: Add content rating system APIs from gnome-software
|
||||
* Allow timestamp in the future in validate-relax
|
||||
* Fix crash with invalid children of <ul/>
|
||||
* as-app: Properly initialize unique_id_mutex
|
||||
* The AppData files now go to /usr/share/metainfo
|
||||
* util: Complete new validate-version command
|
||||
* util: Add "validate-version" command
|
||||
* trivial: Actually use the correct NEWS contents
|
||||
* trivial: post release version bump
|
||||
- Drop patch as-glib-PR359.patch (fixed upstream)
|
||||
- Run spec-cleaner
|
||||
* Remove rpm groups
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 22 09:30:51 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: appstream-glib
|
||||
version: 0.7.17
|
||||
mtime: 1582191077
|
||||
commit: 93f614add2377465bc7bd24a9a99c8ae28e2342f
|
||||
version: 0.7.18
|
||||
mtime: 1599473586
|
||||
commit: 705e8e2061e9c9ef741792b1de56c6529fb57082
|
||||
|
||||
|
||||
@ -18,16 +18,13 @@
|
||||
|
||||
|
||||
Name: appstream-glib
|
||||
Version: 0.7.17
|
||||
Version: 0.7.18
|
||||
Release: 0
|
||||
Summary: AppStream Abstraction Library
|
||||
License: LGPL-2.1-or-later AND GPL-2.0-or-later
|
||||
Group: System/Libraries
|
||||
URL: http://people.freedesktop.org/~hughsient/appstream-glib/
|
||||
URL: https://people.freedesktop.org/~hughsient/appstream-glib/
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Source1: openSUSE-appstream-process
|
||||
# PATCH-FIX-UPSTREAM as-glib-PR359.patch dimstar@opensuse.org -- Fix crash with invalid children of <ul>
|
||||
Patch0: as-glib-PR359.patch
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: gcab >= 0.6
|
||||
BuildRequires: gobject-introspection-devel
|
||||
@ -71,7 +68,6 @@ This library allows to:
|
||||
%package -n libappstream-glib8
|
||||
Summary: AppStream Abstraction Library
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libappstream-glib8
|
||||
This library provides GObjects and helper methods to read and write
|
||||
@ -81,7 +77,6 @@ nodes and convert to and from the standardized XML representation.
|
||||
%package -n typelib-1_0-AppStreamGlib-1_0
|
||||
Summary: Introspection bindings for the AppStream abstraction library
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n typelib-1_0-AppStreamGlib-1_0
|
||||
This library provides GObjects and helper methods to read and write
|
||||
@ -91,7 +86,6 @@ nodes and convert to and from the standardized XML representation.
|
||||
%package devel
|
||||
Summary: Development files for the AppStream abstraction library
|
||||
License: LGPL-2.1-or-later AND GPL-2.0-or-later
|
||||
Group: Development/Languages/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
Requires: libappstream-glib8 = %{version}
|
||||
Requires: typelib-1_0-AppStreamGlib-1_0 = %{version}
|
||||
@ -117,7 +111,6 @@ This library allows to:
|
||||
%package -n openSUSE-appstream-process
|
||||
Summary: Appstream processor employed by kiwi
|
||||
License: LGPL-2.1-or-later AND GPL-2.0-or-later
|
||||
Group: Development/Tools/Building
|
||||
Requires: appstream-glib >= %{version}
|
||||
Requires: openSUSE-appdata-extra
|
||||
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
From d4bfa8389932029ae85a7bad4a762d69a47fbbb4 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Wed, 22 Apr 2020 11:22:03 +0200
|
||||
Subject: [PATCH] Fix crash with invalid children of <ul/>
|
||||
|
||||
It segfaulted when building the error message as data_c->name was invalid.
|
||||
data_c was a valid tag, so only the data_c->tag union member was active.
|
||||
Fix the crash by calling the proper function instead and add a test case.
|
||||
---
|
||||
libappstream-glib/as-node.c | 2 +-
|
||||
libappstream-glib/as-self-test.c | 11 +++++++++++
|
||||
2 files changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libappstream-glib/as-node.c b/libappstream-glib/as-node.c
|
||||
index 7fd68515..66d582a8 100644
|
||||
--- a/libappstream-glib/as-node.c
|
||||
+++ b/libappstream-glib/as-node.c
|
||||
@@ -1891,7 +1891,7 @@ as_node_get_localized_unwrap_type_li (const AsNode *node,
|
||||
AS_NODE_ERROR,
|
||||
AS_NODE_ERROR_INVALID_MARKUP,
|
||||
"Tag %s in %s invalid",
|
||||
- data_c->name,
|
||||
+ as_tag_data_get_name (data_c),
|
||||
as_tag_data_get_name (data));
|
||||
return FALSE;
|
||||
}
|
||||
diff --git a/libappstream-glib/as-self-test.c b/libappstream-glib/as-self-test.c
|
||||
index 47ad937f..66166410 100644
|
||||
--- a/libappstream-glib/as-self-test.c
|
||||
+++ b/libappstream-glib/as-self-test.c
|
||||
@@ -2810,6 +2810,7 @@ as_test_node_xml_func (void)
|
||||
AsNode *n2;
|
||||
AsNode *root;
|
||||
GString *xml;
|
||||
+ GHashTable *hashtable;
|
||||
|
||||
/* invalid XML */
|
||||
root = as_node_from_xml ("<moo>", 0, &error);
|
||||
@@ -2920,6 +2921,16 @@ as_test_node_xml_func (void)
|
||||
g_assert_cmpstr (xml->str, ==, "<!-- 1st -->\n<!-- 2nd -->\n<foo/>\n");
|
||||
g_string_free (xml, TRUE);
|
||||
as_node_unref (root);
|
||||
+
|
||||
+ /* invalid child of ul */
|
||||
+ root = as_node_from_xml ("<ul><ul></ul></ul>", 0, &error);
|
||||
+ g_assert_no_error (error);
|
||||
+ g_assert (root != NULL);
|
||||
+ hashtable = as_node_get_localized_unwrap (root, &error);
|
||||
+ g_assert_error (error, AS_NODE_ERROR, AS_NODE_ERROR_INVALID_MARKUP);
|
||||
+ g_assert_cmpstr (error->message, ==, "Tag ul in ul invalid");
|
||||
+ g_clear_error (&error);
|
||||
+ g_assert (hashtable == NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
Loading…
Reference in New Issue
Block a user