From unknown Sat Sep 13 07:22:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45573] [PATCH] Correct freecad runtime errors Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Dec 2020 18:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45573@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Reply-To: Ekaitz Zarraga Received: via spool by submit@debbugs.gnu.org id=B.160944050020101 (code B ref -1); Thu, 31 Dec 2020 18:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Dec 2020 18:48:20 +0000 Received: from localhost ([127.0.0.1]:41539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv2zf-0005E5-K7 for submit@debbugs.gnu.org; Thu, 31 Dec 2020 13:48:20 -0500 Received: from lists.gnu.org ([209.51.188.17]:42326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv2zd-0005Dy-WF for submit@debbugs.gnu.org; Thu, 31 Dec 2020 13:48:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv2zd-0001rJ-Ob for guix-patches@gnu.org; Thu, 31 Dec 2020 13:48:13 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:38350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv2zY-0006Eb-Rq for guix-patches@gnu.org; Thu, 31 Dec 2020 13:48:13 -0500 Date: Thu, 31 Dec 2020 18:47:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1609440483; bh=Nrwrm8iQdRhn0bgrXk/AAalaVokl+29MEwLgB2uWyTE=; h=Date:To:From:Reply-To:Subject:From; b=G+AfnaOYp3V/bl6n5XIMEI6OBnUE8llB16ctv+8YW0K9BKENYXf8V1IrZZqE7xxvS jTJZnpzvpCu20IKYJHauUgxGno1SXntrdnwqpXA1mxivldafGRlk2UfhnCpzuKTe+7 B1iNGQHIOvcSQaUOAOFqWffxCRLNt4J2S4uWHkgjc+ruykWZxVW1OYFSj3FmkdFs9v HJZ9U8fH9SoSZPwMS5f9QHSkvzC8QzUA0m3bKm6AlosClwT1cbgNLbpwQ3RLOXim2S jVX0gEfqaOpkb59CwT4PkcLZ6aqofYhe0ff3v19aabQMO5eJeXQdu2tjX+e8qBSkEz NtWPxDR4H/oIw== From: Ekaitz Zarraga Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg" X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Received-SPF: pass client-ip=185.70.40.134; envelope-from=ekaitz@elenq.tech; helo=mail-40134.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This is a multi-part message in MIME format. --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, I attach 4 patches that correct the runtime issues freecad has and also sup= ply some packages needed as a dependency. Freecad is a very complex package that is hard to build because many of its= dependencies' buildsystem is broken. The approach followed here is the sam= e that Nix follows and appears to work correctly. The changes correct the Draft module, which wasn't available because pivy w= as not added as a dependency. For context, see this message: https://lists.gnu.org/archive/html/guix-devel/2020-12/msg00123.html Thanks --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg Content-Type: text/x-patch; name=0001-gnu-Add-coin3D-4.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-Add-coin3D-4.patch RnJvbSA4YjZiMTcwYTZlODEwYzZkZTg5NjU1NTcwMmI3NzMwYTI5YjI1NjhjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IFRodSwgMzEgRGVjIDIwMjAgMTk6MzI6MzQgKzAxMDAKU3ViamVjdDogW1BBVENIIDEvNF0g Z251OiBBZGQgY29pbjNELTQuCgogICAgKiBnbnUvcGFja2FnZXMvZ3JhcGhpY3Muc2NtIChjb2lu M0QtNCk6IE5ldyB2YXJpYWJsZS4KLS0tCiBnbnUvcGFja2FnZXMvZ3JhcGhpY3Muc2NtIHwgNDkg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwg NDkgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9ncmFwaGljcy5zY20g Yi9nbnUvcGFja2FnZXMvZ3JhcGhpY3Muc2NtCmluZGV4IDdhNjEwODRmMjQuLjg2ZjY4ZTRjYjcg MTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9ncmFwaGljcy5zY20KKysrIGIvZ251L3BhY2thZ2Vz L2dyYXBoaWNzLnNjbQpAQCAtMTczMiw2ICsxNzMyLDU1IEBAIHN0YW5kYXJkIGdyYXBoaWNzIGxp YnJhcnkgZm9yIDNEIHZpc3VhbGl6YXRpb24gYW5kIHZpc3VhbCBzaW11bGF0aW9uCiBzb2Z0d2Fy ZSBpbiB0aGUgc2NpZW50aWZpYyBhbmQgZW5naW5lZXJpbmcgY29tbXVuaXR5LiIpCiAgICAgICAo bGljZW5zZSBsaWNlbnNlOmJzZC0zKSkpKQogCisoZGVmaW5lLXB1YmxpYyBjb2luM0QtNAorICAg IChwYWNrYWdlCisgICAgKG5hbWUgImNvaW4zRC00IikKKyAgICAodmVyc2lvbiAiNC4wLjAiKQor ICAgIChzb3VyY2UKKyAgICAgIChvcmlnaW4KKyAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCisg ICAgICAgICh1cmkgKGdpdC1yZWZlcmVuY2UKKyAgICAgICAgICAgICAgICh1cmwgImh0dHBzOi8v Z2l0aHViLmNvbS9jb2luM2QvY29pbiIpCisgICAgICAgICAgICAgICAoY29tbWl0IChzdHJpbmct YXBwZW5kICJDb2luLSIgdmVyc2lvbikpCisgICAgICAgICAgICAgICAocmVjdXJzaXZlPyAjdCkp KQorICAgICAgICAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCisgICAg ICAgIChzaGEyNTYKKyAgICAgICAgICAoYmFzZTMyICIxYXlnMGhsOHdhbmhhZGFobTV4YmdoZ2h4 dzFxandxYnJzM2RsM25nbmZmMDI3aHN5ZjhwIikpCisgICAgICAgIChtb2R1bGVzICcoKGd1aXgg YnVpbGQgdXRpbHMpKSkKKyAgICAgICAgKHNuaXBwZXQKKyAgICAgICAgICAnKGJlZ2luCisgICAg ICAgICAgICAgKGZvci1lYWNoIGRlbGV0ZS1maWxlCisgICAgICAgICAgICAgICAgICAgICAgICco ImNmZy9jc3Vic3QuZXhlIgorICAgICAgICAgICAgICAgICAgICAgICAgICJjZmcvd3JhcG1zdmMu ZXhlIikpCisgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJDTWFrZUxpc3RzLnR4dCIKKyAgICAg ICAgICAgICAgICgoIi4qY3BhY2suZC4qIikgIiIpKQorICAgICAgICAgICAgICN0KSkpKQorICAg IChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQorICAgIChuYXRpdmUtaW5wdXRzCisg ICAgICBgKCgiZG94eWdlbiIgLGRveHlnZW4pCisgICAgICAgICgiZ3JhcGh2aXoiICxncmFwaHZp eikpKQorICAgIChpbnB1dHMKKyAgICAgIGAoKCJib29zdCIgLGJvb3N0KQorICAgICAgICAoImZy ZWVnbHV0IiAsZnJlZWdsdXQpCisgICAgICAgICgiZ2xldyIgLGdsZXcpKSkKKyAgICAoYXJndW1l bnRzCisgICAgICBgKCM6Y29uZmlndXJlLWZsYWdzCisgICAgICAgIChsaXN0CisgICAgICAgICAg Ii1EQ09JTl9CVUlMRF9ET0NVTUVOVEFUSU9OX01BTj1PTiIKKyAgICAgICAgICAoc3RyaW5nLWFw cGVuZCAiLURCT09TVF9ST09UPSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAoYXNzb2MtcmVm ICVidWlsZC1pbnB1dHMgImJvb3N0IikpKSkpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRo dWIuY29tL2NvaW4zZC9jb2luIikKKyAgICAoc3lub3BzaXMKKyAgICAgICJIaWdoLWxldmVsIDNE IHZpc3VhbGl6YXRpb24gbGlicmFyeSB3aXRoIE9wZW4gSW52ZW50b3IgMi4xIEFQSSIpCisgICAg KGRlc2NyaXB0aW9uCisgICAgICAiQ29pbiBpcyBhIDNEIGdyYXBoaWNzIGxpYnJhcnkgd2l0aCBh biBBcHBsaWNhdGlvbiBQcm9ncmFtbWluZyBJbnRlcmZhY2UKK2Jhc2VkIG9uIHRoZSBPcGVuIElu dmVudG9yIDIuMSBBUEkuICBGb3IgdGhvc2Ugd2hvIGFyZSBub3QgZmFtaWxpYXIgd2l0aCBPcGVu CitJbnZlbnRvciwgaXQgaXMgYSBzY2VuZS1ncmFwaCBiYXNlZCByZXRhaW4tbW9kZSByZW5kZXJp bmcgYW5kIG1vZGVsIGludGVyYWN0aW9uCitsaWJyYXJ5LCB3cml0dGVuIGluIEMrKywgd2hpY2gg aGFzIGJlY29tZSB0aGUgZGUgZmFjdG8gc3RhbmRhcmQgZ3JhcGhpY3MKK2xpYnJhcnkgZm9yIDNE IHZpc3VhbGl6YXRpb24gYW5kIHZpc3VhbCBzaW11bGF0aW9uIHNvZnR3YXJlIGluIHRoZSBzY2ll bnRpZmljCithbmQgZW5naW5lZXJpbmcgY29tbXVuaXR5LiIpCisgICAgICAobGljZW5zZSBsaWNl bnNlOmJzZC0zKSkpCisKIChkZWZpbmUtcHVibGljIHN1cGVyZmFtaWNvbnYKICAgKHBhY2thZ2UK ICAgICAobmFtZSAic3VwZXJmYW1pY29udiIpCi0tIAoyLjI5LjIKCg== --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg Content-Type: text/x-patch; name=0003-gnu-Add-python-pivy.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0003-gnu-Add-python-pivy.patch RnJvbSAzYTRjYzZmY2QxN2Q0YmE0ZDQ1YjE1ODMzY2FlY2Y4MWM4ZjUxNmFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IFRodSwgMzEgRGVjIDIwMjAgMTk6MzU6MjggKzAxMDAKU3ViamVjdDogW1BBVENIIDMvNF0g Z251OiBBZGQgcHl0aG9uLXBpdnkuCgogICAgKiBnbnUvcGFja2FnZXMvcHl0aG9uLXh5ei5zY20g KHB5dGhvbi1waXZ5KTogTmV3IHZhcmlhYmxlLgotLS0KIGdudS9wYWNrYWdlcy9weXRob24teHl6 LnNjbSB8IDQzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBj aGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3B5dGhv bi14eXouc2NtIGIvZ251L3BhY2thZ2VzL3B5dGhvbi14eXouc2NtCmluZGV4IGQwN2M5MTEyMWEu LjgzYjU1YTMyOWEgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9weXRob24teHl6LnNjbQorKysg Yi9nbnUvcGFja2FnZXMvcHl0aG9uLXh5ei5zY20KQEAgLTE3NSw2ICsxNzUsNyBAQAogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBzaGVsbHMpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIHNwaGlueCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgc3NoKQorICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBzd2lnKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB0 ZXJtaW5hbHMpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHRleCkKICAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgdGV4aW5mbykKQEAgLTIzMjM4LDMgKzIzMjM5LDQ1IEBAIHByb2Nl c3MuIikKICAgICAgIkdhbWVyYSBpcyBhIHRvb2xraXQgZm9yIGJ1aWxkaW5nIGRvY3VtZW50IGlt YWdlIHJlY29nbml0aW9uIHN5c3RlbXMuIikKICAgICAoaG9tZS1wYWdlICJodHRwczovL2dhbWVy YS5pbmZvcm1hdGlrLmhzbnIuZGUvIikKICAgICAobGljZW5zZSBsaWNlbnNlOmdwbDIrKSkpCisK KyhkZWZpbmUtcHVibGljIHB5dGhvbi1waXZ5CisgIChwYWNrYWdlCisgICAgKG5hbWUgInB5dGhv bi1waXZ5IikKKyAgICAodmVyc2lvbiAiMC42LjUiKQorICAgIChzb3VyY2UKKyAgICAgIChvcmln aW4KKyAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCisgICAgICAgICh1cmkgKGdpdC1yZWZlcmVu Y2UKKyAgICAgICAgICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9jb2luM2QvcGl2eSIp CisgICAgICAgICAgICAgICAoY29tbWl0IHZlcnNpb24pKSkKKyAgICAgICAgKGZpbGUtbmFtZSAo Z2l0LWZpbGUtbmFtZSBuYW1lIHZlcnNpb24pKQorICAgICAgICAoc2hhMjU2CisgICAgICAgICAg KGJhc2UzMiAiMHZpZHM3c3hrOHc1dnI3M3hkbmY4eGRjaTcxYTdzeWw2Y2QzNWFpaXNwcGJxeXlm bXlreCIpKQorCisgICAgICAgIChtb2R1bGVzICcoKGd1aXggYnVpbGQgdXRpbHMpKSkKKyAgICAg ICAgKHNuaXBwZXQKKyAgICAgICAgICAnKGJlZ2luCisgICAgICAgICAgICAgKHN1YnN0aXR1dGUq ICJDTWFrZUxpc3RzLnR4dCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgKCgiXFwkXFx7U29R dF9JTkNMVURFX0RJUlN9IikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICIke0NvaW5fSU5D TFVERV9ESVJ9OyR7U29RdF9JTkNMVURFX0RJUlN9IikpCisgICAgICAgICAgICAgI3QpKSkpCisg ICAgKGJ1aWxkLXN5c3RlbSBweXRob24tYnVpbGQtc3lzdGVtKQorICAgIChhcmd1bWVudHMKKyAg ICAgIGAoIzp0ZXN0cz8gI2YpKQorICAgIChuYXRpdmUtaW5wdXRzCisgICAgICBgKCgiY21ha2Ui ICxjbWFrZSkKKyAgICAgICAgKCJzd2lnIiAsc3dpZykpKQorICAgIChpbnB1dHMKKyAgICAgIGAo KCJweXRob24td3JhcHBlciIgLHB5dGhvbi13cmFwcGVyKQorICAgICAgICAoInF0YmFzZSIgLHF0 YmFzZSkKKyAgICAgICAgKCJsaWJ4aSIgLGxpYnhpKQorICAgICAgICAoImxpYmljZSIgLGxpYmlj ZSkKKyAgICAgICAgKCJzb3F0IiAsc29xdCkKKyAgICAgICAgKCJnbGV3IiAsZ2xldykKKyAgICAg ICAgKCJjb2luM0QtNCIgLGNvaW4zRC00KSkpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRo dWIuY29tL2NvaW4zZC9waXZ5IikKKyAgICAoc3lub3BzaXMgIlB5dGhvbiBiaW5kaW5ncyB0byBD b2luM0QiKQorICAgIChkZXNjcmlwdGlvbgorICAgICAgIlBpdnkgcHJvdmlkZXMgcHl0aG9uIGJp bmRpbmdzIGZvciBDb2luLCBhIDNEIGdyYXBoaWNzIGxpYnJhcnkgd2l0aCBhbgorQXBwbGljYXRp b24gUHJvZ3JhbW1pbmcgSW50ZXJmYWNlIGJhc2VkIG9uIHRoZSBPcGVuIEludmVudG9yIDIuMSBB UEkuIikKKyAgICAobGljZW5zZSBsaWNlbnNlOmlzYykpKQotLSAKMi4yOS4yCgo= --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg Content-Type: text/x-patch; name=0004-gnu-freecad-correct-runtime-errors.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0004-gnu-freecad-correct-runtime-errors.patch RnJvbSBlMWU1OWE4YTE1OTA4NzQ3MzA1YjYyOTAwNWQ2MzExNmExYzM0ZjM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IFRodSwgMzEgRGVjIDIwMjAgMTk6MzY6MTQgKzAxMDAKU3ViamVjdDogW1BBVENIIDQvNF0g Z251OiBmcmVlY2FkIGNvcnJlY3QgcnVudGltZSBlcnJvcnMKCiAgICAqIGdudS9wYWNrYWdlcy9l bmdpbmVlcmluZy5zY20gKGZyZWVjYWQpOiBVcGRhdGUgcGFja2FnZQogICAgW2lucHV0c106IE1v dmUgcHl0aG9uLXB5c2lkZS0yLXRvb2xzIHRvIG5hdGl2ZS1pbnB1dHMKICAgIFtpbnB1dHNdOiBB ZGQgcGl2eQogICAgW2lucHV0c106IEFkZCBxdHhtbHBhdHRlcm5zCiAgICBbaW5wdXRzXTogQWRk IHF0d2Via2l0Ci0tLQogZ251L3BhY2thZ2VzL2VuZ2luZWVyaW5nLnNjbSB8IDUwICsrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIyIGluc2VydGlv bnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9lbmdpbmVl cmluZy5zY20gYi9nbnUvcGFja2FnZXMvZW5naW5lZXJpbmcuc2NtCmluZGV4IGU0MzY5OTQ0OTIu LmY4NTYzMDg1YWMgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9lbmdpbmVlcmluZy5zY20KKysr IGIvZ251L3BhY2thZ2VzL2VuZ2luZWVyaW5nLnNjbQpAQCAtMzYsNyArMzYsNiBAQAogOzs7CiA7 OzsgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVi bGljIExpY2Vuc2UKIDs7OyBhbG9uZyB3aXRoIEdOVSBHdWl4LiAgSWYgbm90LCBzZWUgPGh0dHA6 Ly93d3cuZ251Lm9yZy9saWNlbnNlcy8+LgotCiAoZGVmaW5lLW1vZHVsZSAoZ251IHBhY2thZ2Vz IGVuZ2luZWVyaW5nKQogICAjOnVzZS1tb2R1bGUgKGd1aXggcGFja2FnZXMpCiAgICM6dXNlLW1v ZHVsZSAoZ3VpeCBkb3dubG9hZCkKQEAgLTI0MzEsMzUgKzI0MzAsMzAgQEAgZnVsbCBwcm9ncmFt bWF0aWMgY29udHJvbCBvdmVyIHlvdXIgbW9kZWxzLiIpCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6 Ly93d3cub3BlbnNjYWQub3JnLyIpCiAgICAgKGxpY2Vuc2UgbGljZW5zZTpncGwyKykpKQogCisK IChkZWZpbmUtcHVibGljIGZyZWVjYWQKLSAgKHBhY2thZ2UKLSAgICAobmFtZSAiZnJlZWNhZCIp Ci0gICAgKHZlcnNpb24gIjAuMTguNSIpCi0gICAgKHNvdXJjZQotICAgICAob3JpZ2luCi0gICAg ICAgKG1ldGhvZCBnaXQtZmV0Y2gpCi0gICAgICAgKHVyaSAoZ2l0LXJlZmVyZW5jZQotICAgICAg ICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9GcmVlQ0FEL0ZyZWVDQUQiKQotICAgICAg ICAgICAgIChjb21taXQgdmVyc2lvbikpKQotICAgICAgIChtb2R1bGVzICcoKGd1aXggYnVpbGQg dXRpbHMpKSkKLSAgICAgICAoc25pcHBldAotICAgICAgICAnKGJlZ2luCi0gICAgICAgICAgIDs7 IEZpeCBidWlsZCB3aXRoIFB5dGhvbiAzLjgsIHNlZQotICAgICAgICAgICA7OyA8aHR0cHM6Ly90 cmFja2VyLmZyZWVjYWR3ZWIub3JnL3ZpZXcucGhwP2lkPTQxNDM+LgotICAgICAgICAgICAoc3Vi c3RpdHV0ZSogInNyYy9CYXNlL3N3aWdweXJ1bi5pbmwiCi0gICAgICAgICAgICAgKCgiUHlPYmpl Y3QgXFwqbW9kdWxlcyA9IGludGVycC0+bW9kdWxlczsiKQotICAgICAgICAgICAgICAiUHlPYmpl Y3QgKm1vZHVsZXMgPSBQeUV2YWxfR2V0QnVpbHRpbnMoKTsiKSkKLSAgICAgICAgICAgI3QpKQot ICAgICAgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUgbmFtZSB2ZXJzaW9uKSkKLSAgICAgICAo c2hhMjU2Ci0gICAgICAgIChiYXNlMzIKLSAgICAgICAgICIwcjMxanp6a2FtZjc2bDE5ZmIxNzVo aHY0OGlyazA2ZnBpOGxkeGRscjMxdzhjMWl4NGFhIikpKSkKKyAgKGxldCAoKGNvbW1pdC1yZWYg Ijc2MTYxNTNiM2MzMWFjZTAwNjE2OWNkYzJmZGFmYWI0ODQ0OTg4NTgiKQorICAgICAgICAocmV2 aXNpb24gIjEiKSkKKyAgICAocGFja2FnZQorICAgICAgKG5hbWUgImZyZWVjYWQiKQorICAgICAg KHZlcnNpb24gKGdpdC12ZXJzaW9uICIwLjE4LjUiIHJldmlzaW9uIGNvbW1pdC1yZWYpKQorICAg ICAgKHNvdXJjZQorICAgICAgICAob3JpZ2luCisgICAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gp CisgICAgICAgICAgKHVyaSAoZ2l0LXJlZmVyZW5jZQorICAgICAgICAgICAgICAgICAodXJsICJo dHRwczovL2dpdGh1Yi5jb20vRnJlZUNBRC9GcmVlQ0FEIikKKyAgICAgICAgICAgICAgICAgKGNv bW1pdCBjb21taXQtcmVmKSkpCisgICAgICAgICAgKGZpbGUtbmFtZSAoZ2l0LWZpbGUtbmFtZSBu YW1lIHZlcnNpb24pKQorICAgICAgICAgIChzaGEyNTYKKyAgICAgICAgICAgIChiYXNlMzIKKyAg ICAgICAgICAgICAgIjE2OTY1eXhucDJwcTdubTh6M3AwcGprempkeXE2MnZmcmo4ajNuazI2Yndj ODk4Y3p5bjIiKSkpKQogICAgIChidWlsZC1zeXN0ZW0gcXQtYnVpbGQtc3lzdGVtKQogICAgIChu YXRpdmUtaW5wdXRzCiAgICAgIGAoKCJkb3h5Z2VuIiAsZG94eWdlbikKICAgICAgICAoImdyYXBo dml6IiAsZ3JhcGh2aXopCiAgICAgICAgKCJxdHRvb2xzIiAscXR0b29scykKICAgICAgICAoInBr Zy1jb25maWciICxwa2ctY29uZmlnKQorICAgICAgICgicHl0aG9uLXB5c2lkZS0yLXRvb2xzIiAs cHl0aG9uLXB5c2lkZS0yLXRvb2xzKQogICAgICAgICgic3dpZyIgLHN3aWcpKSkKICAgICAoaW5w dXRzCiAgICAgIGAoKCJib29zdCIgLGJvb3N0KQpAQCAtMjQ3NywxNiArMjQ3MSwxNSBAQCBmdWxs IHByb2dyYW1tYXRpYyBjb250cm9sIG92ZXIgeW91ciBtb2RlbHMuIikKICAgICAgICAoIm9wZW5j YXNjYWRlLW9jY3QiICxvcGVuY2FzY2FkZS1vY2N0KQogICAgICAgICgicHl0aG9uLW1hdHBsb3Rs aWIiICxweXRob24tbWF0cGxvdGxpYikKICAgICAgICAoInB5dGhvbi1weXNpZGUtMiIgLHB5dGhv bi1weXNpZGUtMikKLSAgICAgICAoInB5dGhvbi1weXNpZGUtMi10b29scyIgLHB5dGhvbi1weXNp ZGUtMi10b29scykKICAgICAgICAoInB5dGhvbi1zaGlib2tlbi0yIiAscHl0aG9uLXNoaWJva2Vu LTIpCisgICAgICAgKCJweXRob24tcGl2eSIgLHB5dGhvbi1waXZ5KQogICAgICAgICgicHl0aG9u LXdyYXBwZXIiICxweXRob24td3JhcHBlcikKICAgICAgICAoInF0YmFzZSIgLHF0YmFzZSkKICAg ICAgICAoInF0c3ZnIiAscXRzdmcpCiAgICAgICAgKCJxdHgxMWV4dHJhcyIgLHF0eDExZXh0cmFz KQogICAgICAgICgicXR4bWxwYXR0ZXJucyIgLHF0eG1scGF0dGVybnMpCi0gICAgICAgOzsgcXR3 ZWJraXQgaXMgb3B0aW9uYWwuIFdlIHJlbW92ZSBpdCBjdXJyZW50bHksIGJlY2F1c2UgaXQgdGFr ZXMKLSAgICAgICA7OyBtdWNoIHRpbWUgdG8gY29tcGlsZSBhbmQgc3Vic3RpdHV0ZXMgYXJlIG9m dGVuIHVuYXZhaWxhYmxlCi0gICAgICAgOzsoInF0d2Via2l0IiAscXR3ZWJraXQpCisgICAgICAg KCJxdHdlYmtpdCIgLHF0d2Via2l0KQorICAgICAgICgicXR4bWxwYXR0ZXJucyIgLHF0eG1scGF0 dGVybnMpCiAgICAgICAgKCJ0YmIiICx0YmIpCiAgICAgICAgKCJ2dGsiICx2dGspCiAgICAgICAg KCJ4ZXJjZXMtYyIgLHhlcmNlcy1jKQpAQCAtMjU0Niw3ICsyNTM5LDggQEAgY3VzdG9taXphdGlv bi4iKQogICAgICAgbGljZW5zZTpsZ3BsMi4xKwogICAgICAgbGljZW5zZTpsZ3BsMi4wKwogICAg ICAgbGljZW5zZTpncGwzKwotICAgICAgbGljZW5zZTpic2QtMykpKSkKKyAgICAgIGxpY2Vuc2U6 YnNkLTMpKSkpKQorCiAKIChkZWZpbmUtcHVibGljIGxpYm1lZGZpbGUKICAgKHBhY2thZ2UKLS0g CjIuMjkuMgoK --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg Content-Type: text/x-patch; name=0002-gnu-Add-soqt.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-gnu-Add-soqt.patch RnJvbSAzYzNmZGU4ZjVhYTM0MzNkZTA3NmQ2YmJiOTBmOWU2MDMzM2YzMWIwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IFRodSwgMzEgRGVjIDIwMjAgMTk6MzQ6NDUgKzAxMDAKU3ViamVjdDogW1BBVENIIDIvNF0g Z251OiBBZGQgc29xdC4KCiAgICAqIGdudS9wYWNrYWdlcy9xdC5zY20gKHNvcXQpOiBOZXcgdmFy aWFibGUuCi0tLQogZ251L3BhY2thZ2VzL3F0LnNjbSB8IDM0ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCspCgpkaWZmIC0t Z2l0IGEvZ251L3BhY2thZ2VzL3F0LnNjbSBiL2dudS9wYWNrYWdlcy9xdC5zY20KaW5kZXggMmU2 MjFlNzU4Yy4uMmFmN2U0MDczNCAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3F0LnNjbQorKysg Yi9nbnUvcGFja2FnZXMvcXQuc2NtCkBAIC02Nyw2ICs2Nyw3IEBACiAgICM6dXNlLW1vZHVsZSAo Z251IHBhY2thZ2VzIGdsaWIpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdudXBnKQog ICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBncGVyZikKKyAgIzp1c2UtbW9kdWxlIChnbnUg cGFja2FnZXMgZ3JhcGhpY3MpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdzdHJlYW1l cikKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ3RrKQogICAjOnVzZS1tb2R1bGUgKGdu dSBwYWNrYWdlcyBpY3U0YykKQEAgLTI4MjQsMyArMjgyNSwzNiBAQCBiZWluZyBmdWxseSBjdXN0 b21pemFibGUgYW5kIGVhc3kgdG8gZXh0ZW5kLiIpCiAgICAgOzsgQWNjb3JkaW5nIHRvIExJQ0VO U0UsIGVpdGhlciB2ZXJzaW9uIDIgb3IgdmVyc2lvbiAzIG9mIHRoZSBHTlUgR1BMIG1heQogICAg IDs7IGJlIHVzZWQuCiAgICAgKGxpY2Vuc2UgKGxpc3QgbGljZW5zZTpncGwyIGxpY2Vuc2U6Z3Bs MykpKSkKKworCisoZGVmaW5lLXB1YmxpYyBzb3F0CisgIChsZXQgKChjb21taXQtcmVmICJmYjhm NjU1NjMyYmI5YzljNjBlMGZmOWZhNjlhNWJhMjJkM2ZmOTlkIikKKyAgICAgICAgKHJldmlzaW9u ICIxIikpCisgICAgKHBhY2thZ2UKKyAgICAobmFtZSAic29xdCIpCisgICAgKHZlcnNpb24gKGdp dC12ZXJzaW9uICIxLjYuMCIgcmV2aXNpb24gY29tbWl0LXJlZikpCisgICAgKHNvdXJjZQorICAg ICAgKG9yaWdpbgorICAgICAgICAobWV0aG9kIGdpdC1mZXRjaCkKKyAgICAgICAgKHVyaSAoZ2l0 LXJlZmVyZW5jZQorICAgICAgICAgICAgICAgKHVybCAiaHR0cHM6Ly9naXRodWIuY29tL2NvaW4z ZC9zb3F0IikKKyAgICAgICAgICAgICAgIChjb21taXQgY29tbWl0LXJlZikKKyAgICAgICAgICAg ICAgIChyZWN1cnNpdmU/ICN0KSkpCisgICAgICAgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUg bmFtZSB2ZXJzaW9uKSkKKyAgICAgICAgKHNoYTI1NgorICAgICAgICAgIChiYXNlMzIgIjE2dmlr YjNmeThybWsxMHNnNWcwZ3kyYzM0M2hpM3g3emNjc2dhOTBzc25renBxNm0wMzIiKSkpKQorICAg IChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQorICAgIChhcmd1bWVudHMKKyAgICAg ICcoIzp0ZXN0cz8gI2YpKQorICAgIChuYXRpdmUtaW5wdXRzCisgICAgICBgKCgicGtnLWNvbmZp ZyIgLHBrZy1jb25maWcpCisgICAgICAgICgiY21ha2UiICxjbWFrZSkpKQorICAgIChpbnB1dHMK KyAgICAgIGAoKCJxdGJhc2UiICxxdGJhc2UpCisgICAgICAgICgiY29pbjNELTQiICxjb2luM0Qt NCkpKQorICAgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9jb2luM2Qvc29xdCIpCisg ICAgKHN5bm9wc2lzICJRdCBHVUkgY29tcG9uZW50IHRvb2xraXQgbGlicmFyeSBmb3IgQ29pbiIp CisgICAgKGRlc2NyaXB0aW9uICJTb1F0IGlzIGEgUXQgR1VJIGNvbXBvbmVudCB0b29sa2l0IGxp YnJhcnkgZm9yIENvaW4uICBJdCBpcworYWxzbyBjb21wYXRpYmxlIHdpdGggU0dJIGFuZCBUR1Mg T3BlbiBJbnZlbnRvciwgYW5kIHRoZSBBUEkgaXMgYmFzZWQgb24gdGhlIEFQSQorb2YgdGhlIElu dmVudG9yWHQgR1VJIGNvbXBvbmVudCB0b29sa2l0LiIpCisgICAgKGxpY2Vuc2UgbGljZW5zZTpi c2QtMykpKSkKLS0gCjIuMjkuMgoK --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg-- From unknown Sat Sep 13 07:22:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45573] [PATCH] Correct freecad runtime errors Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Dec 2020 22:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ekaitz Zarraga Cc: 45573@debbugs.gnu.org Received: via spool by 45573-submit@debbugs.gnu.org id=B45573.16094541948693 (code B ref 45573); Thu, 31 Dec 2020 22:37:02 +0000 Received: (at 45573) by debbugs.gnu.org; 31 Dec 2020 22:36:34 +0000 Received: from localhost ([127.0.0.1]:41827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv6Yb-0002G8-NK for submit@debbugs.gnu.org; Thu, 31 Dec 2020 17:36:34 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:39519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv6YZ-0002Ft-IS for 45573@debbugs.gnu.org; Thu, 31 Dec 2020 17:36:32 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 830FD109E; Thu, 31 Dec 2020 17:36:25 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 31 Dec 2020 17:36:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; s=mesmtp; bh=7XjAU+2+o7XbfqtqKA08ZGThf7mcfDWirmvgui633EE=; b=AaiZYbRMcK2m dZl1MFmqbnQbHTnTrt+SAQm1takRRbUFFG4iYWnpn7ySE+6LxB7YOjyCQ//mrKmU E4cmqEVsqoi0Jkl1ySEf7uveBztnTKptkSqA2JIXns+VUE3iizL/DLYCK7tMDHDl rQFsSBTqHG9dEtL66/pg4KtKHtRZ3lU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=7XjAU+2+o7XbfqtqKA08ZGThf7mcfDWirmvgui633 EE=; b=JP6PU+2gg02c7NFzun+pZhbut/zjRqLmET+rVikUJrE+4SWKPpPvR/Zwq jOuZa+Py+6GFfpIcUewevx1hxVnZ2A3R3XjTnhIC2EWHkm6pA3MpiIuOtiSqC/k6 ErogpXRsQhXTod4BcTt8pLP0XCnB1TgCVe4MFPPRrYfHWV7Vgv17u//AvvMtsm3K ASChpoMHcfrGwrwHywerfXnjY4J1mfZprm6soiZYraH7i5YG1yn/TR/AsZFmFRUM iksVSGEitArDInmpTB2sybdwQNGNmrcWxzwYeQeFBfIZcogsS2/80ojEs/FidJOd ol0rm/Y0bl5ryjfS7X+CSVne+eZGw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvddvhedgudeigecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggugfgjsehtkeertddttdejnecuhfhrohhmpefnvgho ucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrg htthgvrhhnpefgudffteettdekkeduhffgfefgieefgeeuieetudejffelieduueeifffg udfgudenucffohhmrghinhepghhnuhdrohhrghenucfkphepjeefrddugedurdduvdejrd dugeeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhep lhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id A1486108005B; Thu, 31 Dec 2020 17:36:24 -0500 (EST) Date: Thu, 31 Dec 2020 17:36:22 -0500 From: Leo Famulari Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Thu, Dec 31, 2020 at 06:47:59PM +0000, Ekaitz Zarraga wrote: > I attach 4 patches that correct the runtime issues freecad has and also supply some packages needed as a dependency. > > Freecad is a very complex package that is hard to build because many of its dependencies' buildsystem is broken. The approach followed here is the same that Nix follows and appears to work correctly. > > The changes correct the Draft module, which wasn't available because pivy was not added as a dependency. > > For context, see this message: > https://lists.gnu.org/archive/html/guix-devel/2020-12/msg00123.html Thanks! Here is my feedback: > Subject: [PATCH 1/4] gnu: Add coin3D-4. > > * gnu/packages/graphics.scm (coin3D-4): New variable. > + (snippet > + '(begin > + (for-each delete-file > + '("cfg/csubst.exe" > + "cfg/wrapmsvc.exe")) Please add a brief code comment like "Delete binaries". > + (substitute* "CMakeLists.txt" > + ((".*cpack.d.*") "")) > + #t)))) What does this do? Please add an explanatory comment. > Subject: [PATCH 3/4] gnu: Add python-pivy. > > * gnu/packages/python-xyz.scm (python-pivy): New variable. > + (snippet > + '(begin > + (substitute* "CMakeLists.txt" > + (("\\$\\{SoQt_INCLUDE_DIRS}") > + "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}")) > + #t)))) Origin snippets affect what is returned by `guix build --source python-pivy`, and are used for correcting very serious bugs in the source code or for fixing so-called "freedom issues", such as removing pre-compiled binaries. We prefer to make other types of changes in custom build phases in a package's arguments. I'm not sure exactly what this substitution does — please add a comment — but perhaps it would be more appropriate in a custom build phase? > + (arguments > + `(#:tests? #f)) Why are the tests disabled? We aim to make Guix packages pass upstream test suites, so there should be a reason for skipping them. If there is no test suite, just add a comment saying so. Same question about the soqt package. > Subject: [PATCH 4/4] gnu: freecad correct runtime errors > > * gnu/packages/engineering.scm (freecad): Update package > [inputs]: Move python-pyside-2-tools to native-inputs > [inputs]: Add pivy > [inputs]: Add qtxmlpatterns > [inputs]: Add qtwebkit Are all of these changes necessary to fix the errors? If not, we prefer to split the changes up into separate commits. For example, one commit to update the package, one commit to fix the errors, one commit to enable some optional feature (e.g. requiring qtwebkit). If all the changes must be made together, that's fine too. The commit message should be rewritten, but exactly how depends on answers to my previous questions. It could be written like this: ------ gnu: FreeCad: Update to 0.18.5-1.7616153. Fixes *description of bug*. * gnu/packages/engineering.scm (freecad): Update to 0.18.5-1.7616153. [inputs]: Add python-pivy, qtxmlpatterns, and qtwebkit. Remove python-pyside-2-tools. [native-inputs]: Add python-pyside-2-tools. ------ Can you send a revised patch series? From unknown Sat Sep 13 07:22:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45573] [PATCH] Correct freecad runtime errors Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Dec 2020 23:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: "45573@debbugs.gnu.org" <45573@debbugs.gnu.org> Reply-To: Ekaitz Zarraga Received: via spool by 45573-submit@debbugs.gnu.org id=B45573.160945703213068 (code B ref 45573); Thu, 31 Dec 2020 23:24:02 +0000 Received: (at 45573) by debbugs.gnu.org; 31 Dec 2020 23:23:52 +0000 Received: from localhost ([127.0.0.1]:41853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv7IN-0003Oh-Om for submit@debbugs.gnu.org; Thu, 31 Dec 2020 18:23:52 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:24831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv7IJ-0003OS-SH for 45573@debbugs.gnu.org; Thu, 31 Dec 2020 18:23:50 -0500 Date: Thu, 31 Dec 2020 23:23:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1609457020; bh=gY4UwR4K/ZcGn/p21yaxmdYj6JxrgsD2J8Yjm+oeUuI=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=NlOYMaJK+YmKDLzMtNSrgMGaEZF/43b0qUAnSkJeGyBFdfvw9lFekts0xpRoDjgQX wnc6ixaveYZzbxJn6ZZtIE98KsIVvBvyUvOjATUGG5b/0AXlACZj6AKmXdTNOj/UlW FxGQCwMUr5uIdvQwDvNqFLCU/R1TR+WwcgBOlN1ylqhJYghAMphPR1HiXywmLypkIe aHPtBRKbxiJSBl4eRCHnMRsfuRK0+e6RWiSCEvE89rmQNZGcU+iczXWiSV4q4S8Tiw 6DHTl63Kxo/FiAuYMFd8YtoTCZshwLj2XNgu7W2Bj9BBdX+930jiuQ31oDlv0IuxXP +u8FqSYDtazQQ== From: Ekaitz Zarraga Message-ID: <6b2IbqX7a-q86Pjb_nOtz_XcCOrATSHf2T7vfIU5qrXWhYtQFsoex3XlfmDVhLt8UXjnOonMiLCS-1oKUzxXpp8x3HSUjNkzUjhUsKGc3Iw=@elenq.tech> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 Original Me= ssage =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 On Thursday, December 31, 2020 11:36 PM, Leo Famulari w= rote: > On Thu, Dec 31, 2020 at 06:47:59PM +0000, Ekaitz Zarraga wrote: > > > I attach 4 patches that correct the runtime issues freecad has and also= supply some packages needed as a dependency. > > Freecad is a very complex package that is hard to build because many of= its dependencies' buildsystem is broken. The approach followed here is the= same that Nix follows and appears to work correctly. > > The changes correct the Draft module, which wasn't available because pi= vy was not added as a dependency. > > For context, see this message: > > https://lists.gnu.org/archive/html/guix-devel/2020-12/msg00123.html > > Thanks! > > Here is my feedback: > > > Subject: [PATCH 1/4] gnu: Add coin3D-4. > > > > * gnu/packages/graphics.scm (coin3D-4): New variable. > > > > > - (snippet > > > > > > - '(begin > > > > > > - (for-each delete-file > > > > > > - '("cfg/csubst.exe" > > > > > > - "cfg/wrapmsvc.exe")) > > > > > > Please add a brief code comment like "Delete binaries". > > > - (substitute* "CMakeLists.txt" > > > > > > - ((".*cpack.d.*") "")) > > > > > > - #t)))) > > > > > > What does this do? Please add an explanatory comment. It removes an unnecessary library. I'll add a comment. > > Subject: [PATCH 3/4] gnu: Add python-pivy. > > > > * gnu/packages/python-xyz.scm (python-pivy): New variable. > > > > > - (snippet > > > > > > - '(begin > > > > > > - (substitute* "CMakeLists.txt" > > > > > > - (("\\\\$\\\\{SoQt_INCLUDE_DIRS}") > > > > > > - "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}= ")) > > > > > > - #t)))) > > > > > > Origin snippets affect what is returned by`guix build --source python-piv= y`, and are used for correcting very serious bugs in the > source code or for fixing so-called "freedom issues", such as removing > pre-compiled binaries. > > We prefer to make other types of changes in custom build phases in a > package's arguments. I'm not sure exactly what this substitution does = =E2=80=94 > please add a comment =E2=80=94 but perhaps it would be more appropriate i= n a > custom build phase? This substitution corrects the repository. By default the repository doesn't find Coin3D, so we need to insert its sea= rch path by hand. What's the best way to add this? > > - (arguments > > - `(#:tests? #f)) > > > > > > Why are the tests disabled? We aim to make Guix packages pass upstream > test suites, so there should be a reason for skipping them. If there is > no test suite, just add a comment saying so. Same question about the > soqt package. > > > Subject: [PATCH 4/4] gnu: freecad correct runtime errors > > > > * gnu/packages/engineering.scm (freecad): Update package > > [inputs]: Move python-pyside-2-tools to native-inputs > > [inputs]: Add pivy > > [inputs]: Add qtxmlpatterns > > [inputs]: Add qtwebkit > > > > Are all of these changes necessary to fix the errors? If not, we prefer > to split the changes up into separate commits. For example, one commit > to update the package, one commit to fix the errors, one commit to > enable some optional feature (e.g. requiring qtwebkit). Ok, I'll separate the qtwebkit as it's not necessary for this fix. > If all the changes must be made together, that's fine too. > > The commit message should be rewritten, but exactly how depends on > answers to my previous questions. It could be written like this: > > -------------------------------------------------------------------------= ---------------------------------------------------------------------------= ---------------------------------------------------------------------------= ---------------------------------------------------------------------------= ---------------------------------------------------------------------------= ---------------------------------------------------------------------------= ------------- > > gnu: FreeCad: Update to 0.18.5-1.7616153. > > Fixes description of bug. > > - gnu/packages/engineering.scm (freecad): Update to 0.18.5-1.7616153. > [inputs]: Add python-pivy, qtxmlpatterns, and qtwebkit. Remove > python-pyside-2-tools. > [native-inputs]: Add python-pyside-2-tools. I'll change that. > Can you send a revised patch series? Of course. I'll write a follow up soon. Happy new year. Ekaitz From unknown Sat Sep 13 07:22:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45573] [PATCH] Correct freecad runtime errors Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Jan 2021 14:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari , "45573@debbugs.gnu.org" <45573@debbugs.gnu.org> Reply-To: Ekaitz Zarraga Received: via spool by 45573-submit@debbugs.gnu.org id=B45573.160951218210723 (code B ref 45573); Fri, 01 Jan 2021 14:44:02 +0000 Received: (at 45573) by debbugs.gnu.org; 1 Jan 2021 14:43:02 +0000 Received: from localhost ([127.0.0.1]:59662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvLdt-0002mc-JZ for submit@debbugs.gnu.org; Fri, 01 Jan 2021 09:43:02 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:29928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvLYt-0002GT-Rs for 45573@debbugs.gnu.org; Fri, 01 Jan 2021 09:37:55 -0500 Date: Fri, 01 Jan 2021 14:37:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1609511863; bh=iqIam2VlHRM0iE1fASVAvpZ77nuLraofDjXHSPQm/QI=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=dryepQ0cIqtjciB0NrNCX5lppw7y+Y2sxCOxAflgjRNtsOg1xDcFRDNC8s1c0TT/R zqj7AVa/DWrN+WXqU6GFQ2sRq9zKDboekjc9sESorTz7dMFoT7h+8Q0hZmeRk3cnrs Fn0YEcdomniBdEbdFOqkvyJGw8KWG381n4LPWusKMgOGxZGniU5z1XD0/HHZvfLdIG IPIlRzeG/3VC5t5uqBMjr/h7sIL8c1b10k/RSepJRZc+ApHzEB916Nijcs3rNFgtf5 erD+RrLJ58hAlU3hIF8945XrUcYLYRNiva6q7DdkAsLp30sTydjihQziJU6dIzx++u qL8W22IVCze7A== From: Ekaitz Zarraga Message-ID: In-Reply-To: <6b2IbqX7a-q86Pjb_nOtz_XcCOrATSHf2T7vfIU5qrXWhYtQFsoex3XlfmDVhLt8UXjnOonMiLCS-1oKUzxXpp8x3HSUjNkzUjhUsKGc3Iw=@elenq.tech> References: <6b2IbqX7a-q86Pjb_nOtz_XcCOrATSHf2T7vfIU5qrXWhYtQFsoex3XlfmDVhLt8UXjnOonMiLCS-1oKUzxXpp8x3HSUjNkzUjhUsKGc3Iw=@elenq.tech> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_cQ9obbaiUa8aX1oSNGGXmFKeYCcWpS5lE1m79TnBKU" X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --b1_cQ9obbaiUa8aX1oSNGGXmFKeYCcWpS5lE1m79TnBKU Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, I attach the corrected patch set. If something is missing please let me know. Thanks. Happy new year. Ekaitz --b1_cQ9obbaiUa8aX1oSNGGXmFKeYCcWpS5lE1m79TnBKU Content-Type: text/x-patch; name=0001-gnu-Add-coin3D-4.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-Add-coin3D-4.patch RnJvbSA4YzhjODJkZmM1MmE4Nzc1YjAxYTBkMDM4ZGRmNDJiYTQ1MzYyNGU1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IEZyaSwgMSBKYW4gMjAyMSAxNToxNjowNyArMDEwMApTdWJqZWN0OiBbUEFUQ0ggMS82XSBn bnU6IEFkZCBjb2luM0QtNC4KCiAgICAqIGdudS9wYWNrYWdlcy9ncmFwaGljcy5zY20gKGNvaW4z RC00KTogTmV3IHZhcmlhYmxlLgotLS0KIGdudS9wYWNrYWdlcy9ncmFwaGljcy5zY20gfCA1MSAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA1 MSBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2dyYXBoaWNzLnNjbSBi L2dudS9wYWNrYWdlcy9ncmFwaGljcy5zY20KaW5kZXggN2E2MTA4NGYyNC4uODZjOTVlZjExYiAx MDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2dyYXBoaWNzLnNjbQorKysgYi9nbnUvcGFja2FnZXMv Z3JhcGhpY3Muc2NtCkBAIC0xNzMyLDYgKzE3MzIsNTcgQEAgc3RhbmRhcmQgZ3JhcGhpY3MgbGli cmFyeSBmb3IgM0QgdmlzdWFsaXphdGlvbiBhbmQgdmlzdWFsIHNpbXVsYXRpb24KIHNvZnR3YXJl IGluIHRoZSBzY2llbnRpZmljIGFuZCBlbmdpbmVlcmluZyBjb21tdW5pdHkuIikKICAgICAgIChs aWNlbnNlIGxpY2Vuc2U6YnNkLTMpKSkpCiAKKyhkZWZpbmUtcHVibGljIGNvaW4zRC00CisgICAg KHBhY2thZ2UKKyAgICAobmFtZSAiY29pbjNELTQiKQorICAgICh2ZXJzaW9uICI0LjAuMCIpCisg ICAgKHNvdXJjZQorICAgICAgKG9yaWdpbgorICAgICAgICAobWV0aG9kIGdpdC1mZXRjaCkKKyAg ICAgICAgKHVyaSAoZ2l0LXJlZmVyZW5jZQorICAgICAgICAgICAgICAgKHVybCAiaHR0cHM6Ly9n aXRodWIuY29tL2NvaW4zZC9jb2luIikKKyAgICAgICAgICAgICAgIChjb21taXQgKHN0cmluZy1h cHBlbmQgIkNvaW4tIiB2ZXJzaW9uKSkKKyAgICAgICAgICAgICAgIChyZWN1cnNpdmU/ICN0KSkp CisgICAgICAgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUgbmFtZSB2ZXJzaW9uKSkKKyAgICAg ICAgKHNoYTI1NgorICAgICAgICAgIChiYXNlMzIgIjFheWcwaGw4d2FuaGFkYWhtNXhiZ2hnaHh3 MXFqd3FicnMzZGwzbmduZmYwMjdoc3lmOHAiKSkKKyAgICAgICAgKG1vZHVsZXMgJygoZ3VpeCBi dWlsZCB1dGlscykpKQorICAgICAgICAoc25pcHBldAorICAgICAgICAgICcoYmVnaW4KKyAgICAg ICAgICAgICA7OyBEZWxldGUgYmluYXJpZXMKKyAgICAgICAgICAgICAoZm9yLWVhY2ggZGVsZXRl LWZpbGUKKyAgICAgICAgICAgICAgICAgICAgICAgJygiY2ZnL2NzdWJzdC5leGUiCisgICAgICAg ICAgICAgICAgICAgICAgICAgImNmZy93cmFwbXN2Yy5leGUiKSkKKyAgICAgICAgICAgICA7OyBE ZWxldGUgcmVmZXJlbmNlcyB0byBwYWNrYWdpbmcgdG9vbCBjcGFjaworICAgICAgICAgICAgIChz dWJzdGl0dXRlKiAiQ01ha2VMaXN0cy50eHQiCisgICAgICAgICAgICAgICAoKCIuKmNwYWNrLmQu KiIpICIiKSkKKyAgICAgICAgICAgICAjdCkpKSkKKyAgICAoYnVpbGQtc3lzdGVtIGNtYWtlLWJ1 aWxkLXN5c3RlbSkKKyAgICAobmF0aXZlLWlucHV0cworICAgICAgYCgoImRveHlnZW4iICxkb3h5 Z2VuKQorICAgICAgICAoImdyYXBodml6IiAsZ3JhcGh2aXopKSkKKyAgICAoaW5wdXRzCisgICAg ICBgKCgiYm9vc3QiICxib29zdCkKKyAgICAgICAgKCJmcmVlZ2x1dCIgLGZyZWVnbHV0KQorICAg ICAgICAoImdsZXciICxnbGV3KSkpCisgICAgKGFyZ3VtZW50cworICAgICAgYCgjOmNvbmZpZ3Vy ZS1mbGFncworICAgICAgICAobGlzdAorICAgICAgICAgICItRENPSU5fQlVJTERfRE9DVU1FTlRB VElPTl9NQU49T04iCisgICAgICAgICAgKHN0cmluZy1hcHBlbmQgIi1EQk9PU1RfUk9PVD0iCisg ICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiAlYnVpbGQtaW5wdXRzICJib29zdCIp KSkpKQorICAgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9jb2luM2QvY29pbiIpCisg ICAgKHN5bm9wc2lzCisgICAgICAiSGlnaC1sZXZlbCAzRCB2aXN1YWxpemF0aW9uIGxpYnJhcnkg d2l0aCBPcGVuIEludmVudG9yIDIuMSBBUEkiKQorICAgIChkZXNjcmlwdGlvbgorICAgICAgIkNv aW4gaXMgYSAzRCBncmFwaGljcyBsaWJyYXJ5IHdpdGggYW4gQXBwbGljYXRpb24gUHJvZ3JhbW1p bmcgSW50ZXJmYWNlCitiYXNlZCBvbiB0aGUgT3BlbiBJbnZlbnRvciAyLjEgQVBJLiAgRm9yIHRo b3NlIHdobyBhcmUgbm90IGZhbWlsaWFyIHdpdGggT3BlbgorSW52ZW50b3IsIGl0IGlzIGEgc2Nl bmUtZ3JhcGggYmFzZWQgcmV0YWluLW1vZGUgcmVuZGVyaW5nIGFuZCBtb2RlbCBpbnRlcmFjdGlv bgorbGlicmFyeSwgd3JpdHRlbiBpbiBDKyssIHdoaWNoIGhhcyBiZWNvbWUgdGhlIGRlIGZhY3Rv IHN0YW5kYXJkIGdyYXBoaWNzCitsaWJyYXJ5IGZvciAzRCB2aXN1YWxpemF0aW9uIGFuZCB2aXN1 YWwgc2ltdWxhdGlvbiBzb2Z0d2FyZSBpbiB0aGUgc2NpZW50aWZpYworYW5kIGVuZ2luZWVyaW5n IGNvbW11bml0eS4iKQorICAgICAgKGxpY2Vuc2UgbGljZW5zZTpic2QtMykpKQorCiAoZGVmaW5l LXB1YmxpYyBzdXBlcmZhbWljb252CiAgIChwYWNrYWdlCiAgICAgKG5hbWUgInN1cGVyZmFtaWNv bnYiKQotLSAKMi4yOS4yCgo= --b1_cQ9obbaiUa8aX1oSNGGXmFKeYCcWpS5lE1m79TnBKU Content-Type: text/x-patch; name=0002-gnu-Add-soqt.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-gnu-Add-soqt.patch RnJvbSA5N2I2ZWJmN2UxYzBkZmU1NzI4YzllOGRjNzJjZDZmN2NiMjM3OTA5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IEZyaSwgMSBKYW4gMjAyMSAxNToxNzowNiArMDEwMApTdWJqZWN0OiBbUEFUQ0ggMi82XSBn bnU6IEFkZCBzb3F0LgoKICAgICogZ251L3BhY2thZ2VzL3F0LnNjbSAoc29xdCk6IE5ldyB2YXJp YWJsZS4KLS0tCiBnbnUvcGFja2FnZXMvcXQuc2NtIHwgMzMgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdp dCBhL2dudS9wYWNrYWdlcy9xdC5zY20gYi9nbnUvcGFja2FnZXMvcXQuc2NtCmluZGV4IDJlNjIx ZTc1OGMuLjNlOTNiYzU1ZjQgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9xdC5zY20KKysrIGIv Z251L3BhY2thZ2VzL3F0LnNjbQpAQCAtNjcsNiArNjcsNyBAQAogICAjOnVzZS1tb2R1bGUgKGdu dSBwYWNrYWdlcyBnbGliKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBnbnVwZykKICAg Izp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ3BlcmYpCisgICM6dXNlLW1vZHVsZSAoZ251IHBh Y2thZ2VzIGdyYXBoaWNzKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBnc3RyZWFtZXIp CiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGd0aykKICAgIzp1c2UtbW9kdWxlIChnbnUg cGFja2FnZXMgaWN1NGMpCkBAIC0yODI0LDMgKzI4MjUsMzUgQEAgYmVpbmcgZnVsbHkgY3VzdG9t aXphYmxlIGFuZCBlYXN5IHRvIGV4dGVuZC4iKQogICAgIDs7IEFjY29yZGluZyB0byBMSUNFTlNF LCBlaXRoZXIgdmVyc2lvbiAyIG9yIHZlcnNpb24gMyBvZiB0aGUgR05VIEdQTCBtYXkKICAgICA7 OyBiZSB1c2VkLgogICAgIChsaWNlbnNlIChsaXN0IGxpY2Vuc2U6Z3BsMiBsaWNlbnNlOmdwbDMp KSkpCisKKworKGRlZmluZS1wdWJsaWMgc29xdAorICAobGV0ICgoY29tbWl0LXJlZiAiZmI4ZjY1 NTYzMmJiOWM5YzYwZTBmZjlmYTY5YTViYTIyZDNmZjk5ZCIpCisgICAgICAgIChyZXZpc2lvbiAi MSIpKQorICAgIChwYWNrYWdlCisgICAgKG5hbWUgInNvcXQiKQorICAgICh2ZXJzaW9uIChnaXQt dmVyc2lvbiAiMS42LjAiIHJldmlzaW9uIGNvbW1pdC1yZWYpKQorICAgIChzb3VyY2UKKyAgICAg IChvcmlnaW4KKyAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCisgICAgICAgICh1cmkgKGdpdC1y ZWZlcmVuY2UKKyAgICAgICAgICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9jb2luM2Qv c29xdCIpCisgICAgICAgICAgICAgICAoY29tbWl0IGNvbW1pdC1yZWYpCisgICAgICAgICAgICAg ICAocmVjdXJzaXZlPyAjdCkpKQorICAgICAgICAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5h bWUgdmVyc2lvbikpCisgICAgICAgIChzaGEyNTYKKyAgICAgICAgICAoYmFzZTMyICIxNnZpa2Iz Znk4cm1rMTBzZzVnMGd5MmMzNDNoaTN4N3pjY3NnYTkwc3Nua3pwcTZtMDMyIikpKSkKKyAgICAo YnVpbGQtc3lzdGVtIGNtYWtlLWJ1aWxkLXN5c3RlbSkKKyAgICAoYXJndW1lbnRzICcoIzp0ZXN0 cz8gI2YpKSA7IFRoZXJlIGFyZSBubyB0ZXN0cworICAgIChuYXRpdmUtaW5wdXRzCisgICAgICBg KCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpCisgICAgICAgICgiY21ha2UiICxjbWFrZSkpKQor ICAgIChpbnB1dHMKKyAgICAgIGAoKCJxdGJhc2UiICxxdGJhc2UpCisgICAgICAgICgiY29pbjNE LTQiICxjb2luM0QtNCkpKQorICAgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9jb2lu M2Qvc29xdCIpCisgICAgKHN5bm9wc2lzICJRdCBHVUkgY29tcG9uZW50IHRvb2xraXQgbGlicmFy eSBmb3IgQ29pbiIpCisgICAgKGRlc2NyaXB0aW9uICJTb1F0IGlzIGEgUXQgR1VJIGNvbXBvbmVu dCB0b29sa2l0IGxpYnJhcnkgZm9yIENvaW4uICBJdCBpcworYWxzbyBjb21wYXRpYmxlIHdpdGgg U0dJIGFuZCBUR1MgT3BlbiBJbnZlbnRvciwgYW5kIHRoZSBBUEkgaXMgYmFzZWQgb24gdGhlIEFQ SQorb2YgdGhlIEludmVudG9yWHQgR1VJIGNvbXBvbmVudCB0b29sa2l0LiIpCisgICAgKGxpY2Vu c2UgbGljZW5zZTpic2QtMykpKSkKLS0gCjIuMjkuMgoK --b1_cQ9obbaiUa8aX1oSNGGXmFKeYCcWpS5lE1m79TnBKU Content-Type: text/x-patch; name=0005-gnu-freecad-move-python-pyside-2-tools-to-native-inp.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0005-gnu-freecad-move-python-pyside-2-tools-to-native-inp.patch RnJvbSBkODIzZmVhYzNkNGEwZTA1ZDFjNDUyYTBjYWVhZWI1MjhjYjAxNTg3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IEZyaSwgMSBKYW4gMjAyMSAxNToyNDo1NCArMDEwMApTdWJqZWN0OiBbUEFUQ0ggNS82XSBn bnU6IGZyZWVjYWQ6IG1vdmUgcHl0aG9uLXB5c2lkZS0yLXRvb2xzIHRvIG5hdGl2ZS1pbnB1dHMK CiAgICAqIGdudS9wYWNrYWdlcy9lbmdpbmVlcmluZy5zY20gKGZyZWVjYWQpOgogICAgW2lucHV0 c106IFJlbW92ZSBweXRob24tcHlzaWRlLTItdG9vbHMuCiAgICBbbmF0aXZlLWlucHV0c106IEFk ZCBweXRob24tcHlzaWRlLTItdG9vbHMuCi0tLQogZ251L3BhY2thZ2VzL2VuZ2luZWVyaW5nLnNj bSB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoK ZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9lbmdpbmVlcmluZy5zY20gYi9nbnUvcGFja2FnZXMv ZW5naW5lZXJpbmcuc2NtCmluZGV4IDRiYjdmNjg5MzkuLjExMzc2NmQ0NTMgMTAwNjQ0Ci0tLSBh L2dudS9wYWNrYWdlcy9lbmdpbmVlcmluZy5zY20KKysrIGIvZ251L3BhY2thZ2VzL2VuZ2luZWVy aW5nLnNjbQpAQCAtMjQ1Myw2ICsyNDUzLDcgQEAgZnVsbCBwcm9ncmFtbWF0aWMgY29udHJvbCBv dmVyIHlvdXIgbW9kZWxzLiIpCiAgICAgICAgKCJncmFwaHZpeiIgLGdyYXBodml6KQogICAgICAg ICgicXR0b29scyIgLHF0dG9vbHMpCiAgICAgICAgKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykK KyAgICAgICAoInB5dGhvbi1weXNpZGUtMi10b29scyIgLHB5dGhvbi1weXNpZGUtMi10b29scykK ICAgICAgICAoInN3aWciICxzd2lnKSkpCiAgICAgKGlucHV0cwogICAgICBgKCgiYm9vc3QiICxi b29zdCkKQEAgLTI0NzAsNyArMjQ3MSw2IEBAIGZ1bGwgcHJvZ3JhbW1hdGljIGNvbnRyb2wgb3Zl ciB5b3VyIG1vZGVscy4iKQogICAgICAgICgib3BlbmNhc2NhZGUtb2NjdCIgLG9wZW5jYXNjYWRl LW9jY3QpCiAgICAgICAgKCJweXRob24tbWF0cGxvdGxpYiIgLHB5dGhvbi1tYXRwbG90bGliKQog ICAgICAgICgicHl0aG9uLXB5c2lkZS0yIiAscHl0aG9uLXB5c2lkZS0yKQotICAgICAgICgicHl0 aG9uLXB5c2lkZS0yLXRvb2xzIiAscHl0aG9uLXB5c2lkZS0yLXRvb2xzKQogICAgICAgICgicHl0 aG9uLXNoaWJva2VuLTIiICxweXRob24tc2hpYm9rZW4tMikKICAgICAgICAoInB5dGhvbi1waXZ5 IiAscHl0aG9uLXBpdnkpCiAgICAgICAgKCJweXRob24td3JhcHBlciIgLHB5dGhvbi13cmFwcGVy KQotLSAKMi4yOS4yCgo= --b1_cQ9obbaiUa8aX1oSNGGXmFKeYCcWpS5lE1m79TnBKU Content-Type: text/x-patch; name=0006-gnu-freecad-Add-qtwebkit-input.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0006-gnu-freecad-Add-qtwebkit-input.patch RnJvbSAyNzNiMGU1Y2M5ODEzYzJlMTk2NTUzMWExMWIzNzc4YmVhNDZlMDU3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IEZyaSwgMSBKYW4gMjAyMSAxNToyODowOSArMDEwMApTdWJqZWN0OiBbUEFUQ0ggNi82XSBn bnU6IGZyZWVjYWQ6IEFkZCBxdHdlYmtpdCBpbnB1dC4KCiAgICAqIGdudS9wYWNrYWdlcy9lbmdp bmVlcmluZy5zY20gKGZyZWVjYWQpOgogICAgW2lucHV0c106IEFkZCBxdHdlYmtpdC4KLS0tCiBn bnUvcGFja2FnZXMvZW5naW5lZXJpbmcuc2NtIHwgNCArLS0tCiAxIGZpbGUgY2hhbmdlZCwgMSBp bnNlcnRpb24oKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2Vu Z2luZWVyaW5nLnNjbSBiL2dudS9wYWNrYWdlcy9lbmdpbmVlcmluZy5zY20KaW5kZXggMTEzNzY2 ZDQ1My4uMzA4NDZiYzFhZCAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2VuZ2luZWVyaW5nLnNj bQorKysgYi9nbnUvcGFja2FnZXMvZW5naW5lZXJpbmcuc2NtCkBAIC0yNDc4LDkgKzI0NzgsNyBA QCBmdWxsIHByb2dyYW1tYXRpYyBjb250cm9sIG92ZXIgeW91ciBtb2RlbHMuIikKICAgICAgICAo InF0c3ZnIiAscXRzdmcpCiAgICAgICAgKCJxdHgxMWV4dHJhcyIgLHF0eDExZXh0cmFzKQogICAg ICAgICgicXR4bWxwYXR0ZXJucyIgLHF0eG1scGF0dGVybnMpCi0gICAgICAgOzsgcXR3ZWJraXQg aXMgb3B0aW9uYWwuIFdlIHJlbW92ZSBpdCBjdXJyZW50bHksIGJlY2F1c2UgaXQgdGFrZXMKLSAg ICAgICA7OyBtdWNoIHRpbWUgdG8gY29tcGlsZSBhbmQgc3Vic3RpdHV0ZXMgYXJlIG9mdGVuIHVu YXZhaWxhYmxlCi0gICAgICAgOzsoInF0d2Via2l0IiAscXR3ZWJraXQpCisgICAgICAgKCJxdHdl YmtpdCIgLHF0d2Via2l0KQogICAgICAgICgidGJiIiAsdGJiKQogICAgICAgICgidnRrIiAsdnRr KQogICAgICAgICgieGVyY2VzLWMiICx4ZXJjZXMtYykKLS0gCjIuMjkuMgoK --b1_cQ9obbaiUa8aX1oSNGGXmFKeYCcWpS5lE1m79TnBKU Content-Type: text/x-patch; name=0003-gnu-Add-python-pivy.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0003-gnu-Add-python-pivy.patch RnJvbSBiZWI4MTdmODUwYTMzNGVjYzNiNzczNDk5YmJkNDg0NWFiNmQ4MzVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IEZyaSwgMSBKYW4gMjAyMSAxNToxNzozNyArMDEwMApTdWJqZWN0OiBbUEFUQ0ggMy82XSBn bnU6IEFkZCBweXRob24tcGl2eS4KCiAgICAqIGdudS9wYWNrYWdlcy9weXRob24teHl6LnNjbSAo cHl0aG9uLXBpdnkpOiBOZXcgdmFyaWFibGUuCi0tLQogZ251L3BhY2thZ2VzL3B5dGhvbi14eXou c2NtIHwgNDQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNo YW5nZWQsIDQ0IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcHl0aG9u LXh5ei5zY20gYi9nbnUvcGFja2FnZXMvcHl0aG9uLXh5ei5zY20KaW5kZXggZDA3YzkxMTIxYS4u MTgzY2ZhMjg5NCAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3B5dGhvbi14eXouc2NtCisrKyBi L2dudS9wYWNrYWdlcy9weXRob24teHl6LnNjbQpAQCAtMTc1LDYgKzE3NSw3IEBACiAgICM6dXNl LW1vZHVsZSAoZ251IHBhY2thZ2VzIHNoZWxscykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2Fn ZXMgc3BoaW54KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBzc2gpCisgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIHN3aWcpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHRl cm1pbmFscykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgdGV4KQogICAjOnVzZS1tb2R1 bGUgKGdudSBwYWNrYWdlcyB0ZXhpbmZvKQpAQCAtMjMyMzgsMyArMjMyMzksNDYgQEAgcHJvY2Vz cy4iKQogICAgICAiR2FtZXJhIGlzIGEgdG9vbGtpdCBmb3IgYnVpbGRpbmcgZG9jdW1lbnQgaW1h Z2UgcmVjb2duaXRpb24gc3lzdGVtcy4iKQogICAgIChob21lLXBhZ2UgImh0dHBzOi8vZ2FtZXJh LmluZm9ybWF0aWsuaHNuci5kZS8iKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6Z3BsMispKSkKKwor KGRlZmluZS1wdWJsaWMgcHl0aG9uLXBpdnkKKyAgKHBhY2thZ2UKKyAgICAobmFtZSAicHl0aG9u LXBpdnkiKQorICAgICh2ZXJzaW9uICIwLjYuNSIpCisgICAgKHNvdXJjZQorICAgICAgKG9yaWdp bgorICAgICAgICAobWV0aG9kIGdpdC1mZXRjaCkKKyAgICAgICAgKHVyaSAoZ2l0LXJlZmVyZW5j ZQorICAgICAgICAgICAgICAgKHVybCAiaHR0cHM6Ly9naXRodWIuY29tL2NvaW4zZC9waXZ5IikK KyAgICAgICAgICAgICAgIChjb21taXQgdmVyc2lvbikpKQorICAgICAgICAoZmlsZS1uYW1lIChn aXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCisgICAgICAgIChzaGEyNTYKKyAgICAgICAgICAo YmFzZTMyICIwdmlkczdzeGs4dzV2cjczeGRuZjh4ZGNpNzFhN3N5bDZjZDM1YWlpc3BwYnF5eWZt eWt4IikpKSkKKyAgICAoYnVpbGQtc3lzdGVtIHB5dGhvbi1idWlsZC1zeXN0ZW0pCisgICAgKGFy Z3VtZW50cworICAgICAgYCgjOnRlc3RzPyAjZiA7IFRlc3RzIGFyZSBicm9rZW4KKyAgICAgICAg IzpwaGFzZXMKKyAgICAgICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcworICAgICAg ICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAncGF0Y2gtY21ha2UtaW5jbHVkZS1kaXJzCisgICAgICAg ICAgIChsYW1iZGEgXworICAgICAgICAgICAgIDs7IFBhdGNoIGJ1aWxkc3lzdGVtIHRvIHJlc3Bl Y3QgQ29pbjNEIGluY2x1ZGUgZGlyZWN0b3J5CisgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJD TWFrZUxpc3RzLnR4dCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgKCgiXFwkXFx7U29RdF9J TkNMVURFX0RJUlN9IikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICIke0NvaW5fSU5DTFVE RV9ESVJ9OyR7U29RdF9JTkNMVURFX0RJUlN9IikpCisgICAgICAgICAgICAgI3QpKSkpKQorICAg IChuYXRpdmUtaW5wdXRzCisgICAgICBgKCgiY21ha2UiICxjbWFrZSkKKyAgICAgICAgKCJzd2ln IiAsc3dpZykpKQorICAgIChpbnB1dHMKKyAgICAgIGAoKCJweXRob24td3JhcHBlciIgLHB5dGhv bi13cmFwcGVyKQorICAgICAgICAoInF0YmFzZSIgLHF0YmFzZSkKKyAgICAgICAgKCJsaWJ4aSIg LGxpYnhpKQorICAgICAgICAoImxpYmljZSIgLGxpYmljZSkKKyAgICAgICAgKCJzb3F0IiAsc29x dCkKKyAgICAgICAgKCJnbGV3IiAsZ2xldykKKyAgICAgICAgKCJjb2luM0QtNCIgLGNvaW4zRC00 KSkpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL2NvaW4zZC9waXZ5IikKKyAg ICAoc3lub3BzaXMgIlB5dGhvbiBiaW5kaW5ncyB0byBDb2luM0QiKQorICAgIChkZXNjcmlwdGlv bgorICAgICAgIlBpdnkgcHJvdmlkZXMgcHl0aG9uIGJpbmRpbmdzIGZvciBDb2luLCBhIDNEIGdy YXBoaWNzIGxpYnJhcnkgd2l0aCBhbgorQXBwbGljYXRpb24gUHJvZ3JhbW1pbmcgSW50ZXJmYWNl IGJhc2VkIG9uIHRoZSBPcGVuIEludmVudG9yIDIuMSBBUEkuIikKKyAgICAobGljZW5zZSBsaWNl bnNlOmlzYykpKQotLSAKMi4yOS4yCgo= --b1_cQ9obbaiUa8aX1oSNGGXmFKeYCcWpS5lE1m79TnBKU Content-Type: text/x-patch; name=0004-gnu-FreeCad-Update-to-0.18.5-1.7616153.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0004-gnu-FreeCad-Update-to-0.18.5-1.7616153.patch RnJvbSA0MmE3OGQ1NzJhYmRkZGJlZDg2YjY5ZGUwZTg3NDY4ODIzYmZlOGQ5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IEZyaSwgMSBKYW4gMjAyMSAxNToyMjowMiArMDEwMApTdWJqZWN0OiBbUEFUQ0ggNC82XSBn bnU6IEZyZWVDYWQ6IFVwZGF0ZSB0byAwLjE4LjUtMS43NjE2MTUzLgoKRml4ZXMgRHJhZnQgbW9k dWxlIGltcG9ydCBlcnJvcnMKCiAgICAqIGdudS9wYWNrYWdlcy9lbmdpbmVlcmluZy5zY20gKGZy ZWVjYWQpOiBVcGRhdGUgdG8gMC4xOC41LTEuNzYxNjE1My4KICAgIFtpbnB1dHNdOiBBZGQgcHl0 aG9uLXBpdnkuCi0tLQogZ251L3BhY2thZ2VzL2VuZ2luZWVyaW5nLnNjbSB8IDQxICsrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlv bnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9lbmdpbmVl cmluZy5zY20gYi9nbnUvcGFja2FnZXMvZW5naW5lZXJpbmcuc2NtCmluZGV4IGU0MzY5OTQ0OTIu LjRiYjdmNjg5MzkgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9lbmdpbmVlcmluZy5zY20KKysr IGIvZ251L3BhY2thZ2VzL2VuZ2luZWVyaW5nLnNjbQpAQCAtMjQzMiwyOCArMjQzMiwyMSBAQCBm dWxsIHByb2dyYW1tYXRpYyBjb250cm9sIG92ZXIgeW91ciBtb2RlbHMuIikKICAgICAobGljZW5z ZSBsaWNlbnNlOmdwbDIrKSkpCiAKIChkZWZpbmUtcHVibGljIGZyZWVjYWQKLSAgKHBhY2thZ2UK LSAgICAobmFtZSAiZnJlZWNhZCIpCi0gICAgKHZlcnNpb24gIjAuMTguNSIpCi0gICAgKHNvdXJj ZQotICAgICAob3JpZ2luCi0gICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCi0gICAgICAgKHVyaSAo Z2l0LXJlZmVyZW5jZQotICAgICAgICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9GcmVl Q0FEL0ZyZWVDQUQiKQotICAgICAgICAgICAgIChjb21taXQgdmVyc2lvbikpKQotICAgICAgICht b2R1bGVzICcoKGd1aXggYnVpbGQgdXRpbHMpKSkKLSAgICAgICAoc25pcHBldAotICAgICAgICAn KGJlZ2luCi0gICAgICAgICAgIDs7IEZpeCBidWlsZCB3aXRoIFB5dGhvbiAzLjgsIHNlZQotICAg ICAgICAgICA7OyA8aHR0cHM6Ly90cmFja2VyLmZyZWVjYWR3ZWIub3JnL3ZpZXcucGhwP2lkPTQx NDM+LgotICAgICAgICAgICAoc3Vic3RpdHV0ZSogInNyYy9CYXNlL3N3aWdweXJ1bi5pbmwiCi0g ICAgICAgICAgICAgKCgiUHlPYmplY3QgXFwqbW9kdWxlcyA9IGludGVycC0+bW9kdWxlczsiKQot ICAgICAgICAgICAgICAiUHlPYmplY3QgKm1vZHVsZXMgPSBQeUV2YWxfR2V0QnVpbHRpbnMoKTsi KSkKLSAgICAgICAgICAgI3QpKQotICAgICAgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUgbmFt ZSB2ZXJzaW9uKSkKLSAgICAgICAoc2hhMjU2Ci0gICAgICAgIChiYXNlMzIKLSAgICAgICAgICIw cjMxanp6a2FtZjc2bDE5ZmIxNzVoaHY0OGlyazA2ZnBpOGxkeGRscjMxdzhjMWl4NGFhIikpKSkK KyAgKGxldCAoKGNvbW1pdC1yZWYgIjc2MTYxNTNiM2MzMWFjZTAwNjE2OWNkYzJmZGFmYWI0ODQ0 OTg4NTgiKQorICAgICAgICAocmV2aXNpb24gIjEiKSkKKyAgICAocGFja2FnZQorICAgICAgKG5h bWUgImZyZWVjYWQiKQorICAgICAgKHZlcnNpb24gKGdpdC12ZXJzaW9uICIwLjE4LjUiIHJldmlz aW9uIGNvbW1pdC1yZWYpKQorICAgICAgKHNvdXJjZQorICAgICAgICAob3JpZ2luCisgICAgICAg ICAgKG1ldGhvZCBnaXQtZmV0Y2gpCisgICAgICAgICAgKHVyaSAoZ2l0LXJlZmVyZW5jZQorICAg ICAgICAgICAgICAgICAodXJsICJodHRwczovL2dpdGh1Yi5jb20vRnJlZUNBRC9GcmVlQ0FEIikK KyAgICAgICAgICAgICAgICAgKGNvbW1pdCBjb21taXQtcmVmKSkpCisgICAgICAgICAgKGZpbGUt bmFtZSAoZ2l0LWZpbGUtbmFtZSBuYW1lIHZlcnNpb24pKQorICAgICAgICAgIChzaGEyNTYKKyAg ICAgICAgICAgIChiYXNlMzIKKyAgICAgICAgICAgICAgIjE2OTY1eXhucDJwcTdubTh6M3AwcGpr empkeXE2MnZmcmo4ajNuazI2YndjODk4Y3p5bjIiKSkpKQogICAgIChidWlsZC1zeXN0ZW0gcXQt YnVpbGQtc3lzdGVtKQogICAgIChuYXRpdmUtaW5wdXRzCiAgICAgIGAoKCJkb3h5Z2VuIiAsZG94 eWdlbikKQEAgLTI0NzksNiArMjQ3Miw3IEBAIGZ1bGwgcHJvZ3JhbW1hdGljIGNvbnRyb2wgb3Zl ciB5b3VyIG1vZGVscy4iKQogICAgICAgICgicHl0aG9uLXB5c2lkZS0yIiAscHl0aG9uLXB5c2lk ZS0yKQogICAgICAgICgicHl0aG9uLXB5c2lkZS0yLXRvb2xzIiAscHl0aG9uLXB5c2lkZS0yLXRv b2xzKQogICAgICAgICgicHl0aG9uLXNoaWJva2VuLTIiICxweXRob24tc2hpYm9rZW4tMikKKyAg ICAgICAoInB5dGhvbi1waXZ5IiAscHl0aG9uLXBpdnkpCiAgICAgICAgKCJweXRob24td3JhcHBl ciIgLHB5dGhvbi13cmFwcGVyKQogICAgICAgICgicXRiYXNlIiAscXRiYXNlKQogICAgICAgICgi cXRzdmciICxxdHN2ZykKQEAgLTI1NDYsNyArMjU0MCw4IEBAIGN1c3RvbWl6YXRpb24uIikKICAg ICAgIGxpY2Vuc2U6bGdwbDIuMSsKICAgICAgIGxpY2Vuc2U6bGdwbDIuMCsKICAgICAgIGxpY2Vu c2U6Z3BsMysKLSAgICAgIGxpY2Vuc2U6YnNkLTMpKSkpCisgICAgICBsaWNlbnNlOmJzZC0zKSkp KSkKKwogCiAoZGVmaW5lLXB1YmxpYyBsaWJtZWRmaWxlCiAgIChwYWNrYWdlCi0tIAoyLjI5LjIK Cg== --b1_cQ9obbaiUa8aX1oSNGGXmFKeYCcWpS5lE1m79TnBKU-- From unknown Sat Sep 13 07:22:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45573] [PATCH] Correct freecad runtime errors Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jan 2021 00:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ekaitz Zarraga Cc: "45573@debbugs.gnu.org" <45573@debbugs.gnu.org> Received: via spool by 45573-submit@debbugs.gnu.org id=B45573.16097192278936 (code B ref 45573); Mon, 04 Jan 2021 00:14:01 +0000 Received: (at 45573) by debbugs.gnu.org; 4 Jan 2021 00:13:47 +0000 Received: from localhost ([127.0.0.1]:38897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwDVK-0002K3-Sg for submit@debbugs.gnu.org; Sun, 03 Jan 2021 19:13:47 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:46065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwDVI-0002Jn-Kn for 45573@debbugs.gnu.org; Sun, 03 Jan 2021 19:13:45 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 991B35C00D5; Sun, 3 Jan 2021 19:13:38 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sun, 03 Jan 2021 19:13:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=rGxAyJZf0av/SVyf/W9TjBvj l4ZTM9/yrU+mVRLYyAo=; b=F1Dkrtj+E8xsCfhHlUOc1x66TBXkvs7RD3WsD5m0 xraSyRIa1M/InuNIvM2vR6aJTLfH8JBPJ3Z2XszTvI53aJ3LsHPLu0UuGHB21iKg 4fG7wD43W2TO5dkg15YvfFWqh3LZIAM+lktNmvxTW7YHG/5orQYkpcR+D1QXAR7e 7PY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=rGxAyJ Zf0av/SVyf/W9TjBvjl4ZTM9/yrU+mVRLYyAo=; b=TkWAXvh19xct5lxCKjnyv0 drKL1gWncAS3XixHluRl8hLwyfpVUgGMWKbkLehIveKYDcPo8eFKdUIJ0ekhJmYP Qxa4xeU0MR0r8ol42XQKjXrnRYWLSC/PthKDMKxd375tIIvjr9yYkzCE4ldXn9Jk KtQztAnGtdJf/FCrzs9SDb2dricJj6L+ibBjkzDLbj/YbZKHTp8Xc04/DF9dPbJt X4jwWf3W3txYk3ciUTQ3H+Lo6XSBZUGlyG10GRw59JAfvazeerzz5ctFbREBa4V2 4nsmkh/ltXcmi+UmXN3w+ggo9qg++N2MqxVP+0AZc8PCNFJdx7dX8lj3ZtSN6MCg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdefvddgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpeeukeektdffvddtudegjeegtdevhfeufeeivdejiedtieegtdevjedvjeehffev gfenucfkphepjeefrddugedurdduvdejrddugeeinecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 3561F24005C; Sun, 3 Jan 2021 19:13:38 -0500 (EST) Date: Sun, 3 Jan 2021 19:13:36 -0500 From: Leo Famulari Message-ID: References: <6b2IbqX7a-q86Pjb_nOtz_XcCOrATSHf2T7vfIU5qrXWhYtQFsoex3XlfmDVhLt8UXjnOonMiLCS-1oKUzxXpp8x3HSUjNkzUjhUsKGc3Iw=@elenq.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Fri, Jan 01, 2021 at 02:37:39PM +0000, Ekaitz Zarraga wrote: > I attach the corrected patch set. > If something is missing please let me know. Thanks for the revisions! > Subject: [PATCH 1/6] gnu: Add coin3D-4. > > * gnu/packages/graphics.scm (coin3D-4): New variable. > + (name "coin3D-4") I changed the name to "coin3D". One can specify the version in the Guix UI with "coin3D@4" and in code by referring to the variable name, coin3D-4. > + ;; Delete references to packaging tool cpack > + (substitute* "CMakeLists.txt" > + ((".*cpack.d.*") "")) > + #t)))) I still did not understand the reason for this substitution. I tried building without it and found that the build is broken, so I added this info to the comment. Can you report it upstream? It seems like something that all distributors would benefit from. > Subject: [PATCH 2/6] gnu: Add soqt. > > * gnu/packages/qt.scm (soqt): New variable. I pushed these first two patches as a5f13705cb9261ab66bdf73d1fb4a832714feb31 Comments on the others to follow... From unknown Sat Sep 13 07:22:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45573] [PATCH] Correct freecad runtime errors Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jan 2021 00:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ekaitz Zarraga Cc: "45573@debbugs.gnu.org" <45573@debbugs.gnu.org> Received: via spool by 45573-submit@debbugs.gnu.org id=B45573.16097195389430 (code B ref 45573); Mon, 04 Jan 2021 00:19:02 +0000 Received: (at 45573) by debbugs.gnu.org; 4 Jan 2021 00:18:58 +0000 Received: from localhost ([127.0.0.1]:38904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwDaM-0002S2-Fx for submit@debbugs.gnu.org; Sun, 03 Jan 2021 19:18:58 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:55081) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwDaK-0002Ro-FP for 45573@debbugs.gnu.org; Sun, 03 Jan 2021 19:18:56 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 678255C00BD; Sun, 3 Jan 2021 19:18:51 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sun, 03 Jan 2021 19:18:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=U34F1ZAdi/jtYkT6UvZcgyOk s3+a76c9/UtQfU6qfdQ=; b=L1X/2yZhoHo2zEl7PMvJr4BcpxJTA8n8x4rCzCpc 1G9KeqcYoUbt4iIpy81sH7T/ksQv3mKjCiUWZEYV9rVcxJrTW8GbT+3FAMw/3Dpj lZt1Iwj9Ss/AMBzqBGigJG0uxac3+3ih10huxWjnsZu7Y7X2ZsKgBRBTbFm9XjlF vsk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=U34F1Z Adi/jtYkT6UvZcgyOks3+a76c9/UtQfU6qfdQ=; b=cZasjMgXGj+/nlD7mFfSTj Sn7jFX04B8TILiJKWmiQNGHwqhJD0UHluX5hnqkoGk3yOAEkxEJ/2+rxM/FX4jGD Aaqy1WkUUdC4BQUordRNf6J+tnAjoX28Z/UNuX5VGZqZ1m74NMCMormlCJ4CVIpq KuUVPUTJGTrLMuEGJsk9uS4QWZa9wmXNh9LEQiSVpG7uP26kMERdzWoyrOgVOex0 X4tjHNgl/ZXuKwEiAqEl/d+gyYxRz+pqEQ3bMUDRpW+WdlZKwaQqJItv1Kc+b9rH 04GBZeZz8GffqYxnaEZl4emOlGMpEPWZDSYzKooChI5sqcgGZfUYSoHTd4NXG2fg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdefvddgvddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpeeukeektdffvddtudegjeegtdevhfeufeeivdejiedtieegtdevjedvjeehffev gfenucfkphepjeefrddugedurdduvdejrddugeeinecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 1146924005D; Sun, 3 Jan 2021 19:18:51 -0500 (EST) Date: Sun, 3 Jan 2021 19:18:49 -0500 From: Leo Famulari Message-ID: References: <6b2IbqX7a-q86Pjb_nOtz_XcCOrATSHf2T7vfIU5qrXWhYtQFsoex3XlfmDVhLt8UXjnOonMiLCS-1oKUzxXpp8x3HSUjNkzUjhUsKGc3Iw=@elenq.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Fri, Jan 01, 2021 at 02:37:39PM +0000, Ekaitz Zarraga wrote: > Subject: [PATCH 3/6] gnu: Add python-pivy. > > * gnu/packages/python-xyz.scm (python-pivy): New variable. > + `(#:tests? #f ; Tests are broken Can you clarify what you mean, and the overall situation with the tests? Are they actually used upstream? > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'patch-cmake-include-dirs > + (lambda _ > + ;; Patch buildsystem to respect Coin3D include directory > + (substitute* "CMakeLists.txt" > + (("\\$\\{SoQt_INCLUDE_DIRS}") > + "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}")) This can probably be fixed with #:configure-flags. I can look into this before pushing. > Subject: [PATCH 4/6] gnu: FreeCad: Update to 0.18.5-1.7616153. > > Fixes Draft module import errors > > * gnu/packages/engineering.scm (freecad): Update to 0.18.5-1.7616153. > [inputs]: Add python-pivy. > Subject: [PATCH 5/6] gnu: freecad: move python-pyside-2-tools to native-inputs > > * gnu/packages/engineering.scm (freecad): > [inputs]: Remove python-pyside-2-tools. > [native-inputs]: Add python-pyside-2-tools. The re-indentation of the package in patch 4/6 is not complete, and I will squash these two patches before pushing. I have this "ready to go" in my Git tree. > Subject: [PATCH 6/6] gnu: freecad: Add qtwebkit input. > > * gnu/packages/engineering.scm (freecad): > [inputs]: Add qtwebkit. > - ;; qtwebkit is optional. We remove it currently, because it takes > - ;; much time to compile and substitutes are often unavailable > - ;;("qtwebkit" ,qtwebkit) > + ("qtwebkit" ,qtwebkit) The comment is still true... I recommend adding a note in the commit message saying what the new dependency enables. From unknown Sat Sep 13 07:22:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45573] [PATCH] Correct freecad runtime errors Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jan 2021 12:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: "45573@debbugs.gnu.org" <45573@debbugs.gnu.org> Reply-To: Ekaitz Zarraga Received: via spool by 45573-submit@debbugs.gnu.org id=B45573.160976172731245 (code B ref 45573); Mon, 04 Jan 2021 12:03:02 +0000 Received: (at 45573) by debbugs.gnu.org; 4 Jan 2021 12:02:07 +0000 Received: from localhost ([127.0.0.1]:57999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwOYp-00087t-Dq for submit@debbugs.gnu.org; Mon, 04 Jan 2021 07:02:07 -0500 Received: from mail-40136.protonmail.ch ([185.70.40.136]:53023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwOYl-00087G-2n for 45573@debbugs.gnu.org; Mon, 04 Jan 2021 07:02:05 -0500 Date: Mon, 04 Jan 2021 12:01:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1609761716; bh=znk0UEcZwnLSP9lwfNBgEe9zC5p+oPfoE2D+7qFwjGc=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=L+j0CQG/UiVJj/unYC/Pe/t6LUn2bXrql5fT7P86M+BNgTJeyRJjYfKEaUczJ+Lzw P7jQr3XX/aSJgBsUO8DyQCnsQ+EfmQpBP2QOMpyQf6hY0lfnahVsdm3pK5jCWrVo8E qAhntlncfVglWRwyEiy6A+x4FZTivuub6sCQnI5nQWVh82yZ1mDMn1Za3O4DB8TPOH uLWcI2GsLPZSdNsqJtiM/3Wx/6MM1AAaM2UjuWK14B+GSbl205YhS4x0QbdD8QoQ7W Jl9fZUcBPrN3AUFdJi6/VqtTcGGYGFEbBGamjT5j4tDvH3rewlcjlsdpkaEvxCqLb1 QeUpfspSr2VMg== From: Ekaitz Zarraga Message-ID: In-Reply-To: References: <6b2IbqX7a-q86Pjb_nOtz_XcCOrATSHf2T7vfIU5qrXWhYtQFsoex3XlfmDVhLt8UXjnOonMiLCS-1oKUzxXpp8x3HSUjNkzUjhUsKGc3Iw=@elenq.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Leo, =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 Original Me= ssage =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 On Monday, January 4, 2021 1:13 AM, Leo Famulari wrote: > > > - ;; Delete references to packaging tool cpack > > > > > > - (substitute* "CMakeLists.txt" > > > > > > - ((".*cpack.d.*") "")) > > > > > > - #t)))) > > > > > > I still did not understand the reason for this substitution. I tried > building without it and found that the build is broken, so I added this > info to the comment. > > Can you report it upstream? It seems like something that all > distributors would benefit from. I think it's related with packaging. But I'm not sure neither. Guys at Nix do the same and remove that line. I tried to leave it and it doesn't work. I'll try to report upstream. > > Subject: [PATCH 2/6] gnu: Add soqt. > > > > * gnu/packages/qt.scm (soqt): New variable. > > > > I pushed these first two patches as > a5f13705cb9261ab66bdf73d1fb4a832714feb31 > > Comments on the others to follow... Thanks! From unknown Sat Sep 13 07:22:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45573] [PATCH] Correct freecad runtime errors Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jan 2021 12:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: "45573@debbugs.gnu.org" <45573@debbugs.gnu.org> Reply-To: Ekaitz Zarraga Received: via spool by 45573-submit@debbugs.gnu.org id=B45573.160976254232491 (code B ref 45573); Mon, 04 Jan 2021 12:16:02 +0000 Received: (at 45573) by debbugs.gnu.org; 4 Jan 2021 12:15:42 +0000 Received: from localhost ([127.0.0.1]:58039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwOlx-0008Ry-Q5 for submit@debbugs.gnu.org; Mon, 04 Jan 2021 07:15:42 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:32857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwOlt-0008Rj-L0 for 45573@debbugs.gnu.org; Mon, 04 Jan 2021 07:15:40 -0500 Date: Mon, 04 Jan 2021 12:15:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1609762530; bh=z5n4Iilnr6hj5q7wpHjr1P6N767LIXOCWQYL2OULniE=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=Obgh3WxId8rC53stP8z/8Lzk87B7JolDl6lyzP73xFJI4Bpf5NNRzKgLCHYRcz96Q kUifCdOYbqpgIT7JHk3JevTYw4+Du24IWKywQmrx/zAw2qQPNt8k4GfJAtrvCosjyV iV4Lu46s1j8/qpfNZlzottUpO5zMcapzJFzfal62l6wxns8u2/khK9CkSU3F889t2t zFTnRN6fgpBvyLh8UJuz4Od+1Ulqvp+fqmsizyygDcxMrnUS5M7wqdQUrj7qcGwsYB CGVWTbx9fwVmYkxDQVH7wslDQmJtW4TqDf07aSr0ZcP9X9C3faKx1S4M6pjkJK4JdI tI7wcPCQWeY5w== From: Ekaitz Zarraga Message-ID: In-Reply-To: References: <6b2IbqX7a-q86Pjb_nOtz_XcCOrATSHf2T7vfIU5qrXWhYtQFsoex3XlfmDVhLt8UXjnOonMiLCS-1oKUzxXpp8x3HSUjNkzUjhUsKGc3Iw=@elenq.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 Original Me= ssage =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 On Monday, January 4, 2021 1:18 AM, Leo Famulari wrote: > On Fri, Jan 01, 2021 at 02:37:39PM +0000, Ekaitz Zarraga wrote: > > > Subject: [PATCH 3/6] gnu: Add python-pivy. > > > > * gnu/packages/python-xyz.scm (python-pivy): New variable. > > > > > - `(#:tests? #f ; Tests are broken > > > > > > Can you clarify what you mean, and the overall situation with the tests? > Are they actually used upstream? I think they are broken upstream. When they are run during the guix compilation they report a circular dependency issue when loading but once the lib is installed i'm able to import it without issues. > > > - #:phases > > > > > > - (modify-phases %standard-phases > > > > > > - (add-after 'unpack 'patch-cmake-include-dirs > > > > > > - (lambda _ > > > > > > - ;; Patch buildsystem to respect Coin3D include director= y > > > > > > - (substitute* "CMakeLists.txt" > > > > > > - (("\\\\$\\\\{SoQt_INCLUDE_DIRS}") > > > > > > - "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}= ")) > > > > > > This can probably be fixed with #:configure-flags. I can look into this > before pushing. I tried that and I was unable to solve it that way. I'm not a CMake expert but I think the problem is that even if CMake finds Coin3D, it's not taking it in account during the compilation, so it needs that patch to use it. > > > Subject: [PATCH 4/6] gnu: FreeCad: Update to 0.18.5-1.7616153. > > Fixes Draft module import errors > > > > * gnu/packages/engineering.scm (freecad): Update to 0.18.5-1.761615= 3. > > [inputs]: Add python-pivy. > > > > > Subject: [PATCH 5/6] gnu: freecad: move python-pyside-2-tools to native= -inputs > > > > * gnu/packages/engineering.scm (freecad): > > [inputs]: Remove python-pyside-2-tools. > > [native-inputs]: Add python-pyside-2-tools. > > > > The re-indentation of the package in patch 4/6 is not complete, and I > will squash these two patches before pushing. I have this "ready to go" > in my Git tree. > > > Subject: [PATCH 6/6] gnu: freecad: Add qtwebkit input. > > > > * gnu/packages/engineering.scm (freecad): > > [inputs]: Add qtwebkit. > > > > > - ;; qtwebkit is optional. We remove it currently, because it t= akes > > > > > > - ;; much time to compile and substitutes are often unavailable > > > > > > - ;;("qtwebkit" ,qtwebkit) > > > > > > > > - ("qtwebkit" ,qtwebkit) > > > > > > The comment is still true... I recommend adding a note in the commit > message saying what the new dependency enables. I'm not sure if the comment is true. I'd like to discuss it, but you can safely discard this change. The only part that is affected by qtwebkit is the first screen of the program that shows some examples, links and news. So it's safe to remove but I'm not sure if the substitutes were unavailable because of this or because the compilation was failing (it have been broken for a long time). I'm not sure about how to proceed here. I'm ok with a FreeCad that is open in a blank screen and shows a couple of warnings on load. I'll leave the decision of including this patch or not on you guys if you don't mind. Thank you for your time, Ekaitz From unknown Sat Sep 13 07:22:30 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ekaitz Zarraga Subject: bug#45573: closed (Re: [bug#45573] [PATCH] Correct freecad runtime errors) Message-ID: References: X-Gnu-PR-Message: they-closed 45573 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 45573@debbugs.gnu.org Date: Mon, 04 Jan 2021 20:13:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1609791182-15614-1" This is a multi-part message in MIME format... ------------=_1609791182-15614-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #45573: [PATCH] Correct freecad runtime errors which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 45573@debbugs.gnu.org. --=20 45573: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D45573 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1609791182-15614-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 45573-done) by debbugs.gnu.org; 4 Jan 2021 20:12:39 +0000 Received: from localhost ([127.0.0.1]:60365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwWDX-00043C-3G for submit@debbugs.gnu.org; Mon, 04 Jan 2021 15:12:39 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:53413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwWDV-00042z-5q for 45573-done@debbugs.gnu.org; Mon, 04 Jan 2021 15:12:37 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id DC79A5C012F; Mon, 4 Jan 2021 15:12:31 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 04 Jan 2021 15:12:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=yOBs6Q+4yMdFQ47JDQCxBsgD Q9ZW0+4TQXxNnAdoSO8=; b=w7oNDrTfvVWbMPxnBxXfa1tO6lnzFRs+R06PWuy2 V8kNMtC7+vGoILsOEGrqagbv9fiZotCLOk0DL86wPcgDi4WTFBJv5fzCroVVMBKr xXhZpfobQlXmq4oR5+vkiTe8k4T7P5lKnNSWYn9u93BN9piHyLFlxGVb3oAkW/F9 3/M= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=yOBs6Q +4yMdFQ47JDQCxBsgDQ9ZW0+4TQXxNnAdoSO8=; b=PSFBsiNERHGFh6B3KC3ZQt hJhF0JTZR8LW93aFjtiYNBIBxKzzyzKX9DmP2MNceHgVSNYE5LwQpP6uTcl3sc/S 4iOLcsyj8Sv6LMRwUjMPtn1kUcT6CtpviyT2SMCOM1NcdIPgjPmZSaiAqo6w5nwg dhRu7iNpya/ynDNvuWcWDcu5LNhdcvUKH3uYtRZEr/CJi/YvQ4E7+mGe2QfWexfr 63E5u1ugKqfF1nZz21j+33RwWTTp02XevH+YVlI5bBAL9XrCD1ADRPVzLgv/TBsS enADh2H3wmB+M+fjCMkDy+4Cu/z9LhU6YuKF+T4RHvaOHlW2vOdyKukLTfK5DGnQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdeffedgudefiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepueekkedtffdvtddugeejgedtvefhueefiedvjeeitdeigedtveejvdejheff vefgnecukfhppeejfedrudeguddruddvjedrudegieenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 6320424005C; Mon, 4 Jan 2021 15:12:31 -0500 (EST) Date: Mon, 4 Jan 2021 15:12:29 -0500 From: Leo Famulari To: Ekaitz Zarraga Subject: Re: [bug#45573] [PATCH] Correct freecad runtime errors Message-ID: References: <6b2IbqX7a-q86Pjb_nOtz_XcCOrATSHf2T7vfIU5qrXWhYtQFsoex3XlfmDVhLt8UXjnOonMiLCS-1oKUzxXpp8x3HSUjNkzUjhUsKGc3Iw=@elenq.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 45573-done Cc: "45573@debbugs.gnu.org" <45573-done@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Mon, Jan 04, 2021 at 12:15:26PM +0000, Ekaitz Zarraga wrote: > I think they are broken upstream. > > When they are run during the guix compilation they report a circular > dependency issue when loading but once the lib is installed i'm able to > import it without issues. Thanks for the info. I added it to a comment. It helps reviewers (and later readers of the package definition) to include bits of info to help understand why the package definition does something non-standard. > I tried that and I was unable to solve it that way. > I'm not a CMake expert but I think the problem is that even if CMake finds > Coin3D, it's not taking it in account during the compilation, so it needs > that patch to use it. Okay. > The only part that is affected by qtwebkit is the first screen of the > program that shows some examples, links and news. So it's safe to remove > but I'm not sure if the substitutes were unavailable because of this or > because the compilation was failing (it have been broken for a long time). > > I'm not sure about how to proceed here. I'm ok with a FreeCad that > is open in a blank screen and shows a couple of warnings on load. I'll > leave the decision of including this patch or not on you guys if you don't > mind. Now that I understand that the absence of QtWebKit breaks part of the FreeCAD interface, I agree that it should be included. I squashed the patches in a way that seemed appropriate, wrote the commit messages, and pushed as ed2e0b1b50587a38ad26574585f73979874e56f0 ------------=_1609791182-15614-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 31 Dec 2020 18:48:20 +0000 Received: from localhost ([127.0.0.1]:41539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv2zf-0005E5-K7 for submit@debbugs.gnu.org; Thu, 31 Dec 2020 13:48:20 -0500 Received: from lists.gnu.org ([209.51.188.17]:42326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv2zd-0005Dy-WF for submit@debbugs.gnu.org; Thu, 31 Dec 2020 13:48:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv2zd-0001rJ-Ob for guix-patches@gnu.org; Thu, 31 Dec 2020 13:48:13 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:38350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv2zY-0006Eb-Rq for guix-patches@gnu.org; Thu, 31 Dec 2020 13:48:13 -0500 Date: Thu, 31 Dec 2020 18:47:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1609440483; bh=Nrwrm8iQdRhn0bgrXk/AAalaVokl+29MEwLgB2uWyTE=; h=Date:To:From:Reply-To:Subject:From; b=G+AfnaOYp3V/bl6n5XIMEI6OBnUE8llB16ctv+8YW0K9BKENYXf8V1IrZZqE7xxvS jTJZnpzvpCu20IKYJHauUgxGno1SXntrdnwqpXA1mxivldafGRlk2UfhnCpzuKTe+7 B1iNGQHIOvcSQaUOAOFqWffxCRLNt4J2S4uWHkgjc+ruykWZxVW1OYFSj3FmkdFs9v HJZ9U8fH9SoSZPwMS5f9QHSkvzC8QzUA0m3bKm6AlosClwT1cbgNLbpwQ3RLOXim2S jVX0gEfqaOpkb59CwT4PkcLZ6aqofYhe0ff3v19aabQMO5eJeXQdu2tjX+e8qBSkEz NtWPxDR4H/oIw== To: "guix-patches@gnu.org" From: Ekaitz Zarraga Subject: [PATCH] Correct freecad runtime errors Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg" X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Received-SPF: pass client-ip=185.70.40.134; envelope-from=ekaitz@elenq.tech; helo=mail-40134.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Ekaitz Zarraga Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This is a multi-part message in MIME format. --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, I attach 4 patches that correct the runtime issues freecad has and also sup= ply some packages needed as a dependency. Freecad is a very complex package that is hard to build because many of its= dependencies' buildsystem is broken. The approach followed here is the sam= e that Nix follows and appears to work correctly. The changes correct the Draft module, which wasn't available because pivy w= as not added as a dependency. For context, see this message: https://lists.gnu.org/archive/html/guix-devel/2020-12/msg00123.html Thanks --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg Content-Type: text/x-patch; name=0001-gnu-Add-coin3D-4.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-Add-coin3D-4.patch RnJvbSA4YjZiMTcwYTZlODEwYzZkZTg5NjU1NTcwMmI3NzMwYTI5YjI1NjhjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IFRodSwgMzEgRGVjIDIwMjAgMTk6MzI6MzQgKzAxMDAKU3ViamVjdDogW1BBVENIIDEvNF0g Z251OiBBZGQgY29pbjNELTQuCgogICAgKiBnbnUvcGFja2FnZXMvZ3JhcGhpY3Muc2NtIChjb2lu M0QtNCk6IE5ldyB2YXJpYWJsZS4KLS0tCiBnbnUvcGFja2FnZXMvZ3JhcGhpY3Muc2NtIHwgNDkg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwg NDkgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9ncmFwaGljcy5zY20g Yi9nbnUvcGFja2FnZXMvZ3JhcGhpY3Muc2NtCmluZGV4IDdhNjEwODRmMjQuLjg2ZjY4ZTRjYjcg MTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9ncmFwaGljcy5zY20KKysrIGIvZ251L3BhY2thZ2Vz L2dyYXBoaWNzLnNjbQpAQCAtMTczMiw2ICsxNzMyLDU1IEBAIHN0YW5kYXJkIGdyYXBoaWNzIGxp YnJhcnkgZm9yIDNEIHZpc3VhbGl6YXRpb24gYW5kIHZpc3VhbCBzaW11bGF0aW9uCiBzb2Z0d2Fy ZSBpbiB0aGUgc2NpZW50aWZpYyBhbmQgZW5naW5lZXJpbmcgY29tbXVuaXR5LiIpCiAgICAgICAo bGljZW5zZSBsaWNlbnNlOmJzZC0zKSkpKQogCisoZGVmaW5lLXB1YmxpYyBjb2luM0QtNAorICAg IChwYWNrYWdlCisgICAgKG5hbWUgImNvaW4zRC00IikKKyAgICAodmVyc2lvbiAiNC4wLjAiKQor ICAgIChzb3VyY2UKKyAgICAgIChvcmlnaW4KKyAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCisg ICAgICAgICh1cmkgKGdpdC1yZWZlcmVuY2UKKyAgICAgICAgICAgICAgICh1cmwgImh0dHBzOi8v Z2l0aHViLmNvbS9jb2luM2QvY29pbiIpCisgICAgICAgICAgICAgICAoY29tbWl0IChzdHJpbmct YXBwZW5kICJDb2luLSIgdmVyc2lvbikpCisgICAgICAgICAgICAgICAocmVjdXJzaXZlPyAjdCkp KQorICAgICAgICAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCisgICAg ICAgIChzaGEyNTYKKyAgICAgICAgICAoYmFzZTMyICIxYXlnMGhsOHdhbmhhZGFobTV4YmdoZ2h4 dzFxandxYnJzM2RsM25nbmZmMDI3aHN5ZjhwIikpCisgICAgICAgIChtb2R1bGVzICcoKGd1aXgg YnVpbGQgdXRpbHMpKSkKKyAgICAgICAgKHNuaXBwZXQKKyAgICAgICAgICAnKGJlZ2luCisgICAg ICAgICAgICAgKGZvci1lYWNoIGRlbGV0ZS1maWxlCisgICAgICAgICAgICAgICAgICAgICAgICco ImNmZy9jc3Vic3QuZXhlIgorICAgICAgICAgICAgICAgICAgICAgICAgICJjZmcvd3JhcG1zdmMu ZXhlIikpCisgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJDTWFrZUxpc3RzLnR4dCIKKyAgICAg ICAgICAgICAgICgoIi4qY3BhY2suZC4qIikgIiIpKQorICAgICAgICAgICAgICN0KSkpKQorICAg IChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQorICAgIChuYXRpdmUtaW5wdXRzCisg ICAgICBgKCgiZG94eWdlbiIgLGRveHlnZW4pCisgICAgICAgICgiZ3JhcGh2aXoiICxncmFwaHZp eikpKQorICAgIChpbnB1dHMKKyAgICAgIGAoKCJib29zdCIgLGJvb3N0KQorICAgICAgICAoImZy ZWVnbHV0IiAsZnJlZWdsdXQpCisgICAgICAgICgiZ2xldyIgLGdsZXcpKSkKKyAgICAoYXJndW1l bnRzCisgICAgICBgKCM6Y29uZmlndXJlLWZsYWdzCisgICAgICAgIChsaXN0CisgICAgICAgICAg Ii1EQ09JTl9CVUlMRF9ET0NVTUVOVEFUSU9OX01BTj1PTiIKKyAgICAgICAgICAoc3RyaW5nLWFw cGVuZCAiLURCT09TVF9ST09UPSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAoYXNzb2MtcmVm ICVidWlsZC1pbnB1dHMgImJvb3N0IikpKSkpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRo dWIuY29tL2NvaW4zZC9jb2luIikKKyAgICAoc3lub3BzaXMKKyAgICAgICJIaWdoLWxldmVsIDNE IHZpc3VhbGl6YXRpb24gbGlicmFyeSB3aXRoIE9wZW4gSW52ZW50b3IgMi4xIEFQSSIpCisgICAg KGRlc2NyaXB0aW9uCisgICAgICAiQ29pbiBpcyBhIDNEIGdyYXBoaWNzIGxpYnJhcnkgd2l0aCBh biBBcHBsaWNhdGlvbiBQcm9ncmFtbWluZyBJbnRlcmZhY2UKK2Jhc2VkIG9uIHRoZSBPcGVuIElu dmVudG9yIDIuMSBBUEkuICBGb3IgdGhvc2Ugd2hvIGFyZSBub3QgZmFtaWxpYXIgd2l0aCBPcGVu CitJbnZlbnRvciwgaXQgaXMgYSBzY2VuZS1ncmFwaCBiYXNlZCByZXRhaW4tbW9kZSByZW5kZXJp bmcgYW5kIG1vZGVsIGludGVyYWN0aW9uCitsaWJyYXJ5LCB3cml0dGVuIGluIEMrKywgd2hpY2gg aGFzIGJlY29tZSB0aGUgZGUgZmFjdG8gc3RhbmRhcmQgZ3JhcGhpY3MKK2xpYnJhcnkgZm9yIDNE IHZpc3VhbGl6YXRpb24gYW5kIHZpc3VhbCBzaW11bGF0aW9uIHNvZnR3YXJlIGluIHRoZSBzY2ll bnRpZmljCithbmQgZW5naW5lZXJpbmcgY29tbXVuaXR5LiIpCisgICAgICAobGljZW5zZSBsaWNl bnNlOmJzZC0zKSkpCisKIChkZWZpbmUtcHVibGljIHN1cGVyZmFtaWNvbnYKICAgKHBhY2thZ2UK ICAgICAobmFtZSAic3VwZXJmYW1pY29udiIpCi0tIAoyLjI5LjIKCg== --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg Content-Type: text/x-patch; name=0003-gnu-Add-python-pivy.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0003-gnu-Add-python-pivy.patch RnJvbSAzYTRjYzZmY2QxN2Q0YmE0ZDQ1YjE1ODMzY2FlY2Y4MWM4ZjUxNmFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IFRodSwgMzEgRGVjIDIwMjAgMTk6MzU6MjggKzAxMDAKU3ViamVjdDogW1BBVENIIDMvNF0g Z251OiBBZGQgcHl0aG9uLXBpdnkuCgogICAgKiBnbnUvcGFja2FnZXMvcHl0aG9uLXh5ei5zY20g KHB5dGhvbi1waXZ5KTogTmV3IHZhcmlhYmxlLgotLS0KIGdudS9wYWNrYWdlcy9weXRob24teHl6 LnNjbSB8IDQzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBj aGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3B5dGhv bi14eXouc2NtIGIvZ251L3BhY2thZ2VzL3B5dGhvbi14eXouc2NtCmluZGV4IGQwN2M5MTEyMWEu LjgzYjU1YTMyOWEgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9weXRob24teHl6LnNjbQorKysg Yi9nbnUvcGFja2FnZXMvcHl0aG9uLXh5ei5zY20KQEAgLTE3NSw2ICsxNzUsNyBAQAogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBzaGVsbHMpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIHNwaGlueCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgc3NoKQorICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBzd2lnKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB0 ZXJtaW5hbHMpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHRleCkKICAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgdGV4aW5mbykKQEAgLTIzMjM4LDMgKzIzMjM5LDQ1IEBAIHByb2Nl c3MuIikKICAgICAgIkdhbWVyYSBpcyBhIHRvb2xraXQgZm9yIGJ1aWxkaW5nIGRvY3VtZW50IGlt YWdlIHJlY29nbml0aW9uIHN5c3RlbXMuIikKICAgICAoaG9tZS1wYWdlICJodHRwczovL2dhbWVy YS5pbmZvcm1hdGlrLmhzbnIuZGUvIikKICAgICAobGljZW5zZSBsaWNlbnNlOmdwbDIrKSkpCisK KyhkZWZpbmUtcHVibGljIHB5dGhvbi1waXZ5CisgIChwYWNrYWdlCisgICAgKG5hbWUgInB5dGhv bi1waXZ5IikKKyAgICAodmVyc2lvbiAiMC42LjUiKQorICAgIChzb3VyY2UKKyAgICAgIChvcmln aW4KKyAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCisgICAgICAgICh1cmkgKGdpdC1yZWZlcmVu Y2UKKyAgICAgICAgICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9jb2luM2QvcGl2eSIp CisgICAgICAgICAgICAgICAoY29tbWl0IHZlcnNpb24pKSkKKyAgICAgICAgKGZpbGUtbmFtZSAo Z2l0LWZpbGUtbmFtZSBuYW1lIHZlcnNpb24pKQorICAgICAgICAoc2hhMjU2CisgICAgICAgICAg KGJhc2UzMiAiMHZpZHM3c3hrOHc1dnI3M3hkbmY4eGRjaTcxYTdzeWw2Y2QzNWFpaXNwcGJxeXlm bXlreCIpKQorCisgICAgICAgIChtb2R1bGVzICcoKGd1aXggYnVpbGQgdXRpbHMpKSkKKyAgICAg ICAgKHNuaXBwZXQKKyAgICAgICAgICAnKGJlZ2luCisgICAgICAgICAgICAgKHN1YnN0aXR1dGUq ICJDTWFrZUxpc3RzLnR4dCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgKCgiXFwkXFx7U29R dF9JTkNMVURFX0RJUlN9IikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICIke0NvaW5fSU5D TFVERV9ESVJ9OyR7U29RdF9JTkNMVURFX0RJUlN9IikpCisgICAgICAgICAgICAgI3QpKSkpCisg ICAgKGJ1aWxkLXN5c3RlbSBweXRob24tYnVpbGQtc3lzdGVtKQorICAgIChhcmd1bWVudHMKKyAg ICAgIGAoIzp0ZXN0cz8gI2YpKQorICAgIChuYXRpdmUtaW5wdXRzCisgICAgICBgKCgiY21ha2Ui ICxjbWFrZSkKKyAgICAgICAgKCJzd2lnIiAsc3dpZykpKQorICAgIChpbnB1dHMKKyAgICAgIGAo KCJweXRob24td3JhcHBlciIgLHB5dGhvbi13cmFwcGVyKQorICAgICAgICAoInF0YmFzZSIgLHF0 YmFzZSkKKyAgICAgICAgKCJsaWJ4aSIgLGxpYnhpKQorICAgICAgICAoImxpYmljZSIgLGxpYmlj ZSkKKyAgICAgICAgKCJzb3F0IiAsc29xdCkKKyAgICAgICAgKCJnbGV3IiAsZ2xldykKKyAgICAg ICAgKCJjb2luM0QtNCIgLGNvaW4zRC00KSkpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRo dWIuY29tL2NvaW4zZC9waXZ5IikKKyAgICAoc3lub3BzaXMgIlB5dGhvbiBiaW5kaW5ncyB0byBD b2luM0QiKQorICAgIChkZXNjcmlwdGlvbgorICAgICAgIlBpdnkgcHJvdmlkZXMgcHl0aG9uIGJp bmRpbmdzIGZvciBDb2luLCBhIDNEIGdyYXBoaWNzIGxpYnJhcnkgd2l0aCBhbgorQXBwbGljYXRp b24gUHJvZ3JhbW1pbmcgSW50ZXJmYWNlIGJhc2VkIG9uIHRoZSBPcGVuIEludmVudG9yIDIuMSBB UEkuIikKKyAgICAobGljZW5zZSBsaWNlbnNlOmlzYykpKQotLSAKMi4yOS4yCgo= --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg Content-Type: text/x-patch; name=0004-gnu-freecad-correct-runtime-errors.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0004-gnu-freecad-correct-runtime-errors.patch RnJvbSBlMWU1OWE4YTE1OTA4NzQ3MzA1YjYyOTAwNWQ2MzExNmExYzM0ZjM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IFRodSwgMzEgRGVjIDIwMjAgMTk6MzY6MTQgKzAxMDAKU3ViamVjdDogW1BBVENIIDQvNF0g Z251OiBmcmVlY2FkIGNvcnJlY3QgcnVudGltZSBlcnJvcnMKCiAgICAqIGdudS9wYWNrYWdlcy9l bmdpbmVlcmluZy5zY20gKGZyZWVjYWQpOiBVcGRhdGUgcGFja2FnZQogICAgW2lucHV0c106IE1v dmUgcHl0aG9uLXB5c2lkZS0yLXRvb2xzIHRvIG5hdGl2ZS1pbnB1dHMKICAgIFtpbnB1dHNdOiBB ZGQgcGl2eQogICAgW2lucHV0c106IEFkZCBxdHhtbHBhdHRlcm5zCiAgICBbaW5wdXRzXTogQWRk IHF0d2Via2l0Ci0tLQogZ251L3BhY2thZ2VzL2VuZ2luZWVyaW5nLnNjbSB8IDUwICsrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIyIGluc2VydGlv bnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9lbmdpbmVl cmluZy5zY20gYi9nbnUvcGFja2FnZXMvZW5naW5lZXJpbmcuc2NtCmluZGV4IGU0MzY5OTQ0OTIu LmY4NTYzMDg1YWMgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9lbmdpbmVlcmluZy5zY20KKysr IGIvZ251L3BhY2thZ2VzL2VuZ2luZWVyaW5nLnNjbQpAQCAtMzYsNyArMzYsNiBAQAogOzs7CiA7 OzsgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVi bGljIExpY2Vuc2UKIDs7OyBhbG9uZyB3aXRoIEdOVSBHdWl4LiAgSWYgbm90LCBzZWUgPGh0dHA6 Ly93d3cuZ251Lm9yZy9saWNlbnNlcy8+LgotCiAoZGVmaW5lLW1vZHVsZSAoZ251IHBhY2thZ2Vz IGVuZ2luZWVyaW5nKQogICAjOnVzZS1tb2R1bGUgKGd1aXggcGFja2FnZXMpCiAgICM6dXNlLW1v ZHVsZSAoZ3VpeCBkb3dubG9hZCkKQEAgLTI0MzEsMzUgKzI0MzAsMzAgQEAgZnVsbCBwcm9ncmFt bWF0aWMgY29udHJvbCBvdmVyIHlvdXIgbW9kZWxzLiIpCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6 Ly93d3cub3BlbnNjYWQub3JnLyIpCiAgICAgKGxpY2Vuc2UgbGljZW5zZTpncGwyKykpKQogCisK IChkZWZpbmUtcHVibGljIGZyZWVjYWQKLSAgKHBhY2thZ2UKLSAgICAobmFtZSAiZnJlZWNhZCIp Ci0gICAgKHZlcnNpb24gIjAuMTguNSIpCi0gICAgKHNvdXJjZQotICAgICAob3JpZ2luCi0gICAg ICAgKG1ldGhvZCBnaXQtZmV0Y2gpCi0gICAgICAgKHVyaSAoZ2l0LXJlZmVyZW5jZQotICAgICAg ICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9GcmVlQ0FEL0ZyZWVDQUQiKQotICAgICAg ICAgICAgIChjb21taXQgdmVyc2lvbikpKQotICAgICAgIChtb2R1bGVzICcoKGd1aXggYnVpbGQg dXRpbHMpKSkKLSAgICAgICAoc25pcHBldAotICAgICAgICAnKGJlZ2luCi0gICAgICAgICAgIDs7 IEZpeCBidWlsZCB3aXRoIFB5dGhvbiAzLjgsIHNlZQotICAgICAgICAgICA7OyA8aHR0cHM6Ly90 cmFja2VyLmZyZWVjYWR3ZWIub3JnL3ZpZXcucGhwP2lkPTQxNDM+LgotICAgICAgICAgICAoc3Vi c3RpdHV0ZSogInNyYy9CYXNlL3N3aWdweXJ1bi5pbmwiCi0gICAgICAgICAgICAgKCgiUHlPYmpl Y3QgXFwqbW9kdWxlcyA9IGludGVycC0+bW9kdWxlczsiKQotICAgICAgICAgICAgICAiUHlPYmpl Y3QgKm1vZHVsZXMgPSBQeUV2YWxfR2V0QnVpbHRpbnMoKTsiKSkKLSAgICAgICAgICAgI3QpKQot ICAgICAgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUgbmFtZSB2ZXJzaW9uKSkKLSAgICAgICAo c2hhMjU2Ci0gICAgICAgIChiYXNlMzIKLSAgICAgICAgICIwcjMxanp6a2FtZjc2bDE5ZmIxNzVo aHY0OGlyazA2ZnBpOGxkeGRscjMxdzhjMWl4NGFhIikpKSkKKyAgKGxldCAoKGNvbW1pdC1yZWYg Ijc2MTYxNTNiM2MzMWFjZTAwNjE2OWNkYzJmZGFmYWI0ODQ0OTg4NTgiKQorICAgICAgICAocmV2 aXNpb24gIjEiKSkKKyAgICAocGFja2FnZQorICAgICAgKG5hbWUgImZyZWVjYWQiKQorICAgICAg KHZlcnNpb24gKGdpdC12ZXJzaW9uICIwLjE4LjUiIHJldmlzaW9uIGNvbW1pdC1yZWYpKQorICAg ICAgKHNvdXJjZQorICAgICAgICAob3JpZ2luCisgICAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gp CisgICAgICAgICAgKHVyaSAoZ2l0LXJlZmVyZW5jZQorICAgICAgICAgICAgICAgICAodXJsICJo dHRwczovL2dpdGh1Yi5jb20vRnJlZUNBRC9GcmVlQ0FEIikKKyAgICAgICAgICAgICAgICAgKGNv bW1pdCBjb21taXQtcmVmKSkpCisgICAgICAgICAgKGZpbGUtbmFtZSAoZ2l0LWZpbGUtbmFtZSBu YW1lIHZlcnNpb24pKQorICAgICAgICAgIChzaGEyNTYKKyAgICAgICAgICAgIChiYXNlMzIKKyAg ICAgICAgICAgICAgIjE2OTY1eXhucDJwcTdubTh6M3AwcGprempkeXE2MnZmcmo4ajNuazI2Yndj ODk4Y3p5bjIiKSkpKQogICAgIChidWlsZC1zeXN0ZW0gcXQtYnVpbGQtc3lzdGVtKQogICAgIChu YXRpdmUtaW5wdXRzCiAgICAgIGAoKCJkb3h5Z2VuIiAsZG94eWdlbikKICAgICAgICAoImdyYXBo dml6IiAsZ3JhcGh2aXopCiAgICAgICAgKCJxdHRvb2xzIiAscXR0b29scykKICAgICAgICAoInBr Zy1jb25maWciICxwa2ctY29uZmlnKQorICAgICAgICgicHl0aG9uLXB5c2lkZS0yLXRvb2xzIiAs cHl0aG9uLXB5c2lkZS0yLXRvb2xzKQogICAgICAgICgic3dpZyIgLHN3aWcpKSkKICAgICAoaW5w dXRzCiAgICAgIGAoKCJib29zdCIgLGJvb3N0KQpAQCAtMjQ3NywxNiArMjQ3MSwxNSBAQCBmdWxs IHByb2dyYW1tYXRpYyBjb250cm9sIG92ZXIgeW91ciBtb2RlbHMuIikKICAgICAgICAoIm9wZW5j YXNjYWRlLW9jY3QiICxvcGVuY2FzY2FkZS1vY2N0KQogICAgICAgICgicHl0aG9uLW1hdHBsb3Rs aWIiICxweXRob24tbWF0cGxvdGxpYikKICAgICAgICAoInB5dGhvbi1weXNpZGUtMiIgLHB5dGhv bi1weXNpZGUtMikKLSAgICAgICAoInB5dGhvbi1weXNpZGUtMi10b29scyIgLHB5dGhvbi1weXNp ZGUtMi10b29scykKICAgICAgICAoInB5dGhvbi1zaGlib2tlbi0yIiAscHl0aG9uLXNoaWJva2Vu LTIpCisgICAgICAgKCJweXRob24tcGl2eSIgLHB5dGhvbi1waXZ5KQogICAgICAgICgicHl0aG9u LXdyYXBwZXIiICxweXRob24td3JhcHBlcikKICAgICAgICAoInF0YmFzZSIgLHF0YmFzZSkKICAg ICAgICAoInF0c3ZnIiAscXRzdmcpCiAgICAgICAgKCJxdHgxMWV4dHJhcyIgLHF0eDExZXh0cmFz KQogICAgICAgICgicXR4bWxwYXR0ZXJucyIgLHF0eG1scGF0dGVybnMpCi0gICAgICAgOzsgcXR3 ZWJraXQgaXMgb3B0aW9uYWwuIFdlIHJlbW92ZSBpdCBjdXJyZW50bHksIGJlY2F1c2UgaXQgdGFr ZXMKLSAgICAgICA7OyBtdWNoIHRpbWUgdG8gY29tcGlsZSBhbmQgc3Vic3RpdHV0ZXMgYXJlIG9m dGVuIHVuYXZhaWxhYmxlCi0gICAgICAgOzsoInF0d2Via2l0IiAscXR3ZWJraXQpCisgICAgICAg KCJxdHdlYmtpdCIgLHF0d2Via2l0KQorICAgICAgICgicXR4bWxwYXR0ZXJucyIgLHF0eG1scGF0 dGVybnMpCiAgICAgICAgKCJ0YmIiICx0YmIpCiAgICAgICAgKCJ2dGsiICx2dGspCiAgICAgICAg KCJ4ZXJjZXMtYyIgLHhlcmNlcy1jKQpAQCAtMjU0Niw3ICsyNTM5LDggQEAgY3VzdG9taXphdGlv bi4iKQogICAgICAgbGljZW5zZTpsZ3BsMi4xKwogICAgICAgbGljZW5zZTpsZ3BsMi4wKwogICAg ICAgbGljZW5zZTpncGwzKwotICAgICAgbGljZW5zZTpic2QtMykpKSkKKyAgICAgIGxpY2Vuc2U6 YnNkLTMpKSkpKQorCiAKIChkZWZpbmUtcHVibGljIGxpYm1lZGZpbGUKICAgKHBhY2thZ2UKLS0g CjIuMjkuMgoK --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg Content-Type: text/x-patch; name=0002-gnu-Add-soqt.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-gnu-Add-soqt.patch RnJvbSAzYzNmZGU4ZjVhYTM0MzNkZTA3NmQ2YmJiOTBmOWU2MDMzM2YzMWIwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IFRodSwgMzEgRGVjIDIwMjAgMTk6MzQ6NDUgKzAxMDAKU3ViamVjdDogW1BBVENIIDIvNF0g Z251OiBBZGQgc29xdC4KCiAgICAqIGdudS9wYWNrYWdlcy9xdC5zY20gKHNvcXQpOiBOZXcgdmFy aWFibGUuCi0tLQogZ251L3BhY2thZ2VzL3F0LnNjbSB8IDM0ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCspCgpkaWZmIC0t Z2l0IGEvZ251L3BhY2thZ2VzL3F0LnNjbSBiL2dudS9wYWNrYWdlcy9xdC5zY20KaW5kZXggMmU2 MjFlNzU4Yy4uMmFmN2U0MDczNCAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3F0LnNjbQorKysg Yi9nbnUvcGFja2FnZXMvcXQuc2NtCkBAIC02Nyw2ICs2Nyw3IEBACiAgICM6dXNlLW1vZHVsZSAo Z251IHBhY2thZ2VzIGdsaWIpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdudXBnKQog ICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBncGVyZikKKyAgIzp1c2UtbW9kdWxlIChnbnUg cGFja2FnZXMgZ3JhcGhpY3MpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdzdHJlYW1l cikKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ3RrKQogICAjOnVzZS1tb2R1bGUgKGdu dSBwYWNrYWdlcyBpY3U0YykKQEAgLTI4MjQsMyArMjgyNSwzNiBAQCBiZWluZyBmdWxseSBjdXN0 b21pemFibGUgYW5kIGVhc3kgdG8gZXh0ZW5kLiIpCiAgICAgOzsgQWNjb3JkaW5nIHRvIExJQ0VO U0UsIGVpdGhlciB2ZXJzaW9uIDIgb3IgdmVyc2lvbiAzIG9mIHRoZSBHTlUgR1BMIG1heQogICAg IDs7IGJlIHVzZWQuCiAgICAgKGxpY2Vuc2UgKGxpc3QgbGljZW5zZTpncGwyIGxpY2Vuc2U6Z3Bs MykpKSkKKworCisoZGVmaW5lLXB1YmxpYyBzb3F0CisgIChsZXQgKChjb21taXQtcmVmICJmYjhm NjU1NjMyYmI5YzljNjBlMGZmOWZhNjlhNWJhMjJkM2ZmOTlkIikKKyAgICAgICAgKHJldmlzaW9u ICIxIikpCisgICAgKHBhY2thZ2UKKyAgICAobmFtZSAic29xdCIpCisgICAgKHZlcnNpb24gKGdp dC12ZXJzaW9uICIxLjYuMCIgcmV2aXNpb24gY29tbWl0LXJlZikpCisgICAgKHNvdXJjZQorICAg ICAgKG9yaWdpbgorICAgICAgICAobWV0aG9kIGdpdC1mZXRjaCkKKyAgICAgICAgKHVyaSAoZ2l0 LXJlZmVyZW5jZQorICAgICAgICAgICAgICAgKHVybCAiaHR0cHM6Ly9naXRodWIuY29tL2NvaW4z ZC9zb3F0IikKKyAgICAgICAgICAgICAgIChjb21taXQgY29tbWl0LXJlZikKKyAgICAgICAgICAg ICAgIChyZWN1cnNpdmU/ICN0KSkpCisgICAgICAgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUg bmFtZSB2ZXJzaW9uKSkKKyAgICAgICAgKHNoYTI1NgorICAgICAgICAgIChiYXNlMzIgIjE2dmlr YjNmeThybWsxMHNnNWcwZ3kyYzM0M2hpM3g3emNjc2dhOTBzc25renBxNm0wMzIiKSkpKQorICAg IChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQorICAgIChhcmd1bWVudHMKKyAgICAg ICcoIzp0ZXN0cz8gI2YpKQorICAgIChuYXRpdmUtaW5wdXRzCisgICAgICBgKCgicGtnLWNvbmZp ZyIgLHBrZy1jb25maWcpCisgICAgICAgICgiY21ha2UiICxjbWFrZSkpKQorICAgIChpbnB1dHMK KyAgICAgIGAoKCJxdGJhc2UiICxxdGJhc2UpCisgICAgICAgICgiY29pbjNELTQiICxjb2luM0Qt NCkpKQorICAgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9jb2luM2Qvc29xdCIpCisg ICAgKHN5bm9wc2lzICJRdCBHVUkgY29tcG9uZW50IHRvb2xraXQgbGlicmFyeSBmb3IgQ29pbiIp CisgICAgKGRlc2NyaXB0aW9uICJTb1F0IGlzIGEgUXQgR1VJIGNvbXBvbmVudCB0b29sa2l0IGxp YnJhcnkgZm9yIENvaW4uICBJdCBpcworYWxzbyBjb21wYXRpYmxlIHdpdGggU0dJIGFuZCBUR1Mg T3BlbiBJbnZlbnRvciwgYW5kIHRoZSBBUEkgaXMgYmFzZWQgb24gdGhlIEFQSQorb2YgdGhlIElu dmVudG9yWHQgR1VJIGNvbXBvbmVudCB0b29sa2l0LiIpCisgICAgKGxpY2Vuc2UgbGljZW5zZTpi c2QtMykpKSkKLS0gCjIuMjkuMgoK --b1_jnq0bS4pbg7YR88qcRu9RDGUlBNXv5DuM8nfjtZ8Rg-- ------------=_1609791182-15614-1--