Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GFileInfo Fix Survey 20231017 #4795

Merged
merged 3 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From bfa8fa6ac4ef645368a93384a6c16ac551a40922 Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <[email protected]>
Date: Sun, 12 Mar 2023 17:36:11 +0100
Subject: [PATCH] Add missing standard::is-hidden attribute to file search
enumerator

Resolves: #470
---
src/as-utils.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/as-utils.c b/src/as-utils.c
index 260f3cbf..b983e7ec 100644
--- a/src/as-utils.c
+++ b/src/as-utils.c
@@ -511,7 +511,12 @@ as_utils_find_files_matching (const gchar* dir, const gchar* pattern, gboolean r

list = g_ptr_array_new_with_free_func (g_free);
fdir = g_file_new_for_path (dir);
- enumerator = g_file_enumerate_children (fdir, G_FILE_ATTRIBUTE_STANDARD_NAME, 0, NULL, &tmp_error);
+ enumerator = g_file_enumerate_children (fdir,
+ G_FILE_ATTRIBUTE_STANDARD_NAME ","
+ G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
+ 0,
+ NULL,
+ &tmp_error);
if (tmp_error != NULL)
goto out;

--
2.39.1

1 change: 1 addition & 0 deletions app-admin/appstream/spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
VER=0.16.0
REL=1
SRCS="tbl::https://www.freedesktop.org/software/appstream/releases/AppStream-$VER.tar.xz"
CHKSUMS="sha256::6430cce80ddfcda5a35270edf80f71e78f437ca5104183f765af9f3ed048e170"
CHKUPDATE="anitya::id=10385"
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 376c9d7effa01fa020711a3f12829fe9b18b8bca Mon Sep 17 00:00:00 2001
From: Evan Anderson <[email protected]>
Date: Wed, 15 Mar 2023 21:33:21 -0500
Subject: [PATCH] core: Ensure glib standard::size attribute is always set

* A recent change in glib [1] requires that the appropriate attribute
be available when calling getters. ostree core only sets this attribute
on regular files, and frequently triggers the critical warning. Solve
this by setting standard::size to zero for non-regular files.

Fixes https://github.com/ostreedev/ostree/issues/2827

[1]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3261
---
src/libostree/ostree-core.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 56b381d9..0d1b0d5d 100644
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -1739,6 +1739,8 @@ _ostree_stbuf_to_gfileinfo (const struct stat *stbuf)

if (S_ISREG (mode))
g_file_info_set_attribute_uint64 (ret, "standard::size", stbuf->st_size);
+ else
+ g_file_info_set_attribute_uint64 (ret, "standard::size", 0);

return ret;
}
--
2.39.1

2 changes: 1 addition & 1 deletion app-admin/ostree/spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VER=2023.1
REL=1
REL=2
SRCS="git::commit=tags/v$VER::https://github.com/ostreedev/ostree"
CHKSUMS="SKIP"
CHKUPDATE="anitya::id=10899"
5 changes: 2 additions & 3 deletions desktop-gnome/gtk-3/spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
VER=3.24.34
REL=2
VER=3.24.38
SRCS="https://download.gnome.org/sources/gtk+/${VER:0:4}/gtk+-$VER.tar.xz"
CHKSUMS="sha256::dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec"
CHKSUMS="sha256::ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7"
CHKUPDATE="anitya::id=10018"