diff --git a/admin/mac/add-Qt-to-bundle.sh b/admin/mac/add-Qt-to-bundle.sh index e5c8f319f..8720e3f8d 100755 --- a/admin/mac/add-Qt-to-bundle.sh +++ b/admin/mac/add-Qt-to-bundle.sh @@ -54,8 +54,8 @@ cp -R $QT_PLUGINS_DIR/imageformats/libqgif.dylib Contents/MacOS/imageformats/ cp -R $QT_PLUGINS_DIR/imageformats/libqjpeg.dylib Contents/MacOS/imageformats/ cp -R $QT_PLUGINS_DIR/imageformats/libqico.dylib Contents/MacOS/imageformats/ cp -R $QT_PLUGINS_DIR/imageformats/libqmng.dylib Contents/MacOS/imageformats/ -cp -R $QT_PLUGINS_DIR/imageformats/libqsvg.dylib Contents/MacOS/imageformats/ -cp -R $QT_PLUGINS_DIR/imageformats/libqtiff.dylib Contents/MacOS/imageformats/ +#cp -R $QT_PLUGINS_DIR/imageformats/libqsvg.dylib Contents/MacOS/imageformats/ +#cp -R $QT_PLUGINS_DIR/imageformats/libqtiff.dylib Contents/MacOS/imageformats/ cp -R $QT_PLUGINS_DIR/crypto/libqca-ossl.dylib Contents/MacOS/crypto/ cp -R $QT_PLUGINS_DIR/phonon_backend/phonon_vlc.so Contents/MacOS/phonon_backend/ diff --git a/admin/mac/deposx.sh b/admin/mac/deposx.sh index 8da4cd3e0..131cfea37 100755 --- a/admin/mac/deposx.sh +++ b/admin/mac/deposx.sh @@ -50,7 +50,11 @@ function deposx_change install_name_tool -change /usr/local/Cellar/qt/$QTVERSION/lib/$y.framework/Versions/4/$y \ @executable_path/../Frameworks/$y.framework/Versions/4/$y \ - "$1" + "$1" + + install_name_tool -change /usr/X11/lib/libpng12.0.dylib \ + @executable_path/libpng12.0.dylib \ + "$1" done for y in $LIBS @@ -126,6 +130,7 @@ import_lib /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.dylib import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlccore.4.dylib import_lib /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib +import_lib /usr/X11/lib/libpng12.0.dylib import_lib $ORIGROOT/libjreen.dylib import_lib $ORIGROOT/libtomahawklib.dylib