From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:56867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbNr-00084l-6r for guix-patches@gnu.org; Fri, 03 May 2019 12:50:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbNq-0001dT-9T for guix-patches@gnu.org; Fri, 03 May 2019 12:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36020) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbNq-0001dI-5j for guix-patches@gnu.org; Fri, 03 May 2019 12:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbNp-0007Ux-UA for guix-patches@gnu.org; Fri, 03 May 2019 12:50:01 -0400 Subject: [bug#35446] [PATCH 03/26] gnu: calibre: Update to 3.41.3. Resent-Message-ID: References: <20190427093659.21851-1-mail@brendan.scot> <20190427093659.21851-3-mail@brendan.scot> <20190503115725.GA3192@jurong> From: Brendan Tildesley Message-ID: <5e4327e8-860e-35cf-1f5a-22f694952227@brendan.scot> Date: Sat, 4 May 2019 02:49:13 +1000 MIME-Version: 1.0 In-Reply-To: <20190503115725.GA3192@jurong> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-AU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35446@debbugs.gnu.org On 5/3/19 9:57 PM, Andreas Enge wrote: > Hello, > > On Sat, Apr 27, 2019 at 07:36:36PM +1000, Brendan Tildesley wrote: >> * gnu/packages/ebook.scm (calibre): Update to 3.41.3. This breaks the build >> until my followup patches. > could you prepare a minimal patch that updates calibre and includes all > modifications to make it work? I think it will be desirable to be "atomic" > in the sense that after every commit, we have a functioning Guix. > Unbundling patches etc. can then come one by one, but again such that > "guix build calibre" should work at all times. I ended up redoing the whole patch set, and fixed a small problems, and made sure it applies to the latest master. Actually Calibre 3.42.0 is out now so I added that on the end (its too difficult to rebase it back on to the original update to 3.41.3, so im sending both updates.). Also, in git send-email i accidentally set the last patch's char encoding to 'y', hopefully it doesn't break anything. > > Thanks! > > Andreas > > PS: I considered applying some later patches like your change of e-mail > address, but this one did not apply on current master, and then I > thought that maybe it will be easier for you if I do not take patches > out of order. >