From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Wielkiewicz Subject: Re: Packaging Jami progress Date: Thu, 7 Nov 2019 20:47:57 +0100 Message-ID: <20191107204757.23dd08de@interia.pl> References: <20191104214754.793ec2ff@interia.pl> <20191105175001.389c6117@interia.pl> <87pni5qouc.fsf@ambrevar.xyz> <20191106172445.3bdd057d@interia.pl> <87r22lorwh.fsf@ambrevar.xyz> <877e4bo646.fsf@ambrevar.xyz> 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]:36668) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSnlL-0004MX-Cc for guix-devel@gnu.org; Thu, 07 Nov 2019 14:48:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iSnlK-0004yh-7j for guix-devel@gnu.org; Thu, 07 Nov 2019 14:48:11 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.152]:34869) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iSnlJ-0004q5-LJ for guix-devel@gnu.org; Thu, 07 Nov 2019 14:48:10 -0500 In-Reply-To: <877e4bo646.fsf@ambrevar.xyz> 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: Pierre Neidhardt Cc: Guix-devel Dnia 2019-11-07, o godz. 20:10:01 Pierre Neidhardt napisa=C5=82(a): > Jan, can you resend the your patch set, I think you forgot a commit. > The first patch does not apply, in particular this hunk: >=20 > --8<---------------cut here---------------start------------->8--- > ;; Things we don't need: > ;; BaseClasses - contains libraries from Windows > SDK ;; we don't need it, at least not now. > - (list "BaseClasses" "bin" "g7221" "ilbc" "milenage" > + (list "BaseClasses" "g7221" "ilbc" "milenage" > "speex" "threademulation" "yuv" "bdsound" > - "gsm" "lib" "mp3" "resample" "srtp" "webrtc" > + "gsm" "mp3" "resample" "srtp" "webrtc" > ;; Keep only resample, build and README.txt. > "build/baseclasses" "build/g7221" "build/gsm" > "build/ilbc" "build/milenage" > "build/resample" --8<---------------cut > here---------------end--------------->8--- >=20 > Cheers! >=20 I sent everything I had, so don't know what's wrong. Can we skip this now and I'll make a new commit (don't know how intelligent git is)? There's a chance I modified and something, then ran "git checkout previous_commit_number", and then commited, but I'm not sure, since this is the first time I use git for something other than "git clone". I also ran a strange command - "git cherrypick", when I was trying to figure out how to patch my commits. Jan Wielkiewicz