[evince/wip/hadess/app-provided-pixbuf-loader: 261/261] flatpak: Update Flatpak for app-provided gdk-pixbuf loader
- From: Germán Poo-Caamaño <gpoo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince/wip/hadess/app-provided-pixbuf-loader: 261/261] flatpak: Update Flatpak for app-provided gdk-pixbuf loader
- Date: Sun, 31 May 2020 13:14:55 +0000 (UTC)
commit d78aab7c5f63e63d8b045b8fc88cccd8d40ade2b
Author: Bastien Nocera <hadess hadess net>
Date: Thu Feb 28 14:55:31 2019 +0100
flatpak: Update Flatpak for app-provided gdk-pixbuf loader
This simplifies the code slightly.
build-aux/flatpak/org.gnome.Evince.json | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Evince.json b/build-aux/flatpak/org.gnome.Evince.json
index 508e8cab..a75ff615 100644
--- a/build-aux/flatpak/org.gnome.Evince.json
+++ b/build-aux/flatpak/org.gnome.Evince.json
@@ -19,7 +19,6 @@
"--filesystem=~/.config/dconf:ro",
"--talk-name=ca.desrt.dconf",
"--env=DCONF_USER_CONFIG_DIR=.config/dconf",
- "--env=GDK_PIXBUF_MODULE_FILE=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache",
"--talk-name=org.gtk.vfs",
"--talk-name=org.gtk.vfs.*",
"--talk-name=org.gnome.SessionManager",
@@ -49,6 +48,9 @@
{
"name" : "webp-pixbuf-loader",
"buildsystem" : "cmake-ninja",
+ "env": {
+ "GDK_PIXBUF_MODULEDIR": "/app/lib/evince/gdk-pixbuf/2.10.0/"
+ },
"sources" : [
{
"type" : "git",
@@ -57,8 +59,7 @@
}
],
"post-install" : [
- "GDK_PIXBUF_MODULEDIR=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders/ gdk-pixbuf-query-loaders >
loaders.cache",
- "cat /usr/lib/*/gdk-pixbuf-2.0/2.10.0/loaders.cache loaders.cache >
/app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+ "gdk-pixbuf-query-loaders > $GDK_PIXBUF_MODULEDIR/loaders.cache"
]
},
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]