From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Subject: Re: Packaging Jami progress Date: Mon, 23 Dec 2019 20:43:17 +0100 Message-ID: <20191223204317.3069e8ba@kompiuter> References: <20191215211230.66fea79e@interia.pl> <875zihclep.fsf@elephly.net> <20191222002815.4db8e9ca@interia.pl> <87d0cgpzqo.fsf@elephly.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:36495) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijTc1-0001DJ-Rd for guix-devel@gnu.org; Mon, 23 Dec 2019 14:43:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ijTc0-00052J-MA for guix-devel@gnu.org; Mon, 23 Dec 2019 14:43:29 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.156]:36945) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ijTc0-0004x8-2W for guix-devel@gnu.org; Mon, 23 Dec 2019 14:43:28 -0500 In-Reply-To: <87d0cgpzqo.fsf@elephly.net> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ricardo Wurmus Cc: guix-devel@gnu.org On Sun, 22 Dec 2019 08:48:31 +0100 Ricardo Wurmus wrote: > The problem here is that =E2=80=9Csubstitute*=E2=80=9D expects regular ex= pressions and > =E2=80=9C$=E2=80=9D, =E2=80=9C(=E2=80=9D, =E2=80=9C)=E2=80=9D, and =E2=80= =9C.=E2=80=9D all have special meaning in a regular > expression context, so they need to be escaped. Escaping is done > with a backslash, but using a backslash in a string in Guile requires > another layer of escaping, so we end up with this expression: >=20 > (add-before 'check 'skip-test > (lambda _ > (substitute* "tests/Makefile" > (("include > \\$\\(SRC_PATH\\)/tests/fate/lavf-container.mak") "")) #t)) >=20 > (I did not escap the dot here because it can only match a single > character, a literal dot in this case.) >=20 > -- > Ricardo >=20 Thanks, this solved the issue! ffmpeg-jami now builds correctly, but there's one more issue. In the "origin" field I use the exact commit number needed in for applying the patches correctly. Downloading the source code takes about a minute and then it throws an error saying that the given commit number is unadvertised by the server and then it switches to the commit. How can I prevent the source code from being downloaded for so long? Besides this, I think the work is finished for now and I would like to send the patches myself this time, but it seems I used "git pull" somewhere between my changes. How do I make a patch containing only my changes? What about the copyright lines? Should I add them? I also moved Jami and its modified dependencies to a new file - jami.scm. I know for sure that's Pierre's and my work, but I don't know if someone else have modified the code. Jan Wielkiewicz