Update to 2.76.0
This commit is contained in:
parent
95c4c12179
commit
7f5cc41413
@ -1,56 +0,0 @@
|
|||||||
From 4e62e55d6d0109012869a589eae2371e836e9cb3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Philip Withnall <pwithnall@endlessos.org>
|
|
||||||
Date: Mon, 6 Mar 2023 13:02:41 +0000
|
|
||||||
Subject: [PATCH] gfile: Check ETag attribute is present before trying to get
|
|
||||||
it
|
|
||||||
|
|
||||||
A regression from issue #2907.
|
|
||||||
|
|
||||||
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
|
|
||||||
|
|
||||||
Fixes: #2932
|
|
||||||
---
|
|
||||||
gio/gfile.c | 4 ++--
|
|
||||||
gio/gpollfilemonitor.c | 4 +++-
|
|
||||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/gio/gfile.c b/gio/gfile.c
|
|
||||||
index 84353cb44c..7cfe1ffb4d 100644
|
|
||||||
--- a/gio/gfile.c
|
|
||||||
+++ b/gio/gfile.c
|
|
||||||
@@ -7773,7 +7773,7 @@ g_file_load_contents (GFile *file,
|
|
||||||
NULL);
|
|
||||||
if (info)
|
|
||||||
{
|
|
||||||
- *etag_out = g_strdup (g_file_info_get_etag (info));
|
|
||||||
+ *etag_out = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_ETAG_VALUE) ? g_strdup (g_file_info_get_etag (info)) : NULL;
|
|
||||||
g_object_unref (info);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7847,7 +7847,7 @@ load_contents_fstat_callback (GObject *obj,
|
|
||||||
stat_res, NULL);
|
|
||||||
if (info)
|
|
||||||
{
|
|
||||||
- data->etag = g_strdup (g_file_info_get_etag (info));
|
|
||||||
+ data->etag = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_ETAG_VALUE) ? g_strdup (g_file_info_get_etag (info)) : NULL;
|
|
||||||
g_object_unref (info);
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/gio/gpollfilemonitor.c b/gio/gpollfilemonitor.c
|
|
||||||
index 685ede964e..c4dfd99132 100644
|
|
||||||
--- a/gio/gpollfilemonitor.c
|
|
||||||
+++ b/gio/gpollfilemonitor.c
|
|
||||||
@@ -89,7 +89,9 @@ calc_event_type (GFileInfo *last,
|
|
||||||
if (last != NULL && new == NULL)
|
|
||||||
return G_FILE_MONITOR_EVENT_DELETED;
|
|
||||||
|
|
||||||
- if (g_strcmp0 (g_file_info_get_etag (last), g_file_info_get_etag (new)))
|
|
||||||
+ if (g_file_info_has_attribute (last, G_FILE_ATTRIBUTE_ETAG_VALUE) &&
|
|
||||||
+ g_file_info_has_attribute (new, G_FILE_ATTRIBUTE_ETAG_VALUE) &&
|
|
||||||
+ g_strcmp0 (g_file_info_get_etag (last), g_file_info_get_etag (new)) != 0)
|
|
||||||
return G_FILE_MONITOR_EVENT_CHANGED;
|
|
||||||
|
|
||||||
if (g_file_info_get_size (last) != g_file_info_get_size (new))
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
@ -1,18 +1,16 @@
|
|||||||
Name: glib2
|
Name: glib2
|
||||||
Version: 2.75.4
|
Version: 2.76.0
|
||||||
Release: %autorelease
|
Release: %autorelease
|
||||||
Summary: A library of handy utility functions
|
Summary: A library of handy utility functions
|
||||||
|
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
URL: https://www.gtk.org
|
URL: https://www.gtk.org
|
||||||
Source0: https://download.gnome.org/sources/glib/2.75/glib-%{version}.tar.xz
|
Source0: https://download.gnome.org/sources/glib/2.76/glib-%{version}.tar.xz
|
||||||
|
|
||||||
# Required for RHEL core crypto components policy. Good for Fedora too.
|
# Required for RHEL core crypto components policy. Good for Fedora too.
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1630260
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1630260
|
||||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/903
|
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/903
|
||||||
Patch0: gnutls-hmac.patch
|
Patch0: gnutls-hmac.patch
|
||||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3312.patch
|
|
||||||
Patch1: glib2-2.75.4-fix-etag-gjs.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (glib-2.75.4.tar.xz) = 520ebedb54d6b2ab5771452b9fec331ebf32a12b8b6590ae0edc70db5f1b7af89865e4ba9ecf189464fe82312c2e0fa03a5cbff0ab2e8cc16d41705c605c6d91
|
SHA512 (glib-2.76.0.tar.xz) = 812834ca6d840dd9c15c0689685d8bd96f4acd69a89213f807a75732d1aa5efadbed0e0073f05a56a09beb2d4f0be1b83a4642259682aac84302632da2d62370
|
||||||
|
Loading…
Reference in New Issue
Block a user