From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +JlTOFxY42CCCwEAgWs5BA (envelope-from ) for ; Mon, 05 Jul 2021 21:07:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id qCP2M1xY42A2GgAAbx9fmQ (envelope-from ) for ; Mon, 05 Jul 2021 19:07:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 573221E4D7 for ; Mon, 5 Jul 2021 21:07:08 +0200 (CEST) Received: from localhost ([::1]:59164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0Tvv-0002lN-Al for larch@yhetil.org; Mon, 05 Jul 2021 15:07:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0Tvq-0002lF-Co for guix-patches@gnu.org; Mon, 05 Jul 2021 15:07:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0Tvq-0003og-4v for guix-patches@gnu.org; Mon, 05 Jul 2021 15:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m0Tvp-0003bg-VA for guix-patches@gnu.org; Mon, 05 Jul 2021 15:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49421] [PATCH] profiles: Optimise 'fonts-dir-file'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Jul 2021 19:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49421 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49421@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162551200813844 (code B ref -1); Mon, 05 Jul 2021 19:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jul 2021 19:06:48 +0000 Received: from localhost ([127.0.0.1]:46667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0Tvc-0003bE-9p for submit@debbugs.gnu.org; Mon, 05 Jul 2021 15:06:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:46666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0Tvb-0003b6-3f for submit@debbugs.gnu.org; Mon, 05 Jul 2021 15:06:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0Tva-0002jD-Kn for guix-patches@gnu.org; Mon, 05 Jul 2021 15:06:47 -0400 Received: from laurent.telenet-ops.be ([2a02:1800:110:4::f00:19]:37826) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0TvX-0003ab-Fq for guix-patches@gnu.org; Mon, 05 Jul 2021 15:06:46 -0400 Received: from butterfly.local ([188.189.37.160]) by laurent.telenet-ops.be with bizsmtp id RX6e2500S3TK16401X6fRe; Mon, 05 Jul 2021 21:06:40 +0200 Message-ID: From: Maxime Devos Date: Mon, 05 Jul 2021 21:06:32 +0200 Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-eL9RW6M64D0urJpMFyVi" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1625512000; bh=MKk42yST6cQgFpQLSwQm0V0RnDr8kShPYI9A47IR2dQ=; h=Subject:From:To:Date; b=FOb6COnKsREiTmPN0XeVa8cisyAqlmXdSFgVAeD1VPAdKDUmnm1l6dAkoaZkFo1nd E/M0m+/VNmvly3pejQu4p0Bf/szH4Cv+5bXUpC1ENimyKbSk5tBYtEagJ1QvOWUhx2 ZI8EjRm9FtaJuqmzaVprOb6AFKm/MgG5KXnu1YxNg2hQ5/CXD2h1nCtKDKi8XNXKeB Q5PbW/j0F9Y0uK917p5KrhfmZextk/4xl4o5KXuPBtTGLveK98LTXiUsWBEsU3DPcS 3fhKZ4+NvQJUFtOUCh8CkmkMiBwTtPnnhquEiQN4syq0x8ZweXT0k8IkA5jVbgVoYX 6F5kqJ28q6Gig== Received-SPF: pass client-ip=2a02:1800:110:4::f00:19; envelope-from=maximedevos@telenet.be; helo=laurent.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1625512028; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=MKk42yST6cQgFpQLSwQm0V0RnDr8kShPYI9A47IR2dQ=; b=MwOGzEck95XPBAtdLykA6g6nV9ykSeEO439rkB9z8LLtbeAQYOqgUWbmWyqus4P+2VRYoY htmjbZbHcB0DeDdsn/UXJ/48xD1TtOqSlMsePfqaY0Y4pK0pNNL3GsWdnIIascarT/Yhge etrY2DrV6m3vm8AWBgeMSkyQS+8y3Y15H3WXgYiMhTG0dfgiWL0HTxfw24rT2eZJqnK3PR 00ewsoQK754xl04cS09jiJMVelu1o7WJ0ZUB7p4BTeBqn4HfM/phNtH6vCTG5iZF6NTOsj jFPodSe250bcP+UY2FDoyd1TalsZzjSA06lfjhIUYLTlKRd/Kud0KNSS/y1qOA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625512028; a=rsa-sha256; cv=none; b=sEOnS+/IXVAqkM/0oWTtNfUd4wSRsQKyPNpIEpsWkgNNdWGteDQe7SnazcYcpEsQXS8dvV tCkA0HmplGRjwDDw3EU2wE47EQV1qo8DMoRhSwgYX0jnfZtDmTOZPyoALPUQLOeh2PvhzS Vgh1IoQCsUFgazTw5ladjJz8KEeNrqRbGl7dGciyYarPbtt00MVDBxbkeGQrQ5+15g2S77 jKgheMYM+LYC5xShSSOIvjPnJrv4D0vHb+G/z1lRJQ7s2ESiS0kkUyW1/1TsR/5LXi2GGH LsGMvvBpWQeKCTJzitng+/Smk++c26Drkgo13zpfzTji4jeMk7L0+qia/bO3yQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=FOb6COnK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=FOb6COnK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 573221E4D7 X-Spam-Score: -2.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: AK401N2UY4d0 --=-eL9RW6M64D0urJpMFyVi Content-Type: multipart/mixed; boundary="=-hq4KR5p1OcuVD7uhGQNP" --=-hq4KR5p1OcuVD7uhGQNP Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi guix, These two patches should speed up profile generation by optimising the 'fonts-dir-file' hook. The first patch is the most important; from the commit message: =E2=80=98Only let the build G-exp refer to inputs that might actually have fonts. That way, if the list of fonts in the manifest didn't change and the new manifest is built, the font files will not be rebuilt.=E2=80=99 The second patch doesn't bring much. To test, you can test whether things like ... $ ./pre-inst-env guix environment --ad-hoc --pure lagrange -- lagrange still work (lagrange is a graphical application using fonts). Not sure what a good =E2=80=98benchmark=E2=80=99 would be. Unfortunately, this does not help with the "guix package -i" case, as in that case, the code doesn't have access to all the package objects, and will have to satisfy itself with the store paths, in which case the profile code pessimistically assumes the store item has fonts ... I suppose this restriction could be lifted if/when the gs-fonts package is renamed to font-ghostscript or something like that ... However, the optimisation should work in the "guix environment ... --ad-hoc= ...", "guix system reconfigure ..." and (I'd presume) the guix home-manager cases= , though I only tested the first. Greetings, Maxime. --=-hq4KR5p1OcuVD7uhGQNP Content-Disposition: inline; filename="0001-profiles-Optimise-fonts-dir-file.patch" Content-Type: text/x-patch; name="0001-profiles-Optimise-fonts-dir-file.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA0ZmUxZTMwZTMzYzAxYmU5ZmQxN2NmMjQwNzMyYjMzNTFjN2IwZmE0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IE1vbiwgNSBKdWwgMjAyMSAxODo1NTozMSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMS8y XSBwcm9maWxlczogT3B0aW1pc2UgJ2ZvbnRzLWRpci1maWxlJy4KCk9ubHkgbGV0IHRoZSBidWls ZCBHLWV4cCByZWZlciB0byBpbnB1dHMgdGhhdCBtaWdodCBhY3R1YWxseQpoYXZlIGZvbnRzLiAg VGhhdCB3YXksIGlmIHRoZSBsaXN0IG9mIGZvbnRzIGluIHRoZSBtYW5pZmVzdApkaWRuJ3QgY2hh bmdlIGFuZCB0aGUgbmV3IG1hbmlmZXN0IGlzIGJ1aWx0LCB0aGUgZm9udCBmaWxlcwp3aWxsIG5v dCBiZSByZWJ1aWx0LgoKKiBndWl4L3Byb2ZpbGVzLnNjbQogIChmb250cy1kaXItZmlsZSlbaGFz LWZvbnRzP106IE5ldyBwcmVkaWNhdGUuCiAgKGZvbnRzLWRpci1maWxlKVtyZWxldmFudC1pbnB1 dHNdOiBOZXcgdmFyaWFibGUuCiAgKGZvbnRzLWRpci1maWxlKVtidWlsZF06IFVzZSAncmVsZXZh bnQtaW5wdXRzJyBpbnN0ZWFkIG9mCiAgJ21hbmlmZXN0LWlucHV0cycuCiogZG9jL2NvbnRyaWJ1 dGluZy50ZXhpIChGb250cyk6IE5vdGUgdGhlICdmb250cy0nIG5hbWluZwogIGNvbnZlbnRpb24g aXMgdGVjaG5pY2FsbHkgaW1wb3J0YW50IG5vdy4KKiBnbnUvcGFja2FnZXMvZ2hvc3RzY3JpcHQu c2NtIChncy1mb250cyk6IFdvcmstYXJvdW5kIHRoZQogIHBhY2thZ2UgbmFtZSBjb250cmF2ZW5p bmcgdGhlIGNvbnZlbnRpb24uCi0tLQogZG9jL2NvbnRyaWJ1dGluZy50ZXhpICAgICAgICB8ICA4 ICsrKysrKysrCiBnbnUvcGFja2FnZXMvZ2hvc3RzY3JpcHQuc2NtIHwgMTAgKysrKysrKysrLQog Z3VpeC9wcm9maWxlcy5zY20gICAgICAgICAgICB8IDIyICsrKysrKysrKysrKysrKysrKysrKy0K IDMgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kb2MvY29udHJpYnV0aW5nLnRleGkgYi9kb2MvY29udHJpYnV0aW5nLnRleGkKaW5k ZXggMWYwMTYwYTcwNy4uOTAzY2ZkMzkwYiAxMDA2NDQKLS0tIGEvZG9jL2NvbnRyaWJ1dGluZy50 ZXhpCisrKyBiL2RvYy9jb250cmlidXRpbmcudGV4aQpAQCAtODg2LDYgKzg4NiwxNCBAQCBpcyBh ZGRlZCB0byB0aGUgcGFja2FnZSBuYW1lLiAgV2UgdXNlIEBjb2Rley10dGZ9IGZvciBUcnVlVHlw ZSBmb250cywKIEBjb2Rley1vdGZ9IGZvciBPcGVuVHlwZSBmb250cyBhbmQgQGNvZGV7LXR5cGUx fSBmb3IgUG9zdFNjcmlwdCBUeXBlIDEKIGZvbnRzLgogCitUaGVyZSBhcmUgaW1wb3J0YW50IHRl Y2huaWNhbCByZWFzb25zIGZvciB0aGlzIG5hbWluZyBjb252ZW50aW9uIGFzIHdlbGw6Citmb3Ig ZWZmaWNpZW5jeSByZWFzb25zLCB0aGUgcHJvZmlsZSBnZW5lcmF0aW9uIGNvZGUgbmVlZHMgdG8g a25vdyBpZiBhCitwYWNrYWdlIGhhcyBmb250cyBhbmQgbG9va3MgYXQgdGhlIHBhY2thZ2UgbmFt ZSB0byBkZXRlcm1pbmUgdGhpcy4KKworQGMgXiBUaGVyZSBpcyBhbiBlc2NhcGUgaGF0Y2ggKHRo ZSAnaGFzLWZvbnRzPycgcGFja2FnZSBwcm9wZXJ0eSksCitAYyBidXQgbGV0J3Mga2VlcCBpdCB1 bmRvY3VtZW50ZWQgdW50aWwgaXQgdHVybnMgb3V0IHRvIGJlIGFjdHVhbGx5CitAYyBuZWVkZWQg c29tZXdoZXJlIGVsc2UgdGhhbiBpbiB0aGUgaW5jb3JyZWN0bHktbmFtZWQgJ2dzLWZvbnRzJwor QGMgcGFja2FnZSAuLi4KIAogQG5vZGUgQ29kaW5nIFN0eWxlCiBAc2VjdGlvbiBDb2RpbmcgU3R5 bGUKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9naG9zdHNjcmlwdC5zY20gYi9nbnUvcGFja2Fn ZXMvZ2hvc3RzY3JpcHQuc2NtCmluZGV4IDAzYTUxNmRjNTIuLmE5ZjFjNTJjNjYgMTAwNjQ0Ci0t LSBhL2dudS9wYWNrYWdlcy9naG9zdHNjcmlwdC5zY20KKysrIGIvZ251L3BhY2thZ2VzL2dob3N0 c2NyaXB0LnNjbQpAQCAtMzg0LDcgKzM4NCwxNSBAQCBhcmNoaXRlY3R1cmUuIikKICAgICAiR2hv c3RzY3JpcHQgZm9udHMgcHJvdmlkZXMgZm9udHMgYW5kIGZvbnQgbWV0cmljcyBjdXN0b21hcmls eSBkaXN0cmlidXRlZCB3aXRoCiBHaG9zdHNjcmlwdC4gIEl0IGN1cnJlbnRseSBpbmNsdWRlcyB0 aGUgMzUgc3RhbmRhcmQgUG9zdFNjcmlwdCBmb250cy4iKQogICAgKGxpY2Vuc2UgbGljZW5zZTpn cGwyKQotICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9zb3VyY2Vmb3JnZS5uZXQvcHJvamVjdHMvZ3Mt Zm9udHMvIikpKQorICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9zb3VyY2Vmb3JnZS5uZXQvcHJvamVj dHMvZ3MtZm9udHMvIikKKyAgIChwcm9wZXJ0aWVzCisgICAgOzsgVE9ETzogZXhwbGljaXRlbHkg dGVsbCAnZm9udHMtZGlyLWZpbGUnIHRoYXQgdGhpcyBpcyBhIGZvbnQgcGFja2FnZSwKKyAgICA7 OyBhcyB0aGlzIHBhY2thZ2UgdmlvbGF0ZXMgdGhlIGNvbnZlbnRpb24gdGhhdCBmb250IHBhY2th Z2UgbmFtZXMgYXJlCisgICAgOzsgcHJlZml4ZWQgd2l0aCAnZm9udC0nLgorICAgIDs7CisgICAg OzsgVE9ETyhjb3JlLXVwZGF0ZXMpOiBSZW5hbWUgcGFja2FnZSB0byAnZm9udHMtZ2hvc3RzY3Jp cHQnIG9yIHNvbWV0aGluZworICAgIDs7IGxpa2UgdGhhdC4KKyAgICBgKChoYXMtZm9udHM/IC4g I3QpKSkpKQogCiAoZGVmaW5lLXB1YmxpYyBsaWJzcGVjdHJlCiAgIChwYWNrYWdlCmRpZmYgLS1n aXQgYS9ndWl4L3Byb2ZpbGVzLnNjbSBiL2d1aXgvcHJvZmlsZXMuc2NtCmluZGV4IDhjMDIxNDlj NmYuLjBmOWRmNjhmNDIgMTAwNjQ0Ci0tLSBhL2d1aXgvcHJvZmlsZXMuc2NtCisrKyBiL2d1aXgv cHJvZmlsZXMuc2NtCkBAIC0xMiw2ICsxMiw3IEBACiA7OzsgQ29weXJpZ2h0IMKpIDIwMTkgTWF0 aGlldSBPdGhhY2VoZSA8bS5vdGhhY2VoZUBnbWFpbC5jb20+CiA7OzsgQ29weXJpZ2h0IMKpIDIw MjAgRGFubnkgTWlsb3NhdmxqZXZpYyA8ZGFubnltQHNjcmF0Y2hwb3N0Lm9yZz4KIDs7OyBDb3B5 cmlnaHQgwqkgMjAxNCBEYXZpZCBUaG9tcHNvbiA8ZGF2ZXRAZ251Lm9yZz4KKzs7OyBDb3B5cmln aHQgwqkgMjAyMSBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+CiA7OzsKIDs7 OyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgR3VpeC4KIDs7OwpAQCAtMzMsNiArMzQsOCBAQAog ICAjOnVzZS1tb2R1bGUgKChndWl4IHV0aWxzKSAjOmhpZGUgKHBhY2thZ2UtbmFtZS0+bmFtZSt2 ZXJzaW9uKSkKICAgIzp1c2UtbW9kdWxlICgoZ3VpeCBidWlsZCB1dGlscykKICAgICAgICAgICAg ICAgICAjOnNlbGVjdCAocGFja2FnZS1uYW1lLT5uYW1lK3ZlcnNpb24gbWtkaXItcCkpCisgICM6 dXNlLW1vZHVsZSAoKGd1aXggYnVpbGQtc3lzdGVtKQorICAgICAgICAgICAgICAgICM6c2VsZWN0 IChidWlsZC1zeXN0ZW0tbmFtZSkpCiAgICM6dXNlLW1vZHVsZSAoKGd1aXggZGlhZ25vc3RpY3Mp ICM6c2VsZWN0ICgmZml4LWhpbnQpKQogICAjOnVzZS1tb2R1bGUgKGd1aXggaTE4bikKICAgIzp1 c2UtbW9kdWxlIChndWl4IHJlY29yZHMpCkBAIC0xNTE0LDYgKzE1MTcsMjMgQEAgZmlsZXMgZm9y IHRoZSBmb250cyBvZiB0aGUgQHZhcnttYW5pZmVzdH0gZW50cmllcy4iCiAgIChkZWZpbmUgbWtm b250ZGlyCiAgICAgKG1vZHVsZS1yZWYgKHJlc29sdmUtaW50ZXJmYWNlICcoZ251IHBhY2thZ2Vz IHhvcmcpKSAnbWtmb250ZGlyKSkKIAorICAoZGVmaW5lIChoYXMtZm9udHM/IGlucHV0KQorICAg IChkZWZpbmUgdGhpbmcgKGdleHAtaW5wdXQtdGhpbmcgaW5wdXQpKQorICAgIChpZiAocGFja2Fn ZT8gdGhpbmcpCisgICAgICAgIChvciAoc3RyaW5nLXByZWZpeD8gImZvbnQtIiAocGFja2FnZS1u YW1lIHRoaW5nKSkKKyAgICAgICAgICAgIDs7IEluIHRoZSB1cHN0cmVhbSAnZ3VpeCcgY2hhbm5l bCwgZm9udCBwYWNrYWdlcyBzaG91bGQKKyAgICAgICAgICAgIDs7IGJlIG5hbWVkIGZvbnQtU09N RVRISU5HLiAgQnV0IGlmIGFub3RoZXIgY2hhbm5lbAorICAgICAgICAgICAgOzsgbmFtZXMgaXRz IGZvbnRzIGRpZmZlcmVudGx5IGJ1dCB1c2VzIGZvbnQtYnVpbGQtc3lzdGVtLAorICAgICAgICAg ICAgOzsgYWNjZXB0aW5nIHRoYXQgc2VlbXMgZnJpZW5kbHkuCisgICAgICAgICAgICAoZXE/ICdm b250IChidWlsZC1zeXN0ZW0tbmFtZSAocGFja2FnZS1idWlsZC1zeXN0ZW0gdGhpbmcpKSkKKyAg ICAgICAgICAgIDs7IEZJWE1FKGNvcmUtdXBkYXRlcykgZXNjYXBlIGhhdGNoIGZvciB0aGUgaW5j b3JyZWN0bHktbmFtZWQKKyAgICAgICAgICAgIDs7ICdncy1mb250cycgcGFja2FnZQorICAgICAg ICAgICAgKGFzc3EtcmVmIChwYWNrYWdlLXByb3BlcnRpZXMgdGhpbmcpICdoYXMtZm9udHM/KSkK KyAgICAgICAgOzsgUGVzc2ltaXN0aWNhbGx5IGFzc3VtZSB0aGUgaW5wdXQgbWlnaHQgaGF2ZSBm b250cy4KKyAgICAgICAgI3QpKQorCisgIChkZWZpbmUgcmVsZXZhbnQtaW5wdXRzIChmaWx0ZXIg aGFzLWZvbnRzPyAobWFuaWZlc3QtaW5wdXRzIG1hbmlmZXN0KSkpCisKICAgKGRlZmluZSBidWls ZAogICAgICN+KGJlZ2luCiAgICAgICAgICh1c2UtbW9kdWxlcyAoc3JmaSBzcmZpLTI2KQpAQCAt MTUyMiw3ICsxNTQyLDcgQEAgZmlsZXMgZm9yIHRoZSBmb250cyBvZiB0aGUgQHZhcnttYW5pZmVz dH0gZW50cmllcy4iCiAgICAgICAgIChsZXQgKChmb250cy1kaXJzIChmaWx0ZXIgZmlsZS1leGlz dHM/CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG1hcCAoY3V0IHN0cmluZy1h cHBlbmQgPD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9z aGFyZS9mb250cyIpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnIyQo bWFuaWZlc3QtaW5wdXRzIG1hbmlmZXN0KSkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICcjJHJlbGV2YW50LWlucHV0cykpKSkKICAgICAgICAgICAobWtkaXIgIyRv dXRwdXQpCiAgICAgICAgICAgKGlmIChudWxsPyBmb250cy1kaXJzKQogICAgICAgICAgICAgICAo ZXhpdCAjdCkKLS0gCjIuMzIuMAoK --=-hq4KR5p1OcuVD7uhGQNP Content-Disposition: inline; filename*0=0002-profiles-Avoid-dependency-on-mkfontdir-and-friend-wh.pat; filename*1=ch Content-Type: text/x-patch; name="0002-profiles-Avoid-dependency-on-mkfontdir-and-friend-wh.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBhNzA2YjhiZTRmNTQ1MzBiMWNkMTJjMDNhMWJmMzk0MWJlNDNiZTNjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IE1vbiwgNSBKdWwgMjAyMSAyMDoxNjoyMiArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMi8y XSBwcm9maWxlczogQXZvaWQgZGVwZW5kZW5jeSBvbiAnbWtmb250ZGlyJyBhbmQgZnJpZW5kIHdo ZW4KIHVudXNlZC4KCkF2b2lkIGRlcGVuZGluZyBvbiBvbiAibWtmb250ZGlyIiBhbmQgIm1rZm9u dHNjYWxlIiBpZgp0aGV5IHdvbid0IGFjdHVhbGx5IGJlIHVzZWQsIHRvIGF2b2lkIGJ1aWxkaW5n IHRoZQphZm9yZW1lbnRpb25lZCBwYWNrYWdlcyB3aGVuIHRoZXkgYXJlIHVwZGF0ZWQuCgoqIGd1 aXgvcHJvZmlsZXMuc2NtCiAgKGZvbnRzLWRpci1maWxlKVtidWlsZF06IE5vdGUgd2h5IHRoZSAn KG51bGw/IGZvbnRzLWRpciknIGNoZWNrCiAgY2Fubm90IGJlIHJlbW92ZWQuCiAgKGZvbnRzLWRp ci1maWxlKTogV2hlbiB0aGUgJ3JlbGV2YW50LWlucHV0cycgbGlzdCBpcyBlbXB0eSwKICBqdXN0 IGJ1aWxkIGFuIGVtcHR5IGRpcmVjdG9yeS4KLS0tCiBndWl4L3Byb2ZpbGVzLnNjbSB8IDI1ICsr KysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCsp LCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2d1aXgvcHJvZmlsZXMuc2NtIGIvZ3VpeC9w cm9maWxlcy5zY20KaW5kZXggMGY5ZGY2OGY0Mi4uNmNmNDgwZGRmMiAxMDA2NDQKLS0tIGEvZ3Vp eC9wcm9maWxlcy5zY20KKysrIGIvZ3VpeC9wcm9maWxlcy5zY20KQEAgLTE1NDQsNiArMTU0NCw4 IEBAIGZpbGVzIGZvciB0aGUgZm9udHMgb2YgdGhlIEB2YXJ7bWFuaWZlc3R9IGVudHJpZXMuIgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL3NoYXJlL2ZvbnRz IikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcjJHJlbGV2YW50LWlu cHV0cykpKSkKICAgICAgICAgICAobWtkaXIgIyRvdXRwdXQpCisgICAgICAgICAgOzsgaGFzLWZv bnRzPyBjYW4gaGF2ZSBmYWxzZSBwb3NpdGl2ZXMsCisgICAgICAgICAgOzsgc28gdGhpcyBjaGVj ayBpcyBuZWNlc3NhcnkuCiAgICAgICAgICAgKGlmIChudWxsPyBmb250cy1kaXJzKQogICAgICAg ICAgICAgICAoZXhpdCAjdCkKICAgICAgICAgICAgICAgKGxldCogKChzaGFyZS1kaXIgICAoc3Ry aW5nLWFwcGVuZCAjJG91dHB1dCAiL3NoYXJlIikpCkBAIC0xNTg1LDE1ICsxNTg3LDIwIEBAIGZp bGVzIGZvciB0aGUgZm9udHMgb2YgdGhlIEB2YXJ7bWFuaWZlc3R9IGVudHJpZXMuIgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChkZWxldGUtZmlsZSBmb250cy1kaXItZmlsZSkp KSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXJlY3RvcmllcykpKSkpKSkKIAotICAo Z2V4cC0+ZGVyaXZhdGlvbiAiZm9udHMtZGlyIiBidWlsZAotICAgICAgICAgICAgICAgICAgICAj Om1vZHVsZXMgJygoZ3VpeCBidWlsZCB1dGlscykKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKGd1aXggYnVpbGQgdW5pb24pCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChzcmZpIHNyZmktMjYpKQotICAgICAgICAgICAgICAgICAgICAjOmxvY2FsLWJ1aWxkPyAjdAot ICAgICAgICAgICAgICAgICAgICAjOnN1YnN0aXR1dGFibGU/ICNmCi0gICAgICAgICAgICAgICAg ICAgICM6cHJvcGVydGllcwotICAgICAgICAgICAgICAgICAgICBgKCh0eXBlIC4gcHJvZmlsZS1o b29rKQotICAgICAgICAgICAgICAgICAgICAgIChob29rIC4gZm9udHMtZGlyKSkpKQorICAoaWYg KG51bGw/IHJlbGV2YW50LWlucHV0cykKKyAgICAgIDs7IEF2b2lkIGRlcGVuZGluZyBvbiBvbiAi bWtmb250ZGlyIiBhbmQgIm1rZm9udHNjYWxlIiBpZgorICAgICAgOzsgdGhleSB3b24ndCBhY3R1 YWxseSBiZSB1c2VkLCB0byBhdm9pZCBidWlsZGluZyB0aGUgYWZvcmVtZW50aW9uZWQKKyAgICAg IDs7IHBhY2thZ2VzIHdoZW4gdGhleSBhcmUgdXBkYXRlZC4KKyAgICAgIChsb3dlci1vYmplY3Qg KGZpbGUtdW5pb24gImZvbnRzLWRpciIgJygpKSkKKyAgICAgIChnZXhwLT5kZXJpdmF0aW9uICJm b250cy1kaXIiIGJ1aWxkCisgICAgICAgICAgICAgICAgICAgICAgICAjOm1vZHVsZXMgJygoZ3Vp eCBidWlsZCB1dGlscykKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChndWl4 IGJ1aWxkIHVuaW9uKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNyZmkg c3JmaS0yNikpCisgICAgICAgICAgICAgICAgICAgICAgICAjOmxvY2FsLWJ1aWxkPyAjdAorICAg ICAgICAgICAgICAgICAgICAgICAgIzpzdWJzdGl0dXRhYmxlPyAjZgorICAgICAgICAgICAgICAg ICAgICAgICAgIzpwcm9wZXJ0aWVzCisgICAgICAgICAgICAgICAgICAgICAgICBgKCh0eXBlIC4g cHJvZmlsZS1ob29rKQorICAgICAgICAgICAgICAgICAgICAgICAgICAoaG9vayAuIGZvbnRzLWRp cikpKSkpCiAKIChkZWZpbmUgKG1hbnVhbC1kYXRhYmFzZSBtYW5pZmVzdCkKICAgIlJldHVybiBh IGRlcml2YXRpb24gdGhhdCBidWlsZHMgdGhlIG1hbnVhbCBwYWdlIGRhdGFiYXNlIChcIm1hbmRi XCIpIGZvcgotLSAKMi4zMi4wCgo= --=-hq4KR5p1OcuVD7uhGQNP-- --=-eL9RW6M64D0urJpMFyVi Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYONYOBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7lJtAP9nvaqaE+zY3PdMOWeNm3KRB0gn Jg7olk/UOUwGsYucgAEA2flnKzsocky7i3yjttW1kFKdfasoNfjiUnMOziukKw0= =6xxl -----END PGP SIGNATURE----- --=-eL9RW6M64D0urJpMFyVi--