From 434c2b6cf95f66d30b792aeb24b85842d3074211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sun, 28 Mar 2021 02:01:37 -0300 Subject: [PATCH] gnome-desktop: fix thumbnail generation on musl systems. /etc/ld.so.cache doesn't exist on musl systems, which makes the bwrap command fail. Users will have to remove the "failed generation" cache from ~/.cache/thumbnails/fail/ for nautilus to reattempt thumbnail generation of previously visited directories. Upstream issue: https://gitlab.gnome.org/GNOME/gnome-desktop/-/issues/117 Seems to be the direction upstream is moving in as well: https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/107 Fixes #29767. --- .../patches/thumbnail-bwrap-musl.patch | 13 +++++++++++++ srcpkgs/gnome-desktop/template | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch diff --git a/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch b/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch new file mode 100644 index 000000000000..9b53c755dab8 --- /dev/null +++ b/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch @@ -0,0 +1,13 @@ +diff --git libgnome-desktop/gnome-desktop-thumbnail-script.c libgnome-desktop/gnome-desktop-thumbnail-script.c +index cfbbad0..efad40b 100644 +--- libgnome-desktop/gnome-desktop-thumbnail-script.c ++++ libgnome-desktop/gnome-desktop-thumbnail-script.c +@@ -532,7 +532,7 @@ add_bwrap (GPtrArray *array, + add_args (array, + "bwrap", + "--ro-bind", "/usr", "/usr", +- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", ++ "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", + NULL); + + /* These directories might be symlinks into /usr/... */ diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 4e98eea5eeaa..0196656cc4b8 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,7 +1,7 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop version=3.38.4 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled