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.

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

Patch failed with recent commits. #146

Open
smallzhan opened this issue Jul 14, 2019 · 5 comments

Comments

@smallzhan
Copy link

commented Jul 14, 2019

brew install emacs-plus --HEAD --with-xwidgets --with-jansson --without-spacemacs-icon
with the commit id bcc3d36d8a.

The patch xwidgets_webkit_in_cocoa.patch failed on file src/xwidget.c

patching file src/xwidget.c
Hunk # 1 FAILED at 18.
Hunk # 2 succeeded at 67 (offset 1 line).
Hunk # 3 succeeded at 81 (offset 1 line).
Hunk # 4 succeeded at 99 (offset 1 line).
Hunk # 5 succeeded at 117 (offset 1 line).
Hunk # 6 succeeded at 176 (offset 1 line).
Hunk # 7 succeeded at 214 (offset 1 line).
Hunk # 8 succeeded at 253 (offset 1 line).
Hunk # 9 succeeded at 269 (offset 1 line).
Hunk # 10 succeeded at 305 (offset 1 line).
Hunk # 11 succeeded at 563 (offset 1 line).
Hunk # 12 succeeded at 573 (offset 1 line).
Hunk # 13 succeeded at 587 (offset 1 line).
Hunk # 14 succeeded at 645 (offset 1 line).
Hunk # 15 succeeded at 661 (offset 1 line).
Hunk # 16 succeeded at 736 (offset 1 line).
Hunk # 17 succeeded at 754 (offset 1 line).
Hunk # 18 FAILED at 777.
Hunk # 19 succeeded at 846 (offset 2 lines).
Hunk # 20 succeeded at 885 (offset 2 lines).
Hunk # 21 succeeded at 929 (offset 2 lines).
Hunk # 22 succeeded at 940 (offset 2 lines).
Hunk # 23 succeeded at 951 (offset 2 lines).
Hunk # 24 succeeded at 972 (offset 2 lines).
Hunk # 25 succeeded at 981 (offset 2 lines).
Hunk # 26 succeeded at 991 (offset 2 lines).
Hunk # 27 succeeded at 1017 (offset 2 lines).
Hunk # 28 succeeded at 1100 (offset 2 lines).
Hunk # 29 succeeded at 1218 (offset 2 lines).
Hunk # 30 succeeded at 1392 (offset 2 lines).
Hunk # 31 succeeded at 1421 (offset 2 lines).
Hunk # 32 succeeded at 1454 (offset 2 lines).
Hunk # 33 succeeded at 1468 (offset 2 lines).
2 out of 33 hunks FAILED -- saving rejects to file src/xwidget.c.rej
patching file src/xwidget.h
Error: Failure while executing; patch -g 0 -f -p1 -i /private/tmp/emacs-plus--patch-20190714-69601-1s5ipq/xwidgets_webkit_in_cocoa.patch exited with 1.

@fuxialexander

This comment has been minimized.

Copy link

commented Jul 26, 2019

You can try this new patch: https://gist.github.com/fuxialexander/9c69f0d6306e0f8247255999e2db7754

sha: ca85e3b44b5ce88350318f9f16aaee4a91c4d8fb97fc111d5c7f4e9e6bbfe466

simply use brew edit emacs-plus to edit the formula and replace the corresponding URL and sha

@d12frosted

This comment has been minimized.

@kirill-gerasimenko-zocdoc

This comment has been minimized.

Copy link

commented Jul 26, 2019

Patch applies fine, but build is failing for me

make[1]: *** No rule to make target `nsxwidget.m', needed by `gl-stamp'.  Stop.
make: *** [src] Error 2
make: *** Waiting for unfinished jobs....
@fuxialexander

This comment has been minimized.

Copy link

commented Jul 27, 2019

@kirill-gerasimenko-zocdoc Sorry, the patch missed two newly created file. Please have a try again.

@pcr910303

This comment has been minimized.

Copy link
Contributor

commented Jul 27, 2019

@d12frosted Actually, I have my patches pending in the emacs-dev mailing list: Please see https://lists.gnu.org/archive/html/emacs-devel/2019-07/msg00640.html
Hopefully the patch gets merged and we wont need any patches.
Until them, using them (instead of the giant patch I have added before) might be better. I made some fixes to the patch that isn’t in the current patches.

Sent with GitHawk

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.