From 8f10c2de9ad5a5b631ee33023e443e6c8c5910b1 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Fri, 5 Aug 2022 08:31:44 -0400 Subject: [PATCH] Drop gnome-desktop patch: applied in new release --- ...ory-update-for-new-gnome-desktop-API.patch | 54 ------------------- debian/patches/series | 1 - 2 files changed, 55 deletions(-) delete mode 100644 debian/patches/M-104-icon-factory-update-for-new-gnome-desktop-API.patch diff --git a/debian/patches/M-104-icon-factory-update-for-new-gnome-desktop-API.patch b/debian/patches/M-104-icon-factory-update-for-new-gnome-desktop-API.patch deleted file mode 100644 index d428bad73a..0000000000 --- a/debian/patches/M-104-icon-factory-update-for-new-gnome-desktop-API.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Michael Catanzaro -Date: Mon, 11 Apr 2022 17:16:58 -0500 -Subject: M!104 - icon-factory: update for new gnome-desktop API - -See gnome-desktop!132 - -Closes https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/104 - -(cherry picked from commit 9e3019a0961e91e5fbffe190b973a47c7fafd361) ---- - src/e-util/e-icon-factory.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/src/e-util/e-icon-factory.c b/src/e-util/e-icon-factory.c -index 25c2ecb..71ffd72 100644 ---- a/src/e-util/e-icon-factory.c -+++ b/src/e-util/e-icon-factory.c -@@ -170,6 +170,9 @@ e_icon_factory_create_thumbnail (const gchar *filename) - static GnomeDesktopThumbnailFactory *thumbnail_factory = NULL; - struct stat file_stat; - gchar *thumbnail = NULL; -+#if defined(GNOME_DESKTOP_PLATFORM_VERSION) && GNOME_DESKTOP_PLATFORM_VERSION >= 43 -+ GError *error = NULL; -+#endif - - g_return_val_if_fail (filename != NULL, NULL); - -@@ -194,10 +197,26 @@ e_icon_factory_create_thumbnail (const gchar *filename) - if (!thumbnail && gnome_desktop_thumbnail_factory_can_thumbnail (thumbnail_factory, uri, mime, file_stat.st_mtime)) { - GdkPixbuf *pixbuf; - -+#if defined(GNOME_DESKTOP_PLATFORM_VERSION) && GNOME_DESKTOP_PLATFORM_VERSION >= 43 -+ pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (thumbnail_factory, uri, mime, NULL, &error); -+ if (!pixbuf) { -+ g_warning ("Failed to generate thumbnail for %s: %s", uri, error ? error->message : "Unknown error"); -+ g_clear_error (&error); -+ } -+#else - pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (thumbnail_factory, uri, mime); -+#endif - - if (pixbuf) { -+#if defined(GNOME_DESKTOP_PLATFORM_VERSION) && GNOME_DESKTOP_PLATFORM_VERSION >= 43 -+ gnome_desktop_thumbnail_factory_save_thumbnail (thumbnail_factory, pixbuf, uri, file_stat.st_mtime, NULL, &error); -+ if (error) { -+ g_warning ("Failed to save thumbnail for %s: %s", uri, error ? error->message : "Unknown error"); -+ g_clear_error (&error); -+ } -+#else - gnome_desktop_thumbnail_factory_save_thumbnail (thumbnail_factory, pixbuf, uri, file_stat.st_mtime); -+#endif - g_object_unref (pixbuf); - - thumbnail = gnome_desktop_thumbnail_factory_lookup (thumbnail_factory, uri, file_stat.st_mtime); diff --git a/debian/patches/series b/debian/patches/series index 0e37c5db18..9a7b54f8a5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 10_revert_libevolution_avoid-version.patch ubuntu_gettext_domain.patch -M-104-icon-factory-update-for-new-gnome-desktop-API.patch