Github messages for voidlinux
 help / color / mirror / Atom feed
From: q66 <q66@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [ISSUE] [CLOSED] Error with do_patch when patch already applied
Date: Fri, 05 Nov 2021 18:49:03 +0100	[thread overview]
Message-ID: <20211105174903.e1tyhYuOWUINzISsL9QHx3TsENtk7_QOzIMHa8QFWKY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33915@inbox.vuxu.org>

[-- 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
```



      parent reply	other threads:[~2021-11-05 17:49 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-05 15:31 [ISSUE] " foopub
2021-11-05 15:43 ` foopub
2021-11-05 15:52 ` foopub
2021-11-05 16:13 ` foopub
2021-11-05 17:49 ` q66 [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211105174903.e1tyhYuOWUINzISsL9QHx3TsENtk7_QOzIMHa8QFWKY@z \
    --to=q66@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).