From: Soeren Apel <redacted>
Date: Thu, 7 Mar 2024 17:03:40 +0000 (+0100)
Subject: build.yml: Make MacOS build work
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=54b14859c2b20301c3e4b8eb05e0855566726c0c;p=sigrok-build.git

build.yml: Make MacOS build work
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7fa2937..88e866e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -397,6 +397,10 @@ jobs:
           libzip libusb libftdi hidapi nettle check doxygen swig \
           glib glibmm@2.66 cmake boost sdcc $BREW_PYTHON_VERSION $BREW_QT_VERSION
 
+      - name: Provide qt also in prefix directory as qt is using a keg
+        run: |
+          brew link -f $BREW_QT_VERSION
+
       - name: Checkout sigrok-build
         uses: actions/checkout@v4
         with:
diff --git a/ci/macos/sigrok-macos-create-dmg.sh b/ci/macos/sigrok-macos-create-dmg.sh
index d52d74b..4322e8e 100755
--- a/ci/macos/sigrok-macos-create-dmg.sh
+++ b/ci/macos/sigrok-macos-create-dmg.sh
@@ -25,9 +25,24 @@
 set -e
 set -x
 
+
+echo "------------------------------------------"
+echo $(brew --prefix "$BREW_QT_VERSION")
+find /usr/local/opt/qt
+echo "------------------------------------------"
+echo $(brew --cellar "$BREW_QT_VERSION")
+echo "------------------------------------------"
+# Note: Turn "qt 6.6.1" into "qt/6.6.1"
+QT_VER=$(brew list --versions qt)
+QT_VER_PATH=$(echo $QT_VER | sed 's# #/#')
+p=$(brew --cellar)/$QT_VER_PATH/share/qt/translations
+find $p -iname "qt*.qm"
+echo "------------------------------------------"
+echo "------------------------------------------"
+
 # Path to Qt5 binaries
 QT_BIN_DIR=$(brew list "$BREW_QT_VERSION" | grep bin | head -n 1 | xargs dirname)
-QT_TRANSLATIONS_DIR=$(brew --prefix "$BREW_QT_VERSION")/translations
+QT_TRANSLATIONS_DIR=$p
 
 # Path to Python 3 framework
 PYTHON_FRAMEWORK_DIR=$(brew list "$BREW_PYTHON_VERSION" | grep Python.framework/Python | head -n 1 | xargs dirname)