* [PR PATCH] gnome-desktop: fix thumbnail generation on musl systems.
@ 2021-03-28 5:08 ericonr
2021-03-28 5:09 ` [PR PATCH] [Updated] " ericonr
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: ericonr @ 2021-03-28 5:08 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] gnome-desktop: fix thumbnail generation on musl systems.
2021-03-28 5:08 [PR PATCH] gnome-desktop: fix thumbnail generation on musl systems ericonr
@ 2021-03-28 5:09 ` ericonr
2021-03-28 5:14 ` ericonr
2021-03-28 5:14 ` [PR PATCH] [Merged]: " ericonr
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-03-28 5:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1900 bytes --]
There is an updated 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: 2137 bytes --]
From 8a2f0599a68ad0fb2df6005ab9c9cff41d262963 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.
Upstream issue:
https://gitlab.gnome.org/GNOME/gnome-desktop/-/issues/117
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] gnome-desktop: fix thumbnail generation on musl systems.
2021-03-28 5:08 [PR PATCH] gnome-desktop: fix thumbnail generation on musl systems ericonr
2021-03-28 5:09 ` [PR PATCH] [Updated] " ericonr
@ 2021-03-28 5:14 ` ericonr
2021-03-28 5:14 ` [PR PATCH] [Merged]: " ericonr
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-03-28 5:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1900 bytes --]
There is an updated 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: 2261 bytes --]
From 434c2b6cf95f66d30b792aeb24b85842d3074211 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.
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: gnome-desktop: fix thumbnail generation on musl systems.
2021-03-28 5:08 [PR PATCH] gnome-desktop: fix thumbnail generation on musl systems ericonr
2021-03-28 5:09 ` [PR PATCH] [Updated] " ericonr
2021-03-28 5:14 ` ericonr
@ 2021-03-28 5:14 ` ericonr
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-03-28 5:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]
There's a merged pull request on the void-packages repository
gnome-desktop: fix thumbnail generation on musl systems.
https://github.com/void-linux/void-packages/pull/29800
Description:
/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
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-28 5:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-28 5:08 [PR PATCH] gnome-desktop: fix thumbnail generation on musl systems ericonr
2021-03-28 5:09 ` [PR PATCH] [Updated] " ericonr
2021-03-28 5:14 ` ericonr
2021-03-28 5:14 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).