[PR PATCH] gnome-desktop: fix thumbnail generation on musl systems.

[ericonr <ericonr@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1895 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages nautilus
https://github.com/void-linux/void-packages/pull/29800

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.

Fixes #29767.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29800.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nautilus-29800.patch --]
[-- Type: text/x-diff, Size: 2062 bytes --]

From 82bdc0edeac661bae60aa99ac8099d8fc83d6881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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.

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