From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54065) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itpEc-0003WV-T1 for guix-patches@gnu.org; Tue, 21 Jan 2020 03:50:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itpEY-0007eL-Vj for guix-patches@gnu.org; Tue, 21 Jan 2020 03:50:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40481) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itpEY-0007eE-Mf for guix-patches@gnu.org; Tue, 21 Jan 2020 03:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1itpEY-00037q-Ls for guix-patches@gnu.org; Tue, 21 Jan 2020 03:50:02 -0500 Subject: [bug#39159] [PATCH] Add Tokei Resent-Message-ID: MIME-Version: 1.0 References: <20200120072549.GD1603@E5400> <4EE3AF80-3720-44BF-87AC-B64DCFD2CAAB@asu.edu> In-Reply-To: <4EE3AF80-3720-44BF-87AC-B64DCFD2CAAB@asu.edu> From: John Soo Date: Tue, 21 Jan 2020 08:49:15 +0000 Message-ID: Content-Type: multipart/mixed; boundary="0000000000003eac47059ca27c93" 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: Efraim Flashner Cc: 39159@debbugs.gnu.org --0000000000003eac47059ca27c93 Content-Type: text/plain; charset="UTF-8" Hi Efraim, I updated the vendored package replacement in librsvg after these patches. This should fix librsvg-next building after tokei is in. I'd like to fix what I can from the coordination thread without conflicting too much with what you've done already. Ripgrep and cbindgen both build correctly after the package updates. Thanks again, John --0000000000003eac47059ca27c93 Content-Type: text/x-patch; charset="UTF-8"; name="0001-gnu-librsvg-next-source-Replace-and-update-some-depe.patch" Content-Disposition: attachment; filename="0001-gnu-librsvg-next-source-Replace-and-update-some-depe.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k5nmzkpk0 RnJvbSAxMzE4MzUyMWI1OTM5YjFjY2VkNDA1NDBmMGEyOTEzM2RmNDk5MjYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIFNvbyA8anNvbzFAYXN1LmVkdT4KRGF0ZTogVHVlLCAy MSBKYW4gMjAyMCAwMDo0MjozMiAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIGdudTogbGlicnN2Zy1u ZXh0LXNvdXJjZTogUmVwbGFjZSBhbmQgdXBkYXRlIHNvbWUKIGRlcGVuZGVuY2llcy4KCiogZ251 L3BhY2thZ2VzL2dub21lLnNjbSAobGlicnN2Zy1uZXh0LXNvdXJjZSk6IFVwZGF0ZSB2ZW5kb3Jl ZCByZXBsYWNlbWVudHMuCi0tLQogZ251L3BhY2thZ2VzL2dub21lLnNjbSB8IDI5ICsrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwg MTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2dub21lLnNjbSBiL2du dS9wYWNrYWdlcy9nbm9tZS5zY20KaW5kZXggMDY0Y2U4Njk1Ni4uZDJkYzM5Mjk2OSAxMDA2NDQK LS0tIGEvZ251L3BhY2thZ2VzL2dub21lLnNjbQorKysgYi9nbnUvcGFja2FnZXMvZ25vbWUuc2Nt CkBAIC00Niw2ICs0Niw3IEBACiA7OzsgQ29weXJpZ2h0IMKpIDIwMTkgSm9uYXRoYW4gQnJpZWxt YWllciA8am9uYXRoYW4uYnJpZWxtYWllckB3ZWIuZGU+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMTkg TGVvIFByaWtsZXIgPGxlby5wcmlrbGVyQHN0dWRlbnQudHVncmF6LmF0PgogOzs7IENvcHlyaWdo dCDCqSAyMDIwIE9sZWcgUHlraGFsb3YgPGdvLndpZ3VzdEBnbWFpbC5jb20+Cis7OzsgQ29weXJp Z2h0IMKpIDIwMjAgSm9obiBTb28gPGpzb28xQGFzdS5lZHU+CiA7OzsKIDs7OyBUaGlzIGZpbGUg aXMgcGFydCBvZiBHTlUgR3VpeC4KIDs7OwpAQCAtMjE4NCw3ICsyMTg1LDcgQEAgZnJvbSBmb3Jj aW5nIEdFWFAtUFJPTUlTRS4iCiAgICAgICAgICAgICAgICAgICAobGFtYmRhIChjcmF0ZSkKICAg ICAgICAgICAgICAgICAgICAgKGRlbGV0ZS1maWxlLXJlY3Vyc2l2ZWx5IChzdHJpbmctYXBwZW5k ICJ2ZW5kb3IvIiAoY2FyIGNyYXRlKSkpCiAgICAgICAgICAgICAgICAgICAgIChpbnZva2UgInRh ciIgInh2ZiIgKGNkciBjcmF0ZSkgIi1DIiAidmVuZG9yIikpCi0gICAgICAgICAgICAgICAgICAn KDsoImFoby1jb3Jhc2ljayIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LWFoby1jb3Jhc2ljay0w LjcpKQorICAgICAgICAgICAgICAgICAgJygoImFoby1jb3Jhc2ljayIgLiAjKyhwYWNrYWdlLXNv dXJjZSBydXN0LWFoby1jb3Jhc2ljay0wLjcpKQogOzsgYWxnYSAwLjkKICAgICAgICAgICAgICAg ICAgICAgKCJhcHByb3giIC4gIysocGFja2FnZS1zb3VyY2UgcnVzdC1hcHByb3gtMC4zKSkKICAg ICAgICAgICAgICAgICAgICAgKCJhcnJheXZlYyIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LWFy cmF5dmVjLTAuNCkpCkBAIC0yMjAzLDkgKzIyMDQsOSBAQCBmcm9tIGZvcmNpbmcgR0VYUC1QUk9N SVNFLiIKICAgICAgICAgICAgICAgICAgICAgKCJjcml0ZXJpb24iIC4gIysocGFja2FnZS1zb3Vy Y2UgcnVzdC1jcml0ZXJpb24tMC4yKSkKICAgICAgICAgICAgICAgICAgICAgKCJjcml0ZXJpb24t cGxvdCIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LWNyaXRlcmlvbi1wbG90LTAuMykpCiAgICAg ICAgICAgICAgICAgICAgICgiY3Jvc3NiZWFtLWRlcXVlIiAuICMrKHBhY2thZ2Utc291cmNlIHJ1 c3QtY3Jvc3NiZWFtLWRlcXVlLTAuNykpCi0gICAgICAgICAgICAgICAgICAgIDsoImNyb3NzYmVh bS1lcG9jaCIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LWNyb3NzYmVhbS1lcG9jaC0wLjcpKQot ICAgICAgICAgICAgICAgICAgICAoImNyb3NzYmVhbS1xdWV1ZSIgLiAjKyhwYWNrYWdlLXNvdXJj ZSBydXN0LWNyb3NzYmVhbS1xdWV1ZS0wLjEpKQotICAgICAgICAgICAgICAgICAgICAoImNyb3Nz YmVhbS11dGlscyIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LWNyb3NzYmVhbS11dGlscy0wLjYp KQorICAgICAgICAgICAgICAgICAgICAoImNyb3NzYmVhbS1lcG9jaCIgLiAjKyhwYWNrYWdlLXNv dXJjZSBydXN0LWNyb3NzYmVhbS1lcG9jaC0wLjgpKQorICAgICAgICAgICAgICAgICAgICAoImNy b3NzYmVhbS1xdWV1ZSIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LWNyb3NzYmVhbS1xdWV1ZS0w LjIpKQorICAgICAgICAgICAgICAgICAgICAoImNyb3NzYmVhbS11dGlscyIgLiAjKyhwYWNrYWdl LXNvdXJjZSBydXN0LWNyb3NzYmVhbS11dGlscy0wLjcpKQogOzsgY3NzcGFyc2VyIDAuMjUKIDs7 IGNzc3BhcnNlci1tYWNyb3MgMC4zCiAgICAgICAgICAgICAgICAgICAgICgiY3N2IiAuICMrKHBh Y2thZ2Utc291cmNlIHJ1c3QtY3N2LTEuMSkpCkBAIC0yMjM0LDcgKzIyMzUsNyBAQCBmcm9tIGZv cmNpbmcgR0VYUC1QUk9NSVNFLiIKIDs7IGdsaWIgMC44CiA7OyBnbGliLXN5cyAwLjkKIDs7IGdv YmplY3Qtc3lzIDAuOQotOzsgaWRuYSAwLjIKKyAgICAgICAgICAgICAgICAgICAgKCJpZG5hIiAu ICMrKHBhY2thZ2Utc291cmNlIHJ1c3QtaWRuYS0wLjIpKQogICAgICAgICAgICAgICAgICAgICAo Iml0ZXJ0b29scyIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LWl0ZXJ0b29scy0wLjgpKQogICAg ICAgICAgICAgICAgICAgICAoIml0b2EiIC4gIysocGFja2FnZS1zb3VyY2UgcnVzdC1pdG9hLTAu NCkpCiAgICAgICAgICAgICAgICAgICAgICgibGFuZ3VhZ2UtdGFncyIgLiAjKyhwYWNrYWdlLXNv dXJjZSBydXN0LWxhbmd1YWdlLXRhZ3MtMC4yKSkKQEAgLTIyNDgsOCArMjI0OSw4IEBAIGZyb20g Zm9yY2luZyBHRVhQLVBST01JU0UuIgogOzsgbWFya3VwNWV2ZXIgMC45CiAgICAgICAgICAgICAg ICAgICAgICgibWF0Y2hlcyIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LW1hdGNoZXMtMC4xKSkK IDs7IG1hdHJpeG11bHRpcGx5IDAuMgotICAgICAgICAgICAgICAgICAgICA7KCJtZW1jaHIiIC4g IysocGFja2FnZS1zb3VyY2UgcnVzdC1tZW1jaHItMi4yKSkKLTs7IG1lbW9mZnNldCAwLjUKKyAg ICAgICAgICAgICAgICAgICAgKCJtZW1jaHIiIC4gIysocGFja2FnZS1zb3VyY2UgcnVzdC1tZW1j aHItMi4yKSkKKyAgICAgICAgICAgICAgICAgICAgKCJtZW1vZmZzZXQiIC4gIysocGFja2FnZS1z b3VyY2UgcnVzdC1tZW1vZmZzZXQtMC41KSkKIDs7IG5hbGdlYnJhIDAuMTgKICAgICAgICAgICAg ICAgICAgICAgKCJuZXdfZGVidWdfdW5yZWFjaGFibGUiIC4gIysocGFja2FnZS1zb3VyY2UgcnVz dC1uZXctZGVidWctdW5yZWFjaGFibGUtMS4wKSkKICAgICAgICAgICAgICAgICAgICAgKCJub2Ry b3AiIC4gIysocGFja2FnZS1zb3VyY2UgcnVzdC1ub2Ryb3AtMC4xKSkKQEAgLTIyODUsMTUgKzIy ODYsMTUgQEAgZnJvbSBmb3JjaW5nIEdFWFAtUFJPTUlTRS4iCiAgICAgICAgICAgICAgICAgICAg ICgicmFuZF9vcyIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LXJhbmQtb3MtMC4xKSkKICAgICAg ICAgICAgICAgICAgICAgKCJyYW5kX3BjZyIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LXJhbmQt cGNnLTAuMSkpCiAgICAgICAgICAgICAgICAgICAgICgicmFuZF94b3JzaGlmdCIgLiAjKyhwYWNr YWdlLXNvdXJjZSBydXN0LXJhbmQteG9yc2hpZnQtMC4xKSkKLTs7IHJhbmRfeG9zaGlybyAwLjEK KyAgICAgICAgICAgICAgICAgICAgKCJyYW5kX3hvc2hpcm8iIC4gIysocGFja2FnZS1zb3VyY2Ug cnVzdC1yYW5kLXhvc2hpcm8tMC4xKSkKIDs7IHJhd3BvaW50ZXIgMC4yCi07OyByYXlvbiAxLjIK LTs7IHJheW9uLWNvcmUgMS42CisgICAgICAgICAgICAgICAgICAgICgicmF5b24iIC4gIysocGFj a2FnZS1zb3VyY2UgcnVzdC1yYXlvbi0xLjMpKQorICAgICAgICAgICAgICAgICAgICAoInJheW9u LWNvcmUiIC4gIysocGFja2FnZS1zb3VyY2UgcnVzdC1yYXlvbi1jb3JlLTEuNykpCiA7OyByY3Ry ZWUgMC4zCiAgICAgICAgICAgICAgICAgICAgICgicmRyYW5kIiAuICMrKHBhY2thZ2Utc291cmNl IHJ1c3QtcmRyYW5kLTAuNCkpCi07OyByZWdleCAxLjMKKyAgICAgICAgICAgICAgICAgICAgKCJy ZWdleCIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LXJlZ2V4LTEuMykpCiAgICAgICAgICAgICAg ICAgICAgICgicmVnZXgtYXV0b21hdGEiIC4gIysocGFja2FnZS1zb3VyY2UgcnVzdC1yZWdleC1h dXRvbWF0YS0wLjEpKQotICAgICAgICAgICAgICAgICAgICA7KCJyZWdleC1zeW50YXgiIC4gIyso cGFja2FnZS1zb3VyY2UgcnVzdC1yZWdleC1zeW50YXgtMC42KSkKKyAgICAgICAgICAgICAgICAg ICAgKCJyZWdleC1zeW50YXgiIC4gIysocGFja2FnZS1zb3VyY2UgcnVzdC1yZWdleC1zeW50YXgt MC42KSkKICAgICAgICAgICAgICAgICAgICAgKCJydXN0Y192ZXJzaW9uIiAuICMrKHBhY2thZ2Ut c291cmNlIHJ1c3QtcnVzdGMtdmVyc2lvbi0wLjIpKQogICAgICAgICAgICAgICAgICAgICAoInJ5 dSIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LXJ5dS0xLjApKQogICAgICAgICAgICAgICAgICAg ICAoInNhbWUtZmlsZSIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LXNhbWUtZmlsZS0xLjApKQpA QCAtMjMxMSwxNCArMjMxMiwxNCBAQCBmcm9tIGZvcmNpbmcgR0VYUC1QUk9NSVNFLiIKICAgICAg ICAgICAgICAgICAgICAgKCJzeW4iIC4gIysocGFja2FnZS1zb3VyY2UgcnVzdC1zeW4tMS4wKSkK ICAgICAgICAgICAgICAgICAgICAgKCJ0ZW5kcmlsIiAuICMrKHBhY2thZ2Utc291cmNlIHJ1c3Qt dGVuZHJpbC0wLjQpKQogICAgICAgICAgICAgICAgICAgICAoInRleHR3cmFwIiAuICMrKHBhY2th Z2Utc291cmNlIHJ1c3QtdGV4dHdyYXAtMC4xMSkpCi0gICAgICAgICAgICAgICAgICAgICgidGhy ZWFkX2xvY2FsIiAuICMrKHBhY2thZ2Utc291cmNlIHJ1c3QtdGhyZWFkLWxvY2FsLTAuMykpCisg ICAgICAgICAgICAgICAgICAgICgidGhyZWFkX2xvY2FsIiAuICMrKHBhY2thZ2Utc291cmNlIHJ1 c3QtdGhyZWFkLWxvY2FsLTEuMCkpCiAgICAgICAgICAgICAgICAgICAgICgidGlueXRlbXBsYXRl IiAuICMrKHBhY2thZ2Utc291cmNlIHJ1c3QtdGlueXRlbXBsYXRlLTEuMCkpCiAgICAgICAgICAg ICAgICAgICAgICgidHlwZW51bSIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LXR5cGVudW0tMS4x MCkpCiAgICAgICAgICAgICAgICAgICAgICgidW5pY29kZS1iaWRpIiAuICMrKHBhY2thZ2Utc291 cmNlIHJ1c3QtdW5pY29kZS1iaWRpLTAuMykpCiAgICAgICAgICAgICAgICAgICAgICgidW5pY29k ZS1ub3JtYWxpemF0aW9uIiAuICMrKHBhY2thZ2Utc291cmNlIHJ1c3QtdW5pY29kZS1ub3JtYWxp emF0aW9uLTAuMSkpCiAgICAgICAgICAgICAgICAgICAgICgidW5pY29kZS13aWR0aCIgLiAjKyhw YWNrYWdlLXNvdXJjZSBydXN0LXVuaWNvZGUtd2lkdGgtMC4xKSkKICAgICAgICAgICAgICAgICAg ICAgKCJ1bmljb2RlLXhpZCIgLiAjKyhwYWNrYWdlLXNvdXJjZSBydXN0LXVuaWNvZGUteGlkLTAu MikpCi07OyB1cmwgMi4xCisgICAgICAgICAgICAgICAgICAgICgidXJsIiAuICMrKHBhY2thZ2Ut c291cmNlIHJ1c3QtdXJsLTIuMSkpCiAgICAgICAgICAgICAgICAgICAgICgidXRmLTgiIC4gIyso cGFja2FnZS1zb3VyY2UgcnVzdC11dGYtOC0wLjcpKQogICAgICAgICAgICAgICAgICAgICAoIndh bGtkaXIiIC4gIysocGFja2FnZS1zb3VyY2UgcnVzdC13YWxrZGlyLTIuMikpCiAgICAgICAgICAg ICAgICAgICAgICgid2luYXBpIiAuICMrKHBhY2thZ2Utc291cmNlIHJ1c3Qtd2luYXBpLTAuMykp Ci0tIAoyLjI1LjAKCg== --0000000000003eac47059ca27c93--