From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id KO9JA+0f8WIk4AAAbAwnHQ (envelope-from ) for ; Mon, 08 Aug 2022 16:38:37 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id AHdyAu0f8WI5bQEAG6o9tA (envelope-from ) for ; Mon, 08 Aug 2022 16:38:37 +0200 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 74976AF0D for ; Mon, 8 Aug 2022 16:38:36 +0200 (CEST) Received: from localhost ([::1]:54796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oL3tr-0004WX-H5 for larch@yhetil.org; Mon, 08 Aug 2022 10:38:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oL3tK-0003S9-DU for guix-patches@gnu.org; Mon, 08 Aug 2022 10:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oL3tK-00029c-4g for guix-patches@gnu.org; Mon, 08 Aug 2022 10:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oL3tK-0001xi-15 for guix-patches@gnu.org; Mon, 08 Aug 2022 10:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57043] [PATCH] gnu: rust-freetype-sys-0.13: Unbundle freetype2. References: In-Reply-To: Resent-From: Jean Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Aug 2022 14:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "57043@debbugs.gnu.org" <57043@debbugs.gnu.org> Received: via spool by 57043-submit@debbugs.gnu.org id=B57043.16599694437478 (code B ref 57043); Mon, 08 Aug 2022 14:38:01 +0000 Received: (at 57043) by debbugs.gnu.org; 8 Aug 2022 14:37:23 +0000 Received: from localhost ([127.0.0.1]:41449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL3sg-0001wY-Ou for submit@debbugs.gnu.org; Mon, 08 Aug 2022 10:37:23 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:41325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL3sc-0001w1-KL for 57043@debbugs.gnu.org; Mon, 08 Aug 2022 10:37:21 -0400 Date: Mon, 08 Aug 2022 14:37:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jeandudey.tech; s=protonmail3; t=1659969431; x=1660228631; bh=GHS7Qw4WEpnzIbHK+Er0Z3dNZTjCcJY7kgqnm0VxBx8=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=HfgvBYxiEcbaNQjKxrMQijenf68nr6ZwOPF06ycaho38bXb9ciYfn8dDzx04nQQPr 9KPVwM5cN7BO5mvgkLlMwpJJUrIIe2Fzsfw6oCfLL3uGc/lU1XhZLxtWxzxSajPXk0 slA1Dd4CLQZPQtXp6c3ogBk92/r2knAS7DvFqY8aqdh3R+t7kbixfpE8WPhoR5KBds p6SD3XauQGPf/j7SAY3fBbDvwhJLCW0UORTnITxla70SXcuqwjnonGuAEjJMwqqYMf RX6V+VgPSoYQv1WPPdJPFGEUikn6s2EJYNAD0uk3oTuNeXzLWauDY8u2zs1+HAKg1s +lZA8RlxwLS/A== Message-ID: Feedback-ID: 20187791:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_1rMOy1YQY4nQivi1jDX4vzV7Aroi2aD1oW6GQF4LEc" 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" Reply-to: Jean Pierre De Jesus DIAZ X-ACL-Warn: , Jean Pierre De Jesus DIAZ via Guix-patches From: Jean Pierre De Jesus DIAZ via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1659969516; h=from:from:sender:sender:reply-to: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:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=GHS7Qw4WEpnzIbHK+Er0Z3dNZTjCcJY7kgqnm0VxBx8=; b=EK1vh3GAgPIHECrtH5A6i5775fxrGJJENgS8wKkdJw7g21iiUaV+ndw3JWZXdHmL1t08ZZ CWXHkZCsB2dz8Rp9grmp8X0Xz9M0CU/0yYyT4vRf8w8M1ozuZeChpTtkV6Msa93T3s21kQ H0pjt5log5TMTqOr51IcoyJFg+6hQ/TwCAj8jKRleOrRl2zKpeL8gJ+ekAb1OskyObvqVQ Z5xA3XBaJFqQcfpCQ3le9jx7uZlJQE2+KEYReDp3tNPXT/KQSV8uYhRBjp+EqOgumNi0/o NoeojmsYfV5NW2x6huaP34ivhWQEbWst4Z9dn8TsYzA4NnQRvJSWZLplDV/ObQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659969516; a=rsa-sha256; cv=none; b=FZJnPU2tP61JWVqtIBtKJEWyliiTP1M0McP1U7yLgcT3bv0Z58KM5aehomZxVNYyhcIupV Y0aixUueKncKz249+fyD+kIAdWs0d+/zZ6nOJ3GAD/vzTHjtXMX6AJZHYoGizzH4i8puMo FNOB8LuhShvRXruKLumqWmUrPugV8gcEGSPNEbanAYRYw41DGVzUaQlAHn74NIlV5Y4Fk2 Ze1nVgQ8TSBDnprfbM1LSopU3ItnW9P+BnYq7ROC88OSu/NESf/S3D+AtE15eigHJYsSfb ys/Ua+8w3A8ULTstYHZftKFQWr3T/+5UxZBPxfqNHKhm7nyZlzLYhuX96ewGtQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jeandudey.tech header.s=protonmail3 header.b=HfgvBYxi; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.29 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jeandudey.tech header.s=protonmail3 header.b=HfgvBYxi; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 74976AF0D X-Spam-Score: -3.29 X-Migadu-Scanner: scn1.migadu.com X-TUID: ml5iJwiuJDzQ This is a multi-part message in MIME format. --b1_1rMOy1YQY4nQivi1jDX4vzV7Aroi2aD1oW6GQF4LEc Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable >Anyway, this can be done more simple -- all that I needed to do was >deleting the freetype2 subdirectory (in a snippet) and adding 'freetype' >to inputs. Patching the build script or build.rs was not necessary. Thought that the pkg-config `if' block was for Android only, my mistake. Probably influenced by the compilation error caused by not building without the freetype2 directory, because `pkg-config' was not present. >Additionally, I noticed that in the modified build.rs, only >rustc-link-lib (-l) is set, but not rustc-link-search (-L). >Antioxidant needs the latter to be set, otherwise dependents will fail >to link because of not finding the freetype library. This reminds me of also fixing `rust-bzip2-sys-0.1' in the future because it also doesn't specify the linker search path because the default build script was removed like I did in this case. See: https://github.com/alexcrichton/bzip2-rs/blob/bzip2-sys-0.1.9/bzip2-sys/bui= ld.rs#L12-L23 I don't know our stance on this though, or if there's a policy that mandates removing compilation support for bundled code or to leave it as is as long as the code compiles. I'd leave it as it though to make maintenance easier and less modifications to the original source code. Thanks for the review! =E2=80=94 Jean-Pierre De Jesus DIAZ --b1_1rMOy1YQY4nQivi1jDX4vzV7Aroi2aD1oW6GQF4LEc Content-Type: text/x-patch; name=0001-gnu-rust-freetype-sys-0.13-Unbundle-freetype2.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-rust-freetype-sys-0.13-Unbundle-freetype2.patch RnJvbSBhMzQ4N2VhZTJjNWI3YTUwNzkyOTgxNmU2MDIwNjg3OGMxZDJmYzBlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWFuLVBpZXJyZSBEZSBKZXN1cyBESUFaIDxtZUBqZWFuZHVk ZXkudGVjaD4KRGF0ZTogTW9uLCA4IEF1ZyAyMDIyIDE2OjMzOjE2ICswMjAwClN1YmplY3Q6IFtQ QVRDSF0gZ251OiBydXN0LWZyZWV0eXBlLXN5cy0wLjEzOiBVbmJ1bmRsZSBmcmVldHlwZTIuCgoq IGdudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtIChydXN0LWZyZWV0eXBlLXN5cy0wLjEzKQogIFtz b3VyY2VdOiBSZW1vdmUgYnVuZGxlZCBgZnJlZXR5cGUyJyBzb3VyY2UgY29kZS4KICBbYXJndW1l bnRzXTogUmVtb3ZlIGAjOnNraXAtYnVpbGQ/ICN0Jy4KICBbbmF0aXZlLWlucHV0c106IEFkZCBw a2ctY29uZmlnLgogIFtpbnB1dHNdOiBBZGQgZnJlZXR5cGUuCi0tLQogZ251L3BhY2thZ2VzL2Ny YXRlcy1pby5zY20gfCAxMyArKysrKysrKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0 aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvY3JhdGVz LWlvLnNjbSBiL2dudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtCmluZGV4IGNmYWZjZTlhYTMuLmI1 ZDRkYzdjNjEgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtCisrKyBiL2du dS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtCkBAIC0yNyw2ICsyNyw3IEBACiA7OzsgQ29weXJpZ2h0 IMKpIDIwMjIgQWxla3NhbmRyIFZpdHlhemV2IDxhdml0eWF6ZXZAcG9zdGVvLm9yZz4KIDs7OyBD b3B5cmlnaHQgwqkgMjAyMiBNYXJpdXMgQmFra2UgPG1hcml1c0BnbnUub3JnPgogOzs7IENvcHly aWdodCDCqSAyMDIyIEV2Z2VuaWkgTGVwaWtoaW4gPGUubGVwaWtoaW5AY29ycC5tYWlsLnJ1Pgor Ozs7IENvcHlyaWdodCDCqSAyMDIyIEplYW4tUGllcnJlIERlIEplc3VzIERJQVogPG1lQGplYW5k dWRleS50ZWNoPgogOzs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7OzsK QEAgLTIyOTA0LDE0ICsyMjkwNSwyMCBAQCAoZGVmaW5lLXB1YmxpYyBydXN0LWZyZWV0eXBlLXN5 cy0wLjEzCiAgICAgICAgKHVyaSAoY3JhdGUtdXJpICJmcmVldHlwZS1zeXMiIHZlcnNpb24pKQog ICAgICAgIChmaWxlLW5hbWUgKHN0cmluZy1hcHBlbmQgbmFtZSAiLSIgdmVyc2lvbiAiLnRhci5n eiIpKQogICAgICAgIChzaGEyNTYKLSAgICAgICAgKGJhc2UzMiAiMDZra2RzMzFzNmIxaTM5ZHlh bndtemJuaWM3bGFpYTFrazNnZnZ4OHNxbmNxMDhsMHpkMyIpKSkpCisgICAgICAgIChiYXNlMzIg IjA2a2tkczMxczZiMWkzOWR5YW53bXpibmljN2xhaWExa2szZ2Z2eDhzcW5jcTA4bDB6ZDMiKSkK KyAgICAgICAobW9kdWxlcyAnKChndWl4IGJ1aWxkIHV0aWxzKSkpCisgICAgICAgKHNuaXBwZXQK KyAgICAgICAgICcoZGVsZXRlLWZpbGUtcmVjdXJzaXZlbHkgImZyZWV0eXBlMiIpKSkpCiAgICAg KGJ1aWxkLXN5c3RlbSBjYXJnby1idWlsZC1zeXN0ZW0pCiAgICAgKGFyZ3VtZW50cwotICAgICBg KCM6c2tpcC1idWlsZD8gI3QKLSAgICAgICAjOmNhcmdvLWlucHV0cworICAgICBgKCM6Y2FyZ28t aW5wdXRzCiAgICAgICAgKCgicnVzdC1jbWFrZSIgLHJ1c3QtY21ha2UtMC4xKQogICAgICAgICAo InJ1c3QtbGliYyIgLHJ1c3QtbGliYy0wLjIpCiAgICAgICAgICgicnVzdC1wa2ctY29uZmlnIiAs cnVzdC1wa2ctY29uZmlnLTAuMykpKSkKKyAgICAobmF0aXZlLWlucHV0cworICAgICAgKGxpc3Qg cGtnLWNvbmZpZykpCisgICAgKGlucHV0cworICAgICAgKGxpc3QgZnJlZXR5cGUpKQogICAgICho b21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9QaXN0b25EZXZlbG9wZXJzL2ZyZWV0eXBlLXN5 cyIpCiAgICAgKHN5bm9wc2lzICJMb3cgbGV2ZWwgYmluZGluZyBmb3IgRnJlZVR5cGUgZm9udCBs aWJyYXJ5IikKICAgICAoZGVzY3JpcHRpb24KLS0gCjIuMzYuMQoK --b1_1rMOy1YQY4nQivi1jDX4vzV7Aroi2aD1oW6GQF4LEc--