<div dir="ltr">I'm not sure we need this patch anymore, it's been rebased on top of upstream changes but one of those changes were to fix x32 builds:<div><br></div><div><a href="https://git.gnome.org/browse/gnome-desktop/commit/libgnome-desktop/gnome-desktop-thumbnail.c?id=012cad653253ae5f5248988cda89159f22c1fb1d">https://git.gnome.org/browse/gnome-desktop/commit/libgnome-desktop/gnome-desktop-thumbnail.c?id=012cad653253ae5f5248988cda89159f22c1fb1d</a><br></div><div><br></div><div>I believe we can drop this patch to gnome-desktop.</div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 8 March 2018 at 01:35, Joe Slater <span dir="ltr"><<a href="mailto:joe.slater@windriver.com" target="_blank">joe.slater@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Do not free() the buffer returned by localtime(). Also,<br>
switch to calling localtime_r() which is re-entrant.<br>
<br>
Signed-off-by: Joe Slater <<a href="mailto:joe.slater@windriver.com">joe.slater@windriver.com</a>><br>
---<br>
...op-thumbnail-don-t-convert-<wbr>time_t-to-long.patch | 27 +++++++++-------------<br>
1 file changed, 11 insertions(+), 16 deletions(-)<br>
<br>
diff --git a/meta/recipes-gnome/gnome-<wbr>desktop/gnome-desktop/gnome-<wbr>desktop-thumbnail-don-t-<wbr>convert-time_t-to-long.patch b/meta/recipes-gnome/gnome-<wbr>desktop/gnome-desktop/gnome-<wbr>desktop-thumbnail-don-t-<wbr>convert-time_t-to-long.patch<br>
index c1a7d4f..be657a8 100644<br>
--- a/meta/recipes-gnome/gnome-<wbr>desktop/gnome-desktop/gnome-<wbr>desktop-thumbnail-don-t-<wbr>convert-time_t-to-long.patch<br>
+++ b/meta/recipes-gnome/gnome-<wbr>desktop/gnome-desktop/gnome-<wbr>desktop-thumbnail-don-t-<wbr>convert-time_t-to-long.patch<br>
@@ -9,12 +9,11 @@ build for X32, where long's size doesn't match that of time_t.<br>
Upstream-Status: Pending<br>
Signed-off-by: Christopher Larson <<a href="mailto:chris_larson@mentor.com">chris_larson@mentor.com</a>><br>
<br>
----<br>
- libgnome-desktop/gnome-<wbr>desktop-thumbnail.c | 16 ++++++++++++++--<br>
- 1 file changed, 14 insertions(+), 2 deletions(-)<br>
+Modified to use localtime_r() and not free() a static structure.<br>
+<br>
+Signed-off-by: Joe Slater <<a href="mailto:jslater@windriver.com">jslater@windriver.com</a>><br>
+<br>
<br>
-diff --git a/libgnome-desktop/gnome-<wbr>desktop-thumbnail.c b/libgnome-desktop/gnome-<wbr>desktop-thumbnail.c<br>
-index e56c3d7..5d96bf3 100644<br>
--- a/libgnome-desktop/gnome-<wbr>desktop-thumbnail.c<br>
+++ b/libgnome-desktop/gnome-<wbr>desktop-thumbnail.c<br>
@@ -120,6 +120,8 @@<br>
@@ -30,24 +29,23 @@ index e56c3d7..5d96bf3 100644<br>
char *tmp_path = NULL;<br>
int tmp_fd;<br>
char mtime_str[21];<br>
-+ struct tm *tmp_mtime = NULL;<br>
++ struct tm tmp_mtime;<br>
gboolean ret = FALSE;<br>
GError *error = NULL;<br>
const char *width, *height;<br>
-@@ -1124,7 +1127,11 @@ save_thumbnail (GdkPixbuf *pixbuf,<br>
+@@ -1124,7 +1127,10 @@ save_thumbnail (GdkPixbuf *pixbuf,<br>
goto out;<br>
close (tmp_fd);<br>
<br>
- g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime);<br>
-+ tmp_mtime = localtime (&mtime);<br>
-+ if (!tmp_mtime)<br>
++ if (!localtime_r (&mtime,&tmp_mtime))<br>
+ goto out;<br>
-+ strftime (mtime_str, 21, "%s", tmp_mtime);<br>
-+ free (tmp_mtime);<br>
++<br>
++ strftime (mtime_str, 21, "%s", &tmp_mtime);<br>
width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width");<br>
height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height");<br>
<br>
-@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_<wbr>valid (GdkPixbuf *pixbuf,<br>
+@@ -1319,6 +1325,7 @@ gnome_desktop_thumbnail_is_<wbr>valid (GdkPix<br>
{<br>
const char *thumb_uri, *thumb_mtime_str;<br>
time_t thumb_mtime;<br>
@@ -55,7 +53,7 @@ index e56c3d7..5d96bf3 100644<br>
<br>
thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI");<br>
if (g_strcmp0 (uri, thumb_uri) != 0)<br>
-@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_<wbr>valid (GdkPixbuf *pixbuf,<br>
+@@ -1327,7 +1334,11 @@ gnome_desktop_thumbnail_is_<wbr>valid (GdkPix<br>
thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");<br>
if (!thumb_mtime_str)<br>
return FALSE;<br>
@@ -68,6 +66,3 @@ index e56c3d7..5d96bf3 100644<br>
if (mtime != thumb_mtime)<br>
return FALSE;<br>
<br>
---<br>
-2.14.1<br>
-<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.7.4<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>