From mboxrd@z Thu Jan 1 00:00:00 1970 From: Federico Beffa Subject: [PATCH 2/2] gnu: netpbm: Fix location of X color name database. Date: Fri, 13 May 2016 18:51:27 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a113df516f74f070532bc156c Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1GJF-0005j1-D8 for guix-devel@gnu.org; Fri, 13 May 2016 12:51:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b1GJD-0002sb-Tu for guix-devel@gnu.org; Fri, 13 May 2016 12:51:29 -0400 Received: from mail-vk0-x243.google.com ([2607:f8b0:400c:c05::243]:36604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1GJD-0002sN-OI for guix-devel@gnu.org; Fri, 13 May 2016 12:51:27 -0400 Received: by mail-vk0-x243.google.com with SMTP id c189so12953026vkb.3 for ; Fri, 13 May 2016 09:51:27 -0700 (PDT) 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 --001a113df516f74f070532bc156c Content-Type: text/plain; charset=UTF-8 This fixes some of the provided programs like, e.g. 'pamtogif'. Regards, Fede --001a113df516f74f070532bc156c Content-Type: text/x-patch; charset=US-ASCII; name="0002-gnu-netpbm-Fix-location-of-X-color-name-database.patch" Content-Disposition: attachment; filename="0002-gnu-netpbm-Fix-location-of-X-color-name-database.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_io5s39bu0 RnJvbSAzNjU4YTFlZGZkY2QyMWE4MWVhMTRhOTYyN2M1ZThiYWM1MGJjMGY4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogRnJpLCAxMyBNYXkgMjAxNiAxNTozMjo0OSArMDIwMApTdWJqZWN0OiBbUEFUQ0gg Mi8yXSBnbnU6IG5ldHBibTogRml4IGxvY2F0aW9uIG9mIFggY29sb3IgbmFtZSBkYXRhYmFzZS4K CiogZ251L3BhY2thZ2VzL25ldHBibS5zY20gKG5ldHBibSlbaW5wdXRzXTogQWRkICd4b3JnLXJn YicuCiAgW2FyZ3VtZW50c106IFVzZSAnbW9kaWZ5LXBoYXNlcycgc3ludGF4LiAgSW4gdGhlICdj b25maWd1cmUnIHBoYXNlLCBwYXRjaAogICdwbV9jb25maWcuaW4uaCcgd2l0aCB0aGUgZnVsbCBw YXRoIHRvIHRoZSAncmdiLnR4dCcgZmlsZS4KLS0tCiBnbnUvcGFja2FnZXMvbmV0cGJtLnNjbSB8 IDkyICsrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCA0NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9nbnUvcGFja2FnZXMvbmV0cGJtLnNjbSBiL2dudS9wYWNrYWdlcy9uZXRwYm0uc2NtCmlu ZGV4IDQ3NTYzNWUuLmQwOTU1ZmUgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9uZXRwYm0uc2Nt CisrKyBiL2dudS9wYWNrYWdlcy9uZXRwYm0uc2NtCkBAIC0yNyw2ICsyNyw3IEBACiAgICM6dXNl LW1vZHVsZSAoZ251IHBhY2thZ2VzIHBrZy1jb25maWcpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBh Y2thZ2VzIHB5dGhvbikKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgeG1sKQorICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB4b3JnKQogICAjOnVzZS1tb2R1bGUgKGd1aXggYnVpbGQt c3lzdGVtIGdudSkKICAgIzp1c2UtbW9kdWxlICgoZ3VpeCBsaWNlbnNlcykgIzpzZWxlY3QgKGdw bDIpKQogICAjOnVzZS1tb2R1bGUgKGd1aXggcGFja2FnZXMpCkBAIC05MSw2ICs5Miw3IEBACiAg ICAgICAgICAgICAgKCJsaWJwbmciICxsaWJwbmcpCiAgICAgICAgICAgICAgKCJsaWJ0aWZmIiAs bGlidGlmZikKICAgICAgICAgICAgICAoImxpYnhtbDIiICxsaWJ4bWwyKQorICAgICAgICAgICAg ICgieG9yZy1yZ2IiICx4b3JnLXJnYikKICAgICAgICAgICAgICAoInpsaWIiICx6bGliKSkpCiAg ICAobmF0aXZlLWlucHV0cwogICAgICBgKCgiZmxleCIgLGZsZXgpCkBAIC05OSw1MCArMTAxLDUy IEBACiAgICAgICAgKCJweXRob24iICxweXRob24td3JhcHBlcikpKQogICAgKGFyZ3VtZW50cwog ICAgIGAoIzpwaGFzZXMKLSAgICAgIChhbGlzdC1yZXBsYWNlCi0gICAgICAgJ2NvbmZpZ3VyZQot ICAgICAgIChsYW1iZGEgXwotICAgICAgICAoY29weS1maWxlICJjb25maWcubWsuaW4iICJjb25m aWcubWsiKQotICAgICAgICAoY2htb2QgImNvbmZpZy5tayIgI282NjQpCi0gICAgICAgIChsZXQg KChmIChvcGVuLWZpbGUgImNvbmZpZy5tayIgImEiKSkpCi0gICAgICAgICAoZGlzcGxheSAiQ0M9 Z2NjXG4iIGYpCi0gICAgICAgICAoZGlzcGxheSAiQ0ZMQUdTX1NITElCICs9IC1mUElDXG4iIGYp Ci0gICAgICAgICAoZGlzcGxheSAiVElGRkxJQiA9IGxpYnRpZmYuc29cbiIgZikKLSAgICAgICAg IChkaXNwbGF5ICJKUEVHTElCID0gbGlianBlZy5zb1xuIiBmKQotICAgICAgICAgKGRpc3BsYXkg IlpMSUIgPSBsaWJ6LnNvXG4iIGYpCi0gICAgICAgICAoZGlzcGxheSAoc3RyaW5nLWFwcGVuZCAi TERGTEFHUyArPSAtV2wsLXJwYXRoPSIgJW91dHB1dCAiL2xpYiIpIGYpCi0gICAgICAgICAoY2xv c2UtcG9ydCBmKSkpCi0gICAgICAoYWxpc3QtY29ucy1iZWZvcmUKLSAgICAgICAnY2hlY2sgJ3Nl dHVwLWNoZWNrCi0gICAgICAgKGxhbWJkYSBfCi0gICAgICAgICA7OyBpbnN0YWxsIHRlbXBvcmFy aWx5IGludG8gL3RtcC9uZXRwYm0KLSAgICAgICAgIChzeXN0ZW0qICJtYWtlIiAicGFja2FnZSIp Ci0gICAgICAgICA7OyByZW1vdmUgdGVzdCByZXF1aXJpbmcgWAotICAgICAgICAgKHN1YnN0aXR1 dGUqICJ0ZXN0L2FsbC1pbi1wbGFjZS50ZXN0IiAoKCJwYW14IikgIiIpKQotICAgICAgICAgOzsg ZG8gbm90IHdvcnJ5IGFib3V0IG5vbi1leGlzdGluZyBmaWxlCi0gICAgICAgICAoc3Vic3RpdHV0 ZSogInRlc3QvYWxsLWluLXBsYWNlLnRlc3QiICgoIl5ybSAiKSAicm0gLWYgIikpCi0gICAgICAg ICA7OyByZW1vdmUgZm91ciB0ZXN0cyB0aGF0IGZhaWwgZm9yIHVua25vd24gcmVhc29ucwotICAg ICAgICAgKHN1YnN0aXR1dGUqICJ0ZXN0L1Rlc3QtT3JkZXIiCi0gICAgICAgICAgICgoImFsbC1p bi1wbGFjZS50ZXN0IikgIiIpCi0gICAgICAgICAgICgoInBubXBzbnIudGVzdCIpICIiKQotICAg ICAgICAgICAoKCJwbm1yZW1hcDEudGVzdCIpICIiKQotICAgICAgICAgICAoKCJnaWYtcm91bmR0 cmlwLnRlc3QiKSAiIikpKQotICAgICAgKGFsaXN0LXJlcGxhY2UKLSAgICAgICAnaW5zdGFsbAot ICAgICAgIChsYW1iZGEqICgjOmtleSBvdXRwdXRzIG1ha2UtZmxhZ3MgIzphbGxvdy1vdGhlci1r ZXlzKQotICAgICAgICAobGV0ICgob3V0IChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikpKQotICAg ICAgICAgKGFwcGx5IHN5c3RlbSogIm1ha2UiICJwYWNrYWdlIgotICAgICAgICAgICAgICAgICAg ICAgICAgKHN0cmluZy1hcHBlbmQgInBrZ2Rpcj0iIG91dCkgbWFrZS1mbGFncykKLSAgICAgICAg IDs7IGNvcHkgc3RhdGljIGxpYnJhcnkKLSAgICAgICAgIChjb3B5LWZpbGUgKHN0cmluZy1hcHBl bmQgb3V0ICIvbGluay9saWJuZXRwYm0uYSIpCi0gICAgICAgICAgICAgICAgICAgIChzdHJpbmct YXBwZW5kIG91dCAiL2xpYi9saWJuZXRwYm0uYSIpKQotICAgICAgICAgOzsgcmVtb3ZlIHN1cGVy Zmx1b3VzIGZvbGRlcnMgYW5kIGZpbGVzCi0gICAgICAgICAoc3lzdGVtKiAicm0iICItciIgKHN0 cmluZy1hcHBlbmQgb3V0ICIvbGluayIpKQotICAgICAgICAgKHN5c3RlbSogInJtIiAiLXIiIChz dHJpbmctYXBwZW5kIG91dCAiL21pc2MiKSkKLSAgICAgICAgICh3aXRoLWRpcmVjdG9yeS1leGN1 cnNpb24gb3V0Ci0gICAgICAgICAgIChmb3ItZWFjaCBkZWxldGUtZmlsZQotICAgICAgICAgICAg ICAgICAgICAgJygiY29uZmlnX3RlbXBsYXRlIiAicGtnaW5mbyIgIlJFQURNRSIgIlZFUlNJT04i KSkpKSkKLSAgICAgICVzdGFuZGFyZC1waGFzZXMpKSkpKQorICAgICAgKG1vZGlmeS1waGFzZXMg JXN0YW5kYXJkLXBoYXNlcworICAgICAgIChyZXBsYWNlICdjb25maWd1cmUKKyAgICAgICAgIChs YW1iZGEqICgjOmtleSBpbnB1dHMgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAgICAg ICAgIChjb3B5LWZpbGUgImNvbmZpZy5tay5pbiIgImNvbmZpZy5tayIpCisgICAgICAgICAgIChj aG1vZCAiY29uZmlnLm1rIiAjbzY2NCkKKyAgICAgICAgICAgKGxldCAoKGYgKG9wZW4tZmlsZSAi Y29uZmlnLm1rIiAiYSIpKSkKKyAgICAgICAgICAgICAoZGlzcGxheSAiQ0M9Z2NjXG4iIGYpCisg ICAgICAgICAgICAgKGRpc3BsYXkgIkNGTEFHU19TSExJQiArPSAtZlBJQ1xuIiBmKQorICAgICAg ICAgICAgIChkaXNwbGF5ICJUSUZGTElCID0gbGlidGlmZi5zb1xuIiBmKQorICAgICAgICAgICAg IChkaXNwbGF5ICJKUEVHTElCID0gbGlianBlZy5zb1xuIiBmKQorICAgICAgICAgICAgIChkaXNw bGF5ICJaTElCID0gbGliei5zb1xuIiBmKQorICAgICAgICAgICAgIChkaXNwbGF5IChzdHJpbmct YXBwZW5kICJMREZMQUdTICs9IC1XbCwtcnBhdGg9IiAlb3V0cHV0ICIvbGliIikgZikKKyAgICAg ICAgICAgICAoY2xvc2UtcG9ydCBmKSkKKyAgICAgICAgICAgKGxldCAoKHJnYiAoc3RyaW5nLWFw cGVuZCAoYXNzb2MtcmVmIGlucHV0cyAieG9yZy1yZ2IiKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICIvc2hhcmUvWDExL3JnYi50eHQiKSkpCisgICAgICAgICAgICAgKHN1 YnN0aXR1dGUqICJwbV9jb25maWcuaW4uaCIKKyAgICAgICAgICAgICAgICgoIi91c3Ivc2hhcmUv WDExL3JnYi50eHQiKSByZ2IpKSkpKQorICAgICAgIChhZGQtYmVmb3JlICdjaGVjayAnc2V0dXAt Y2hlY2sKKyAgICAgICAgIChsYW1iZGEgXworICAgICAgICAgICA7OyBpbnN0YWxsIHRlbXBvcmFy aWx5IGludG8gL3RtcC9uZXRwYm0KKyAgICAgICAgICAgKHN5c3RlbSogIm1ha2UiICJwYWNrYWdl IikKKyAgICAgICAgICAgOzsgcmVtb3ZlIHRlc3QgcmVxdWlyaW5nIFgKKyAgICAgICAgICAgKHN1 YnN0aXR1dGUqICJ0ZXN0L2FsbC1pbi1wbGFjZS50ZXN0IiAoKCJwYW14IikgIiIpKQorICAgICAg ICAgICA7OyBkbyBub3Qgd29ycnkgYWJvdXQgbm9uLWV4aXN0aW5nIGZpbGUKKyAgICAgICAgICAg KHN1YnN0aXR1dGUqICJ0ZXN0L2FsbC1pbi1wbGFjZS50ZXN0IiAoKCJecm0gIikgInJtIC1mICIp KQorICAgICAgICAgICA7OyByZW1vdmUgZm91ciB0ZXN0cyB0aGF0IGZhaWwgZm9yIHVua25vd24g cmVhc29ucworICAgICAgICAgICAoc3Vic3RpdHV0ZSogInRlc3QvVGVzdC1PcmRlciIKKyAgICAg ICAgICAgICAoKCJhbGwtaW4tcGxhY2UudGVzdCIpICIiKQorICAgICAgICAgICAgICgoInBubXBz bnIudGVzdCIpICIiKQorICAgICAgICAgICAgICgoInBubXJlbWFwMS50ZXN0IikgIiIpCisgICAg ICAgICAgICAgKCgiZ2lmLXJvdW5kdHJpcC50ZXN0IikgIiIpKSkpCisgICAgICAgKHJlcGxhY2Ug J2luc3RhbGwKKyAgICAgICAgIChsYW1iZGEqICgjOmtleSBvdXRwdXRzIG1ha2UtZmxhZ3MgIzph bGxvdy1vdGhlci1rZXlzKQorICAgICAgICAgICAobGV0ICgob3V0IChhc3NvYy1yZWYgb3V0cHV0 cyAib3V0IikpKQorICAgICAgICAgICAgIChhcHBseSBzeXN0ZW0qICJtYWtlIiAicGFja2FnZSIK KyAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgInBrZ2Rpcj0iIG91dCkgbWFrZS1m bGFncykKKyAgICAgICAgICAgICA7OyBjb3B5IHN0YXRpYyBsaWJyYXJ5CisgICAgICAgICAgICAg KGNvcHktZmlsZSAoc3RyaW5nLWFwcGVuZCBvdXQgIi9saW5rL2xpYm5ldHBibS5hIikKKyAgICAg ICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIG91dCAiL2xpYi9saWJuZXRwYm0uYSIp KQorICAgICAgICAgICAgIDs7IHJlbW92ZSBzdXBlcmZsdW91cyBmb2xkZXJzIGFuZCBmaWxlcwor ICAgICAgICAgICAgIChzeXN0ZW0qICJybSIgIi1yIiAoc3RyaW5nLWFwcGVuZCBvdXQgIi9saW5r IikpCisgICAgICAgICAgICAgKHN5c3RlbSogInJtIiAiLXIiIChzdHJpbmctYXBwZW5kIG91dCAi L21pc2MiKSkKKyAgICAgICAgICAgICAod2l0aC1kaXJlY3RvcnktZXhjdXJzaW9uIG91dAorICAg ICAgICAgICAgICAgKGZvci1lYWNoIGRlbGV0ZS1maWxlCisgICAgICAgICAgICAgICAgICAgICAg ICAgJygiY29uZmlnX3RlbXBsYXRlIiAicGtnaW5mbyIgIlJFQURNRSIKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICJWRVJTSU9OIikpKSkpKSkpKQogICAgKHN5bm9wc2lzICJUb29sa2l0IGZv ciBtYW5pcHVsYXRpb24gb2YgaW1hZ2VzIikKICAgIChkZXNjcmlwdGlvbgogICAgICJOZXRwYm0g aXMgYSB0b29sa2l0IGZvciB0aGUgbWFuaXB1bGF0aW9uIG9mIGdyYXBoaWMgaW1hZ2VzLCBpbmNs dWRpbmcKLS0gCjIuNy40Cgo= --001a113df516f74f070532bc156c--