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

Accepting request 293741 from GNOME:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/293741
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/appstream-glib?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2015-04-03 12:34:03 +00:00 committed by Git OBS Bridge
parent 14e2eaffa1
commit ab86599de9
8 changed files with 70 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -2,9 +2,9 @@
<service name="tar_scm" mode="disabled"> <service name="tar_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">0.3.5</param> <param name="versionformat">0.3.6</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>
<param name="revision">refs/tags/appstream_glib_0_3_5</param> <param name="revision">refs/tags/appstream_glib_0_3_6</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">
<param name="file">*.tar</param> <param name="file">*.tar</param>

2
_servicedata
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">d080dd5c862e20559b1ac1529e2d3c96d7b50069</param></service></servicedata> <param name="changesrevision">076326ae9418f0c9068dfab5816198af087bf519</param></service></servicedata>

3
appstream-glib-0.3.5.tar.xz
View File

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

3
appstream-glib-0.3.6.tar.xz Normal file
View File

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

24
appstream-glib-cairo-link.patch Normal file
View File

@ -0,0 +1,24 @@
commit 69d58c2a969ee8d98ef458683a658a6cbec0e5b7
Author: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon Mar 30 17:03:46 2015 +0200
Build: link libasb_plugin_font.la with GTK3
Until f630bcf, linking GDKPIXBUF implicitly also linked against gtk+-3.0
libappstream-builder itself is linked against the whole stack, but when linking
using -Wl,--as-needed, the library references to cairo and gdk are dropped for
not being used. Hence, let's explicitly link the font-plugin against GTK.
diff --git a/libappstream-builder/plugins/Makefile.am b/libappstream-builder/plugins/Makefile.am
index 695bebc..71bc44b 100644
--- a/libappstream-builder/plugins/Makefile.am
+++ b/libappstream-builder/plugins/Makefile.am
@@ -125,7 +125,7 @@ libasb_plugin_ibus_xml_la_LDFLAGS = -module -avoid-version
libasb_plugin_ibus_xml_la_CFLAGS = $(GLIB_CFLAGS) $(WARNINGFLAGS_C)
libasb_plugin_font_la_SOURCES = asb-plugin-font.c
-libasb_plugin_font_la_LIBADD = $(GLIB_LIBS) $(FREETYPE_LIBS) $(GDKPIXBUF_LIBS)
+libasb_plugin_font_la_LIBADD = $(GLIB_LIBS) $(FREETYPE_LIBS) $(GDKPIXBUF_LIBS) $(GTK_LIBS)
libasb_plugin_font_la_LDFLAGS = -module -avoid-version
libasb_plugin_font_la_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(WARNINGFLAGS_C)

78
appstream-glib-uninstall-var-cache.patch
View File

