From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mC+1MkmbM2BYRgAA0tVLHw (envelope-from ) for ; Mon, 22 Feb 2021 11:53:45 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id cEWFLkmbM2AyBAAAbx9fmQ (envelope-from ) for ; Mon, 22 Feb 2021 11:53:45 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D6CF224C7E for ; Mon, 22 Feb 2021 12:53:44 +0100 (CET) Received: from localhost ([::1]:44274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lE9ma-0004mg-0v for larch@yhetil.org; Mon, 22 Feb 2021 06:53:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lE9k8-0003hp-NM for guix-devel@gnu.org; Mon, 22 Feb 2021 06:51:12 -0500 Received: from mout-p-202.mailbox.org ([2001:67c:2050::465:202]:34900) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1lE9k5-0006U1-B6 for guix-devel@gnu.org; Mon, 22 Feb 2021 06:51:12 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4DkgVt3CrPzQlHB for ; Mon, 22 Feb 2021 12:51:02 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1613994660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=969X7az366arrz2cbRDUdWoW8flZycyGTXMIuyP/xhg=; b=pCoAp4Ve+ZibXQTZKzkrE4Qj1A02+S3XOmO2+qJT9IlzybFoZWp5svbzXhRUBP9TA6boUS LYsNHIGCxM79w3l/wGcHO396m0EVXVkDw6WCYPQHD6LKulQPfhigobqza/+RdaWFS0c1hc t0v8rjqMppoLSrnThywU/Xq41lrKP7acqrJAK7N7NtFFNGvhZue09C0idmx05TsaHyfuAg NRXMQcTOyO4hITY92esFQFdvCIOfC2u0lEZ8grdsFnW0wZuUr0EFd9cmRGJfXC/MdyyNQs QEzQRWO4/4XlOKug12eN/knEpU+AGt9dXamKUkDaDgJodWYsjrVs7C+3lDAknQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id 3q_BxmEhGDh1 for ; Mon, 22 Feb 2021 12:50:54 +0100 (CET) Date: Mon, 22 Feb 2021 12:50:53 +0100 (CET) From: Brendan Tildesley To: "guix-devel@gnu.org" Message-ID: <163871842.64725.1613994654410@office.mailbox.org> Subject: Upgrading SIP. MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_64723_615565083.1613994653774" X-Priority: 3 Importance: Normal X-MBO-SPAM-Probability: X-Rspamd-Score: -5.26 / 15.00 / 15.00 X-Rspamd-Queue-Id: 21FCB185F X-Rspamd-UID: 0efef7 Received-SPF: pass client-ip=2001:67c:2050::465:202; envelope-from=mail@brendan.scot; helo=mout-p-202.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.47 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=brendan.scot header.s=MBO0001 header.b=pCoAp4Ve; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Queue-Id: D6CF224C7E X-Spam-Score: -1.47 X-Migadu-Scanner: scn0.migadu.com X-TUID: 5tA1IP3cghg7 ------=_Part_64723_615565083.1613994653774 Content-Type: multipart/alternative; boundary="----=_Part_64724_1914999611.1613994653774" ------=_Part_64724_1914999611.1613994653774 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit I'm looking at upgrading python-sip, since I think Calibre may need it, and presumably it needs updating anyway. Updating the package its self was trivial, but when building packages with it I came across some issues that seem unique to Guix/Nix's directory structure. SIP 5/6 uses sip-build instead of `python configure.py ...'. Updating python-pyqt to use sip@6 mailto:sip@6 with sip-build results in some binaries being installed to a doubled up /gnu/store/.../gnu/store/...-python-wrapper.../bin/... path, since I used INSTALL_ROOT = %output, and set sip-build --target-dir to a relative path. Building python-pyqtwebengine, it is unable to find the .sip files needed since it only searches one global path: openat(AT_FDCWD, "QtCore/QtCoremod.sip", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/tmp/guix-build-python-pyqtwebengine-5.15.2.drv-0/PyQtWebEngine-5.15.2/sip/QtWebEngineCore/QtCore/QtCoremod.sip", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/tmp/guix-build-python-pyqtwebengine-5.15.2.drv-0/PyQtWebEngine-5.15.2/sip/QtCore/QtCoremod.sip", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/tmp/guix-build-python-pyqtwebengine-5.15.2.drv-0/PyQtWebEngine-5.15.2/build/bindings/QtCore/QtCoremod.sip", O_RDONLY) = -1 ENOENT (No such file or directory) openat(AT_FDCWD, "/lib/python3.8/site-packages/PyQt5/PyQt5/bindings/QtCore/QtCoremod.sip", O_RDONLY) = -1 ENOENT (No such file or directory) write(2, ".sip-build-real: Unable to find "..., 61.sip-build-real: Unable to find file "QtCore/QtCoremod.sip" So I'm wondering what the solution to this is. Does SIP 5 & 6 simply not support the Nix style of package management, or is there some simple way for us to make it work? ------=_Part_64724_1914999611.1613994653774 MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit
I'm looking at upgrading python-sip, since I think Calibre may need it, and presumably it needs updating anyway. Updating the package its self was trivial, but when building packages with it I came across some issues that seem unique to Guix/Nix's directory structure. SIP 5/6 uses sip-build instead of `python configure.py ...'.

Updating python-pyqt to use sip@6 with sip-build results in some binaries being installed to a doubled up  /gnu/store/.../gnu/store/...-python-wrapper.../bin/... path, since I used INSTALL_ROOT = %output, and set sip-build --target-dir to a relative path.

Building python-pyqtwebengine, it is unable to find the .sip files needed since it only searches one global path:

openat(AT_FDCWD, "QtCore/QtCoremod.sip", O_RDONLY) = -1 ENOENT (No such file or directory)
openat(AT_FDCWD, "/tmp/guix-build-python-pyqtwebengine-5.15.2.drv-0/PyQtWebEngine-5.15.2/sip/QtWebEngineCore/QtCore/QtCoremod.sip", O_RDONLY) = -1 ENOENT (No such file or directory)
openat(AT_FDCWD, "/tmp/guix-build-python-pyqtwebengine-5.15.2.drv-0/PyQtWebEngine-5.15.2/sip/QtCore/QtCoremod.sip", O_RDONLY) = -1 ENOENT (No such file or directory)
openat(AT_FDCWD, "/tmp/guix-build-python-pyqtwebengine-5.15.2.drv-0/PyQtWebEngine-5.15.2/build/bindings/QtCore/QtCoremod.sip", O_RDONLY) = -1 ENOENT (No such file or directory)
openat(AT_FDCWD, "/lib/python3.8/site-packages/PyQt5/PyQt5/bindings/QtCore/QtCoremod.sip", O_RDONLY) = -1 ENOENT (No such file or directory)
write(2, ".sip-build-real: Unable to find "..., 61.sip-build-real: Unable to find file "QtCore/QtCoremod.sip"


So I'm wondering what the solution to this is. Does SIP 5 & 6 simply not support the Nix style of package management, or is there some simple way for us to make it work?
------=_Part_64724_1914999611.1613994653774-- ------=_Part_64723_615565083.1613994653774 Content-Type: text/x-patch; charset=ISO-8859-1; name=0002-gnu-Add-python-pyqt-builder.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-gnu-Add-python-pyqt-builder.patch X-Part-Id: aba9fe4a962742c09e4cb7f1d0659735 RnJvbSBmNzM2MzU3ZTIyMzJlMDc0ZGFiOTAzMmExN2RlYjJhYjFlYjAyMGRjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcmVuZGFuIFRpbGRlc2xleSA8bWFpbEBicmVuZGFuLnNjb3Q+ CkRhdGU6IE1vbiwgMjIgRmViIDIwMjEgMjI6MTA6NTYgKzExMDAKU3ViamVjdDogW1BBVENIIDIv NF0gZ251OiBBZGQgcHl0aG9uLXB5cXQtYnVpbGRlci4KCiogZ251L3BhY2thZ2VzL3F0LnNjbSAo cHl0aG9uLXB5cXQtYnVpbGRlcik6IE5ldyB2YXJpYWJsZS4KLS0tCiBnbnUvcGFja2FnZXMvcXQu c2NtIHwgMjEgKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMjEgaW5zZXJ0 aW9ucygrKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9xdC5zY20gYi9nbnUvcGFja2FnZXMv cXQuc2NtCmluZGV4IDM4OTAzODAzYmUuLmI5ZjM0ZjM5YmUgMTAwNjQ0Ci0tLSBhL2dudS9wYWNr YWdlcy9xdC5zY20KKysrIGIvZ251L3BhY2thZ2VzL3F0LnNjbQpAQCAtMjI2Myw2ICsyMjYzLDI3 IEBAIGl0c2VsZi4iKQogICAgICAgICAgICAgICAgICAgICAgICAiLS1zaXBkaXIiIHNpcCkpKSkp KSkKICAgICAobGljZW5zZSAobGlzdCBsaWNlbnNlOmdwbDIgbGljZW5zZTpncGwzKSkpKSA7IGNo b2ljZSBvZiBlaXRoZXIgbGljZW5zZQogCisoZGVmaW5lLXB1YmxpYyBweXRob24tcHlxdC1idWls ZGVyCisgIChwYWNrYWdlCisgICAobmFtZSAicHl0aG9uLXB5cXQtYnVpbGRlciIpCisgICAodmVy c2lvbiAiMS44LjAiKQorICAgKHNvdXJjZQorICAgIChvcmlnaW4KKyAgICAgKG1ldGhvZCB1cmwt ZmV0Y2gpCisgICAgICh1cmkgKHB5cGktdXJpICJQeVF0LWJ1aWxkZXIiIHZlcnNpb24pKQorICAg ICAoc2hhMjU2CisgICAgICAoYmFzZTMyCisgICAgICAgIjAzMzVzYXo3aDFqMjVnbTc2NnNzbDMz NzVrdzFhazJ2czNoNzY0cXN4em5zM2N5enZkOWgiKSkpKQorICAgKGJ1aWxkLXN5c3RlbSBweXRo b24tYnVpbGQtc3lzdGVtKQorICAgKGlucHV0cyA7OyBub3Qgc3VyZSB3aGF0IHR5cGUgb2YgaW5w dXRzIHRoZXNlIHNob3VsZCBiZQorICAgIGAoKCJweXRob24tdG9tbCIgLHB5dGhvbi10b21sKQor ICAgICAgKCJweXRob24tcGFja2FnaW5nIiAscHl0aG9uLXBhY2thZ2luZykKKyAgICAgICgicHl0 aG9uLXNpcCIgLHB5dGhvbi1zaXApKSkKKyAgIChob21lLXBhZ2UgImh0dHBzOi8vd3d3LnJpdmVy YmFua2NvbXB1dGluZy5jb20vc29mdHdhcmUvcHlxdC8iKQorICAgKHN5bm9wc2lzICJUaGUgUEVQ IDUxNyBjb21wbGlhbnQgUHlRdCBidWlsZCBzeXN0ZW0iKQorICAgKGRlc2NyaXB0aW9uICJUaGUg UEVQIDUxNyBjb21wbGlhbnQgUHlRdCBidWlsZCBzeXN0ZW0iKQorICAgKGxpY2Vuc2UgKGxpc3Qg bGljZW5zZTpncGwyIGxpY2Vuc2U6Z3BsMykpKSkKKwogKGRlZmluZS1wdWJsaWMgcHl0aG9uLXF0 cHkKICAgKHBhY2thZ2UKICAgICAobmFtZSAicHl0aG9uLXF0cHkiKQotLSAKMi4zMC4xCgo= ------=_Part_64723_615565083.1613994653774 Content-Type: text/x-patch; charset=ISO-8859-1; name=0003-pyqt.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0003-pyqt.patch X-Part-Id: d4ad8c2f520a43cdabe1230f3c7b4a7b RnJvbSAyNmIwNGRhMzViYmRjMGJiYTA5ZjRiNDYyNDM3MWUyMGViNDc5MjY2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcmVuZGFuIFRpbGRlc2xleSA8bWFpbEBicmVuZGFuLnNjb3Q+ CkRhdGU6IE1vbiwgMjIgRmViIDIwMjEgMjI6MjA6NDAgKzExMDAKU3ViamVjdDogW1BBVENIIDMv NF0gcHlxdAoKLS0tCiBnbnUvcGFja2FnZXMvcXQuc2NtIHwgMzMgKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgMjIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3F0LnNjbSBiL2dudS9wYWNrYWdl cy9xdC5zY20KaW5kZXggYjlmMzRmMzliZS4uMzNiNjBhNzRkMSAxMDA2NDQKLS0tIGEvZ251L3Bh Y2thZ2VzL3F0LnNjbQorKysgYi9nbnUvcGFja2FnZXMvcXQuc2NtCkBAIC0yMDE5LDcgKzIwMTks OCBAQCBtb2R1bGUgcHJvdmlkZXMgc3VwcG9ydCBmdW5jdGlvbnMgdG8gdGhlIGF1dG9tYXRpY2Fs bHkgZ2VuZXJhdGVkIGNvZGUuIikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInB5 cXQtcHVibGljLXNpcC5wYXRjaCIpKSkpCiAgICAgKGJ1aWxkLXN5c3RlbSBnbnUtYnVpbGQtc3lz dGVtKQogICAgIChuYXRpdmUtaW5wdXRzCi0gICAgIGAoKCJxdGJhc2UiICxxdGJhc2UpKSkgOyBm b3IgcW1ha2UKKyAgICAgYCgoInF0YmFzZSIgLHF0YmFzZSkKKyAgICAgICAoInB5dGhvbi1weXF0 LWJ1aWxkZXIiICxweXRob24tcHlxdC1idWlsZGVyKSkpCiAgICAgKHByb3BhZ2F0ZWQtaW5wdXRz CiAgICAgIGAoKCJweXRob24tc2lwIiAscHl0aG9uLXNpcCkpKQogICAgIChpbnB1dHMKQEAgLTIw NDQsNiArMjA0NSw3IEBAIG1vZHVsZSBwcm92aWRlcyBzdXBwb3J0IGZ1bmN0aW9ucyB0byB0aGUg YXV0b21hdGljYWxseSBnZW5lcmF0ZWQgY29kZS4iKQogICAgICAgICAgICAgICAgICAgLEAlZ251 LWJ1aWxkLXN5c3RlbS1tb2R1bGVzKQogICAgICAgICM6aW1wb3J0ZWQtbW9kdWxlcyAoKGd1aXgg YnVpbGQgcHl0aG9uLWJ1aWxkLXN5c3RlbSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICxA JWdudS1idWlsZC1zeXN0ZW0tbW9kdWxlcykKKyAgICAgICAjOm1ha2UtZmxhZ3MgKGxpc3QgKHN0 cmluZy1hcHBlbmQgIklOU1RBTExfUk9PVD0iICVvdXRwdXQpKQogICAgICAgICM6cGhhc2VzCiAg ICAgICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcwogICAgICAgICAgOzsgV2hlbiBi dWlsZGluZyBweXRob24tcHlxdHdlYmVuZ2luZSwgPHFwcmludGVyLmg+IGNhbiBub3QgYmUKQEAg LTIwNTksMjkgKzIwNjEsMTYgQEAgbW9kdWxlIHByb3ZpZGVzIHN1cHBvcnQgZnVuY3Rpb25zIHRv IHRoZSBhdXRvbWF0aWNhbGx5IGdlbmVyYXRlZCBjb2RlLiIpCiAgICAgICAgICAgICAgICAjdCkp KQogICAgICAgICAgKHJlcGxhY2UgJ2NvbmZpZ3VyZQogICAgICAgICAgICAobGFtYmRhKiAoIzpr ZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAgICAgIChsZXQq ICgob3V0IChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikpCi0gICAgICAgICAgICAgICAgICAgIChi aW4gKHN0cmluZy1hcHBlbmQgb3V0ICIvYmluIikpCi0gICAgICAgICAgICAgICAgICAgIChzaXAg KHN0cmluZy1hcHBlbmQgb3V0ICIvc2hhcmUvc2lwIikpCi0gICAgICAgICAgICAgICAgICAgIChw bHVnaW5zIChzdHJpbmctYXBwZW5kIG91dCAiL2xpYi9xdDUvcGx1Z2lucyIpKQotICAgICAgICAg ICAgICAgICAgICAoZGVzaWduZXIgKHN0cmluZy1hcHBlbmQgcGx1Z2lucyAiL2Rlc2lnbmVyIikp Ci0gICAgICAgICAgICAgICAgICAgIChxbWwgKHN0cmluZy1hcHBlbmQgcGx1Z2lucyAiL1B5UXQ1 IikpCi0gICAgICAgICAgICAgICAgICAgIChweXRob24gKGFzc29jLXJlZiBpbnB1dHMgInB5dGhv biIpKQotICAgICAgICAgICAgICAgICAgICAobGliIChzdHJpbmctYXBwZW5kIG91dCAiL2xpYi9w eXRob24iCisgICAgICAgICAgICAgKGxldCogKChweXRob24gKGFzc29jLXJlZiBpbnB1dHMgInB5 dGhvbiIpKQorICAgICAgICAgICAgICAgICAgICAobGliIChzdHJpbmctYXBwZW5kICIvbGliL3B5 dGhvbiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocHl0aG9uLXZl cnNpb24gcHl0aG9uKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIv c2l0ZS1wYWNrYWdlcyIpKQotICAgICAgICAgICAgICAgICAgICAoc3R1YnMgKHN0cmluZy1hcHBl bmQgbGliICIvUHlRdDUiKSkpCi0gICAgICAgICAgICAgICAoaW52b2tlICJweXRob24iICJjb25m aWd1cmUucHkiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9zaXRl LXBhY2thZ2VzIikpKQorICAgICAgICAgICAgICAgKGludm9rZSAic2lwLWJ1aWxkIgogICAgICAg ICAgICAgICAgICAgICAgICAiLS1jb25maXJtLWxpY2Vuc2UiCi0gICAgICAgICAgICAgICAgICAg ICAgICItLWJpbmRpciIgYmluCi0gICAgICAgICAgICAgICAgICAgICAgICItLWRlc3RkaXIiIGxp YgotICAgICAgICAgICAgICAgICAgICAgICAiLS1kZXNpZ25lci1wbHVnaW5kaXIiIGRlc2lnbmVy Ci0gICAgICAgICAgICAgICAgICAgICAgICItLXFtbC1wbHVnaW5kaXIiIHFtbAotICAgICAgICAg ICAgICAgICAgICAgICA7IFdoZXJlIHRvIGluc3RhbGwgdGhlIFBFUCA0ODQgVHlwZSBIaW50cyBz dHViCi0gICAgICAgICAgICAgICAgICAgICAgIDsgZmlsZXMuIFdpdGhvdXQgdGhpcyB0aGUgc3R1 YnMgYXJlIHRyaWVkIHRvIGJlCi0gICAgICAgICAgICAgICAgICAgICAgIDsgaW5zdGFsbGVkIGlu dG8gdGhlIHB5dGhvbiBwYWNrYWdlJ3MKLSAgICAgICAgICAgICAgICAgICAgICAgOyBzaXRlLXBh Y2thZ2UgZGlyZWN0b3J5LCB3aGljaCBpcyByZWFkLW9ubHkuCi0gICAgICAgICAgICAgICAgICAg ICAgICItLXN0dWJzZGlyIiBzdHVicwotICAgICAgICAgICAgICAgICAgICAgICAiLS1zaXBkaXIi IHNpcCkpKSkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIi0tbm8tbWFrZSIKKyAgICAgICAg ICAgICAgICAgICAgICAgIi0tdGFyZ2V0LWRpciIgbGliKSkpKQorICAgICAgICAgKGFkZC1iZWZv cmUgJ2J1aWxkICdjaGRpcgorICAgICAgICAgICAobGFtYmRhIF8gKGNoZGlyICJidWlsZCIpKSkp KSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL3d3dy5yaXZlcmJhbmtjb21wdXRpbmcuY29tL3Nv ZnR3YXJlL3B5cXQvaW50cm8iKQogICAgIChzeW5vcHNpcyAiUHl0aG9uIGJpbmRpbmdzIGZvciBR dCIpCiAgICAgKGRlc2NyaXB0aW9uCi0tIAoyLjMwLjEKCg== ------=_Part_64723_615565083.1613994653774 Content-Type: text/x-patch; charset=ISO-8859-1; name=0004-pyqtwebengine.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0004-pyqtwebengine.patch X-Part-Id: d2b1a93ce17f4c62bc02a39294caa067 RnJvbSA0ZDk3Njc3NjkwMjkyYWNhZTY0MDZkOTc3MzUzNjYxMjE1ZGRiMjNjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcmVuZGFuIFRpbGRlc2xleSA8bWFpbEBicmVuZGFuLnNjb3Q+ CkRhdGU6IE1vbiwgMjIgRmViIDIwMjEgMjI6MjA6NTQgKzExMDAKU3ViamVjdDogW1BBVENIIDQv NF0gcHlxdHdlYmVuZ2luZQoKLS0tCiBnbnUvcGFja2FnZXMvcXQuc2NtIHwgMjUgKysrKysrKysr KysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDExIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9xdC5zY20gYi9nbnUvcGFja2Fn ZXMvcXQuc2NtCmluZGV4IDMzYjYwYTc0ZDEuLjU2ZmE5ZjE4ZWMgMTAwNjQ0Ci0tLSBhL2dudS9w YWNrYWdlcy9xdC5zY20KKysrIGIvZ251L3BhY2thZ2VzL3F0LnNjbQpAQCAtMjA5OCw5ICsyMDk4 LDExIEBAIGNvbnRhaW4gb3ZlciA2MjAgY2xhc3Nlcy4iKQogICAgIChidWlsZC1zeXN0ZW0gZ251 LWJ1aWxkLXN5c3RlbSkKICAgICAobmF0aXZlLWlucHV0cwogICAgICBgKCgicHl0aG9uIiAscHl0 aG9uKQotICAgICAgICgicHl0aG9uLXNpcCIgLHB5dGhvbi1zaXApCisgICAgICAgOzsgKCJweXRo b24tcHlxdDUtc2lwIiAscHl0aG9uLXB5cXQ1LXNpcCkgOzs7IFhYWCBkbyB3ZSBuZWVkIGl0Pwor ICAgICAgICgicHl0aG9uLXB5cXQtYnVpbGRlciIgLHB5dGhvbi1weXF0LWJ1aWxkZXIpCiAgICAg ICAgOzsgcXRiYXNlIGlzIHJlcXVpcmVkIGZvciBxbWFrZQotICAgICAgICgicXRiYXNlIiAscXRi YXNlKSkpCisgICAgICAgKCJxdGJhc2UiICxxdGJhc2UpCisgICAgICAgKCJzdHJhY2UiICxzdHJh Y2UpKSkKICAgICAoaW5wdXRzCiAgICAgIGAoKCJweXRob24iICxweXRob24td3JhcHBlcikKICAg ICAgICAoInB5dGhvbi1zaXAiICxweXRob24tc2lwKQpAQCAtMjExNiw2ICsyMTE4LDcgQEAgY29u dGFpbiBvdmVyIDYyMCBjbGFzc2VzLiIpCiAgICAgICAgICAgICAgICAgICAsQCVnbnUtYnVpbGQt c3lzdGVtLW1vZHVsZXMpCiAgICAgICAgIzppbXBvcnRlZC1tb2R1bGVzICgoZ3VpeCBidWlsZCBw eXRob24tYnVpbGQtc3lzdGVtKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgLEAlZ251LWJ1 aWxkLXN5c3RlbS1tb2R1bGVzKQorICAgICAgICM6bWFrZS1mbGFncyAobGlzdCAoc3RyaW5nLWFw cGVuZCAiSU5TVEFMTF9ST09UPSIgJW91dHB1dCkpCiAgICAgICAgIzpwaGFzZXMKICAgICAgICAo bW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCiAgICAgICAgICAocmVwbGFjZSAnY29uZmln dXJlCkBAIC0yMTI4LDE5ICsyMTMxLDE5IEBAIGNvbnRhaW4gb3ZlciA2MjAgY2xhc3Nlcy4iKQog ICAgICAgICAgICAgICAgICAgICAobGliIChzdHJpbmctYXBwZW5kIG91dCAiL2xpYi9weXRob24i CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHB5dGhvbi12ZXJzaW9u IHB5dGhvbikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL3NpdGUt cGFja2FnZXMvUHlRdDUiKSkKKyAgICAgICAgICAgICAgICAgICAgKGxpYiogKHN0cmluZy1hcHBl bmQgIi9saWIvcHl0aG9uIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChweXRob24tdmVyc2lvbiBweXRob24pCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIi9zaXRlLXBhY2thZ2VzL1B5UXQ1IikpCiAgICAgICAgICAgICAgICAgICAgIChz dHVicyAoc3RyaW5nLWFwcGVuZCBsaWIgIi9QeVF0NSIpKSkKIAotICAgICAgICAgICAgICAgKG1r ZGlyLXAgc2lwZGlyKQotICAgICAgICAgICAgICAgKGludm9rZSAicHl0aG9uIiAiY29uZmlndXJl LnB5IgotICAgICAgICAgICAgICAgICAgICAgICAiLXciCi0gICAgICAgICAgICAgICAgICAgICAg ICItLW5vLWRpc3QtaW5mbyIKLSAgICAgICAgICAgICAgICAgICAgICAgIi0tZGVzdGRpciIgbGli Ci0gICAgICAgICAgICAgICAgICAgICAgICItLW5vLXFzY2ktYXBpIgotICAgICAgICAgICAgICAg ICAgICAgICAiLS1zdHVic2RpciIgc3R1YnMKLSAgICAgICAgICAgICAgICAgICAgICAgIi0tc2lw ZGlyIiBzaXBkaXIKLSAgICAgICAgICAgICAgICAgICAgICAgIi0tcHlxdC1zaXBkaXIiIHB5cXQt c2lwZGlyKSkpKQorICAgICAgICAgICAgICAgKGludm9rZSAic3RyYWNlIgorICAgICAgICAgICAg ICAgICAgICAgICAic2lwLWJ1aWxkIgorICAgICAgICAgICAgICAgICAgICAgICAiLS1uby1tYWtl IgorICAgICAgICAgICAgICAgICAgICAgICAiLS10YXJnZXQtZGlyIiBsaWIqKSkpKQogICAgICAg ICAgOzsgQmVjYXVzZSB0aGlzIGhhcyBhIGRpZmZlcmVudCBwcmVmaXggdGhhbiBweXRob24tcHlx dCB0aGVuIHdlIG5lZWQKICAgICAgICAgIDs7IHRvIG1ha2UgdGhpcyBhIG5hbWVzcGFjZSBvZiBp dCdzIG93bgorICAgICAgICAgKGFkZC1iZWZvcmUgJ2J1aWxkICdjaGRpcgorICAgICAgICAgICAo bGFtYmRhIF8gKGNoZGlyICJidWlsZCIpKSkKICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwg J21ha2UtbmFtZXNwYWNlCiAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgb3V0cHV0 cyAjOmFsbG93LW90aGVyLWtleXMpCiAgICAgICAgICAgICAgKGxldCogKChfX2luaXRfXy5weSAo c3RyaW5nLWFwcGVuZAotLSAKMi4zMC4xCgo= ------=_Part_64723_615565083.1613994653774 Content-Type: text/x-patch; charset=ISO-8859-1; name=0001-gnu-python-sip-Upgrade-to-6.0.1.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-python-sip-Upgrade-to-6.0.1.patch X-Part-Id: d27d124609cd41698941f5a2593fa99d RnJvbSBhODlmZTU0YmM0MGZhZDhiODY4N2U1ZjU4NmQ3ZjQzOGNkMzAxMmVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcmVuZGFuIFRpbGRlc2xleSA8bWFpbEBicmVuZGFuLnNjb3Q+ CkRhdGU6IE1vbiwgMjIgRmViIDIwMjEgMjE6MTU6MjEgKzExMDAKU3ViamVjdDogW1BBVENIIDEv NF0gZ251OiBweXRob24tc2lwOiBVcGdyYWRlIHRvIDYuMC4xLgoKKiBnbnUvcGFja2FnZXMvcXQu c2NtIChweXRob24tc2lwKTogVXBncmFkZSB0byA2LjAuMS4KLS0tCiBnbnUvcGFja2FnZXMvcXQu c2NtIHwgMzMgKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgNyBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFj a2FnZXMvcXQuc2NtIGIvZ251L3BhY2thZ2VzL3F0LnNjbQppbmRleCA0ZmJiMTU3NjAwLi4zODkw MzgwM2JlIDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvcXQuc2NtCisrKyBiL2dudS9wYWNrYWdl cy9xdC5zY20KQEAgLTg4LDYgKzg4LDcgQEAKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg cHVsc2VhdWRpbykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcHJvdG9idWYpCiAgICM6 dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHB5dGhvbikKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgcHl0aG9uLWJ1aWxkKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBweXRob24t eHl6KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyByZWdleCkKICAgIzp1c2UtbW9kdWxl IChnbnUgcGFja2FnZXMgcnVieSkKQEAgLTE5NjAsNyArMTk2MSw3IEBAIGFuZCBiaW5hcmllcyBy ZW1vdmVkLCBhbmQgYWRkcyBtb2R1bGFyIHN1cHBvcnQgZm9yIHVzaW5nIHN5c3RlbSBsaWJyYXJp ZXMuIikKIChkZWZpbmUtcHVibGljIHB5dGhvbi1zaXAKICAgKHBhY2thZ2UKICAgICAobmFtZSAi cHl0aG9uLXNpcCIpCi0gICAgKHZlcnNpb24gIjQuMTkuMjQiKQorICAgICh2ZXJzaW9uICI2LjAu MSIpCiAgICAgKHNvdXJjZQogICAgICAgKG9yaWdpbgogICAgICAgICAobWV0aG9kIHVybC1mZXRj aCkKQEAgLTE5NzAsMzIgKzE5NzEsMTIgQEAgYW5kIGJpbmFyaWVzIHJlbW92ZWQsIGFuZCBhZGRz IG1vZHVsYXIgc3VwcG9ydCBmb3IgdXNpbmcgc3lzdGVtIGxpYnJhcmllcy4iKQogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICIvc2lwLSIgdmVyc2lvbiAiLnRhci5neiIpKSkKICAg ICAgICAgKHNoYTI1NgogICAgICAgICAgKGJhc2UzMgotICAgICAgICAgICIxcmExNXZiNWk5Z2tn MnZkdmgxNmNxOXgybW16dzF5aTN4cGh4czhxMzRxMXBmODNna2dkIikpKSkKLSAgICAoYnVpbGQt c3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pCisgICAgICAgICAgIjExNTc0eTg1ODBpMjM5bDhjdmpq dzVmam40MDlmOGJkaTJ2bDR4YzZ2cDVmNGhteWpjeTkiKSkpKQorICAgIChidWlsZC1zeXN0ZW0g cHl0aG9uLWJ1aWxkLXN5c3RlbSkKICAgICAobmF0aXZlLWlucHV0cwotICAgICBgKCgicHl0aG9u IiAscHl0aG9uLXdyYXBwZXIpKSkKLSAgICAoYXJndW1lbnRzCi0gICAgIGAoIzp0ZXN0cz8gI2Yg OyBubyBjaGVjayB0YXJnZXQKLSAgICAgICAjOmltcG9ydGVkLW1vZHVsZXMgKChndWl4IGJ1aWxk IHB5dGhvbi1idWlsZC1zeXN0ZW0pCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAsQCVnbnUt YnVpbGQtc3lzdGVtLW1vZHVsZXMpCi0gICAgICAgIzptb2R1bGVzICgoc3JmaSBzcmZpLTEpCi0g ICAgICAgICAgICAgICAgICAoKGd1aXggYnVpbGQgcHl0aG9uLWJ1aWxkLXN5c3RlbSkgIzpzZWxl Y3QgKHB5dGhvbi12ZXJzaW9uKSkKLSAgICAgICAgICAgICAgICAgICxAJWdudS1idWlsZC1zeXN0 ZW0tbW9kdWxlcykKLSAgICAgICAjOnBoYXNlcwotICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFu ZGFyZC1waGFzZXMKLSAgICAgICAgIChyZXBsYWNlICdjb25maWd1cmUKLSAgICAgICAgICAgKGxh bWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKLSAgICAgICAg ICAgICAobGV0KiAoKG91dCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpKQotICAgICAgICAgICAg ICAgICAgICAoYmluIChzdHJpbmctYXBwZW5kIG91dCAiL2JpbiIpKQotICAgICAgICAgICAgICAg ICAgICAoaW5jbHVkZSAoc3RyaW5nLWFwcGVuZCBvdXQgIi9pbmNsdWRlIikpCi0gICAgICAgICAg ICAgICAgICAgIChweXRob24gKGFzc29jLXJlZiBpbnB1dHMgInB5dGhvbiIpKQotICAgICAgICAg ICAgICAgICAgICAobGliIChzdHJpbmctYXBwZW5kIG91dCAiL2xpYi9weXRob24iCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHB5dGhvbi12ZXJzaW9uIHB5dGhvbikK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL3NpdGUtcGFja2FnZXMi KSkpCi0gICAgICAgICAgICAgICAoaW52b2tlICJweXRob24iICJjb25maWd1cmUucHkiCi0gICAg ICAgICAgICAgICAgICAgICAgICItLWJpbmRpciIgYmluCi0gICAgICAgICAgICAgICAgICAgICAg ICItLWRlc3RkaXIiIGxpYgotICAgICAgICAgICAgICAgICAgICAgICAiLS1pbmNkaXIiIGluY2x1 ZGUpKSkpKSkpCisgICAgIGAoKCJweXRob24iICxweXRob24td3JhcHBlcikKKyAgICAgICAoInB5 dGhvbi10b21sIiAscHl0aG9uLXRvbWwpCisgICAgICAgKCJweXRob24tcGFja2FnaW5nIiAscHl0 aG9uLXBhY2thZ2luZykpKQogICAgIChob21lLXBhZ2UgImh0dHBzOi8vd3d3LnJpdmVyYmFua2Nv bXB1dGluZy5jb20vc29mdHdhcmUvc2lwL2ludHJvIikKICAgICAoc3lub3BzaXMgIlB5dGhvbiBi aW5kaW5nIGNyZWF0b3IgZm9yIEMgYW5kIEMrKyBsaWJyYXJpZXMiKQogICAgIChkZXNjcmlwdGlv bgotLSAKMi4zMC4xCgo= ------=_Part_64723_615565083.1613994653774--