commit f351dd3da5d9fdfad346296b70a3e5aeb5edfac5 Author: Yawning Angel yawning@schwanenlied.me Date: Thu Dec 1 21:56:07 2016 +0000

Rename the gdk loader module file in the assets dir. --- data/loader.cache | 13 ------------- data/loaders.cache | 13 +++++++++++++ .../sandboxed-tor-browser/internal/sandbox/application.go | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/loader.cache b/data/loader.cache deleted file mode 100644 index d310e06..0000000 --- a/data/loader.cache +++ /dev/null @@ -1,13 +0,0 @@ -# GdkPixbuf Image Loader Modules file -# Automatically generated file, do not edit -# Created by gdk-pixbuf-query-loaders from gdk-pixbuf-2.31.1 -# -# LoaderDir = /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders -# -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so" -"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL" -"image/png" "" -"png" "" -"\211PNG\r\n\032\n" "" 100 - - diff --git a/data/loaders.cache b/data/loaders.cache new file mode 100644 index 0000000..d310e06 --- /dev/null +++ b/data/loaders.cache @@ -0,0 +1,13 @@ +# GdkPixbuf Image Loader Modules file +# Automatically generated file, do not edit +# Created by gdk-pixbuf-query-loaders from gdk-pixbuf-2.31.1 +# +# LoaderDir = /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders +# +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so" +"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL" +"image/png" "" +"png" "" +"\211PNG\r\n\032\n" "" 100 + + diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go index 1e8696d..f04e572 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go @@ -613,7 +613,7 @@ func (h *hugbox) appendRestrictedGtk2() ([]string, string, error) { // GDK doesn't have a nice equivalent to `GTK_PATH`, and instead has // an env var pointing to a `loaders.cache` file. loaderCachePath := filepath.Join(normGdkPath, "loaders.cache") - h.assetFile(loaderCachePath, "loader.cache") + h.assetFile(loaderCachePath, "loaders.cache") h.setenv("GDK_PIXBUF_MODULE_FILE", loaderCachePath)

gtkLibs = append(gtkLibs, libPngLoader)