Merge pull request #628 from gnattu/fix-intel

Fix intel builds
jellyfin · May 15, 2024 · f26a761 · f26a761
2 parents 2b00125 + 07dfeab
commit f26a761
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -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

diff --git a/scripts/fix-webengine.py b/scripts/fix-webengine.py
@@ -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()