liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: fixes a few packaging warnings

Browse Source 
and tries not forcing a non-system z or expat into Frameworks.
This commit is contained in:
Benitoite 2023-02-27 21:14:10 -08:00 committed by GitHub
parent 74d6762f79
commit 3fe30277bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/osx/macosx_bundle.sh
View File

@ -201,7 +201,7 @@ else
fi fi
# Copy libomp to Frameworks # Copy libomp to Frameworks
ditto ${LOCAL_PREFIX}/lib/libomp.dylib "${CONTENTS}/Frameworks" cp ${LOCAL_PREFIX}/lib/libomp.dylib "${CONTENTS}/Frameworks"
msg "Copying dependencies from ${GTK_PREFIX}." msg "Copying dependencies from ${GTK_PREFIX}."
CheckLink "${EXECUTABLE}" 2>&1 CheckLink "${EXECUTABLE}" 2>&1
@ -209,24 +209,20 @@ CheckLink "${EXECUTABLE}" 2>&1
# dylib install names # dylib install names
ModifyInstallNames 2>&1 ModifyInstallNames 2>&1
# Copy libjpeg-turbo ("62") into the app bundle ## Copy libexpat into the app bundle (which is keg-only)
ditto ${LOCAL_PREFIX}/lib/libjpeg.62.dylib "${CONTENTS}/Frameworks/libjpeg.62.dylib" ## if [[ -d /usr/local/Cellar/expat ]]; then ditto /usr/local/Cellar/expat/*/lib/libexpat.1.dylib "${CONTENTS}/Frameworks"; else cp "${EXPATLIB}" "${CONTENTS}/Frameworks/libexpat.1.dylib"; fi
# Copy libexpat into the app bundle (which is keg-only) ## Copy libz into the app bundle
if [[ -d /usr/local/Cellar/expat ]]; then ditto /usr/local/Cellar/expat/*/lib/libexpat.1.dylib "${CONTENTS}/Frameworks"; else ditto "${EXPATLIB}" "${CONTENTS}/Frameworks/libexpat.1.dylib"; fi ## cp ${LOCAL_PREFIX}/lib/libz.1.dylib "${CONTENTS}/Frameworks"
# Copy libz into the app bundle # Copy libpng16 to the app bundle
ditto ${LOCAL_PREFIX}/lib/libz.1.dylib "${CONTENTS}/Frameworks" cp ${LOCAL_PREFIX}/lib/libpng16.16.dylib "${CONTENTS}/Frameworks/libpng16.16.dylib"
# Copy libpng12 & 16 to the app bundle
ditto ${LOCAL_PREFIX}/lib/libpng16.16.dylib "${CONTENTS}/Frameworks/libpng16.16.dylib"
ditto ${LOCAL_PREFIX}/lib/libpng12.0.dylib "${CONTENTS}/Frameworks/libpng12.0.dylib"
# Copy libtiff 5 into the app bundle # Copy libtiff 5 into the app bundle
ditto ${LOCAL_PREFIX}/lib/libtiff.5.dylib "${CONTENTS}/Frameworks/libtiff.5.dylib" cp ${LOCAL_PREFIX}/lib/libtiff.5.dylib "${CONTENTS}/Frameworks/libtiff.5.dylib"
# Copy libomp to Frameworks # Copy libomp to Frameworks
ditto ${LOCAL_PREFIX}/lib/libomp.dylib "${CONTENTS}/Frameworks" cp ${LOCAL_PREFIX}/lib/libomp.dylib "${CONTENTS}/Frameworks"
# Prepare GTK+3 installation # Prepare GTK+3 installation
msg "Copying configuration files from ${GTK_PREFIX}:" msg "Copying configuration files from ${GTK_PREFIX}:"
@ -240,7 +236,7 @@ find -E "${LIB}" -type f -regex '.*\.(a|la|cache)$' | while read -r; do rm "${RE
# Make Frameworks folder flat # Make Frameworks folder flat
msg "Flattening the Frameworks folder" msg "Flattening the Frameworks folder"
cp -RL "${LIB}"/gdk-pixbuf-2.0/2*/loaders/* "${LIB}" cp -RL "${LIB}"/gdk-pixbuf-2.0/2*/loaders/* "${LIB}"
cp "${LIB}"/gtk-3.0/3*/immodules/*.{dylib,so} "${LIB}" cp "${LIB}"/gtk-3.0/3*/immodules/*.{dylib,so} "${LIB}" >/dev/null 2>&1
rm -r "${LIB}"/gtk-3.0 rm -r "${LIB}"/gtk-3.0
rm -r "${LIB}"/gdk-pixbuf-2.0 rm -r "${LIB}"/gdk-pixbuf-2.0