summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch (renamed from meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch)30
-rw-r--r--meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb2
2 files changed, 10 insertions, 22 deletions
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch
index c1a7d4f40f..fcc152fdef 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch
@@ -9,6 +9,15 @@ build for X32, where long's size doesn't match that of time_t.
9Upstream-Status: Pending 9Upstream-Status: Pending
10Signed-off-by: Christopher Larson <chris_larson@mentor.com> 10Signed-off-by: Christopher Larson <chris_larson@mentor.com>
11 11
12
13Modify patch described above to eliminate replacement of
14
15g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime)
16
17which is not necessary. Retain replacement of atol().
18
19Signed-off-by: Joe Slater <joe.slater@windriver.com>
20
12--- 21---
13 libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++-- 22 libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++--
14 1 file changed, 14 insertions(+), 2 deletions(-) 23 1 file changed, 14 insertions(+), 2 deletions(-)
@@ -26,27 +35,6 @@ index e56c3d7..5d96bf3 100644
26 #include <config.h> 35 #include <config.h>
27 36
28 #include <glib.h> 37 #include <glib.h>
29@@ -1105,6 +1107,7 @@ save_thumbnail (GdkPixbuf *pixbuf,
30 char *tmp_path = NULL;
31 int tmp_fd;
32 char mtime_str[21];
33+ struct tm *tmp_mtime = NULL;
34 gboolean ret = FALSE;
35 GError *error = NULL;
36 const char *width, *height;
37@@ -1124,7 +1127,11 @@ save_thumbnail (GdkPixbuf *pixbuf,
38 goto out;
39 close (tmp_fd);
40
41- g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime);
42+ tmp_mtime = localtime (&mtime);
43+ if (!tmp_mtime)
44+ goto out;
45+ strftime (mtime_str, 21, "%s", tmp_mtime);
46+ free (tmp_mtime);
47 width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width");
48 height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height");
49
50@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, 38@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,
51 { 39 {
52 const char *thumb_uri, *thumb_mtime_str; 40 const char *thumb_uri, *thumb_mtime_str;
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
index cd6c194c1b..879dc9a2f6 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
@@ -11,7 +11,7 @@ SRC_URI[archive.md5sum] = "6cee2ecd677d87eaa0eb5ebfa7b45fb3"
11SRC_URI[archive.sha256sum] = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a" 11SRC_URI[archive.sha256sum] = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"
12 12
13SRC_URI += " \ 13SRC_URI += " \
14 file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \ 14 file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
15 file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \ 15 file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \
16 file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \ 16 file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \
17 " 17 "