diff options
| author | mjwybrow <mjwybrow@users.sourceforge.net> | 2009-09-23 15:42:41 +0000 |
|---|---|---|
| committer | mjwybrow <mjwybrow@users.sourceforge.net> | 2009-09-23 15:42:41 +0000 |
| commit | 2e3a2ac98872e302eb41842629fc9232304eb420 (patch) | |
| tree | b1ec5243af89033d7e2d2849212903c11987cc03 | |
| parent | Better patch by Adib for 431022. Appears safe, however, I am unable to test a... (diff) | |
| download | inkscape-2e3a2ac98872e302eb41842629fc9232304eb420.tar.gz inkscape-2e3a2ac98872e302eb41842629fc9232304eb420.zip | |
- Fix a bug where the ImageMagick libraries in the OS X App bundle were
not getting properly relocated.
(bzr r8636)
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 027715758..eb479d69b 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -325,9 +325,8 @@ cp -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/* $pkglib/gtk-2.0/$gtk_version/ mkdir -p $pkglib/gnome-vfs-2.0/modules cp $LIBPREFIX/lib/gnome-vfs-2.0/modules/*.so $pkglib/gnome-vfs-2.0/modules/ -imagemagick_version=`pkg-config --modversion ImageMagick` -cp -r "$LIBPREFIX/lib/ImageMagick-$imagemagick_version" "$pkglib/" -cp -r "$LIBPREFIX/share/ImageMagick-$imagemagick_version" "$pkgresources/share/" +cp -r "$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER" "$pkglib/" +cp -r "$LIBPREFIX/share/ImageMagick-$IMAGEMAGICKVER" "$pkgresources/share/" # Copy aspell dictionary files: cp -r "$LIBPREFIX/lib/aspell-0.60" "$pkglib/" @@ -340,7 +339,7 @@ nfiles=0 endl=true while $endl; do echo -e "\033[1mLooking for dependencies.\033[0m Round" $a - libs="`otool -L $pkglib/gtk-2.0/$gtk_version/{engines,immodules,loaders,printbackends}/*.{dylib,so} $pkglib/pango/$pango_version/modules/* $pkglib/gnome-vfs-2.0/modules/* $package/Contents/Resources/lib/* $pkglib/ImageMagick/modules-Q16/{filters,coders}/*.so $binary 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq`" + libs="`otool -L $pkglib/gtk-2.0/$gtk_version/{engines,immodules,loaders,printbackends}/*.{dylib,so} $pkglib/pango/$pango_version/modules/* $pkglib/gnome-vfs-2.0/modules/* $package/Contents/Resources/lib/* $pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/{filters,coders}/*.so $binary 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq`" cp -f $libs $package/Contents/Resources/lib let "a+=1" nnfiles=`ls $package/Contents/Resources/lib | wc -l` @@ -441,13 +440,13 @@ rewritelibpaths () { fixlib "$file" "`pwd`" done ) - (cd "$package/Contents/Resources/lib/ImageMagick/modules-Q16/filters" + (cd "$package/Contents/Resources/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters" for file in *.so; do echo "Rewriting dylib paths for $file..." fixlib "$file" "`pwd`" done ) - (cd "$package/Contents/Resources/lib/ImageMagick/modules-Q16/coders" + (cd "$package/Contents/Resources/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/coders" for file in *.so; do echo "Rewriting dylib paths for $file..." fixlib "$file" "`pwd`" |