@ -1,78 +0,0 @@
From 23e46811a6277f53f76c1cccff883ba8cc6db6cc Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 19 Mar 2015 20:02:21 +0000
Subject: [PATCH] Allow uninstalling AppStream files from /var/cache
---
client/as-util.c | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/client/as-util.c b/client/as-util.c
index 5b35349..bc61edf 100644
--- a/client/as-util.c
+++ b/client/as-util.c
@@ -1473,9 +1473,8 @@ static gboolean
as_util_uninstall (AsUtilPrivate *priv, gchar **values, GError **error)
{
const gchar *destdir;
- _cleanup_free_ gchar *path_icons = NULL;
- _cleanup_free_ gchar *path_xml = NULL;
- _cleanup_object_unref_ GFile *file_xml = NULL;
+ guint i;
+ const gchar *locations[] = { "/usr/share", "/var/cache", NULL };
/* check args */
if (g_strv_length (values) != 1) {
@@ -1489,28 +1488,29 @@ as_util_uninstall (AsUtilPrivate *priv, gchar **values, GError **error)
/* remove XML file */
destdir = g_getenv ("DESTDIR");
- path_xml = g_strdup_printf ("%s/usr/share/app-info/xmls/%s.xml.gz",
- destdir != NULL ? destdir : "", values[0]);
- if (!g_file_test (path_xml, G_FILE_TEST_EXISTS)) {
- g_set_error (error,
- AS_ERROR,
- AS_ERROR_INVALID_ARGUMENTS,
- "AppStream file with that ID not found: %s",
- path_xml);
- return FALSE;
- }
- file_xml = g_file_new_for_path (path_xml);
- if (!g_file_delete (file_xml, NULL, error)) {
- g_prefix_error (error, "Failed to remove %s: ", path_xml);
- return FALSE;
+ for (i = 0; locations[i] != NULL; i++) {
+ _cleanup_free_ gchar *path_xml = NULL;
+ path_xml = g_strdup_printf ("%s%s/app-info/xmls/%s.xml.gz",
+ destdir != NULL ? destdir : "",
+ locations[i], values[0]);
+ if (g_file_test (path_xml, G_FILE_TEST_EXISTS)) {
+ _cleanup_object_unref_ GFile *file = NULL;
+ file = g_file_new_for_path (path_xml);
+ if (!g_file_delete (file, NULL, error))
+ return FALSE;
+ }
}
/* remove icons */
- path_icons = g_strdup_printf ("%s/usr/share/app-info/icons/%s",
- destdir != NULL ? destdir : "", values[0]);
- if (g_file_test (path_icons, G_FILE_TEST_EXISTS)) {
- if (!as_util_rmtree (path_icons, error))
- return FALSE;
+ for (i = 0; locations[i] != NULL; i++) {
+ _cleanup_free_ gchar *path_icons = NULL;
+ path_icons = g_strdup_printf ("%s%s/app-info/icons/%s",
+ destdir != NULL ? destdir : "",
+ locations[i], values[0]);
+ if (g_file_test (path_icons, G_FILE_TEST_EXISTS)) {
+ if (!as_util_rmtree (path_icons, error))
+ return FALSE;
+ }
}
return TRUE;
}
--
2.1.0

36
appstream-glib.changes
View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Mon Mar 30 14:15:04 UTC 2015 - opensuse-packaging@opensuse.org
- Update to version 0.3.6:
+ trivial: post release version bump.
+ trivial: Make the UTF-8 test actually match the comment.
+ Also subsume application licenses.
+ Do not fail due to style warnings when using relaxed
validation.
+ Add --batch-output to be able to disable the progress panel
when building.
+ configure.ac: gcab is a hard requirement.
+ Remove the gtk3 dep from libappstream-glib.
+ configure.ac: fix typo.
+ Use the correct image URL for HiDPI screenshots.
+ Allow uninstalling AppStream files from /var/cache.
+ Use the upstream screenshot when we are using appstream-builder
--no-net.
+ Make the AppStream builder support optional.
+ Assume the INF DriverVer is UTC.
+ Always upscale screenshots if they are too small.
+ Teach asb_utils_write_archive() how to write other archive
formats.
+ Put all the screenshots in a file rather than just writing to
the upload path.
+ If the API version is unspecified when building use the latest
released version.
+ Add the source-only tags when outputting AppData files.
+ Add a 'replace-screenshots' command to appstream-util.
+ Update the checksums for the gcab-generated firmware.
+ Do not trust the result of FcConfigAppFontAddFile().
+ Release version 0.3.6.
- Drop appstream-glib-uninstall-var-cache.patch: fixed upstream.
- Add appstream-glib-cairo-link.patch: link the font plugin to
cairo and gtk3.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 20 12:30:54 UTC 2015 - dimstar@opensuse.org Fri Mar 20 12:30:54 UTC 2015 - dimstar@opensuse.org

8
appstream-glib.spec
View File

@ -20,7 +20,7 @@
%define _build_from_vcs 1 %define _build_from_vcs 1
Name: appstream-glib Name: appstream-glib
Version: 0.3.5 Version: 0.3.6
Release: 0 Release: 0
Summary: AppStream Abstraction Library Summary: AppStream Abstraction Library
License: LGPL-2.1+ License: LGPL-2.1+
@ -29,15 +29,15 @@ Url: http://people.freedesktop.org/~hughsient/appstream-glib/
#Source: http://people.freedesktop.org/~hughsient/appstream-glib/releases/%{name}-%{version}.tar.xz #Source: http://people.freedesktop.org/~hughsient/appstream-glib/releases/%{name}-%{version}.tar.xz
Source: %{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.xz
Patch0: 0001-Add-yast2-branding-openSUSE-if-an-app-depends-on-yas.patch Patch0: 0001-Add-yast2-branding-openSUSE-if-an-app-depends-on-yas.patch
# PATCH-FIX-UPSTREAM appstream-glib-uninstall-var-cache.patch gh#hughsie/appstream-glib#42 dimstar@opensuse.org -- Also uninstall appdata from /var/cache # PATCH-FIX-UPSTREAM appstream-glib-cairo-link.patch dimstar@opensuse.org -- Link the font plugin to GTK3
Patch1: appstream-glib-uninstall-var-cache.patch Patch1: appstream-glib-cairo-link.patch
%if %{_build_from_vcs} %if %{_build_from_vcs}
BuildRequires: gnome-common BuildRequires: gnome-common
%else %else
# We still need some part to build the man pages # We still need some part to build the man pages
BuildRequires: xsltproc BuildRequires: xsltproc
%endif %endif
BuildRequires: gcab BuildRequires: gcab >= 0.6
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
BuildRequires: intltool >= 0.40.0 BuildRequires: intltool >= 0.40.0
BuildRequires: libyaml-devel BuildRequires: libyaml-devel