From: Wang Mingyu <wan...@fujitsu.com> 283c9483afd1215378c8b9871f51cd61770e53e7.patch removed since it's included in 3.12.7
Changelog: ============ Features: * WebP: read the ICC profile if available * WebP: save the EXIF data * Video screenshot: use the configured jpeg extension for the file Bugfixes: * Preferences dialog: same dialog shown endlessy * Bookmarks: fixed loading system bookmarks with the flatpak version * migrate-catalogs: properly use time_t for localtime * Removed references to wiki.gnome.org pages * Appdata: Fix developer id Signed-off-by: Wang Mingyu <wan...@fujitsu.com> --- ...9483afd1215378c8b9871f51cd61770e53e7.patch | 49 ------------------- .../{gthumb_3.12.6.bb => gthumb_3.12.7.bb} | 3 +- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gthumb/gthumb/283c9483afd1215378c8b9871f51cd61770e53e7.patch rename meta-gnome/recipes-gnome/gthumb/{gthumb_3.12.6.bb => gthumb_3.12.7.bb} (88%) diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb/283c9483afd1215378c8b9871f51cd61770e53e7.patch b/meta-gnome/recipes-gnome/gthumb/gthumb/283c9483afd1215378c8b9871f51cd61770e53e7.patch deleted file mode 100644 index c2dbce0c14..0000000000 --- a/meta-gnome/recipes-gnome/gthumb/gthumb/283c9483afd1215378c8b9871f51cd61770e53e7.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b48e34c436eb59877b0fe75ba3bf724c0de4dc36 Mon Sep 17 00:00:00 2001 -From: Pino Toscano <toscano.p...@tiscali.it> -Date: Sat, 7 Sep 2024 09:40:49 +0200 -Subject: [PATCH] migrate-catalogs: properly use time_t for localtime() - -Commit ed219c771bc0c63e1a7847e44c81f43223454eac changed the type of the -'date' variable from 'time_t' to 'long', to ensure the right type is -handled by sscanf(). The problem is that, in case 'time_t' is not the -same as 'long', the wrong pointer is passed to localtime(), and more -strict build flags (such as the defaults of GCC 14) cause the build to -fail on such setups. - -The ideal fix in this case would be to switch back the 'date' variable -to 'time_t' and use the right format specifier for it in sscanf(); -however, since this is an helper to convert very old format, this -additional code is not much worth it. Hence, use a simpler fix: in case -a date timestamp was read from the file, set it to a new 'time_t' -variable which is then used for localtime(). Since 'time_t' is big at -least as much as 'long', there is no precision/value loss. - -There should be no behaviour change. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gthumb/-/commit/283c9483afd1215378c8b9871f51cd61770e53e7] ---- - gthumb/main-migrate-catalogs.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gthumb/main-migrate-catalogs.c b/gthumb/main-migrate-catalogs.c -index 75f5cb11d..e194ed19f 100644 ---- a/gthumb/main-migrate-catalogs.c -+++ b/gthumb/main-migrate-catalogs.c -@@ -308,12 +308,13 @@ migration_for_each_file (GFile *file, - sscanf (line, "%d", &date_scope); - - if ((date > 0) && (date_scope >= 1) && (date_scope <= 3)) { -+ time_t date_as_time = date; - struct tm *tm; - GthDateTime *dt; - char *exif_date; - char *op; - -- tm = localtime (&date); -+ tm = localtime (&date_as_time); - dt = gth_datetime_new (); - gth_datetime_from_struct_tm (dt, tm); - exif_date = gth_datetime_to_exif_date (dt); --- -GitLab - diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.6.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.7.bb similarity index 88% rename from meta-gnome/recipes-gnome/gthumb/gthumb_3.12.6.bb rename to meta-gnome/recipes-gnome/gthumb/gthumb_3.12.7.bb index 8917178582..ed5382035f 100644 --- a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.6.bb +++ b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.7.bb @@ -28,7 +28,6 @@ EXTRA_OEMESON += "-Dwebservices=false -Dlibsecret=false" inherit gnomebase gnome-help gsettings itstool mime-xdg -SRC_URI += "file://283c9483afd1215378c8b9871f51cd61770e53e7.patch" -SRC_URI[archive.sha256sum] = "608770c6c8e73073a1d404b65bd1b761e1ac5dc25e70130ff072488fa92f5c33" +SRC_URI[archive.sha256sum] = "ee12d24cf231010241f758d6c95b9d53a7381278fa76b6a518b3d09b371efaec" FILES:${PN} += "${datadir}/metainfo" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#115603): https://lists.openembedded.org/g/openembedded-devel/message/115603 Mute This Topic: https://lists.openembedded.org/mt/111387399/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-