diff --git a/.gitignore b/.gitignore index 25fe351..86f1073 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ /flatpak-1.4.0.tar.xz /flatpak-1.4.1.tar.xz /flatpak-1.4.2.tar.xz +/flatpak-1.4.3.tar.xz diff --git a/OCI-correctly-handle-locally-present-icons.patch b/OCI-correctly-handle-locally-present-icons.patch deleted file mode 100644 index 04e843c..0000000 --- a/OCI-correctly-handle-locally-present-icons.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e71b7d5199c74560acd4033a07c489da4a01dd1b Mon Sep 17 00:00:00 2001 -From: "Owen W. Taylor" -Date: Wed, 7 Aug 2019 16:25:06 -0400 -Subject: [PATCH] OCI: correctly handle locally present icons - -If the download URL for an icon was already cached locally, the HTTP -code returned FLATPAK_OCI_ERROR_NOT_CHANGED - this was treated as a real -error, and after downloading missing icons, all present icons were -deleted! - -See https://bugzilla.redhat.com/show_bug.cgi?id=1683375 ---- - common/flatpak-oci-registry.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/common/flatpak-oci-registry.c b/common/flatpak-oci-registry.c -index 20b1e682..89974234 100644 ---- a/common/flatpak-oci-registry.c -+++ b/common/flatpak-oci-registry.c -@@ -2215,13 +2215,18 @@ add_icon_image (SoupSession *soup_session, - g_autoptr(SoupURI) base_uri = soup_uri_new (index_uri); - g_autoptr(SoupURI) icon_uri = soup_uri_new_with_base (base_uri, icon_data); - g_autofree char *icon_uri_s = soup_uri_to_string (icon_uri, FALSE); -+ g_autoptr(GError) local_error = NULL; - - if (!flatpak_cache_http_uri (soup_session, icon_uri_s, - 0 /* flags */, - icons_dfd, icon_path, - NULL, NULL, -- cancellable, error)) -- return FALSE; -+ cancellable, &local_error) && -+ !g_error_matches (local_error, FLATPAK_OCI_ERROR, FLATPAK_OCI_ERROR_NOT_CHANGED)) -+ { -+ g_propagate_error (error, g_steal_pointer (&local_error)); -+ return FALSE; -+ } - - g_hash_table_replace (used_icons, g_steal_pointer (&icon_path), GUINT_TO_POINTER (1)); - --- -2.21.0 - diff --git a/flatpak.spec b/flatpak.spec index 1923a16..286bcd0 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -2,8 +2,8 @@ %global ostree_version 2018.9 Name: flatpak -Version: 1.4.2 -Release: 6%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Summary: Application deployment framework for desktop apps License: LGPLv2+ @@ -14,8 +14,6 @@ Source1: flatpak-add-fedora-repos.service # Backported from upstream Patch0: 0001-ref-Fix-a-memory-leak.patch -# https://github.com/flatpak/flatpak/pull/3048 -Patch1: OCI-correctly-handle-locally-present-icons.patch # https://github.com/flatpak/flatpak/pull/3052 Patch2: flatpak-trim-unused-shared-library-linkages.patch @@ -278,6 +276,9 @@ fi %changelog +* Thu Sep 19 2019 Kalev Lember - 1.4.3-1 +- Update to 1.4.3 + * Wed Sep 18 2019 Debarshi Ray - 1.4.2-6 - Trim unused shared library linkages from the session helper diff --git a/sources b/sources index e3f0d49..f015240 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (flatpak-1.4.2.tar.xz) = da0182213538c436d9b0138f60fba0aee514f6d005fb996a42cdc9c25f8a493e9781f6bb74c6a18989a07d140a3b963c83480c6f0192e443770b4fa29474119b +SHA512 (flatpak-1.4.3.tar.xz) = 4812aa08365d0a1078723da5d8dec15573a5692f6f93bcd5a56e60ff55e0a2a1c08ca0efb3efacdc34c544bf30ecec10db1390f4bb7a06007616a43c69bfaafa