From 6d51f6b7dbae13331ef57c4d6e9506a267fcf9b6 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 27 Oct 2015 10:10:18 +0100 Subject: [PATCH] fix macos bundle, which had dependencies on macports --- build/macos/environment.sh | 3 ++- build/macos/linphone.bundle | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build/macos/environment.sh b/build/macos/environment.sh index fae264e0e..879db36dc 100644 --- a/build/macos/environment.sh +++ b/build/macos/environment.sh @@ -3,6 +3,7 @@ export LINPHONE_WORKDIR="$bundle_res" export GIO_EXTRA_MODULES="$bundle_lib/gio/modules" export PANGO_LIBDIR="$bundle_lib" export PANGO_SYSCONFDIR="$bundle_etc" +export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" #this is very important not to force a shared library path so that native frameworks can find their dependencies by themselves, #and not be forced to use the few libraries we have in the bundle that have the same name as native libs (ex: libiconv) @@ -23,4 +24,4 @@ esac export LANG -echo "LANG is $LANG" \ No newline at end of file +echo "LANG is $LANG" diff --git a/build/macos/linphone.bundle b/build/macos/linphone.bundle index b4b5d1ca6..0adbdf91b 100644 --- a/build/macos/linphone.bundle +++ b/build/macos/linphone.bundle @@ -91,12 +91,9 @@ - ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/*.so + ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so - - ${prefix}/etc/gtk-2.0/gdk-pixbuf.loaders -