From fdd207693b42d7930ba9264404a79c2d0632e7d8 Mon Sep 17 00:00:00 2001 From: Benitoite Date: Mon, 25 Sep 2017 23:29:02 -0700 Subject: [PATCH 1/2] Update macosx_bundle.sh --- tools/osx/macosx_bundle.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh index 40cfe195f..b216b3130 100644 --- a/tools/osx/macosx_bundle.sh +++ b/tools/osx/macosx_bundle.sh @@ -154,6 +154,10 @@ ditto {"${GTK_PREFIX}","${RESOURCES}"}/share/icons/Adwaita/index.theme # cp -RL "${GTK_PREFIX}/etc/fonts" "${ETC}" # fi +# Copy Lensfun Database Into App Bundle +mkdir ~/repo-rt/build/RawTherapee.app/Contents/Resources/share/lensfun +cp /opt/local/share/lensfun/version_1/* ~/repo-rt/build/RawTherapee.app/Contents/Resources/share/lensfun/. + # Install names find -E "${CONTENTS}" -type f -regex '.*/(rawtherapee-cli|rawtherapee|.*\.(dylib|so))' | while read -r x; do msg "Modifying install names: ${x}" From d1da927a2ca15c3eaa3af27e6529103a92bb0c2e Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 26 Sep 2017 14:09:17 +0200 Subject: [PATCH 2/2] Changed hard-coded path to RESOURCES variable in macosx_bundle.sh, #4107 --- tools/osx/macosx_bundle.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh index b216b3130..250bc23e2 100644 --- a/tools/osx/macosx_bundle.sh +++ b/tools/osx/macosx_bundle.sh @@ -154,9 +154,9 @@ ditto {"${GTK_PREFIX}","${RESOURCES}"}/share/icons/Adwaita/index.theme # cp -RL "${GTK_PREFIX}/etc/fonts" "${ETC}" # fi -# Copy Lensfun Database Into App Bundle -mkdir ~/repo-rt/build/RawTherapee.app/Contents/Resources/share/lensfun -cp /opt/local/share/lensfun/version_1/* ~/repo-rt/build/RawTherapee.app/Contents/Resources/share/lensfun/. +# Copy the Lensfun database into the app bundle +mkdir -p "${RESOURCES}/share/lensfun" +cp /opt/local/share/lensfun/version_1/* "${RESOURCES}/share/lensfun" # Install names find -E "${CONTENTS}" -type f -regex '.*/(rawtherapee-cli|rawtherapee|.*\.(dylib|so))' | while read -r x; do