[gnome-books/wip/hadess/fix-app-provided-pixbuf: 2/2] flatpak: Fix WebP pixbuf loader not working
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-books/wip/hadess/fix-app-provided-pixbuf: 2/2] flatpak: Fix WebP pixbuf loader not working
- Date: Wed, 24 Mar 2021 19:17:52 +0000 (UTC)
commit 90647c46e2ac362c163ff3b50af434c82daeed0a
Author: Bastien Nocera <hadess hadess net>
Date: Wed Mar 24 20:14:43 2021 +0100
flatpak: Fix WebP pixbuf loader not working
There were multiple problems with the Flatpak changes that were made,
including, installing modules in the wrong place, adding an "env"
property which threw a warning and didn't set any environment variables,
and setting envvars which meant that gdk-pixbuf would only see the webp
loader.
The webp pixbuf loader repository will be reset to the upstream one once
this MR is merged:
https://github.com/aruiz/webp-pixbuf-loader/pull/28
Fixes: a77851f910c6c03a85f39f79d8deb5b99a3eac8b
flatpak/org.gnome.Books.json | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/flatpak/org.gnome.Books.json b/flatpak/org.gnome.Books.json
index 14dc0931..d8ac0e38 100644
--- a/flatpak/org.gnome.Books.json
+++ b/flatpak/org.gnome.Books.json
@@ -17,8 +17,6 @@
"--filesystem=xdg-documents:ro", "--filesystem=xdg-download:ro",
/* Needs to talk to the network: */
"--share=network",
- /* For the WebP loader */
- "--env=GDK_PIXBUF_MODULE_FILE=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache",
/* Needed for dconf to work */
"--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
"--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
@@ -43,17 +41,16 @@
{
"name": "webp-pixbuf-loader",
"buildsystem": "meson",
- "env": {
- "GDK_PIXBUF_MODULEDIR": "/app/lib/gnome-books/gdk-pixbuf/2.10.0/"
- },
+ "config-opts": [ "-Dgdk_pixbuf_moduledir=/app/lib/gnome-books/gdk-pixbuf/2.10.0/" ],
"sources": [
{
"type": "git",
- "url": "https://github.com/aruiz/webp-pixbuf-loader.git"
+ "url": "https://github.com/hadess/webp-pixbuf-loader.git",
+ "branch": "wip/hadess/configurable-moddir"
}
],
"post-install": [
- "gdk-pixbuf-query-loaders > $GDK_PIXBUF_MODULEDIR/loaders.cache"
+ "gdk-pixbuf-query-loaders /app/lib/gnome-books/gdk-pixbuf/2.10.0/*.so >
/app/lib/gnome-books/gdk-pixbuf/2.10.0/loaders.cache"
]
},
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]