rpms/appstream
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added upstream patch to fix crash on applications that use this library (e.g. discover) [release 0.14.0-2mamba;Wed Feb 10 2021]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 20:30:20 +01:00
parent 377e3cca5a
commit 32722643b7
2 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
appstream-0.14.0-upstream-Do_not_automatically_clean_up_errors_that_will_be_propagated.patch Normal file
View File

@ -0,0 +1,63 @@
From 306eb287a36a2779c304fe47b5473e468c7bd0f6 Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Fri, 5 Feb 2021 02:51:08 +0100
Subject: [PATCH] Do not automatically clean up errors that will be propagated
---
compose/asc-image.c | 2 +-
src/as-metadata.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/compose/asc-image.c b/compose/asc-image.c
index 1db354b1..a886c06f 100644
--- a/compose/asc-image.c
+++ b/compose/asc-image.c
@@ -207,7 +207,7 @@ asc_optimize_png (const gchar *fname, GError **error)
g_autofree gchar *opng_stdout = NULL;
g_autofree gchar *opng_stderr = NULL;
g_autofree const gchar **argv = NULL;
- g_autoptr(GError) tmp_error = NULL;
+ GError *tmp_error = NULL;
if (!asc_globals_get_use_optipng ())
return TRUE;
diff --git a/src/as-metadata.c b/src/as-metadata.c
index 9e8848d9..b6c28d26 100644
--- a/src/as-metadata.c
+++ b/src/as-metadata.c
@@ -646,7 +646,7 @@ as_metadata_parse_file (AsMetadata *metad, GFile *file, AsFormatKind format, GEr
g_autoptr(GInputStream) stream_data = NULL;
g_autoptr(GConverter) conv = NULL;
g_autoptr(GString) asdata = NULL;
- g_autoptr(GError) tmp_error = NULL;
+ GError *tmp_error = NULL;
gssize len;
const gsize buffer_size = 1024 * 32;
g_autofree gchar *buffer = NULL;
@@ -701,7 +701,7 @@ as_metadata_parse_file (AsMetadata *metad, GFile *file, AsFormatKind format, GEr
asdata = g_string_new ("");
buffer = g_malloc (buffer_size);
- while ((len = g_input_stream_read (stream_data, buffer, buffer_size, NULL, error)) > 0) {
+ while ((len = g_input_stream_read (stream_data, buffer, buffer_size, NULL, &tmp_error)) > 0) {
g_string_append_len (asdata, buffer, len);
}
/* check if there was an error */
@@ -834,7 +834,7 @@ gboolean
as_metadata_save_metainfo (AsMetadata *metad, const gchar *fname, AsFormatKind format, GError **error)
{
g_autofree gchar *xml_data = NULL;
- g_autoptr(GError) tmp_error = NULL;
+ GError *tmp_error = NULL;
xml_data = as_metadata_component_to_metainfo (metad, format, &tmp_error);
if (tmp_error != NULL) {
@@ -859,7 +859,7 @@ gboolean
as_metadata_save_collection (AsMetadata *metad, const gchar *fname, AsFormatKind format, GError **error)
{
g_autofree gchar *data = NULL;
- g_autoptr(GError) tmp_error = NULL;
+ GError *tmp_error = NULL;
data = as_metadata_components_to_collection (metad, format, &tmp_error);
if (tmp_error != NULL) {

9
appstream.spec
View File

@ -1,6 +1,6 @@
Name: appstream
Version: 0.14.0
Release: 1mamba
Release: 2mamba
Summary: Tools and libraries to work with AppStream metadata
Group: System/Tools
Vendor: openmamba
@ -8,13 +8,16 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://www.freedesktop.org/wiki/Distributions/AppStream/
Source: https://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz
Patch0: appstream-0.14.0-upstream-Do_not_automatically_clean_up_errors_that_will_be_propagated.patch
License: GPL, LGPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: ldconfig
BuildRequires: libgcc
BuildRequires: libglib-devel
BuildRequires: liblmdb-devel
BuildRequires: libqt5-devel
BuildRequires: libsoup-devel
BuildRequires: libstdc++6-devel
BuildRequires: libstemmer-devel
BuildRequires: libxml2-devel
@ -64,6 +67,7 @@ This package contains libraries and header files for developing applications tha
%prep
%setup -q -n AppStream-%{version}
%patch0 -p1
%build
%meson \
@ -125,6 +129,9 @@ export DESTDIR=%{buildroot}
%{_libdir}/libAppStreamQt.so
%changelog
* Wed Feb 10 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 0.14.0-2mamba
- added upstream patch to fix crash on applications that use this library (e.g. discover)
* Tue Feb 02 2021 Automatic Build System <autodist@mambasoft.it> 0.14.0-1mamba
- automatic version update by autodist