fix #3

qgis · Aug 20, 2020 · bdde294 · bdde294
1 parent 3cdabd5
commit bdde294
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/qgis_bundle/recipes/qgis/recipe.sh b/qgis_bundle/recipes/qgis/recipe.sh
@@ -46,9 +46,7 @@ function fix_binaries_qgis() {
  install_name_add_rpath @executable_path/../Frameworks $BUNDLE_CONTENTS_DIR/MacOS/QGIS
  install_name_add_rpath @executable_path/lib $BUNDLE_CONTENTS_DIR/MacOS/QGIS
  install_name_add_rpath @executable_path/../Resources/grass${VERSION_grass_major}${VERSION_grass_minor}/lib $BUNDLE_CONTENTS_DIR/MacOS/QGIS
-
- # TODO: https://github.com/qgis/QGIS-Mac-Packager/issues/3
- # install_name_add_rpath @loader_path/../../MacOS/lib $BUNDLE_CONTENTS_DIR/PlugIns/designer/libqgis_customwidgets.$QGIS_VERSION.0.dylib
+ install_name_add_rpath @loader_path/../../MacOS/lib $BUNDLE_CONTENTS_DIR/PlugIns/designer/libqgis_customwidgets.$QGIS_VERSION.0.dylib
 
  install_name_id @rpath/libqgispython.$QGIS_VERSION.0.dylib $BUNDLE_CONTENTS_DIR/MacOS/lib/libqgispython.$QGIS_VERSION.0.dylib
  install_name_id @rpath/libqgis_app.$QGIS_VERSION.0.dylib $BUNDLE_CONTENTS_DIR/MacOS/lib/libqgis_app.$QGIS_VERSION.0.dylib

diff --git a/qgis_bundle/recipes/qt/designer b/qgis_bundle/recipes/qt/designer
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+BINDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# workaround for https://github.com/qgis/QGIS-Mac-Packager/issues/3
+export DYLD_INSERT_LIBRARIES=$BINDIR/../lib/libsqlite3.dylib
+
+$BINDIR/../Designer.app/Contents/MacOS/Designer
diff --git a/qgis_bundle/recipes/qt/recipe.sh b/qgis_bundle/recipes/qt/recipe.sh
@@ -67,6 +67,7 @@ function bundle_qt() {
 
   #### Designer
   try rsync -av $QT_ROOT_DIR/bin/Designer.app $BUNDLE_MACOS_DIR/
+  try cp -av $RECIPES_PATH/qt/designer $BUNDLE_BIN_DIR/
 }
 
 function fix_binaries_qt() {