New upstream release
This commit is contained in:
parent
70d517b7a6
commit
958d8d1b7c
1
.gitignore
vendored
1
.gitignore
vendored
@ -23,3 +23,4 @@
|
||||
/appstream-glib-0.4.1.tar.xz
|
||||
/appstream-glib-0.5.0.tar.xz
|
||||
/appstream-glib-0.5.1.tar.xz
|
||||
/appstream-glib-0.5.2.tar.xz
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From 01e48c3cd5f4d06e8aec0d33cffdff9fb5bc9d3d Mon Sep 17 00:00:00 2001
|
||||
From: Kalev Lember <klember@redhat.com>
|
||||
Date: Wed, 14 Oct 2015 18:08:48 +0200
|
||||
Subject: [PATCH] Try harder to deal with icons that have extension or full
|
||||
path listed
|
||||
|
||||
It's a common mistake in desktop files to list icons with extension,
|
||||
such as 'filename.png'. Try harder to handle them and special case
|
||||
common extensions; also while at this, make sure to handle icons
|
||||
with full path as well.
|
||||
---
|
||||
libappstream-glib/as-app-desktop.c | 17 ++++++++++++++---
|
||||
1 file changed, 14 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libappstream-glib/as-app-desktop.c b/libappstream-glib/as-app-desktop.c
|
||||
index 05f2556..07602fa 100644
|
||||
--- a/libappstream-glib/as-app-desktop.c
|
||||
+++ b/libappstream-glib/as-app-desktop.c
|
||||
@@ -166,10 +166,21 @@ as_app_parse_file_key (AsApp *app,
|
||||
if (tmp != NULL && tmp[0] != '\0') {
|
||||
g_autoptr(AsIcon) icon = NULL;
|
||||
icon = as_icon_new ();
|
||||
+
|
||||
+ if (g_path_is_absolute (tmp)) {
|
||||
+ as_icon_set_filename (icon, tmp);
|
||||
+ } else {
|
||||
+ /* Work around a common mistake in desktop files */
|
||||
+ dot = g_strstr_len (tmp, -1, ".");
|
||||
+ if (dot != NULL &&
|
||||
+ (g_strcmp0 (dot, ".png") == 0 ||
|
||||
+ g_strcmp0 (dot, ".xpm") == 0 ||
|
||||
+ g_strcmp0 (dot, ".svg") == 0)) {
|
||||
+ *dot = '\0';
|
||||
+ }
|
||||
+ }
|
||||
as_icon_set_name (icon, tmp);
|
||||
- dot = g_strstr_len (tmp, -1, ".");
|
||||
- if (dot != NULL)
|
||||
- *dot = '\0';
|
||||
+
|
||||
if (as_utils_is_stock_icon_name (tmp)) {
|
||||
as_icon_set_name (icon, tmp);
|
||||
as_icon_set_kind (icon, AS_ICON_KIND_STOCK);
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
Summary: Library for AppStream metadata
|
||||
Name: libappstream-glib
|
||||
Version: 0.5.1
|
||||
Release: 2%{?dist}
|
||||
Version: 0.5.2
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+
|
||||
URL: http://people.freedesktop.org/~hughsient/appstream-glib/
|
||||
Source0: http://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-%{version}.tar.xz
|
||||
# Backported from upstream
|
||||
Patch0: 0001-Try-harder-to-deal-with-icons-that-have-extension-or.patch
|
||||
|
||||
BuildRequires: glib2-devel >= 2.45.8
|
||||
BuildRequires: libtool
|
||||
@ -20,6 +18,7 @@ BuildRequires: gdk-pixbuf2-devel >= 2.31.5
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libgcab1-devel
|
||||
|
||||
# for the builder component
|
||||
BuildRequires: fontconfig-devel
|
||||
@ -38,7 +37,7 @@ Obsoletes: appdata-tools < 0.1.9
|
||||
Provides: appdata-tools
|
||||
|
||||
# this is not a library version
|
||||
%define as_plugin_version 2
|
||||
%define as_plugin_version 4
|
||||
|
||||
%description
|
||||
This library provides GObjects and helper methods to make it easy to read and
|
||||
@ -70,7 +69,6 @@ GLib headers and libraries for appstream-builder.
|
||||
|
||||
%prep
|
||||
%setup -q -n appstream-glib-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
@ -103,7 +101,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%{_libdir}/libappstream-glib.so.8*
|
||||
%{_libdir}/girepository-1.0/*.typelib
|
||||
%{_bindir}/appstream-util
|
||||
%{_bindir}/appdata-validate
|
||||
%dir %{_datadir}/bash-completion/completions/
|
||||
%{_datadir}/bash-completion/completions/appstream-util
|
||||
%{_mandir}/man1/appstream-util.1.gz
|
||||
@ -135,6 +132,16 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%{_datadir}/gir-1.0/AppStreamBuilder-1.0.gir
|
||||
|
||||
%changelog
|
||||
* Tue Oct 27 2015 Richard Hughes <richard@hughsie.com> 0.5.2-1
|
||||
- New upstream release
|
||||
- Accept a '0x' hexidecimal prefix when parsing a version
|
||||
- Add multi-guid cabinet firmware support
|
||||
- Add support for AppStream <size> metadata
|
||||
- Fix crash in validator when processing '<li></li>'
|
||||
- Remove the long-obsolete appdata-validate tool
|
||||
- Require AppData files to be present in the AppStream metadata
|
||||
- Use g_set_object() to fix potential crash when adding pixbufs
|
||||
|
||||
* Thu Oct 15 2015 Kalev Lember <klember@redhat.com> 0.5.1-2
|
||||
- Backport a patch to fix icons in gnome-software for apps without AppData
|
||||
- Use license macro for COPYING
|
||||
|
||||
Loading…
Reference in New Issue
Block a user