From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Griffin Subject: [PATCH] gnu: calibre: Update to 2.63.0 Date: Wed, 27 Jul 2016 13:15:20 -0500 Message-ID: <1469643320.3918323.678540177.286200E3@webmail.messagingengine.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="_----------=_146964332039183230"; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSTMn-0003MN-1f for guix-devel@gnu.org; Wed, 27 Jul 2016 14:15:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSTMi-0001mK-4P for guix-devel@gnu.org; Wed, 27 Jul 2016 14:15:35 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:47505) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSTMf-0001jp-CG for guix-devel@gnu.org; Wed, 27 Jul 2016 14:15:31 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 828122051D for ; Wed, 27 Jul 2016 14:15:20 -0400 (EDT) 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: guix-devel@gnu.org This is a multi-part message in MIME format. --_----------=_146964332039183230 Content-Transfer-Encoding: 7bit Content-Type: text/plain This patch updates calibre to 2.63.0. I had to update one of the patches as well to get it to apply. It also removes a dependency on ImageMagick, which hasn't been necessary since 2.57.1. -- Alex Griffin --_----------=_146964332039183230 Content-Disposition: attachment; filename="0001-gnu-calibre-Update-to-2.63.0.patch" Content-Id: <1469643023.3917219.16bcdce09551d5e6c8b8f5f02eb94b12bf1c7a10.227DE9AC@content.messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-gnu-calibre-Update-to-2.63.0.patch" RnJvbSA5NGFkYjIyZTQ3NTEzOTI3NTViNjA1MmYxMWVlNjlhMjJiNzYzOTk4 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IEdyaWZmaW4g PGFAYWpncmYuY29tPgpEYXRlOiBUdWUsIDI2IEp1bCAyMDE2IDEyOjI2OjI1 IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gZ251OiBjYWxpYnJlOiBVcGRhdGUg dG8gMi42My4wLgoKKiBnbnUvcGFja2FnZXMvZWJvb2suc2NtIChjYWxpYnJl KTogVXBkYXRlIHRvIDIuNjMuMC4KW2lucHV0c106IFJlbW92ZSB1bm5lY2Vz c2FyeSBpbWFnZW1hZ2ljayBkZXBlbmRlbmN5LgpbcGhhc2VzXTogVXNlIG1v ZGlmeS1waGFzZXMuCgoqIGdudS9wYWNrYWdlcy9wYXRjaGVzL2NhbGlicmUt ZHJvcC11bnJhci5wYXRjaDogVXBkYXRlCmZvciBuZXcgdmVyc2lvbi4KLS0t CiBnbnUvcGFja2FnZXMvZWJvb2suc2NtICAgICAgICAgICAgICAgICAgICAg ICAgfCAxNCArKysrLS0tLQogZ251L3BhY2thZ2VzL3BhdGNoZXMvY2FsaWJy ZS1kcm9wLXVucmFyLnBhdGNoIHwgNDggKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDM2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9lYm9v ay5zY20gYi9nbnUvcGFja2FnZXMvZWJvb2suc2NtCmluZGV4IGQ5N2U4Njku LmFkMTg3MTYgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9lYm9vay5zY20K KysrIGIvZ251L3BhY2thZ2VzL2Vib29rLnNjbQpAQCAtMSw2ICsxLDcgQEAK IDs7OyBHTlUgR3VpeCAtLS0gRnVuY3Rpb25hbCBwYWNrYWdlIG1hbmFnZW1l bnQgZm9yIEdOVQogOzs7IENvcHlyaWdodCDCqSAyMDE1LCAyMDE2IEFuZHJl YXMgRW5nZSA8YW5kcmVhc0BlbmdlLmZyPgogOzs7IENvcHlyaWdodCDCqSAy MDE2IEVmcmFpbSBGbGFzaG5lciA8ZWZyYWltQGZsYXNobmVyLmNvLmlsPgor Ozs7IENvcHlyaWdodCDCqSAyMDE2IEFsZXggR3JpZmZpbiA8YUBhamdyZi5j b20+CiA7OzsKIDs7OyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgR3VpeC4K IDs7OwpAQCAtMzEsNyArMzIsNiBAQAogICAjOnVzZS1tb2R1bGUgKGdudSBw YWNrYWdlcyBnbGliKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBp Y3U0YykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgaW1hZ2UpCi0g ICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGltYWdlbWFnaWNrKQogICAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBsaWJ1c2IpCiAgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIHBkZikKICAgIzp1c2UtbW9kdWxlIChnbnUg cGFja2FnZXMgcGtnLWNvbmZpZykKQEAgLTYxLDcgKzYxLDcgQEAKIChkZWZp bmUtcHVibGljIGNhbGlicmUKICAgKHBhY2thZ2UKICAgICAobmFtZSAiY2Fs aWJyZSIpCi0gICAgKHZlcnNpb24gIjIuNjIuMCIpCisgICAgKHZlcnNpb24g IjIuNjMuMCIpCiAgICAgKHNvdXJjZQogICAgICAgKG9yaWdpbgogICAgICAg ICAobWV0aG9kIHVybC1mZXRjaCkKQEAgLTcwLDcgKzcwLDcgQEAKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uICIudGFyLnh6IikpCiAg ICAgICAgIChzaGEyNTYKICAgICAgICAgIChiYXNlMzIKLSAgICAgICAgICAi MTVxc2tmc2RnM2Z5OWNwdzFtM21jY3dnbjQ1MzY2eW43bGNpNWtpbTBmZHpw dzlwbmtuYSIpKQorICAgICAgICAgICIxcndndjZyc215M2xqZndjcHY0Mncy MDNnaG5ndzg2czVremIweWptMXpnc3htYXMyd2g2IikpCiAgICAgICAgIDs7 IFJlbW92ZSBub24tZnJlZSBvciBkb3VidGZ1bCBjb2RlLCBzZWUKICAgICAg ICAgOzsgaHR0cHM6Ly9saXN0cy5nbnUub3JnL2FyY2hpdmUvaHRtbC9ndWl4 LWRldmVsLzIwMTUtMDIvbXNnMDA0NzguaHRtbAogICAgICAgICAobW9kdWxl cyAnKChndWl4IGJ1aWxkIHV0aWxzKSkpCkBAIC0xMDIsNyArMTAyLDYgQEAK ICAgICAgICAoImZvbnRjb25maWciICxmb250Y29uZmlnKQogICAgICAgICgi Z2xpYiIgLGdsaWIpCiAgICAgICAgKCJpY3U0YyIgLGljdTRjKQotICAgICAg ICgiaW1hZ2VtYWdpY2siICxpbWFnZW1hZ2ljaykKICAgICAgICAoImxpYm10 cCIgLGxpYm10cCkKICAgICAgICAoImxpYnBuZyIgLGxpYnBuZykKICAgICAg ICAoImxpYnVzYiIgLGxpYnVzYikKQEAgLTEyOCwxNiArMTI3LDE1IEBACiAg ICAgICAgIzp0ZXN0LXRhcmdldCAiY2hlY2siCiAgICAgICAgIzp0ZXN0cz8g I2YgOyBGSVhNRTogZW5hYmxlIG9uY2UgZmxha2U4IGlzIHBhY2thZ2VkCiAg ICAgICAgIzpwaGFzZXMKLSAgICAgICAgIChhbGlzdC1jb25zLWJlZm9yZQot ICAgICAgICAgICdidWlsZCAnY29uZmlndXJlCisgICAgICAgKG1vZGlmeS1w aGFzZXMgJXN0YW5kYXJkLXBoYXNlcworICAgICAgICAgKGFkZC1iZWZvcmUg J2J1aWxkICdjb25maWd1cmUKICAgICAgICAgICAobGFtYmRhKiAoIzprZXkg aW5wdXRzICM6YWxsb3ctb3RoZXIta2V5cykKICAgICAgICAgICAgIChsZXQg KChwb2RvZm8gKGFzc29jLXJlZiBpbnB1dHMgInBvZG9mbyIpKQogICAgICAg ICAgICAgICAgICAgKHB5cXQgKGFzc29jLXJlZiBpbnB1dHMgInB5dGhvbjIt cHlxdCIpKSkKICAgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJzZXR1cC9i dWlsZF9lbnZpcm9ubWVudC5weSIKICAgICAgICAgICAgICAgICAoKCJzeXMu cHJlZml4IikgKHN0cmluZy1hcHBlbmQgIiciIHB5cXQgIiciKSkpCiAgICAg ICAgICAgICAgIChzZXRlbnYgIlBPRE9GT19JTkNfRElSIiAoc3RyaW5nLWFw cGVuZCBwb2RvZm8gIi9pbmNsdWRlL3BvZG9mbyIpKQotICAgICAgICAgICAg ICAoc2V0ZW52ICJQT0RPRk9fTElCX0RJUiIgKHN0cmluZy1hcHBlbmQgcG9k b2ZvICIvbGliIikpKSkKLSAgICAgICAgICAlc3RhbmRhcmQtcGhhc2VzKSkp CisgICAgICAgICAgICAgIChzZXRlbnYgIlBPRE9GT19MSUJfRElSIiAoc3Ry aW5nLWFwcGVuZCBwb2RvZm8gIi9saWIiKSkpKSkpKSkKICAgICAoaG9tZS1w YWdlICJodHRwOi8vY2FsaWJyZS1lYm9vay5jb20vIikKICAgICAoc3lub3Bz aXMgIkUtYm9vayBsaWJyYXJ5IG1hbmFnZW1lbnQgc29mdHdhcmUiKQogICAg IChkZXNjcmlwdGlvbiAiQ2FsaWJyZSBpcyBhbiBlYm9vayBsaWJyYXJ5IG1h bmFnZXIuICBJdCBjYW4gdmlldywgY29udmVydApkaWZmIC0tZ2l0IGEvZ251 L3BhY2thZ2VzL3BhdGNoZXMvY2FsaWJyZS1kcm9wLXVucmFyLnBhdGNoIGIv Z251L3BhY2thZ2VzL3BhdGNoZXMvY2FsaWJyZS1kcm9wLXVucmFyLnBhdGNo CmluZGV4IDZiN2E5ZjQuLjRlYjY0NDAgMTAwNjQ0Ci0tLSBhL2dudS9wYWNr YWdlcy9wYXRjaGVzL2NhbGlicmUtZHJvcC11bnJhci5wYXRjaAorKysgYi9n bnUvcGFja2FnZXMvcGF0Y2hlcy9jYWxpYnJlLWRyb3AtdW5yYXIucGF0Y2gK QEAgLTEsNCArMSw0IEBACi1UYWtlbiBmcm9tIERlYmlhbi4KK1Rha2VuIGZy b20gRGViaWFuLiBVcGRhdGVkIGJ5IEFsZXggR3JpZmZpbi4KIAogQXV0aG9y OiBEbWl0cnkgU2hhY2huZXYgPG1pdHlhNTdAZ21haWwuY29tPgogRGVzY3Jp cHRpb246IGRvIG5vdCBidWlsZCB1bnJhciBleHRlbnNpb24gYXMgd2Ugc3Ry aXAgdW5yYXIgZnJvbSB0aGUgdGFyYmFsbApAQCAtNywzNyArNywyOSBAQCBM YXN0LVVwZGF0ZTogMjAxMy0wNC0wNAogCiBJbmRleDogY2FsaWJyZS9zZXR1 cC9leHRlbnNpb25zLnB5CiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLS0g Y2FsaWJyZS5vcmlnL3NldHVwL2V4dGVuc2lvbnMucHkJMjAxNC0wMi0wMiAx MDo0MjoxNC41MTA5NTQwMDcgKzAxMDAKLSsrKyBjYWxpYnJlL3NldHVwL2V4 dGVuc2lvbnMucHkJMjAxNC0wMi0wMiAxMDo0MjoxNC41MDI5NTQwMDcgKzAx MDAKLUBAIC0yMDksMjQgKzIwOSw2IEBACi0gICAgICAgICAgICAgICAgIHNp cF9maWxlcz1bJ2NhbGlicmUvZWJvb2tzL3BkZi9yZW5kZXIvcXRfaGFjay5z aXAnXQotICAgICAgICAgICAgICAgICApLAotIAotLSAgICBFeHRlbnNpb24o J3VucmFyJywKLS0gICAgICAgICAgICAgIFsndW5yYXIvJXMuY3BwJyUoeC5w YXJ0aXRpb24oJy4nKVswXSkgZm9yIHggaW4gJycnCi0tICAgICAgICAgICAg ICAgcmFyLm8gc3RybGlzdC5vIHN0cmZuLm8gcGF0aGZuLm8gc2F2ZXBvcy5v IHNtYWxsZm4ubyBnbG9iYWwubyBmaWxlLm8KLS0gICAgICAgICAgICAgICBm aWxlZm4ubyBmaWxjcmVhdC5vIGFyY2hpdmUubyBhcmNyZWFkLm8gdW5pY29k ZS5vIHN5c3RlbS5vCi0tICAgICAgICAgICAgICAgaXNudC5vIGNyeXB0Lm8g Y3JjLm8gcmF3cmVhZC5vIGVuY25hbWUubyByZXNvdXJjZS5vIG1hdGNoLm8K LS0gICAgICAgICAgICAgICB0aW1lZm4ubyByZHdyZm4ubyBjb25zaW8ubyBv cHRpb25zLm8gdWxpbmtzLm8gZXJyaG5kLm8gcmFydm0ubwotLSAgICAgICAg ICAgICAgIHNlY3Bhc3N3b3JkLm8gcmlqbmRhZWwubyBnZXRiaXRzLm8gc2hh MS5vIGV4dGluZm8ubyBleHRyYWN0Lm8KLS0gICAgICAgICAgICAgICB2b2x1 bWUubyBsaXN0Lm8gZmluZC5vIHVucGFjay5vIGNtZGRhdGEubyBmaWxlc3Ry Lm8gc2NhbnRyZWUubwotLSAgICAgICAgICAgICAgICcnJy5zcGxpdCgpXSAr IFsnY2FsaWJyZS91dGlscy91bnJhci5jcHAnXSwKLS0gICAgICAgICAgICAg IGluY19kaXJzPVsndW5yYXInXSwKLS0gICAgICAgICAgICAgIGNmbGFncz1b KCcvJyBpZiBpc3dpbmRvd3MgZWxzZSAnLScpICsgeCBmb3IgeCBpbiAoCi0t ICAgICAgICAgICAgICAgICAgJ0RTSUxFTlQnLCAnRFJBUkRMTCcsICdEVU5S QVInKV0gKyAoCi0tICAgICAgICAgICAgICAgICAgW10gaWYgaXN3aW5kb3dz IGVsc2UgWyctRF9GSUxFX09GRlNFVF9CSVRTPTY0JywKLS0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy1EX0xBUkdFRklMRV9T T1VSQ0UnXSksCi0tICAgICAgICAgICAgICBvcHRpbWl6ZV9sZXZlbD0yLAot LSAgICAgICAgICAgICAgbGlicmFyaWVzPVsnVXNlcjMyJywgJ0FkdmFwaTMy JywgJ2tlcm5lbDMyJywgJ1NoZWxsMzInXSBpZiBpc3dpbmRvd3MgZWxzZSBb XQotLSAgICAgICAgICAgICAgKSwKLS0KLSAgICAgXQorLS0tIGNhbGlicmUu b3JpZy9zZXR1cC9leHRlbnNpb25zLmpzb24JMjAxNi0wNy0yMSAyMToyMTow NS4wMDAwMDAwMDAgLTA1MDAKKysrKyBjYWxpYnJlL3NldHVwL2V4dGVuc2lv bnMuanNvbgkyMDE2LTA3LTI3IDExOjIyOjE3LjE2NzcxMDExMiAtMDUwMAor QEAgLTIxMSwxNCArMjExLDUgQEAKKyAgICAgICAgICJzb3VyY2VzIjogImNh bGlicmUvZGV2aWNlcy9tdHAvdW5peC9kZXZpY2VzLmMgY2FsaWJyZS9kZXZp Y2VzL210cC91bml4L2xpYm10cC5jIiwKKyAgICAgICAgICJoZWFkZXJzIjog ImNhbGlicmUvZGV2aWNlcy9tdHAvdW5peC9kZXZpY2VzLmggY2FsaWJyZS9k ZXZpY2VzL210cC91bml4L3Vwc3RyZWFtL211c2ljLXBsYXllcnMuaCBjYWxp YnJlL2RldmljZXMvbXRwL3VuaXgvdXBzdHJlYW0vZGV2aWNlLWZsYWdzLmgi LAorICAgICAgICAgImxpYnJhcmllcyI6ICJtdHAiCistICAgIH0sCistICAg IHsKKy0gICAgICAgICJuYW1lIjogInVucmFyIiwKKy0gICAgICAgICJzb3Vy Y2VzIjogInVucmFyL3Jhci5jcHAgdW5yYXIvc3RybGlzdC5jcHAgdW5yYXIv c3RyZm4uY3BwIHVucmFyL3BhdGhmbi5jcHAgdW5yYXIvc2F2ZXBvcy5jcHAg dW5yYXIvc21hbGxmbi5jcHAgdW5yYXIvZ2xvYmFsLmNwcCB1bnJhci9maWxl LmNwcCB1bnJhci9maWxlZm4uY3BwIHVucmFyL2ZpbGNyZWF0LmNwcCB1bnJh ci9hcmNoaXZlLmNwcCB1bnJhci9hcmNyZWFkLmNwcCB1bnJhci91bmljb2Rl LmNwcCB1bnJhci9zeXN0ZW0uY3BwIHVucmFyL2lzbnQuY3BwIHVucmFyL2Ny eXB0LmNwcCB1bnJhci9jcmMuY3BwIHVucmFyL3Jhd3JlYWQuY3BwIHVucmFy L2VuY25hbWUuY3BwIHVucmFyL3Jlc291cmNlLmNwcCB1bnJhci9tYXRjaC5j cHAgdW5yYXIvdGltZWZuLmNwcCB1bnJhci9yZHdyZm4uY3BwIHVucmFyL2Nv bnNpby5jcHAgdW5yYXIvb3B0aW9ucy5jcHAgdW5yYXIvdWxpbmtzLmNwcCB1 bnJhci9lcnJobmQuY3BwIHVucmFyL3JhcnZtLmNwcCB1bnJhci9zZWNwYXNz d29yZC5jcHAgdW5yYXIvcmlqbmRhZWwuY3BwIHVucmFyL2dldGJpdHMuY3Bw IHVucmFyL3NoYTEuY3BwIHVucmFyL2V4dGluZm8uY3BwIHVucmFyL2V4dHJh Y3QuY3BwIHVucmFyL3ZvbHVtZS5jcHAgdW5yYXIvbGlzdC5jcHAgdW5yYXIv ZmluZC5jcHAgdW5yYXIvdW5wYWNrLmNwcCB1bnJhci9jbWRkYXRhLmNwcCB1 bnJhci9maWxlc3RyLmNwcCB1bnJhci9zY2FudHJlZS5jcHAgY2FsaWJyZS91 dGlscy91bnJhci5jcHAiLAorLSAgICAgICAgImluY19kaXJzIjogInVucmFy IiwKKy0gICAgICAgICJkZWZpbmVzIjogIlNJTEVOVCBSQVJETEwgVU5SQVIg X0ZJTEVfT0ZGU0VUX0JJVFM9NjQgX0xBUkdFRklMRV9TT1VSQ0UiLAorLSAg ICAgICAgIndpbmRvd3NfZGVmaW5lcyI6ICJTSUxFTlQgUkFSRExMIFVOUkFS IiwKKy0gICAgICAgICJvcHRpbWl6ZV9sZXZlbCI6IDIsCistICAgICAgICAi d2luZG93c19saWJyYXJpZXMiOiAiVXNlcjMyIEFkdmFwaTMyIGtlcm5lbDMy IFNoZWxsMzIiCisgICAgIH0KKyBdCiAgCiAgCiBJbmRleDogY2FsaWJyZS9z cmMvY2FsaWJyZS9lYm9va3MvbWV0YWRhdGEvYXJjaGl2ZS5weQogPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0tIGNhbGlicmUub3JpZy9zcmMvY2FsaWJy ZS9lYm9va3MvbWV0YWRhdGEvYXJjaGl2ZS5weQkyMDE0LTAyLTAyIDEwOjQy OjE0LjUxMDk1NDAwNyArMDEwMAotKysrIGNhbGlicmUvc3JjL2NhbGlicmUv ZWJvb2tzL21ldGFkYXRhL2FyY2hpdmUucHkJMjAxNC0wMi0wMiAxMDo0Mjox NC41MDI5NTQwMDcgKzAxMDAKKy0tLSBjYWxpYnJlLm9yaWcvc3JjL2NhbGli cmUvZWJvb2tzL21ldGFkYXRhL2FyY2hpdmUucHkJMjAxNi0wNy0yMSAyMToy MTowNS4wMDAwMDAwMDAgLTA1MDAKKysrKyBjYWxpYnJlL3NyYy9jYWxpYnJl L2Vib29rcy9tZXRhZGF0YS9hcmNoaXZlLnB5CTIwMTYtMDctMjcgMTE6MjE6 MDcuNzkzNjE2MDM5IC0wNTAwCiBAQCAtNDIsNyArNDIsNyBAQAogICAgICBk ZXNjcmlwdGlvbiA9IF8oJ0V4dHJhY3QgY29tbW9uIGUtYm9vayBmb3JtYXRz IGZyb20gYXJjaGl2ZXMgJwogICAgICAgICAgJyh6aXAvcmFyKSBmaWxlcy4g QWxzbyB0cnkgdG8gYXV0b2RldGVjdCBpZiB0aGV5IGFyZSBhY3R1YWxseSAn Ci0tIAoyLjkuMgoK --_----------=_146964332039183230--