[ISSUE] Error with do_patch when patch already applied

[ISSUE] Error with do_patch when patch already applied

[foopub]

[-- Attachment #1: Type: text/plain, Size: 2247 bytes --]

New issue by foopub on void-packages repository

https://github.com/void-linux/void-packages/issues/33915

Description:
<!-- Don't request update of package. We have a script for that. https://alpha.de.repo.voidlinux.org/void-updates/void-updates.txt . However, a quality pull request may help. -->
### System

* xuname:  

Void 5.14.16_1 x86_64 AuthenticAMD uptodate hold rrFFF

* package:  

firefox, probably others too

```
=> firefox-94.0_1: verifying checksum for distfile 'firefox-94.0.source.tar.xz'... OK.
=> firefox-94.0_1: running do-extract hook: 00-distfiles ...
=> firefox-94.0_1: extracting distfile(s), please wait...
=> firefox-94.0_1: running post_extract ...
=> firefox-94.0_1: running do-patch hook: 00-patches ...
=> firefox-94.0_1: patching: avoid-redefinition.patch.
=> firefox-94.0_1: patching: big-endian-image-decoders.patch.
=> firefox-94.0_1: patching: fix-arm-opus-include.patch.
=> firefox-94.0_1: patching: fix-desktop-icon-path.patch.
=> firefox-94.0_1: patching: fix-i386-fdlibm.patch.
=> firefox-94.0_1: patching: fix-i686-ppc-musl.patch.
1 out of 1 hunk FAILED -- saving rejects to file mozglue/misc/StackWalk.cpp.rej
=> ERROR: firefox-94.0_1: do-patch_00-patches: 'patch -s ${_args} -i ${_patch} 2> /dev/null' exited with 1
=> ERROR:   in _process_patch() at common/hooks/do-patch/00-patches.sh:34
=> ERROR:   in hook() at common/hooks/do-patch/00-patches.sh:51
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in run_step() at common/xbps-src/shutils/common.sh:71
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-dopatch.sh:33
```
I guess the patch was merged upstream. Underlying issue is that patch exits with 1 despite the -N option:
```
# patch -s -N -p1 -i srcpkgs/firefox/patches/avoid-redefinition.patch masterdir/builddir/firefox-94.0/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c

Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file masterdir/builddir/firefox-94.0/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c.rej

# echo $?

1
```

Re: Error with do_patch when patch already applied

[foopub]

[-- Attachment #1: Type: text/plain, Size: 1435 bytes --]

New comment by foopub on void-packages repository

https://github.com/void-linux/void-packages/issues/33915#issuecomment-962002531

Comment:
Forgot to mention above, the command was `./xbps-src pkg -o ~dbus,~wayland -j 24 firefox` on after a fresh pull and binary-bootstrap.

Even if the patches weren't previously applied, when repeating the failed build, this fails on the first patch (which previously worked) as it's not been applied:

```
=> firefox-94.0_1: running do-patch hook: 00-patches ...
=> firefox-94.0_1: patching: avoid-redefinition.patch.
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c.rej
=> ERROR: firefox-94.0_1: do-patch_00-patches: 'patch -s ${_args} -i ${_patch} 2> /dev/null' exited with 1
=> ERROR:   in _process_patch() at common/hooks/do-patch/00-patches.sh:34
=> ERROR:   in hook() at common/hooks/do-patch/00-patches.sh:51
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in run_step() at common/xbps-src/shutils/common.sh:71
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-dopatch.sh:33
```

One solution is to add `|& grep "Skipping patch"` or some other version of that to ignore errors cases where the patch has already been applied?

Re: Error with do_patch when patch already applied

[foopub]

[-- Attachment #1: Type: text/plain, Size: 580 bytes --]

New comment by foopub on void-packages repository

https://github.com/void-linux/void-packages/issues/33915#issuecomment-962009698

Comment:
Actually it doesn't seem like the patch has been merged upstream... I'm not good with Mercurial so I barely understand their repo structure, but unless I'm wrong this is the file in question of the `fix-i686-ppc-musl.patch`:

https://hg.mozilla.org/mozilla-central/file/f72751662b4af9b7fafa26fa9efa6a36b11b12a5/mozglue/misc/StackWalk.cpp

It's just that there's some more code added before... so the patch itself needs to be changed. 

Re: Error with do_patch when patch already applied

[foopub]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

New comment by foopub on void-packages repository

https://github.com/void-linux/void-packages/issues/33915#issuecomment-962026413

Comment:
Ok, I've found the root of the issue. This commit adds removes the option to ignore whitespace whereas the patch has 
a single space before the \ while the file to be patched has some tabs.

https://github.com/void-linux/void-packages/commit/7b4119df5cbc0cc37348164a10c88a32910009d8

If you're that keen on ignoring whitespace, you should probably check whether it breaks any patches and fix them accordingly before breaking things...

Re: [ISSUE] [CLOSED] Error with do_patch when patch already applied

[q66]

[-- Attachment #1: Type: text/plain, Size: 2250 bytes --]

Closed issue by foopub on void-packages repository

https://github.com/void-linux/void-packages/issues/33915

Description:
<!-- Don't request update of package. We have a script for that. https://alpha.de.repo.voidlinux.org/void-updates/void-updates.txt . However, a quality pull request may help. -->
### System

* xuname:  

Void 5.14.16_1 x86_64 AuthenticAMD uptodate hold rrFFF

* package:  

firefox, probably others too

```
=> firefox-94.0_1: verifying checksum for distfile 'firefox-94.0.source.tar.xz'... OK.
=> firefox-94.0_1: running do-extract hook: 00-distfiles ...
=> firefox-94.0_1: extracting distfile(s), please wait...
=> firefox-94.0_1: running post_extract ...
=> firefox-94.0_1: running do-patch hook: 00-patches ...
=> firefox-94.0_1: patching: avoid-redefinition.patch.
=> firefox-94.0_1: patching: big-endian-image-decoders.patch.
=> firefox-94.0_1: patching: fix-arm-opus-include.patch.
=> firefox-94.0_1: patching: fix-desktop-icon-path.patch.
=> firefox-94.0_1: patching: fix-i386-fdlibm.patch.
=> firefox-94.0_1: patching: fix-i686-ppc-musl.patch.
1 out of 1 hunk FAILED -- saving rejects to file mozglue/misc/StackWalk.cpp.rej
=> ERROR: firefox-94.0_1: do-patch_00-patches: 'patch -s ${_args} -i ${_patch} 2> /dev/null' exited with 1
=> ERROR:   in _process_patch() at common/hooks/do-patch/00-patches.sh:34
=> ERROR:   in hook() at common/hooks/do-patch/00-patches.sh:51
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in run_step() at common/xbps-src/shutils/common.sh:71
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-dopatch.sh:33
```
I guess the patch was merged upstream. Underlying issue is that patch exits with 1 despite the -N option:
```
# patch -s -N -p1 -i srcpkgs/firefox/patches/avoid-redefinition.patch masterdir/builddir/firefox-94.0/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c

Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file masterdir/builddir/firefox-94.0/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c.rej

# echo $?

1
```