search

cmacrae / emacs

Nightly custom Emacs builds for macOS Nix environments
MIT License
40 stars 17 forks source link

Patches no longer apply successfully with latest upstream commits #7

Closed montchr closed 2 years ago

montchr commented 2 years ago

The macOS-specific patches no longer apply cleanly on recent Emacs upstream commits, causing builds to fail.

Originally noted in https://github.com/cmacrae/emacs/pull/6#issuecomment-1002633614.

We may be able to reference @d12frosted's latest patch updates in emacs-plus. The v29 patches are symlinked to the patches in the v28 directory:

Also see https://github.com/sagittaros/emacs-osx/issues/5 – looks like they're running into a similar or identical issue with patches.

Here's the relevant section from the latest workflow run:

https://github.com/cmacrae/emacs/runs/4725513857?check_suite_focus=true

emacs> unpacking sources
emacs> unpacking source archive /nix/store/7jnpakz058kq0dwi0wllxxlif5py1hsc-source
emacs> source root is source
emacs> patching sources
emacs> applying patch /nix/store/j9fa4phwrah4rwg3va7whlxljf8qbxba-fix-window-role.patch
emacs> patching file src/nsterm.m
emacs> Hunk #1 succeeded at 8634 (offset -244 lines).
emacs> applying patch /nix/store/nlgq5vra3c0r1snj0wbmd49r78pagi5j-no-titlebar.patch
emacs> patching file src/nsterm.m
emacs> Hunk #1 FAILED at 433.
emacs> Hunk #2 succeeded at 8353 (offset 48 lines).
emacs> 1 out of 2 hunks FAILED -- saving rejects to file src/nsterm.m.rej
error: builder for '/nix/store/880sh2mrn0gsdwx1kmbq54d3iddcf39n-emacs-29.0.50.drv' failed with exit code 1;
       last 10 log lines:
       > source root is source
       > patching sources
       > applying patch /nix/store/j9fa4phwrah4rwg3va7whlxljf8qbxba-fix-window-role.patch
       > patching file src/nsterm.m
       > Hunk #1 succeeded at 8634 (offset -244 lines).
       > applying patch /nix/store/nlgq5vra3c0r1snj0wbmd49r78pagi5j-no-titlebar.patch
       > patching file src/nsterm.m
       > Hunk #1 FAILED at 433.
       > Hunk #2 succeeded at 8353 (offset 48 lines).
       > 1 out of 2 hunks FAILED -- saving rejects to file src/nsterm.m.rej
       For full logs, run 'nix log /nix/store/880sh2mrn0gsdwx1kmbq54d3iddcf39n-emacs-29.0.50.drv'.
Error: Process completed with exit code 1.