diff options
| author | Alexander Larsson <alexl@redhat.com> | 2022-06-13 18:32:13 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2022-06-13 18:36:44 +0200 |
| commit | 87dc7079f12c7a06231d0dc1b622a15fe3e790ab (patch) | |
| tree | e5fb7adf075bb13e6b3f5d5956da84dfb715336b | |
| parent | f8202512a98c9aae01eaef9fb10e877300ae45fa (diff) | |
| download | flatpak-bump-glib-dependency.tar.gz | |
Bump glib requirement to 2.46 (from 2.44)bump-glib-dependency
Since we switched to libappstream we really have an implicit dependency
on this, as there are no versions of it building with glib earlier
than 2.46.
This isn't dropping a lot of old code, but at least it is more truthful
about our actual dependencies.
| -rw-r--r-- | common/flatpak-utils-http.c | 8 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/common/flatpak-utils-http.c b/common/flatpak-utils-http.c index 6f2421ba..f1e7b7ba 100644 --- a/common/flatpak-utils-http.c +++ b/common/flatpak-utils-http.c @@ -471,11 +471,7 @@ load_uri_callback (GObject *source_object, break; case SOUP_STATUS_IO_ERROR: -#if !GLIB_CHECK_VERSION(2, 44, 0) - code = G_IO_ERROR_BROKEN_PIPE; -#else code = G_IO_ERROR_CONNECTION_CLOSED; -#endif break; default: @@ -576,11 +572,7 @@ flatpak_http_should_retry_request (const GError *error, g_error_matches (error, G_IO_ERROR, G_IO_ERROR_HOST_NOT_FOUND) || g_error_matches (error, G_IO_ERROR, G_IO_ERROR_HOST_UNREACHABLE) || g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PARTIAL_INPUT) || -#if !GLIB_CHECK_VERSION(2, 44, 0) - g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BROKEN_PIPE) || -#else g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED) || -#endif g_error_matches (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND) || g_error_matches (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_TEMPORARY_FAILURE)) { diff --git a/configure.ac b/configure.ac index 4b5c81b0..1e58cbff 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_INIT([Flatpak], [flatpak], [http://flatpak.org/]) -GLIB_REQS=2.44 +GLIB_REQS=2.46 SYSTEM_BWRAP_REQS=0.5.0 SYSTEM_DBUS_PROXY_REQS=0.1.0 OSTREE_REQS=2020.8 |