diff --git a/gnome-base/librsvg/additional-files/update_loaders_cache.sh b/gnome-base/librsvg/additional-files/update_loaders_cache.sh index 4c88e5cf6..ec41424fd 100755 --- a/gnome-base/librsvg/additional-files/update_loaders_cache.sh +++ b/gnome-base/librsvg/additional-files/update_loaders_cache.sh @@ -1,4 +1,4 @@ #!/bin/sh SETTINGS_DIR=`finddir B_SYSTEM_SETTINGS_DIRECTORY`/gdk-pixbuf-2.0 mkdir -p $SETTINGS_DIR -gdk-pixbuf-query-loaders >$SETTINGS_DIR/loaders.cache +gdk-pixbuf-query-loaders --update-cache diff --git a/gnome-base/librsvg/librsvg-2.50.3.recipe b/gnome-base/librsvg/librsvg-2.50.3.recipe index 1a7de0cc1..ea01e90ee 100644 --- a/gnome-base/librsvg/librsvg-2.50.3.recipe +++ b/gnome-base/librsvg/librsvg-2.50.3.recipe @@ -5,7 +5,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg" COPYRIGHT="2009-2010 Raph Levien" LICENSE="GNU GPL v2 GNU LGPL v2" -REVISION="8" +REVISION="9" SOURCE_URI="https://download.gnome.org/sources/librsvg/2.50/librsvg-$portVersion.tar.xz" CHECKSUM_SHA256="a4298a98e3a95fdd73c858c17d4dd018525fb09dbb13bbd668a0c2243989e958" PATCHES="librsvg-$portVersion.patchset" @@ -123,10 +123,14 @@ BUILD() INSTALL() { # fix path for gdk-pixbuf loaders + mkdir -p $settingsDir/gdk-pixbuf-2.0 + touch $settingsDir/gdk-pixbuf-2.0/loaders.cache + local gdk_pixbuf_version="`pkg-config --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0`" + sed -i -e "s|gdk_pixbuf_binarydir = .*|gdk_pixbuf_binarydir = \"$libDir/gdk-pixbuf-2.0/$gdk_pixbuf_version\"/|" \ $sourceDir/gdk-pixbuf-loader/Makefile - sed -i -e "s|gdk_pixbuf_cache_file = .*|gdk_pixbuf_cache_file = \"$libDir/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache\"|" \ + sed -i -e "s|gdk_pixbuf_cache_file = .*|gdk_pixbuf_cache_file = \"$settingsDir/gdk-pixbuf-2.0/loaders.cache\"|" \ $sourceDir/gdk-pixbuf-loader/Makefile sed -i -e "s|gdk_pixbuf_moduledir = .*|gdk_pixbuf_moduledir = \"$libDir/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders\"|" \ $sourceDir/gdk-pixbuf-loader/Makefile @@ -138,7 +142,8 @@ INSTALL() rm $libDir/*.la \ $libDir/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.a \ $libDir/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.la - rm -rf $dataDir/pixmaps + rm -rf $dataDir/pixmaps \ + $settingsDir/gdk-pixbuf-2.0 # postinstall script for rebuild loaders.cache mkdir -p $postInstallDir