Bruce Leidl
f4f1f3b153
* citadel-kernel 5.15.8 -> 5.18 * adwaita-icon-theme 42.0 * ell 0.44 -> 0.50 * libnma 1.8.30 -> 1.8.38 * iwd 1.17 -> 1.27 * modemmanager 1.16.8 -> 1.18.6 * networkmanager 1.32.10 -> 1.36.2 * networkmanager-openvpn 1.8.14 -> 1.8.18 * accountsservice 0.6.55 -> 22.08.8 * colord-gtk 0.1.26 -> 0.3.0 * polkit 0.118 -> 0.119 * gexiv2 0.12.1 -> 0.14.0 * gjs 1.70.0 -> 1.72.0 * gnome-autoar 0.4.1 -> 0.4.3 * gnome-backgrounds 0.41.0 -> 0.42.0 * gnome-bluetooth 0.34.3 -> 42.0 * gnome-control-center 41.1 -> 42.1 * gnome-desktop 41.1 -> 42.1 * gnome-disk-utility 41.0 -> 42.0 * gnome-screenshot 40.0 -> 41.0 * gnome-session 40.1.1 -> 42.0 * gnome-settings-daemon 41.0 -> 42.1 * gnome-shell 41.1 -> 42.1 * gnome-system-monitor 41.0 -> 42.0 * gnome-terminal 3.42.1 -> 3.42.2 * gtk4 4.4.1 -> 4.6.4 * gvfs 1.48.1 -> 1.50.0 * libgweather 40.0 -> libgweather4 4.0.0 * mutter 41.1 -> 42.1 * network-manager-applet 1.18.0 -> 1.26.0 * yelp 3.36 -> 42.1 * yelp-xsl 3.36 -> 42.0 * yelp-tools 3.32.2 -> 42.0 * zenity 3.30.0 -> 3.42.1
62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001
|
|
From: Christopher Larson <chris_larson@mentor.com>
|
|
Date: Tue, 13 Dec 2016 20:39:51 -0700
|
|
Subject: [PATCH 1/2] gnome-desktop-thumbnail: don't convert time_t to long
|
|
|
|
Explicitly use strftime+strptime rather than snprintf+atol. This fixes the
|
|
build for X32, where long's size doesn't match that of time_t.
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
|
|
|
|
|
|
Modify patch described above to eliminate replacement of
|
|
|
|
g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime)
|
|
|
|
which is not necessary. Retain replacement of atol().
|
|
|
|
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
|
|
|
---
|
|
libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++--
|
|
1 file changed, 14 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
|
|
index e56c3d7..5d96bf3 100644
|
|
--- a/libgnome-desktop/gnome-desktop-thumbnail.c
|
|
+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
|
|
@@ -120,6 +120,8 @@
|
|
* Since: 2.2
|
|
*/
|
|
|
|
+#define _XOPEN_SOURCE
|
|
+
|
|
#include <config.h>
|
|
|
|
#include <glib.h>
|
|
@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,
|
|
{
|
|
const char *thumb_uri, *thumb_mtime_str;
|
|
time_t thumb_mtime;
|
|
+ struct tm tmp_mtime;
|
|
|
|
thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI");
|
|
if (g_strcmp0 (uri, thumb_uri) != 0)
|
|
@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,
|
|
thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
|
|
if (!thumb_mtime_str)
|
|
return FALSE;
|
|
- thumb_mtime = atol (thumb_mtime_str);
|
|
+ if (!strptime (thumb_mtime_str, "%s", &tmp_mtime))
|
|
+ return FALSE;
|
|
+ thumb_mtime = mktime (&tmp_mtime);
|
|
+ if (!thumb_mtime)
|
|
+ return FALSE;
|
|
if (mtime != thumb_mtime)
|
|
return FALSE;
|
|
|
|
--
|
|
2.14.1
|
|
|