rpms
/
gnome-software
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport a patch to fix compile with the new anal GCC

This commit is contained in:
Richard Hughes 2014-04-28 16:57:54 +01:00
parent f7dde88f9f
commit 5d696b7a0c
2 changed files with 87 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
0002-Fix-the-formatting-specifiers-for-the-i386-build-wit.patch Normal file
View File

@ -0,0 +1,83 @@
From 205be1f46267e4e45975d38081f597527f86d948 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 28 Apr 2014 16:51:04 +0100
Subject: [PATCH 2/2] Fix the formatting specifiers for the i386 build with
newer GCCs
Apparently the new GCC is really anal about format specifiers now.
---
src/gs-app.c | 7 +++++--
src/gs-profile.c | 8 +++++---
src/plugins/gs-plugin-fedora-tagger-ratings.c | 7 ++++---
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/gs-app.c b/src/gs-app.c
index fa0857b..3ead682 100644
--- a/src/gs-app.c
+++ b/src/gs-app.c
@@ -312,8 +312,11 @@ gs_app_to_string (GsApp *app)
g_string_append_printf (str, "\tpixbuf:\t%p\n", priv->pixbuf);
if (priv->featured_pixbuf != NULL)
g_string_append_printf (str, "\tfeatured-pixbuf:\t%p\n", priv->featured_pixbuf);
- if (priv->install_date != 0)
- g_string_append_printf (str, "\tinstall-date:\t%lu\n", priv->install_date);
+ if (priv->install_date != 0) {
+ g_string_append_printf (str, "\tinstall-date:\t%"
+ G_GUINT64_FORMAT "\n",
+ priv->install_date);
+ }
if (priv->size != 0) {
g_string_append_printf (str, "\tsize:\t%" G_GUINT64_FORMAT "k\n",
priv->size / 1024);
diff --git a/src/gs-profile.c b/src/gs-profile.c
index 93a0b6f..5f43fe6 100644
--- a/src/gs-profile.c
+++ b/src/gs-profile.c
@@ -236,8 +236,9 @@ gs_profile_dump (GsProfile *profile)
g_print ("#");
for (j = bar_offset + bar_length; j < console_width + 1; j++)
g_print (" ");
- g_print ("@%04lims ", (item->time_stop - time_start) / 1000);
- g_print ("%s %lims\n", item->id, time_ms);
+ g_print ("@%04" G_GINT64_FORMAT "ms ",
+ (item->time_stop - time_start) / 1000);
+ g_print ("%s %" G_GINT64_FORMAT "ms\n", item->id, time_ms);
}
/* not all complete */
@@ -248,7 +249,8 @@ gs_profile_dump (GsProfile *profile)
for (j = 0; j < console_width; j++)
g_print ("$");
time_ms = (item->time_stop - item->time_start) / 1000;
- g_print (" @????ms %s %lims\n", item->id, time_ms);
+ g_print (" @????ms %s %" G_GINT64_FORMAT "ms\n",
+ item->id, time_ms);
}
}
}
diff --git a/src/plugins/gs-plugin-fedora-tagger-ratings.c b/src/plugins/gs-plugin-fedora-tagger-ratings.c
index eebb154..6af385c 100644
--- a/src/plugins/gs-plugin-fedora-tagger-ratings.c
+++ b/src/plugins/gs-plugin-fedora-tagger-ratings.c
@@ -568,14 +568,15 @@ gs_plugin_fedora_tagger_load_db (GsPlugin *plugin, GError **error)
if (!ret)
goto out;
} else if (now - mtime > GS_PLUGIN_FEDORA_TAGGER_AGE_MAX) {
- g_debug ("fedora-tagger data was %li days old, so regetting",
+ g_debug ("fedora-tagger data was %" G_GINT64_FORMAT
+ " days old, so regetting",
(now - mtime) / ( 60 * 60 * 24));
ret = gs_plugin_fedora_tagger_download (plugin, error);
if (!ret)
goto out;
} else {
- g_debug ("fedora-tagger data %li days old, "
- "so no need to redownload",
+ g_debug ("fedora-tagger data %" G_GINT64_FORMAT
+ " days old, so no need to redownload",
(now - mtime) / ( 60 * 60 * 24));
}
out:
--
1.9.0

4
gnome-software.spec
View File

@ -11,6 +11,9 @@ Source0: http://download.gnome.org/sources/gnome-software/3.13/%{name}-%{versi
Source1: http://people.freedesktop.org/~hughsient/temp/fedora-%{?distrotag}.xml.gz
Source2: http://people.freedesktop.org/~hughsient/temp/fedora-%{?distrotag}-icons.tar.gz
# already upstream
Patch0: 0002-Fix-the-formatting-specifiers-for-the-i386-build-wit.patch
Requires: epiphany-runtime
Requires: PackageKit
Requires: gnome-icon-theme
@ -39,6 +42,7 @@ and update software in the GNOME desktop.
%prep
%setup -q
%patch0 -p1 -b .upstream
%build
%configure --disable-static