Merge pull request #628 from gnattu/fix-intel

Fix intel builds
This commit is contained in:
Izzie Walton 2024-05-15 18:35:11 -04:00 committed by GitHub
commit f26a761335
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions

View File

@ -18,7 +18,7 @@ jobs:
- name: Release build
run: |
./download_webclient.sh
sed -i '' 's/<body>/<body style="overscroll-behavior: none;">/' ./build/dist/index.html
sed -i '' 's|await loadScript('\''qrc:///qtwebchannel/qwebchannel.js'\'');|document.body.style.overscrollBehavior = "none";&|g' native/nativeshell.js
cd build
cmake -GNinja -DQTROOT=/usr/local/opt/qt@5 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=output ..
ninja install
@ -46,7 +46,7 @@ jobs:
- name: Release build
run: |
./download_webclient.sh
sed -i '' 's/<body>/<body style="overscroll-behavior: none;">/' ./build/dist/index.html
sed -i '' 's|await loadScript('\''qrc:///qtwebchannel/qwebchannel.js'\'');|document.body.style.overscrollBehavior = "none";&|g' native/nativeshell.js
cd build
cmake -GNinja -DQTROOT=/opt/homebrew/opt/qt@5 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=output ..
ninja install

View File

@ -22,7 +22,7 @@ def main(argv=tuple(sys.argv[1:])):
result = subprocess.check_output(['otool', '-L', str(bin_to_fix.resolve())],stderr=subprocess.STDOUT).decode('utf-8')
for dependency in result.splitlines():
dependency = dependency.strip().lstrip()
if dependency.startswith('/opt/homebrew'):
if dependency.startswith('/opt/homebrew') or dependency.startswith('/usr/local'):
# cut off trailing compatibility string
dependency_str = dependency.split(' (compatibility')[0].strip()
dependency_framework_str = dependency_str.split('/lib')[1].strip()