Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix intel builds #628

Merged
merged 2 commits into from
May 15, 2024
+3 −3
Merged

Fix intel builds #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2a5a3a
fix intel webengine
gnattu May 15, 2024
07dfeab
fix overscroll on 10.9 ui
gnattu May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/fix-webengine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down