From mboxrd@z Thu Jan 1 00:00:00 1970 From: Federico Beffa Subject: Re: [PATCH 2/2] gnu: netpbm: Fix location of X color name database. Date: Fri, 13 May 2016 20:44:07 +0200 Message-ID: References: <20160513171031.GA32351@solar> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a114e5c6ceb5c590532bda85d Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1I4J-0007PV-5w for guix-devel@gnu.org; Fri, 13 May 2016 14:44:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b1I4G-0001yJ-JF for guix-devel@gnu.org; Fri, 13 May 2016 14:44:10 -0400 Received: from mail-vk0-x244.google.com ([2607:f8b0:400c:c05::244]:36161) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1I4G-0001yD-8p for guix-devel@gnu.org; Fri, 13 May 2016 14:44:08 -0400 Received: by mail-vk0-x244.google.com with SMTP id c189so13334144vkb.3 for ; Fri, 13 May 2016 11:44:08 -0700 (PDT) In-Reply-To: <20160513171031.GA32351@solar> 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: Andreas Enge Cc: Guix-devel --001a114e5c6ceb5c590532bda85d Content-Type: text/plain; charset=UTF-8 On Fri, May 13, 2016 at 7:10 PM, Andreas Enge wrote: > Hello, > > On Fri, May 13, 2016 at 06:51:27PM +0200, Federico Beffa wrote: >> This fixes some of the provided programs like, e.g. 'pamtogif'. > > I think the common practice is to separate the switch to the %modify-phases > syntax and the real change into two commits; right now, the diff looks big, > but I imagine it must be rather trivial. Indeed the change is trivial. Regards, Fede --001a114e5c6ceb5c590532bda85d Content-Type: text/x-patch; charset=US-ASCII; name="0002-gnu-netpbm-Use-modify-phases-syntax.patch" Content-Disposition: attachment; filename="0002-gnu-netpbm-Use-modify-phases-syntax.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_io62lip91 RnJvbSBiZTM3NjY5YjUwYzAwMGFkNDVlYjg1MDc1ZjMyZDRmMjNjMjY0ODlkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogRnJpLCAxMyBNYXkgMjAxNiAxNTozMjo0OSArMDIwMApTdWJqZWN0OiBbUEFUQ0gg Mi8zXSBnbnU6IG5ldHBibTogVXNlICdtb2RpZnktcGhhc2VzJyBzeW50YXguCgoqIGdudS9wYWNr YWdlcy9uZXRwYm0uc2NtIChuZXRwYm0pW2FyZ3VtZW50c106IERvIGl0LgotLS0KIGdudS9wYWNr YWdlcy9uZXRwYm0uc2NtIHwgODYgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDQ0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9uZXRwYm0uc2NtIGIvZ251L3BhY2th Z2VzL25ldHBibS5zY20KaW5kZXggNDc1NjM1ZS4uZDdkODU3NiAxMDA2NDQKLS0tIGEvZ251L3Bh Y2thZ2VzL25ldHBibS5zY20KKysrIGIvZ251L3BhY2thZ2VzL25ldHBibS5zY20KQEAgLTk5LDUw ICs5OSw0OCBAQAogICAgICAgICgicHl0aG9uIiAscHl0aG9uLXdyYXBwZXIpKSkKICAgIChhcmd1 bWVudHMKICAgICBgKCM6cGhhc2VzCi0gICAgICAoYWxpc3QtcmVwbGFjZQotICAgICAgICdjb25m aWd1cmUKLSAgICAgICAobGFtYmRhIF8KLSAgICAgICAgKGNvcHktZmlsZSAiY29uZmlnLm1rLmlu IiAiY29uZmlnLm1rIikKLSAgICAgICAgKGNobW9kICJjb25maWcubWsiICNvNjY0KQotICAgICAg ICAobGV0ICgoZiAob3Blbi1maWxlICJjb25maWcubWsiICJhIikpKQotICAgICAgICAgKGRpc3Bs YXkgIkNDPWdjY1xuIiBmKQotICAgICAgICAgKGRpc3BsYXkgIkNGTEFHU19TSExJQiArPSAtZlBJ Q1xuIiBmKQotICAgICAgICAgKGRpc3BsYXkgIlRJRkZMSUIgPSBsaWJ0aWZmLnNvXG4iIGYpCi0g ICAgICAgICAoZGlzcGxheSAiSlBFR0xJQiA9IGxpYmpwZWcuc29cbiIgZikKLSAgICAgICAgIChk aXNwbGF5ICJaTElCID0gbGliei5zb1xuIiBmKQotICAgICAgICAgKGRpc3BsYXkgKHN0cmluZy1h cHBlbmQgIkxERkxBR1MgKz0gLVdsLC1ycGF0aD0iICVvdXRwdXQgIi9saWIiKSBmKQotICAgICAg ICAgKGNsb3NlLXBvcnQgZikpKQotICAgICAgKGFsaXN0LWNvbnMtYmVmb3JlCi0gICAgICAgJ2No ZWNrICdzZXR1cC1jaGVjawotICAgICAgIChsYW1iZGEgXwotICAgICAgICAgOzsgaW5zdGFsbCB0 ZW1wb3JhcmlseSBpbnRvIC90bXAvbmV0cGJtCi0gICAgICAgICAoc3lzdGVtKiAibWFrZSIgInBh Y2thZ2UiKQotICAgICAgICAgOzsgcmVtb3ZlIHRlc3QgcmVxdWlyaW5nIFgKLSAgICAgICAgIChz dWJzdGl0dXRlKiAidGVzdC9hbGwtaW4tcGxhY2UudGVzdCIgKCgicGFteCIpICIiKSkKLSAgICAg ICAgIDs7IGRvIG5vdCB3b3JyeSBhYm91dCBub24tZXhpc3RpbmcgZmlsZQotICAgICAgICAgKHN1 YnN0aXR1dGUqICJ0ZXN0L2FsbC1pbi1wbGFjZS50ZXN0IiAoKCJecm0gIikgInJtIC1mICIpKQot ICAgICAgICAgOzsgcmVtb3ZlIGZvdXIgdGVzdHMgdGhhdCBmYWlsIGZvciB1bmtub3duIHJlYXNv bnMKLSAgICAgICAgIChzdWJzdGl0dXRlKiAidGVzdC9UZXN0LU9yZGVyIgotICAgICAgICAgICAo KCJhbGwtaW4tcGxhY2UudGVzdCIpICIiKQotICAgICAgICAgICAoKCJwbm1wc25yLnRlc3QiKSAi IikKLSAgICAgICAgICAgKCgicG5tcmVtYXAxLnRlc3QiKSAiIikKLSAgICAgICAgICAgKCgiZ2lm LXJvdW5kdHJpcC50ZXN0IikgIiIpKSkKLSAgICAgIChhbGlzdC1yZXBsYWNlCi0gICAgICAgJ2lu c3RhbGwKLSAgICAgICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyBtYWtlLWZsYWdzICM6YWxsb3ct b3RoZXIta2V5cykKLSAgICAgICAgKGxldCAoKG91dCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIp KSkKLSAgICAgICAgIChhcHBseSBzeXN0ZW0qICJtYWtlIiAicGFja2FnZSIKLSAgICAgICAgICAg ICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJwa2dkaXI9IiBvdXQpIG1ha2UtZmxhZ3MpCi0g ICAgICAgICA7OyBjb3B5IHN0YXRpYyBsaWJyYXJ5Ci0gICAgICAgICAoY29weS1maWxlIChzdHJp bmctYXBwZW5kIG91dCAiL2xpbmsvbGlibmV0cGJtLmEiKQotICAgICAgICAgICAgICAgICAgICAo c3RyaW5nLWFwcGVuZCBvdXQgIi9saWIvbGlibmV0cGJtLmEiKSkKLSAgICAgICAgIDs7IHJlbW92 ZSBzdXBlcmZsdW91cyBmb2xkZXJzIGFuZCBmaWxlcwotICAgICAgICAgKHN5c3RlbSogInJtIiAi LXIiIChzdHJpbmctYXBwZW5kIG91dCAiL2xpbmsiKSkKLSAgICAgICAgIChzeXN0ZW0qICJybSIg Ii1yIiAoc3RyaW5nLWFwcGVuZCBvdXQgIi9taXNjIikpCi0gICAgICAgICAod2l0aC1kaXJlY3Rv cnktZXhjdXJzaW9uIG91dAotICAgICAgICAgICAoZm9yLWVhY2ggZGVsZXRlLWZpbGUKLSAgICAg ICAgICAgICAgICAgICAgICcoImNvbmZpZ190ZW1wbGF0ZSIgInBrZ2luZm8iICJSRUFETUUiICJW RVJTSU9OIikpKSkpCi0gICAgICAlc3RhbmRhcmQtcGhhc2VzKSkpKSkKKyAgICAgIChtb2RpZnkt cGhhc2VzICVzdGFuZGFyZC1waGFzZXMKKyAgICAgICAocmVwbGFjZSAnY29uZmlndXJlCisgICAg ICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQor ICAgICAgICAgICAoY29weS1maWxlICJjb25maWcubWsuaW4iICJjb25maWcubWsiKQorICAgICAg ICAgICAoY2htb2QgImNvbmZpZy5tayIgI282NjQpCisgICAgICAgICAgIChsZXQgKChmIChvcGVu LWZpbGUgImNvbmZpZy5tayIgImEiKSkpCisgICAgICAgICAgICAgKGRpc3BsYXkgIkNDPWdjY1xu IiBmKQorICAgICAgICAgICAgIChkaXNwbGF5ICJDRkxBR1NfU0hMSUIgKz0gLWZQSUNcbiIgZikK KyAgICAgICAgICAgICAoZGlzcGxheSAiVElGRkxJQiA9IGxpYnRpZmYuc29cbiIgZikKKyAgICAg ICAgICAgICAoZGlzcGxheSAiSlBFR0xJQiA9IGxpYmpwZWcuc29cbiIgZikKKyAgICAgICAgICAg ICAoZGlzcGxheSAiWkxJQiA9IGxpYnouc29cbiIgZikKKyAgICAgICAgICAgICAoZGlzcGxheSAo c3RyaW5nLWFwcGVuZCAiTERGTEFHUyArPSAtV2wsLXJwYXRoPSIgJW91dHB1dCAiL2xpYiIpIGYp CisgICAgICAgICAgICAgKGNsb3NlLXBvcnQgZikpKSkKKyAgICAgICAoYWRkLWJlZm9yZSAnY2hl Y2sgJ3NldHVwLWNoZWNrCisgICAgICAgICAobGFtYmRhIF8KKyAgICAgICAgICAgOzsgaW5zdGFs bCB0ZW1wb3JhcmlseSBpbnRvIC90bXAvbmV0cGJtCisgICAgICAgICAgIChzeXN0ZW0qICJtYWtl IiAicGFja2FnZSIpCisgICAgICAgICAgIDs7IHJlbW92ZSB0ZXN0IHJlcXVpcmluZyBYCisgICAg ICAgICAgIChzdWJzdGl0dXRlKiAidGVzdC9hbGwtaW4tcGxhY2UudGVzdCIgKCgicGFteCIpICIi KSkKKyAgICAgICAgICAgOzsgZG8gbm90IHdvcnJ5IGFib3V0IG5vbi1leGlzdGluZyBmaWxlCisg ICAgICAgICAgIChzdWJzdGl0dXRlKiAidGVzdC9hbGwtaW4tcGxhY2UudGVzdCIgKCgiXnJtICIp ICJybSAtZiAiKSkKKyAgICAgICAgICAgOzsgcmVtb3ZlIGZvdXIgdGVzdHMgdGhhdCBmYWlsIGZv ciB1bmtub3duIHJlYXNvbnMKKyAgICAgICAgICAgKHN1YnN0aXR1dGUqICJ0ZXN0L1Rlc3QtT3Jk ZXIiCisgICAgICAgICAgICAgKCgiYWxsLWluLXBsYWNlLnRlc3QiKSAiIikKKyAgICAgICAgICAg ICAoKCJwbm1wc25yLnRlc3QiKSAiIikKKyAgICAgICAgICAgICAoKCJwbm1yZW1hcDEudGVzdCIp ICIiKQorICAgICAgICAgICAgICgoImdpZi1yb3VuZHRyaXAudGVzdCIpICIiKSkpKQorICAgICAg IChyZXBsYWNlICdpbnN0YWxsCisgICAgICAgICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyBtYWtl LWZsYWdzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgKGxldCAoKG91dCAoYXNzb2Mt cmVmIG91dHB1dHMgIm91dCIpKSkKKyAgICAgICAgICAgICAoYXBwbHkgc3lzdGVtKiAibWFrZSIg InBhY2thZ2UiCisgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJwa2dkaXI9IiBv dXQpIG1ha2UtZmxhZ3MpCisgICAgICAgICAgICAgOzsgY29weSBzdGF0aWMgbGlicmFyeQorICAg ICAgICAgICAgIChjb3B5LWZpbGUgKHN0cmluZy1hcHBlbmQgb3V0ICIvbGluay9saWJuZXRwYm0u YSIpCisgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBvdXQgIi9saWIvbGli bmV0cGJtLmEiKSkKKyAgICAgICAgICAgICA7OyByZW1vdmUgc3VwZXJmbHVvdXMgZm9sZGVycyBh bmQgZmlsZXMKKyAgICAgICAgICAgICAoc3lzdGVtKiAicm0iICItciIgKHN0cmluZy1hcHBlbmQg b3V0ICIvbGluayIpKQorICAgICAgICAgICAgIChzeXN0ZW0qICJybSIgIi1yIiAoc3RyaW5nLWFw cGVuZCBvdXQgIi9taXNjIikpCisgICAgICAgICAgICAgKHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lv biBvdXQKKyAgICAgICAgICAgICAgIChmb3ItZWFjaCBkZWxldGUtZmlsZQorICAgICAgICAgICAg ICAgICAgICAgICAgICcoImNvbmZpZ190ZW1wbGF0ZSIgInBrZ2luZm8iICJSRUFETUUiCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAiVkVSU0lPTiIpKSkpKSkpKSkKICAgIChzeW5vcHNpcyAi VG9vbGtpdCBmb3IgbWFuaXB1bGF0aW9uIG9mIGltYWdlcyIpCiAgICAoZGVzY3JpcHRpb24KICAg ICAiTmV0cGJtIGlzIGEgdG9vbGtpdCBmb3IgdGhlIG1hbmlwdWxhdGlvbiBvZiBncmFwaGljIGlt YWdlcywgaW5jbHVkaW5nCi0tIAoyLjcuNAoK --001a114e5c6ceb5c590532bda85d Content-Type: text/x-patch; charset=US-ASCII; name="0003-gnu-netpbm-Fix-location-of-X-color-name-database.patch" Content-Disposition: attachment; filename="0003-gnu-netpbm-Fix-location-of-X-color-name-database.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_io62moey1 RnJvbSA5ZmQ4YTE1NGMzZmM1OTFiMDFlNGZiMmM3ZjY3ZmJhYzRkYWVhNjg4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogRnJpLCAxMyBNYXkgMjAxNiAyMDozOToyMCArMDIwMApTdWJqZWN0OiBbUEFUQ0gg My8zXSBnbnU6IG5ldHBibTogRml4IGxvY2F0aW9uIG9mIFggY29sb3IgbmFtZSBkYXRhYmFzZS4K CiogZ251L3BhY2thZ2VzL25ldHBibS5zY20gKG5ldHBibSlbaW5wdXRzXTogQWRkICd4b3JnLXJn YicuCiAgW2FyZ3VtZW50c106IEluIHRoZSAnY29uZmlndXJlJyBwaGFzZSwgcGF0Y2ggJ3BtX2Nv bmZpZy5pbi5oJyB3aXRoIHRoZSBmdWxsCiAgcGF0aCB0byB0aGUgJ3JnYi50eHQnIGZpbGUuCi0t LQogZ251L3BhY2thZ2VzL25ldHBibS5zY20gfCA4ICsrKysrKystCiAxIGZpbGUgY2hhbmdlZCwg NyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2Vz L25ldHBibS5zY20gYi9nbnUvcGFja2FnZXMvbmV0cGJtLnNjbQppbmRleCBkN2Q4NTc2Li5kMDk1 NWZlIDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvbmV0cGJtLnNjbQorKysgYi9nbnUvcGFja2Fn ZXMvbmV0cGJtLnNjbQpAQCAtMjcsNiArMjcsNyBAQAogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBwa2ctY29uZmlnKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBweXRob24pCiAg ICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHhtbCkKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgeG9yZykKICAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBnbnUpCiAgICM6 dXNlLW1vZHVsZSAoKGd1aXggbGljZW5zZXMpICM6c2VsZWN0IChncGwyKSkKICAgIzp1c2UtbW9k dWxlIChndWl4IHBhY2thZ2VzKQpAQCAtOTEsNiArOTIsNyBAQAogICAgICAgICAgICAgICgibGli cG5nIiAsbGlicG5nKQogICAgICAgICAgICAgICgibGlidGlmZiIgLGxpYnRpZmYpCiAgICAgICAg ICAgICAgKCJsaWJ4bWwyIiAsbGlieG1sMikKKyAgICAgICAgICAgICAoInhvcmctcmdiIiAseG9y Zy1yZ2IpCiAgICAgICAgICAgICAgKCJ6bGliIiAsemxpYikpKQogICAgKG5hdGl2ZS1pbnB1dHMK ICAgICAgYCgoImZsZXgiICxmbGV4KQpAQCAtMTExLDcgKzExMywxMSBAQAogICAgICAgICAgICAg IChkaXNwbGF5ICJKUEVHTElCID0gbGlianBlZy5zb1xuIiBmKQogICAgICAgICAgICAgIChkaXNw bGF5ICJaTElCID0gbGliei5zb1xuIiBmKQogICAgICAgICAgICAgIChkaXNwbGF5IChzdHJpbmct YXBwZW5kICJMREZMQUdTICs9IC1XbCwtcnBhdGg9IiAlb3V0cHV0ICIvbGliIikgZikKLSAgICAg ICAgICAgICAoY2xvc2UtcG9ydCBmKSkpKQorICAgICAgICAgICAgIChjbG9zZS1wb3J0IGYpKQor ICAgICAgICAgICAobGV0ICgocmdiIChzdHJpbmctYXBwZW5kIChhc3NvYy1yZWYgaW5wdXRzICJ4 b3JnLXJnYiIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9zaGFyZS9Y MTEvcmdiLnR4dCIpKSkKKyAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogInBtX2NvbmZpZy5pbi5o IgorICAgICAgICAgICAgICAgKCgiL3Vzci9zaGFyZS9YMTEvcmdiLnR4dCIpIHJnYikpKSkpCiAg ICAgICAgKGFkZC1iZWZvcmUgJ2NoZWNrICdzZXR1cC1jaGVjawogICAgICAgICAgKGxhbWJkYSBf CiAgICAgICAgICAgIDs7IGluc3RhbGwgdGVtcG9yYXJpbHkgaW50byAvdG1wL25ldHBibQotLSAK Mi43LjQKCg== --001a114e5c6ceb5c590532bda85d--