fix for new version of pango in macports.

Macport upgrade required.

diff --git a/Makefile.am b/Makefile.am
index f871d46a8ac9d9427c67ce43a938d6e7c913a1b9..36466ab9eea510178a15a584255a085de5c31d2a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -220,7 +220,7 @@ bundle: $(LIBICONV_HACK)
        printf "[Pango]\nModuleFiles=./etc/pango/pango.modules\n" \
        > $(BUNDLEDIR)/Contents/Resources/etc/pango/pangorc
        cp -f $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig
-       sed -e 's:@executable_path/../Resources:../..:g' $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig  > $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules
+       sed -e 's:@executable_path.*/::g' $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig  > $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules
        cp -f $(LIBICONV_HACK) $(BUNDLEDIR)/Contents/Resources/lib/.
        cd $(BUNDLEDIR)/.. && rm -f $(MACAPPZIP) && zip -r $(MACAPPZIP) $(MACAPPNAME) && cd -
 

diff --git a/build/macos/environment.sh b/build/macos/environment.sh
index 8d34ca02c55474beb072bd873cbca2d07f5a56e7..c2c672973192d4cfab76af4ac80e2a8de924ea4b 100644 (file)
--- a/build/macos/environment.sh
+++ b/build/macos/environment.sh
@@ -1,4 +1,5 @@
 export EXTRA_ARGS="--workdir $bundle_res"
-export GIO_EXTRA_MODULES="$bundle_res/lib/gio/modules"
-
+export GIO_EXTRA_MODULES="$bundle_lib/gio/modules"
+export PANGO_LIBDIR="$bundle_lib"
+export PANGO_SYSCONFDIR="$bundle_etc"