From 693e391410dbc59fb747c4ad1d9f964bd130d3bd Mon Sep 17 00:00:00 2001
From: toofar <toofar@spalge.com>
Date: Thu, 27 Jul 2023 19:01:34 +1200
Subject: Remove local patching/symlinking of macOS build.

In the past various workarounds have been put in place to move/copy/symlink
files in the macOS app build to make PyQt work and let us sign it.

As of https://github.com/pyinstaller/pyinstaller/pull/7619 our downstream
patching should not be required.

The application seems to run fine.
The app size is 155 MB.
Signing is still to be verified.
---
 scripts/dev/build_release.py | 48 --------------------------------------------
 1 file changed, 48 deletions(-)

diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index 1ddef5cc0..5c07a488a 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -245,52 +245,6 @@ def verify_windows_exe(exe_path: pathlib.Path) -> None:
     assert pe.verify_checksum()
 
 
-def patch_mac_app(qt5: bool) -> None:
-    """Patch .app to save some space and make it signable."""
-    dist_path = pathlib.Path('dist')
-    ver = '5' if qt5 else '6'
-    app_path = dist_path / 'qutebrowser.app'
-
-    contents_path = app_path / 'Contents'
-    macos_path = contents_path / 'MacOS'
-    resources_path = contents_path / 'Resources'
-    pyqt_path = macos_path / f'PyQt{ver}'
-
-    # Replace some duplicate files by symlinks
-    framework_path = pyqt_path / f'Qt{ver}' / 'lib' / 'QtWebEngineCore.framework'
-
-    framework_resource_path = framework_path / 'Resources'
-    for file_path in framework_resource_path.iterdir():
-        target = pathlib.Path(*[os.pardir] * 5, file_path.name)
-        if file_path.is_dir():
-            shutil.rmtree(file_path)
-        else:
-            file_path.unlink()
-        file_path.symlink_to(target)
-
-    if not qt5:
-        # Symlinking QtWebEngineCore.framework does not seem to work with Qt 6.
-        # Also, the symlinking/moving before signing doesn't seem to be required.
-        return
-
-    core_lib = framework_path / 'Versions' / '5' / 'QtWebEngineCore'
-    core_lib.unlink()
-    core_target = pathlib.Path(*[os.pardir] * 7, 'MacOS', 'QtWebEngineCore')
-    core_lib.symlink_to(core_target)
-
-    # Move stuff around to make things signable on macOS
-    # See https://github.com/pyinstaller/pyinstaller/issues/6612
-    pyqt_path_dest = resources_path / pyqt_path.name
-    shutil.move(pyqt_path, pyqt_path_dest)
-    pyqt_path_target = pathlib.Path("..") / pyqt_path_dest.relative_to(contents_path)
-    pyqt_path.symlink_to(pyqt_path_target)
-
-    for path in macos_path.glob("Qt*"):
-        link_path = resources_path / path.name
-        target_path = pathlib.Path("..") / path.relative_to(contents_path)
-        link_path.symlink_to(target_path)
-
-
 def sign_mac_app() -> None:
     """Re-sign and verify the Mac .app."""
     app_path = pathlib.Path('dist') / 'qutebrowser.app'
@@ -341,8 +295,6 @@ def build_mac(
 
     utils.print_title("Building .app via pyinstaller")
     call_tox(f'pyinstaller-64bit{"-qt5" if qt5 else ""}', '-r', debug=debug)
-    utils.print_title("Patching .app")
-    patch_mac_app(qt5=qt5)
     utils.print_title("Re-signing .app")
     sign_mac_app()
 
-- 
cgit v1.2.3-54-g00ecf