Skip to content

wrap: Don't use patch.exe from Strawberry Perl #14795

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

Merged
merged 1 commit into from
Jul 18, 2025

Conversation

nirbheek
Copy link
Member

It barfs on patches from git-format-patch:

Applying diff file "orc-0.4.38\0001-meson-fix-symbols-leaking-from-static-library-on-Win.patch"
patching file meson.build
Assertation failed!
Program: C:\Strawberry\c\bin\patch.EXE
File: .\src\patch\2.5.9\patch-2.5.9-src\patch.c, Line 354
Expression: hunk

@nirbheek nirbheek added this to the 1.8.3 milestone Jul 13, 2025
@nirbheek nirbheek requested a review from jpakkane as a code owner July 13, 2025 14:04
@nirbheek nirbheek added OS:windows Winodows OS specific issues subprojects/wraps labels Jul 13, 2025
@nirbheek nirbheek force-pushed the strawberry-patch branch 3 times, most recently from 089a062 to 3d6c471 Compare July 17, 2025 04:29
@nirbheek nirbheek requested a review from eli-schwartz July 18, 2025 16:16
@eli-schwartz
Copy link
Member

So just to make sure I understand correctly, the issue with Strawberry Perl is that it uses GNU Patch but has a really out of date version that is known to be buggy?

@bonzini
Copy link
Collaborator

bonzini commented Jul 18, 2025

Not even buggy, just inadequate

@nirbheek
Copy link
Member Author

Yep, thanks for prodding me to look at the core issue. I verified that MSYS 1.0 has GNU patch 2.6.1 which works fine, and I think that's as old as we will encounter in the wild on Windows.

It is too old and barfs on patches from git-format-patch:

```
Applying diff file "orc-0.4.38\0001-meson-fix-symbols-leaking-from-static-library-on-Win.patch"
patching file meson.build
Assertation failed!
Program: C:\Strawberry\c\bin\patch.EXE
File: .\src\patch\2.5.9\patch-2.5.9-src\patch.c, Line 354
Expression: hunk
```

2.6.1 is the oldest known version that works correctly.
@nirbheek nirbheek merged commit ab261f9 into mesonbuild:master Jul 18, 2025
32 checks passed
@nirbheek nirbheek deleted the strawberry-patch branch July 18, 2025 22:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OS:windows Winodows OS specific issues subprojects/wraps
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants