all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Pierre Neidhardt <mail@ambrevar.xyz>
To: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>,
	guix-devel@gnu.org
Subject: Re: Trying to update Jami, patching pjproject fails
Date: Thu, 08 Oct 2020 09:26:03 +0200	[thread overview]
Message-ID: <87tuv5b2lw.fsf@ambrevar.xyz> (raw)
In-Reply-To: <20201007224048.3f51243f@interia.pl>

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

Hi Jan!

Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> writes:

> patching file pjnath/src/pjnath/ice_strans.c
> Hunk #1 succeeded at 460 (offset 42 lines).
> Hunk #2 succeeded at 529 with fuzz 2 (offset 49 lines).
> Hunk #3 succeeded at 589 with fuzz 1 (offset 49 lines).
> Hunk #4 FAILED at 680.
> 1 out of 4 hunks FAILED -- saving rejects to file
> pjnath/src/pjnath/ice_strans.c.rej command "patch" "--force" "-p1" "-i"
> "sfl-patches/0013-Assign-unique-local-preferences-for-candidates-with-.patch"
> failed with status 1 builder for

If you build with the -K flag you should find the .rej files in the
corresponding /tmp folder.  This and the patch at line 680 should tell
you more what's not compatible.

I suggest you ask upstream about this incompatibility, they must know
what's going on :)

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

      reply	other threads:[~2020-10-08  7:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-07 20:40 Trying to update Jami, patching pjproject fails Jan Wielkiewicz
2020-10-08  7:26 ` Pierre Neidhardt [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=87tuv5b2lw.fsf@ambrevar.xyz \
    --to=mail@ambrevar.xyz \
    --cc=guix-devel@gnu.org \
    --cc=tona_kosmicznego_smiecia@interia.pl \
    /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.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.