From unknown Tue Jun 17 01:44:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48849] [PATCH core-updates]: Add #:sh argument to wrap-qt-program Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Jun 2021 14:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48849@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162290179019640 (code B ref -1); Sat, 05 Jun 2021 14:04:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jun 2021 14:03:10 +0000 Received: from localhost ([127.0.0.1]:49850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpWtJ-00056i-LL for submit@debbugs.gnu.org; Sat, 05 Jun 2021 10:03:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:39590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpWtF-00056X-3M for submit@debbugs.gnu.org; Sat, 05 Jun 2021 10:03:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpWtE-00052I-JR for guix-patches@gnu.org; Sat, 05 Jun 2021 10:03:04 -0400 Received: from albert.telenet-ops.be ([2a02:1800:110:4::f00:1a]:45554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lpWtB-0004n3-9T for guix-patches@gnu.org; Sat, 05 Jun 2021 10:03:04 -0400 Received: from butterfly ([188.188.221.10]) by albert.telenet-ops.be with bizsmtp id DS2r2500A0E3zys06S2w6U; Sat, 05 Jun 2021 16:02:56 +0200 Message-ID: <678f5b29c1b5e2100bfde5b5121c57a9d2d2f3d8.camel@telenet.be> From: Maxime Devos Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-/0tSPMalm8aJtckGHw5A" Date: Sat, 05 Jun 2021 13:49:23 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.34.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1622901776; bh=L5RylUGQEcdIrtOFrl+yuvTjDtJuEISbKdVONo3BNwM=; h=Subject:From:To:Date; b=UMcECXEs9W07a25T4VWVC4jvp4G9ne2d1LQGhuB7HO2dO7iPXJ8rD9phw5JJ/5+AR XU/hwptur9VT+NYH2he+C5U5obyyUvyAg9c0O19MTRBJUR2o4WLOPLLY4aor1DAMSb ph4zuEm0cOb0xu8aGDqsC5NTtlzkjSh3x6h3P32Hatbk+yipx1H3OKpbPlmahwnbIn UJ1utt8nCgxJKFjABL5NenLmQWHMF0bHLMmPAENbi9mkuASJPhTa4NBEoeFeMeDgni dAB7Yche6Wa7LlHG4isXvdAAtUqe6e1i9VuMIF4QLqAgtbtpdOhYNBwUsw1q9AFH7C PMHyiE60ZagqA== Received-SPF: pass client-ip=2a02:1800:110:4::f00:1a; envelope-from=maximedevos@telenet.be; helo=albert.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-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: -2.3 (--) --=-/0tSPMalm8aJtckGHw5A Content-Type: multipart/mixed; boundary="=-zDA+yx9zSj1vUw915buX" --=-zDA+yx9zSj1vUw915buX Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi guix, This patch series adds a #:sh keyword argument to wrap-qt-program and adjusts callers to set this keyword argument appropriately. Setting this argument appropriately is required for cross-compilation. Otherwise, a bash for SYSTEM (as in --system=3D..) is used instead of a bash for TARGET (as in --target=3D...). I didn't test building some qt programs with this patch series yet, as I'm currently waiting on the substitute servers to catch up with recent changed to core-updates (to avoid building a tower of rusts). I'll do that later. Greetings, Maxime --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename*0=0001-qt-utils-Allow-overriding-the-shell-interpreter-in-w.pat; filename*1=ch Content-Type: text/x-patch; name="0001-qt-utils-Allow-overriding-the-shell-interpreter-in-w.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAyN2Q0MmYyNWY1NGIxNmYzODJlMThiOWVmMGZiMjAyZmIwMGRhOTBkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowMjoxNiArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMS84 XSBxdC11dGlsczogQWxsb3cgb3ZlcnJpZGluZyB0aGUgc2hlbGwgaW50ZXJwcmV0ZXIgaW4KICd3 cmFwLXF0LXByb2dyYW0nLgoKKiBndWl4L2J1aWxkL3F0LXV0aWxzLnNjbSAod3JhcC1xdC1wcm9n cmFtKTogSW50cm9kdWNlIGEgIzpzaCBrZXl3b3JkCiAgYXJndW1lbnQgYW5kIHBhc3MgaXQgdG8g J3dyYXAtcHJvZ3JhbScuCi0tLQogZ3VpeC9idWlsZC9xdC11dGlscy5zY20gfCA0ICsrKy0KIDEg ZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQg YS9ndWl4L2J1aWxkL3F0LXV0aWxzLnNjbSBiL2d1aXgvYnVpbGQvcXQtdXRpbHMuc2NtCmluZGV4 IGQyNDg2ZWU4NmMuLjYwZTY5OWZlMzkgMTAwNjQ0Ci0tLSBhL2d1aXgvYnVpbGQvcXQtdXRpbHMu c2NtCisrKyBiL2d1aXgvYnVpbGQvcXQtdXRpbHMuc2NtCkBAIC0xLDUgKzEsNiBAQAogOzs7IEdO VSBHdWl4IC0tLSBGdW5jdGlvbmFsIHBhY2thZ2UgbWFuYWdlbWVudCBmb3IgR05VCiA7OzsgQ29w eXJpZ2h0IMKpIDIwMTYgRGF2aWQgQ3JhdmVuIDxkYXZpZEBjcmF2ZW4uY2g+Cis7OzsgQ29weXJp Z2h0IMKpIDIwMjEgTWF4aW1lIERldm9zIDxtYXhpbWVkZXZvc0B0ZWxlbmV0LmJlPgogOzs7CiA7 OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7OzsKQEAgLTIwLDcgKzIxLDcgQEAK ICAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkIHV0aWxzKQogICAjOmV4cG9ydCAod3JhcC1xdC1w cm9ncmFtKSkKIAotKGRlZmluZSAod3JhcC1xdC1wcm9ncmFtIG91dCBwcm9ncmFtKQorKGRlZmlu ZSogKHdyYXAtcXQtcHJvZ3JhbSBvdXQgcHJvZ3JhbSAjOmtleSAoc2ggKHdoaWNoICJiYXNoIikp KQogICAoZGVmaW5lIChzdWZmaXggZW52LXZhciBwYXRoKQogICAgIChsZXQgKChlbnYtdmFsIChn ZXRlbnYgZW52LXZhcikpKQogICAgICAgKGlmIGVudi12YWwgKHN0cmluZy1hcHBlbmQgZW52LXZh bCAiOiIgcGF0aCkgcGF0aCkpKQpAQCAtMzQsNiArMzUsNyBAQAogICAgICAgICAoeGRnLWNvbmZp Zy1wYXRoIChzdWZmaXggIlhER19DT05GSUdfRElSUyIKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChzdHJpbmctYXBwZW5kIG91dCAiL2V0Yy94ZGciKSkpKQogICAgICh3cmFwLXBy b2dyYW0gKHN0cmluZy1hcHBlbmQgb3V0ICIvYmluLyIgcHJvZ3JhbSkKKyAgICAgICM6c2ggc2gK ICAgICAgIGAoIlFNTDJfSU1QT1JUX1BBVEgiID0gKCxxbWwtcGF0aCkpCiAgICAgICBgKCJRVF9Q TFVHSU5fUEFUSCIgPSAoLHBsdWdpbi1wYXRoKSkKICAgICAgIGAoIlhER19EQVRBX0RJUlMiID0g KCx4ZGctZGF0YS1wYXRoKSkKLS0gCjIuMzEuMQoK --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0002-gnu-qbittorrent-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0002-gnu-qbittorrent-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA4ZWQ1M2E2ODQwYjEwOTljOGNjYzUwYTE3NzkxODdlMTg2ZGZiN2FmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMCArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMi84 XSBnbnU6IHFiaXR0b3JyZW50OiBTZXQgIzpzaCBhcmd1bWVudCBvZiAnd3JhcC1xdC1wcm9ncmFt Jy4KTUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVU Ri04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKCiogZ251L3BhY2thZ2VzL2JpdHRv cnJlbnQuc2NtCiAgKHFiaXR0b3JyZW50KVthcmd1bWVudHNdPCM6cGhhc2VzPnt3cmFwLXF0fToK ICBTZXQgIzpzaCBhcmd1bWVudCBvZiDigJh3cmFwLXF0LXByb2dyYW3igJkuCi0tLQogZ251L3Bh Y2thZ2VzL2JpdHRvcnJlbnQuc2NtIHwgNSArKystLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0 aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvYml0dG9y cmVudC5zY20gYi9nbnUvcGFja2FnZXMvYml0dG9ycmVudC5zY20KaW5kZXggMjliMGQ2MmFkMi4u MzM5MjQ4ZGE5NCAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2JpdHRvcnJlbnQuc2NtCisrKyBi L2dudS9wYWNrYWdlcy9iaXR0b3JyZW50LnNjbQpAQCAtNDQ4LDggKzQ0OCw5IEBAIGRlc2t0b3Bz LiIpCiAgICAgICAgIzpwaGFzZXMKICAgICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhh c2VzCiAgICAgICAgICAoYWRkLWFmdGVyICdpbnN0YWxsICd3cmFwLXF0Ci0gICAgICAgICAgIChs YW1iZGEqICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKLSAgICAgICAgICAgICAo d3JhcC1xdC1wcm9ncmFtIChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikgInFiaXR0b3JyZW50IikK KyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIt a2V5cykKKyAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFtIChhc3NvYy1yZWYgb3V0cHV0cyAi b3V0IikgInFiaXR0b3JyZW50IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIzpzaCAo c2VhcmNoLWlucHV0LWZpbGUgaW5wdXRzICJiaW4vYmFzaCIpKQogICAgICAgICAgICAgICN0KSkp KSkKICAgICAobmF0aXZlLWlucHV0cwogICAgICBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcp Ci0tIAoyLjMxLjEKCg== --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename*0=0003-gnu-electron-cash-Set-sh-argument-of-wrap-qt-program.pat; filename*1=ch Content-Type: text/x-patch; name="0003-gnu-electron-cash-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBiMDJiMGVhMjAyZDVlMzk3MGU1ZGYyYTQ2MWI4Mzk5MGM5ZWRmYzgxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMCArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMy84 XSBnbnU6IGVsZWN0cm9uLWNhc2g6IFNldCAjOnNoIGFyZ3VtZW50IG9mCiAnd3JhcC1xdC1wcm9n cmFtJy4KTUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0 PVVURi04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKCiogZ251L3BhY2thZ2VzL2Zp bmFuY2Uuc2NtCiAgKGVsZWN0cm9uLWNhc2gpW2FyZ3VtZW50c108IzpwaGFzZXM+e3dyYXAtcXR9 OgogIFNldCAjOnNoIGFyZ3VtZW50IG9mIOKAmHdyYXAtcXQtcHJvZ3JhbeKAmS4KLS0tCiBnbnUv cGFja2FnZXMvZmluYW5jZS5zY20gfCA1ICsrKy0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRp b25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9maW5hbmNl LnNjbSBiL2dudS9wYWNrYWdlcy9maW5hbmNlLnNjbQppbmRleCBmYmQ3ZGY3ODNjLi4wMjlkZjRm OTM0IDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvZmluYW5jZS5zY20KKysrIGIvZ251L3BhY2th Z2VzL2ZpbmFuY2Uuc2NtCkBAIC02MTgsOCArNjE4LDkgQEAgb3RoZXIgbWFjaGluZXMvc2VydmVy cy4gIEVsZWN0cnVtIGRvZXMgbm90IGRvd25sb2FkIHRoZSBCaXRjb2luIGJsb2NrY2hhaW4uIikK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoYXNzb2MtcmVmIGlucHV0cyAibGlic2Vj cDI1NmsxIikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL2xpYi9saWJzZWNwMjU2 azEuc28uMCciKSkpKSkKICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ3dyYXAtcXQKLSAg ICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAg ICAgICAgICAgICh3cmFwLXF0LXByb2dyYW0gKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSAiZWxl Y3Ryb24tY2FzaCIpKSkpKSkKKyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRw dXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFtIChh c3NvYy1yZWYgb3V0cHV0cyAib3V0IikgImVsZWN0cm9uLWNhc2giCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAjOnNoIChzZWFyY2gtaW5wdXQtZmlsZSBpbnB1dHMgImJpbi9iYXNoIikp KSkpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL2VsZWN0cm9uY2FzaC5vcmcvIikKICAgICAo c3lub3BzaXMgIkJpdGNvaW4gQ2FzaCB3YWxsZXQiKQogICAgIChkZXNjcmlwdGlvbgotLSAKMi4z MS4xCgo= --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0004-gnu-qgis-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0004-gnu-qgis-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBlYWM0YTlmYmQwOWJkZThkNTJiZDM4ZjAwYTIzYWExMWNkMjRmZmEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMCArMDIwMApTdWJqZWN0OiBbUEFUQ0ggNC84 XSBnbnU6IHFnaXM6IFNldCAjOnNoIGFyZ3VtZW50IG9mICd3cmFwLXF0LXByb2dyYW0nLgpNSU1F LVZlcnNpb246IDEuMApDb250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgKQ29u dGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJpdAoKKiBnbnUvcGFja2FnZXMvZ2VvLnNjbQogIChx Z2lzKVthcmd1bWVudHNdPCM6cGhhc2VzPnt3cmFwLXF0fToKICBTZXQgIzpzaCBhcmd1bWVudCBv ZiDigJh3cmFwLXF0LXByb2dyYW3igJkuCi0tLQogZ251L3BhY2thZ2VzL2dlby5zY20gfCA1ICsr Ky0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9nZW8uc2NtIGIvZ251L3BhY2thZ2VzL2dlby5zY20KaW5k ZXggYzRiZGI2YWNhMC4uNjViNzYzZWNiZSAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2dlby5z Y20KKysrIGIvZ251L3BhY2thZ2VzL2dlby5zY20KQEAgLTIyMjQsOCArMjIyNCw5IEBAIGdyb3dp bmcgc2V0IG9mIGdlb3NjaWVudGlmaWMgbWV0aG9kcy4iKQogICAgICAgICAgKGFkZC1hZnRlciAn aW5zdGFsbCAnd3JhcC1weXRob24KICAgICAgICAgICAgKGFzc29jLXJlZiBweXRob246JXN0YW5k YXJkLXBoYXNlcyAnd3JhcCkpCiAgICAgICAgICAoYWRkLWFmdGVyICd3cmFwLXB5dGhvbiAnd3Jh cC1xdAotICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtl eXMpCi0gICAgICAgICAgICAgKHdyYXAtcXQtcHJvZ3JhbSAoYXNzb2MtcmVmIG91dHB1dHMgIm91 dCIpICJxZ2lzIikKKyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6 YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFtIChhc3NvYy1y ZWYgb3V0cHV0cyAib3V0IikgInFnaXMiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAj OnNoIChzZWFyY2gtaW5wdXQtZmlsZSAiYmluL2Jhc2giKSkKICAgICAgICAgICAgICAjdCkpCiAg ICAgICAgICAoYWRkLWFmdGVyICd3cmFwLXF0ICd3cmFwLWdpcwogICAgICAgICAgICAobGFtYmRh KiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotLSAKMi4zMS4xCgo= --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0005-gnu-keepassxc-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0005-gnu-keepassxc-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBkMzRkN2IwY2Q0NjRiNmFiYmU3ZmZhMzBmOGM2NzRhNjFhMTRmODg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMCArMDIwMApTdWJqZWN0OiBbUEFUQ0ggNS84 XSBnbnU6IGtlZXBhc3N4YzogU2V0ICM6c2ggYXJndW1lbnQgb2YgJ3dyYXAtcXQtcHJvZ3JhbScu Ck1JTUUtVmVyc2lvbjogMS4wCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYt OApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA4Yml0CgoqIGdudS9wYWNrYWdlcy9wYXNzd29y ZC11dGlscy5zY20KICAoa2VlcGFzc3hjKVthcmd1bWVudHNdPCM6cGhhc2VzPnt3cmFwLXF0fToK ICBTZXQgIzpzaCBhcmd1bWVudCBvZiDigJh3cmFwLXF0LXByb2dyYW3igJkuCi0tLQogZ251L3Bh Y2thZ2VzL3Bhc3N3b3JkLXV0aWxzLnNjbSB8IDUgKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3Bh c3N3b3JkLXV0aWxzLnNjbSBiL2dudS9wYWNrYWdlcy9wYXNzd29yZC11dGlscy5zY20KaW5kZXgg MzEwMjUzYzJhNC4uMmE1YTFlNWM5ZiAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3Bhc3N3b3Jk LXV0aWxzLnNjbQorKysgYi9nbnUvcGFja2FnZXMvcGFzc3dvcmQtdXRpbHMuc2NtCkBAIC0xNDYs OCArMTQ2LDkgQEAgaHVtYW4uIikKICAgICAgICAjOnBoYXNlcwogICAgICAgIChtb2RpZnktcGhh c2VzICVzdGFuZGFyZC1waGFzZXMKICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ3dyYXAt cXQKLSAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlz KQotICAgICAgICAgICAgICh3cmFwLXF0LXByb2dyYW0gKGFzc29jLXJlZiBvdXRwdXRzICJvdXQi KSAia2VlcGFzc3hjIikKKyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRz ICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFtIChhc3Nv Yy1yZWYgb3V0cHV0cyAib3V0IikgImtlZXBhc3N4YyIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICM6c2ggKHNlYXJjaC1pbnB1dC1maWxlIGlucHV0cyAiYmluL2Jhc2giKSkKICAgICAg ICAgICAgICAjdCkpKSkpCiAgICAgKG5hdGl2ZS1pbnB1dHMKICAgICAgYCgoImFzY2lpZG9jdG9y IiAscnVieS1hc2NpaWRvY3RvcikKLS0gCjIuMzEuMQoK --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0006-gnu-qtpass-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0006-gnu-qtpass-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAyNTY5MTAwMTJiOTZlMGM3NDg5YWM2NWU3NzQ4ZjQ4MDY5MDZjMzYwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggNi84 XSBnbnU6IHF0cGFzczogU2V0ICM6c2ggYXJndW1lbnQgb2YgJ3dyYXAtcXQtcHJvZ3JhbScuCk1J TUUtVmVyc2lvbjogMS4wCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOApD b250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA4Yml0CgoqIGdudS9wYWNrYWdlcy9wYXNzd29yZC11 dGlscy5zY20KICAocXRwYXNzKVthcmd1bWVudHNdPCM6cGhhc2VzPnt3cmFwLXF0fToKICBTZXQg IzpzaCBhcmd1bWVudCBvZiDigJh3cmFwLXF0LXByb2dyYW3igJkuCi0tLQogZ251L3BhY2thZ2Vz L3Bhc3N3b3JkLXV0aWxzLnNjbSB8IDUgKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlv bnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3Bhc3N3b3Jk LXV0aWxzLnNjbSBiL2dudS9wYWNrYWdlcy9wYXNzd29yZC11dGlscy5zY20KaW5kZXggMmE1YTFl NWM5Zi4uMTliMWI1NjIzYyAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3Bhc3N3b3JkLXV0aWxz LnNjbQorKysgYi9nbnUvcGFja2FnZXMvcGFzc3dvcmQtdXRpbHMuc2NtCkBAIC02ODMsOCArNjgz LDkgQEAga2V5IFVSSXMgdXNpbmcgdGhlIHN0YW5kYXJkIG90cGF1dGg6Ly8gc2NoZW1lLiIpCiAg ICAgICAgICAgICAgICAoaW5zdGFsbC1maWxlICJxdHBhc3MuMSIgbWFuKQogICAgICAgICAgICAg ICAgI3QpKSkKICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ3dyYXAtcXQKLSAgICAgICAg ICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAg ICAgICh3cmFwLXF0LXByb2dyYW0gKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSAicXRwYXNzIikK KyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIt a2V5cykKKyAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFtIChhc3NvYy1yZWYgb3V0cHV0cyAi b3V0IikgInF0cGFzcyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICM6c2ggKHNlYXJj aC1pbnB1dC1maWxlIGlucHV0cyAiYmluL2Jhc2giKSkKICAgICAgICAgICAgICAjdCkpCiAgICAg ICAgICAoYWRkLWJlZm9yZSAnY2hlY2sgJ2NoZWNrLXNldHVwCiAgICAgICAgICAgIDs7IE1ha2Ug UXQgcmVuZGVyICJvZmZzY3JlZW4iLCByZXF1aXJlZCBmb3IgdGVzdHMuCi0tIAoyLjMxLjEKCg== --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0007-gnu-openshot-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0007-gnu-openshot-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAyMzQ4NmQxMjM0NDJkNjNhYWM3YjU0ZWMwYzRkMGI0Nzg2MjM3NzYyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggNy84 XSBnbnU6IG9wZW5zaG90OiBTZXQgIzpzaCBhcmd1bWVudCBvZiAnd3JhcC1xdC1wcm9ncmFtJy4K TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04 CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKCiogZ251L3BhY2thZ2VzL3ZpZGVvLnNj bQogIChvcGVuc2hvdClbYXJndW1lbnRzXTwjOnBoYXNlcz57d3JhcC1wcm9ncmFtfToKICBTZXQg IzpzaCBhcmd1bWVudCBvZiDigJh3cmFwLXF0LXByb2dyYW3igJkuCi0tLQogZ251L3BhY2thZ2Vz L3ZpZGVvLnNjbSB8IDUgKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3ZpZGVvLnNjbSBiL2dudS9w YWNrYWdlcy92aWRlby5zY20KaW5kZXggNGIxZDI1NDBlNC4uMjUwY2E5NDRhYSAxMDA2NDQKLS0t IGEvZ251L3BhY2thZ2VzL3ZpZGVvLnNjbQorKysgYi9nbnUvcGFja2FnZXMvdmlkZW8uc2NtCkBA IC00NTYwLDkgKzQ1NjAsMTAgQEAgQVBJLiAgSXQgaW5jbHVkZXMgYmluZGluZ3MgZm9yIFB5dGhv biwgUnVieSwgYW5kIG90aGVyIGxhbmd1YWdlcy4iKQogICAgICAgICAgICAgICAgICAgICAgIChz ZXRlbnYgIkhPTUUiICIvdG1wIikKICAgICAgICAgICAgICAgICAgICAgICAjdCkpCiAgICAgICAg ICAgICAgICAgICAoYWRkLWFmdGVyICdpbnN0YWxsICd3cmFwLXByb2dyYW0KLSAgICAgICAgICAg ICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAg ICAgICAgICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1v dGhlci1rZXlzKQogICAgICAgICAgICAgICAgICAgICAgIChsZXQgKChvdXQgKGFzc29jLXJlZiBv dXRwdXRzICJvdXQiKSkpCi0gICAgICAgICAgICAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFt IG91dCAib3BlbnNob3QtcXQiKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICh3cmFwLXF0LXBy b2dyYW0gb3V0ICJvcGVuc2hvdC1xdCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIzpzaCAoc2VhcmNoLWlucHV0LWZpbGUgImJpbi9iYXNoIikpKQogICAgICAgICAg ICAgICAgICAgICAgICN0KSkpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL3d3dy5vcGVuc2hv dC5vcmcvIikKICAgICAoc3lub3BzaXMgIlZpZGVvIGVkaXRvciIpCi0tIAoyLjMxLjEKCg== --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0008-gnu-kristall-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0008-gnu-kristall-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA5MjgwM2NiZWY1YWZmYTNkYmJmMDQ5MjYyZTFmY2YyOTBkOGQ4NjIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggOC84 XSBnbnU6IGtyaXN0YWxsOiBTZXQgIzpzaCBhcmd1bWVudCBvZiAnd3JhcC1xdC1wcm9ncmFtJy4K TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04 CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKCiogZ251L3BhY2thZ2VzL3dlYi1icm93 c2Vycy5zY20KICAoa3Jpc3RhbGwpW2FyZ3VtZW50c108IzpwaGFzZXM+e3dyYXAtcHJvZ3JhbX06 CiAgU2V0ICM6c2ggYXJndW1lbnQgb2Yg4oCYd3JhcC1xdC1wcm9ncmFt4oCZLgotLS0KIGdudS9w YWNrYWdlcy93ZWItYnJvd3NlcnMuc2NtIHwgNyArKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgNCBp bnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy93 ZWItYnJvd3NlcnMuc2NtIGIvZ251L3BhY2thZ2VzL3dlYi1icm93c2Vycy5zY20KaW5kZXggYWYx NzhmOTA5Mi4uMzYzM2ZmMzRhOCAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3dlYi1icm93c2Vy cy5zY20KKysrIGIvZ251L3BhY2thZ2VzL3dlYi1icm93c2Vycy5zY20KQEAgLTQ0Myw5ICs0NDMs MTAgQEAgYWNjZXNzLiIpCiAgICAgICAgICAgICAgICAgICAgIi9zaGFyZS9mb250cy90cnVldHlw ZS9Ob3RvQ29sb3JFbW9qaSIpKSkKICAgICAgICAgICAgICAgICN0KSkKICAgICAgICAgICAgKGFk ZC1hZnRlciAnaW5zdGFsbCAnd3JhcC1wcm9ncmFtCi0gICAgICAgICAgICAgKGxhbWJkYSogKCM6 a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAgICAgICAgKGxldCAoKG91 dCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpKSkKLSAgICAgICAgICAgICAgICAgKHdyYXAtcXQt cHJvZ3JhbSBvdXQgImtyaXN0YWxsIikpCisgICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlu cHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAgIChsZXQgKChv dXQgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSkKKyAgICAgICAgICAgICAgICAgICAgIChiYXNo IChzZWFyY2gtaW5wdXQtZmlsZSBpbnB1dHMgImJpbi9iYXNoIikpKQorICAgICAgICAgICAgICAg ICAod3JhcC1xdC1wcm9ncmFtIG91dCAia3Jpc3RhbGwiICM6c2ggYmFzaCkpCiAgICAgICAgICAg ICAgICAjdCkpKSkpCiAgICAgICAobmF0aXZlLWlucHV0cwogICAgICAgIGAoKCJicmVlemUtc3R5 bGVzaGVldCIKLS0gCjIuMzEuMQoK --=-zDA+yx9zSj1vUw915buX-- --=-/0tSPMalm8aJtckGHw5A Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYLtkuhccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7h9UAPwL/gNHHZiy/jvK9Jpa1FoORrkh Gsu8NdPnSRO963lwagEAxKk9Hoi1CIdR2B6M1oCWPTGjtUYSFseNzC0RrNnklwc= =nXH1 -----END PGP SIGNATURE----- --=-/0tSPMalm8aJtckGHw5A-- From unknown Tue Jun 17 01:44:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48849] [PATCH core-updates]: Add #:sh argument to wrap-qt-program Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Jan 2024 22:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 48849@debbugs.gnu.org Received: via spool by 48849-submit@debbugs.gnu.org id=B48849.17057895076700 (code B ref 48849); Sat, 20 Jan 2024 22:26:02 +0000 Received: (at 48849) by debbugs.gnu.org; 20 Jan 2024 22:25:07 +0000 Received: from localhost ([127.0.0.1]:36065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRJlx-0001jx-Ss for submit@debbugs.gnu.org; Sat, 20 Jan 2024 17:25:07 -0500 Received: from mail-qt1-x836.google.com ([2607:f8b0:4864:20::836]:46282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRJls-0001jG-KD for 48849@debbugs.gnu.org; Sat, 20 Jan 2024 17:25:04 -0500 Received: by mail-qt1-x836.google.com with SMTP id d75a77b69052e-42a31b90edcso6772671cf.0 for <48849@debbugs.gnu.org>; Sat, 20 Jan 2024 14:24:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705789491; x=1706394291; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=4CyGbKFnB7wpxD2CWPozHun6wnbZBywLTbR2K/gwnx4=; b=EuoeB05rc6vrEDsI0tY+hUVYq3cw/X8N5W+Qhp9bIPvUUw4RmQjWdCniBS65dChClq euX1UeG9ufXMsTgGXEPFtu3+FplSHEIshGFZFuclNvGzQcHpZjmPdrMMgdA2WVeOhzTx ACcR2tdYW9TSuskqr2it3lD1/OGMea46a204rnz0eMheTHWmsUUopeEH9QMpgycfC5s4 iIRF3KCXk2tIJNuc1krWcv5BcrQ71w2m9NNDlMQjCJNV+YRmghXVRceLmg8SGPSfxK7v tZUqWrSME0FnwnVfySfC2GBHFG3+iRcaup6o2MSJ5DttCHcfTVtx5ZtxS+ug7Ft7njnr PLOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705789491; x=1706394291; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4CyGbKFnB7wpxD2CWPozHun6wnbZBywLTbR2K/gwnx4=; b=nfN4ZDLIMrYJZARWca/p3v6bUznfHnZmw5Jo3nh3zK7xLBrZbTS6enMuX2QD6u3EKg ivVmZt0VdqLsWy3wJOizByeEl/Wz67akNljrGd0KrBaA6JuJZ+rCjJCq1eaf+aBDol7L iUfRjgrU9eRBXvswvXA9SssuJO0d1eFfFP/oaqleosgzKtMwHHKjFgIsA893ZsUXRztK pGccJazZobRuqQxfbYamXwAWNcb8/LEPAeg8vMbEDnjD+0lBnhB+tZcK1KGQKdX3M1rU Hzfrm5w2LWsSGhkPIlCQ1goVs1ZeQKJ+imHaStMMZeBqC9MSh255NJwM+X7jxS6dOfbL oHtg== X-Gm-Message-State: AOJu0YyrFlW3rI4DmeMhKwhYlgZXXIxZVp1uA/R89ox7aWzGrWIRgdvm LlCaFqyKfUSn+DdkwYMPdxLcZljAwS5df1+02LAM35fBYpX7Max0mKZtZLLr7OM= X-Google-Smtp-Source: AGHT+IEBiXAMA9XMovnJOvIHPMit3xnTT61vxcN0gNPU0UNyLtnXKbzUp+VAA6Wg9Dt3ADbgUyOkoQ== X-Received: by 2002:ac8:58c8:0:b0:42a:3549:d9dd with SMTP id u8-20020ac858c8000000b0042a3549d9ddmr1346463qta.56.1705789491473; Sat, 20 Jan 2024 14:24:51 -0800 (PST) Received: from hurd (dsl-10-128-232.b2b2c.ca. [72.10.128.232]) by smtp.gmail.com with ESMTPSA id ex14-20020a05622a518e00b0042994b3c20dsm1021599qtb.29.2024.01.20.14.24.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 14:24:51 -0800 (PST) From: Maxim Cournoyer In-Reply-To: <678f5b29c1b5e2100bfde5b5121c57a9d2d2f3d8.camel@telenet.be> (Maxime Devos's message of "Sat, 05 Jun 2021 13:49:23 +0200") References: <678f5b29c1b5e2100bfde5b5121c57a9d2d2f3d8.camel@telenet.be> Date: Sat, 20 Jan 2024 17:24:50 -0500 Message-ID: <87a5ozd4nh.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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 Maxime, Maxime Devos writes: > Hi guix, > > This patch series adds a #:sh keyword argument to wrap-qt-program > and adjusts callers to set this keyword argument appropriately. > > Setting this argument appropriately is required for cross-compilation. > Otherwise, a bash for SYSTEM (as in --system=..) is used instead > of a bash for TARGET (as in --target=...). > > I didn't test building some qt programs with this patch series yet, > as I'm currently waiting on the substitute servers to catch up > with recent changed to core-updates (to avoid building a tower > of rusts). I'll do that later. > > Greetings, > Maxime > > From 27d42f25f54b16f382e18b9ef0fb202fb00da90d Mon Sep 17 00:00:00 2001 > From: Maxime Devos > Date: Sat, 5 Jun 2021 11:02:16 +0200 > Subject: [PATCH 1/8] qt-utils: Allow overriding the shell interpreter in > 'wrap-qt-program'. > > * guix/build/qt-utils.scm (wrap-qt-program): Introduce a #:sh keyword > argument and pass it to 'wrap-program'. If bash-minimal is added to inputs as we do for other packages making use of wrap-program, we don't need to do more, no? Why do we need to explicit the argument here? -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 20 17:25:10 2024 Received: (at control) by debbugs.gnu.org; 20 Jan 2024 22:25:10 +0000 Received: from localhost ([127.0.0.1]:36068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRJm2-0001kG-K1 for submit@debbugs.gnu.org; Sat, 20 Jan 2024 17:25:10 -0500 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]:58614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRJm0-0001jp-Rl for control@debbugs.gnu.org; Sat, 20 Jan 2024 17:25:09 -0500 Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-78329cb6742so127467785a.0 for ; Sat, 20 Jan 2024 14:25:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705789500; x=1706394300; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=woGChaQayf5loixG+T2Omsul9HKO+9WjXrNI3t4TsEg=; b=T52LmtoyjNvP+j5esatF/3ta7gxB+3AjSSfxO1UtrHQzs6WnjTeaNvyPkXUyKsU/Z1 uSnJ76QRbCcV1l57QOOFpfLk0ndqyUqVEE+MunidaCCWKBedDzTwF+18o+jxfq0VXnx5 Al5zkiJny8QbykGIn37v6xcYPGDnbQmsyRSnOss064F0e19ossV33rahtqEI+Hbj5XSy WLZ8nlaaqZO9MMjf0AIVhT29E1tPiIZX3ud7pPd1E50JEvyHiq2g2lw5wbNWcylzAUhL Jem+8fCeRyyM4mC+AdsXbWykx6OvX7H+1uiwOqG+M44QxdKhd25NuWxMB0TAxphRf5Xg EDlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705789500; x=1706394300; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=woGChaQayf5loixG+T2Omsul9HKO+9WjXrNI3t4TsEg=; b=pfSddpUdDlbzX16KdzOVsp89r0VhbDpw/2XazYvpqmCLKmU6xuegsYaGXNgt9+/aMM y+MQgLfcgDXFk2UD8tbyqpNYxkW+x6CVpBloSnjhJBtTu6fKet/cnTtGo1TNquEm5O0+ gsACDCBVqscuYA796+xLT+xvatSecXqe/nCrKWfp4B1ivUuHVKyL7oUXCoMAwcFpB7GG ejSlOICbJAG113x7uJ7PUR5Fs8tmaYt99OmMriB8rS+asOCcCuPDUEXnQGoT89YdNjmT tIctX1VEuWEGjZAESvrPqSC7SqnTlsc3O+mfpyOpScKQ2YWvllRDYJolFioZ/ihrLacK ItCQ== X-Gm-Message-State: AOJu0Yzw8SgD8TvDRMI+erofZPOfm5G9IB+EQ5d3+fXr689r68vYDQ5A zfekmEP/6oHcI0ojNaCXr3BHXnMixhZBSMmPRxGCd8JiEmh3+5Jvve3Bt+36CUc= X-Google-Smtp-Source: AGHT+IGoiX0kTFZVMQLrcrseoLcnPoS2B3wY5HVFSPvWaiX9JLRbyLCRTMmPqgHJhxgz53joIcisaA== X-Received: by 2002:a05:620a:1664:b0:783:422f:5484 with SMTP id d4-20020a05620a166400b00783422f5484mr1869293qko.38.1705789499867; Sat, 20 Jan 2024 14:24:59 -0800 (PST) Received: from hurd (dsl-10-128-232.b2b2c.ca. [72.10.128.232]) by smtp.gmail.com with ESMTPSA id gb8-20020a05622a598800b00429d3257dd6sm1022361qtb.45.2024.01.20.14.24.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 14:24:59 -0800 (PST) Date: Sat, 20 Jan 2024 17:24:58 -0500 Message-Id: <878r4jd4n9.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #48849 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control 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 (-) tags 48849 + moreinfo quit From unknown Tue Jun 17 01:44:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48849] [PATCH core-updates]: Add #:sh argument towrap-qt-program Resent-From: M Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Jan 2024 23:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: Maxim Cournoyer , "48849@debbugs.gnu.org" <48849@debbugs.gnu.org> Received: via spool by 48849-submit@debbugs.gnu.org id=B48849.170579191421535 (code B ref 48849); Sat, 20 Jan 2024 23:06:02 +0000 Received: (at 48849) by debbugs.gnu.org; 20 Jan 2024 23:05:14 +0000 Received: from localhost ([127.0.0.1]:36098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRKOn-0005bG-F3 for submit@debbugs.gnu.org; Sat, 20 Jan 2024 18:05:14 -0500 Received: from laurent.telenet-ops.be ([2a02:1800:110:4::f00:19]:41724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRKOi-0005aX-GS for 48849@debbugs.gnu.org; Sat, 20 Jan 2024 18:05:12 -0500 Received: from [IPv6:2a02:1811:8c09:9d00:e5aa:e8c2:b860:4c97] ([IPv6:2a02:1811:8c09:9d00:e5aa:e8c2:b860:4c97]) by laurent.telenet-ops.be with bizsmtp id dB4w2B0081cshW701B4xZR; Sun, 21 Jan 2024 00:04:57 +0100 Message-ID: <20240121000457.dB4w2B0081cshW701B4xZR@laurent.telenet-ops.be> MIME-Version: 1.0 From: M Date: Sun, 21 Jan 2024 00:04:57 +0100 Importance: normal X-Priority: 3 In-Reply-To: <87a5ozd4nh.fsf@gmail.com> References: <678f5b29c1b5e2100bfde5b5121c57a9d2d2f3d8.camel@telenet.be> <87a5ozd4nh.fsf@gmail.com> Content-Type: multipart/alternative; boundary="_5326F311-2858-498E-AF88-2AD7831EDEB1_" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=telenet.be; s=r24; t=1705791897; bh=2KEUGb1yIVUkT0jvXqN+CZJwm7g9RxqisFxKObBe6Dc=; h=To:From:Subject:Date:In-Reply-To:References; b=he6zDEREiN8acwYqKO18aJ5OAvjO0DY2KTabn8zFjXFIPFrJl/9h9nlCTYL27Itt4 TKSMgQP1iih6UvDyUxBGf1VtnRB8pusy/55ReEMQI2fJqeNl7zzlcAYUBnMCZM1qYm T0MZY0Nz+z2St7lMJp9zr6FRrmRecav4VS4/fYnD7erP6UuoDGoKYPPrgtkHDWd8ex z/nWHbbZPhHzhSzkPRiUxCKqP4AyxcBBvs9cneI5IN54m3qBT5g+2jaoyBrCBeh2Q6 NizTuz05lN51o+wWx/FGr6sGSyLeGxxMeQlEyxjocMS3296qkIAFyh43MQrnR15lxh NVtiBpAjAMK5Q== 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 (-) --_5326F311-2858-498E-AF88-2AD7831EDEB1_ Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" >> Subject: [PATCH 1/8] qt-utils: Allow overriding the shell interpreter in >> 'wrap-qt-program'. >> >> * guix/build/qt-utils.scm (wrap-qt-program): Introduce a #:sh keyword >> argument and pass it to 'wrap-program'. > > If bash-minimal is added to inputs as we do for other packages making > use of wrap-program, we don't need to do more, no? Why do we need to > explicit the argument here? Post-hoc reason (for the first patch): wrap-program has #:sh argument, wrap= -qt-program doesn=E2=80=99t, which is inconsistent. For the rest (to be clear I think the remaining patches can be removed): Right, technically we don=E2=80=99t. The reason is to make sure that it=E2= =80=99s the bash from inputs instead of the bash native-inputs. Currently, = at first it gets the (wrong) native bash, and later on this is fixed up by = the patch-shebangs phase, IIRC. However, (IIRC) that behaviour is a bug =E2=80=93 patch-shebangs is for /us= r/bin/=E2=80=A6 -> /gnu/store/=E2=80=A6 stuff =E2=80=93 if the code =E2=80= =9Cmake install=E2=80=9D or the like already set a proper /gnu/store/=E2=80= =A6 shebang, why automatically change it to something else? Presumably it s= et it to the right interpreter, and now patch-shebangs might autocorrupt it= . Another problem: there might not even be a patch-shebangs phase, uses of wr= ap-program, wrap-qt-program and the phase of the qt-build-system that uses = wrap-qt-program (IIRC there exists such a phase) should be usable in isolat= ion. Also, there is a hidden assumption that the uses of wrap-program are _= before_ the shebang patching, whereas it might be run afterwards as wll. Instead, I think it=E2=80=99s better for the uses of =E2=80=98wrap-program= =E2=80=99 to directly set it to the _right_ bash. That=E2=80=99s what the #:sh argument is for, but #:sh is set to by default= (which =E2=80=9Cbash=E2=80=9D), which is incorrect. Hence, #:sh needs to b= e set explicitly, and hence wrap-qt-program needs a #:sh argument or the li= ke to pass on to wrap-program. That said, I don=E2=80=99t think all this explicit #:sh is appropriate eith= er =E2=80=93 it would need to be repeated for every single package definiti= on refering to wrap-program, etc.. Instead, for the future, I=E2=80=99d pro= pose to eliminate the argument list of phases, turning phase procedures in = phase thunks and stuffing the old arguments in parameter objects instead. Then, the #:sh of =E2=80=98wrap-program=E2=80=99 could default to (search-i= nput-file (inputs) =E2=80=9Cbin/inputs=E2=80=9D) =E2=80=93 automatically co= rrect (without needing patch-shebangs) both for native and cross-compilatio= n, and when cross-compiling without =E2=80=9Cbash=E2=80=9D in (implicit) in= puts, it automatically errors out (instead of doing the wrong thing as done= currently). The phases would also be a bit less verbose to write =E2=80=93 (lambda* (#:= key this that #:allow-other-keys) (proc this) stuff =E2=80=A6) could become= (lambda () (proc) stuff =E2=80=A6). (The =E2=80=98procedure=E2=80=99 syntax (inputs) for parameter objects migh= t not be the best here, but that=E2=80=99s nothing some bikeshedding over t= he precise syntax can=E2=80=99t fix.) Bst regards, Maxime Devos (p.s. I received the mails for the other patches but I=E2=80=99m not respon= ding at the time =E2=80=93 not active with Guix currently, and borrowing an= other computer because of repairs.) --_5326F311-2858-498E-AF88-2AD7831EDEB1_ Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset="utf-8"

>&= gt; Subject: [PATCH 1/8] qt-utils: Allow overriding the shell interpreter i= n

>>=C2=A0 'wrap-qt-program'.

>> 

>> * guix/= build/qt-utils.scm (wrap-qt-program): Introduce a #:sh keyword

>>=C2=A0=C2=A0 argument and pass it to 'wrap-program'.

> 

> I= f bash-minimal is added to inputs as we do for other packages making

> use of wrap-program, we don't need to do more, no?= =C2=A0 Why do we need to

> explicit the argument= here?

 

Po= st-hoc reason (for the first patch): wrap-program has #:sh argument, wrap-q= t-program doesn=E2=80=99t, which is inconsistent.

<= o:p> 

For the rest (to be clear I think = the remaining patches can be removed):

 <= /o:p>

Right, technically we don=E2=80=99t. The reas= on is to make sure that it=E2=80=99s the bash from inputs instead of the ba= sh native-inputs. Currently, at first it gets the (wrong) native bash, and = later on this is fixed up by the patch-shebangs phase, IIRC.

 

However, (IIRC) that be= haviour is a bug =E2=80=93 patch-shebangs is for /usr/bin/=E2=80=A6 -> /= gnu/store/=E2=80=A6 stuff =E2=80=93 if the code =E2=80=9Cmake install=E2=80= =9D or the like already set a proper /gnu/store/=E2=80=A6 shebang, why auto= matically change it to something else? Presumably it set it to the right in= terpreter, and now patch-shebangs might autocorrupt it.

 

Another problem: there might= not even be a patch-shebangs phase, uses of wrap-program, wrap-qt-program = and the phase of the qt-build-system that uses wrap-qt-program (IIRC there = exists such a phase) should be usable in isolation. Also, there is a hidden= assumption that the uses of wrap-program are _before_ the shebang p= atching, whereas it might be run afterwards as wll.

 

Instead, I think it=E2=80=99s be= tter for the uses of =E2=80=98wrap-program=E2=80=99 to directly set it to t= he _right_ bash.

That=E2=80=99s what the #:s= h argument is for, but #:sh is set to by default (which =E2=80=9Cbash=E2=80= =9D), which is incorrect. Hence, #:sh needs to be set explicitly, and hence= wrap-qt-program needs a #:sh argument or the like to pass on to wrap-progr= am.

 

That = said, I don=E2=80=99t think all this explicit #:sh is appropriate either = =E2=80=93 it would need to be repeated for every single package definition = refering to wrap-program, etc.. Instead, for the future, I=E2=80=99d propos= e to eliminate the argument list of phases, turning phase procedures in pha= se thunks and stuffing the old arguments in parameter objects instead.

<= p class=3DMsoNormal> 

Then, the #:s= h of =E2=80=98wrap-program=E2=80=99 could default to (search-input-file (in= puts) =E2=80=9Cbin/inputs=E2=80=9D) =E2=80=93 automatically correct (withou= t needing patch-shebangs) both for native and cross-compilation, and when c= ross-compiling without =E2=80=9Cbash=E2=80=9D in (implicit) inputs, it auto= matically errors out (instead of doing the wrong thing as done currently).<= /p>

 

The phase= s would also be a bit less verbose to write =E2=80=93 (lambda* (#:key this = that #:allow-other-keys) (proc this) stuff =E2=80=A6) could become (lambda = () (proc) stuff =E2=80=A6).

 

(The =E2=80=98procedure=E2=80=99 syntax (inputs) for par= ameter objects might not be the best here, but that=E2=80=99s nothing some = bikeshedding over the precise syntax can=E2=80=99t fix.)

 

Bst regards,

Maxime Devos

 

(p.s. I received the mails for the other patches but I=E2=80= =99m not responding at the time =E2=80=93 not active with Guix currently, a= nd borrowing another computer because of repairs.)

= --_5326F311-2858-498E-AF88-2AD7831EDEB1_-- From unknown Tue Jun 17 01:44:00 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48849] [PATCH core-updates]: Add #:sh argument to wrap-qt-program Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 05:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: M Cc: "48849@debbugs.gnu.org" <48849@debbugs.gnu.org> Received: via spool by 48849-submit@debbugs.gnu.org id=B48849.170589955419990 (code B ref 48849); Mon, 22 Jan 2024 05:00:02 +0000 Received: (at 48849) by debbugs.gnu.org; 22 Jan 2024 04:59:14 +0000 Received: from localhost ([127.0.0.1]:39667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRmOw-0005CM-BD for submit@debbugs.gnu.org; Sun, 21 Jan 2024 23:59:14 -0500 Received: from mail-qt1-x82f.google.com ([2607:f8b0:4864:20::82f]:42423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRmOt-0005C9-H2 for 48849@debbugs.gnu.org; Sun, 21 Jan 2024 23:59:13 -0500 Received: by mail-qt1-x82f.google.com with SMTP id d75a77b69052e-429915eefa5so19830271cf.1 for <48849@debbugs.gnu.org>; Sun, 21 Jan 2024 20:59:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705899541; x=1706504341; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7KWZ8F+XS/QEPd/JWFG+LQonDdQRu6JQOk8UPkkWZQg=; b=dh99YcEzyPo789FkdUWGDd/HmeHTUE0XQ2om2NlBmHeBiNgZpZTOSCt8ffTKsHexFY BqIT1nIEGpPJpxzVx7wJGuM0IlGlIjvghcEkeNzzKKkzNsw9rPeiZEa8ZL3SlZlr9xLr O3p5pJDc629N5Ym3Htcfwcftv9yRxD2j3GzqSAXSQ5+QS8HFOJtJKa9AhXRLNgJJWrq9 Nn8/1AR+FJP7WOuKjxAQdb7iB7DSSuEXGFgoajl3Z3PbN9tG6e7RKa9PAur8QMaBp6Rz INIASpcCG+UTNhnsB25MEySQ0cHy9cLNAL/VUFEv5wmXy6Pz5H7ctnwVy60GncTVw6Ti h9xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705899541; x=1706504341; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7KWZ8F+XS/QEPd/JWFG+LQonDdQRu6JQOk8UPkkWZQg=; b=n/Sjne1nxIeHa/cNqPJ5ahyjRmBQxBvoDMPnFTlmctIunjc7hm9vgfjLDGE4RsZ1wI 2vWl56RaxwlUJ1Pqk0pq55x9Z5hBJfMYpApueZdSbyj3H34WavNZFfXHi3ezTPwSak2K wGgKQWQx5Rz6/0sTNkHxaE1ezgkzEcAIgddOp1Fp63UMzUDNTaHXSKqTaULN1eCfNxUl F2bvUIPULSjNhXIlmIvss68EHyC5bqz/WXXpTpl/tPcOaGXFjZoXyXdfZJVVeyVjfZmi GlWTL9Agc0cH9xUxDwpNtp0/4kjLoZF1Nh6ibQOA4DE+4zB9g20Q/m/S1CzhOZpFmfwr 6tPg== X-Gm-Message-State: AOJu0YzlCFTklx9L8gyhGwjxGb1N40k4J4TcJtMykJk3rfQRVCrTnfk4 1DjvLX5UWBO4e54BYUp+hamU7faw81z5naMfwc92Z0xHqPQTXbtV9ckPpUABAZ8= X-Google-Smtp-Source: AGHT+IGO3UMdQjq01Wz1J61Sf7IdYsnmCKqgrr7afL0E/rjn4rTzDshzOylMf1Q+2iiqeqZ5CMScaQ== X-Received: by 2002:a05:622a:38e:b0:42a:29c6:592c with SMTP id j14-20020a05622a038e00b0042a29c6592cmr5553744qtx.50.1705899541508; Sun, 21 Jan 2024 20:59:01 -0800 (PST) Received: from hurd (dsl-10-128-232.b2b2c.ca. [72.10.128.232]) by smtp.gmail.com with ESMTPSA id bs17-20020ac86f11000000b0042a0952805csm2180870qtb.3.2024.01.21.20.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 20:59:01 -0800 (PST) From: Maxim Cournoyer In-Reply-To: <20240121000457.dB4w2B0081cshW701B4xZR@laurent.telenet-ops.be> (M.'s message of "Sun, 21 Jan 2024 00:04:57 +0100") References: <678f5b29c1b5e2100bfde5b5121c57a9d2d2f3d8.camel@telenet.be> <87a5ozd4nh.fsf@gmail.com> <20240121000457.dB4w2B0081cshW701B4xZR@laurent.telenet-ops.be> Date: Sun, 21 Jan 2024 23:58:59 -0500 Message-ID: <87il3m3qwc.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 Maxime, M writes: >>> Subject: [PATCH 1/8] qt-utils: Allow overriding the shell interpreter in >>> 'wrap-qt-program'. >>> >>> * guix/build/qt-utils.scm (wrap-qt-program): Introduce a #:sh keyword >>> argument and pass it to 'wrap-program'. >> >> If bash-minimal is added to inputs as we do for other packages making >> use of wrap-program, we don't need to do more, no? Why do we need to >> explicit the argument here? > > Post-hoc reason (for the first patch): wrap-program has #:sh argument, > wrap-qt-program doesn=E2=80=99t, which is inconsistent. Good point. > For the rest (to be clear I think the remaining patches can be removed): OK, good. > Right, technically we don=E2=80=99t. The reason is to make sure that it= =E2=80=99s the > bash from inputs instead of the bash native-inputs. Currently, at > first it gets the (wrong) native bash, and later on this is fixed up > by the patch-shebangs phase, IIRC. I see. > However, (IIRC) that behaviour is a bug =E2=80=93 patch-shebangs is for > /usr/bin/=E2=80=A6 -> /gnu/store/=E2=80=A6 stuff =E2=80=93 if the code = =E2=80=9Cmake install=E2=80=9D or the > like already set a proper /gnu/store/=E2=80=A6 shebang, why automatically > change it to something else? Presumably it set it to the right > interpreter, and now patch-shebangs might autocorrupt it. Ah! Interesting. I haven't seen any report for such bug. > Another problem: there might not even be a patch-shebangs phase, uses > of wrap-program, wrap-qt-program and the phase of the qt-build-system > that uses wrap-qt-program (IIRC there exists such a phase) should be > usable in isolation. Also, there is a hidden assumption that the uses > of wrap-program are _before_ the shebang patching, whereas it might be > run afterwards as wll. > > Instead, I think it=E2=80=99s better for the uses of =E2=80=98wrap-progra= m=E2=80=99 to directly set it to the _right_ bash. > That=E2=80=99s what the #:sh argument is for, but #:sh is set to by defau= lt > (which =E2=80=9Cbash=E2=80=9D), which is incorrect. Hence, #:sh needs to = be set > explicitly, and hence wrap-qt-program needs a #:sh argument or the > like to pass on to wrap-program. > > That said, I don=E2=80=99t think all this explicit #:sh is appropriate ei= ther > =E2=80=93 it would need to be repeated for every single package definition > refering to wrap-program, etc.. Instead, for the future, I=E2=80=99d prop= ose > to eliminate the argument list of phases, turning phase procedures in > phase thunks and stuffing the old arguments in parameter objects > instead. > > Then, the #:sh of =E2=80=98wrap-program=E2=80=99 could default to (search= -input-file > (inputs) =E2=80=9Cbin/inputs=E2=80=9D) =E2=80=93 automatically correct (w= ithout needing > patch-shebangs) both for native and cross-compilation, and when > cross-compiling without =E2=80=9Cbash=E2=80=9D in (implicit) inputs, it a= utomatically > errors out (instead of doing the wrong thing as done currently). > > The phases would also be a bit less verbose to write =E2=80=93 (lambda* (= #:key > this that #:allow-other-keys) (proc this) stuff =E2=80=A6) could become > (lambda () (proc) stuff =E2=80=A6). > > (The =E2=80=98procedure=E2=80=99 syntax (inputs) for parameter objects mi= ght not be > the best here, but that=E2=80=99s nothing some bikeshedding over the prec= ise > syntax can=E2=80=99t fix.) Thanks for sharing your perspective on this. It's an interesting idea that you are proposing, but it'd entail a massive effort to port the code base. Cheers! Enjoy whatever hack you are currently pursuing! --=20 Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 22 00:09:38 2024 Received: (at control) by debbugs.gnu.org; 22 Jan 2024 05:09:38 +0000 Received: from localhost ([127.0.0.1]:39679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRmYz-0005Vt-Vw for submit@debbugs.gnu.org; Mon, 22 Jan 2024 00:09:38 -0500 Received: from mail-qv1-xf2e.google.com ([2607:f8b0:4864:20::f2e]:52611) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRmYv-0005VZ-Ch for control@debbugs.gnu.org; Mon, 22 Jan 2024 00:09:36 -0500 Received: by mail-qv1-xf2e.google.com with SMTP id 6a1803df08f44-6868f31a555so3458096d6.1 for ; Sun, 21 Jan 2024 21:09:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705900163; x=1706504963; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=bZ0z7IqXkKgW4KKhbIIw+DZXPurgPTeOP/coSAhpDSo=; b=Zwlpect3Aoayj6rRxkfwswXj/Hbel9lQjh4ShZXf+Qkpe5WJbiJqTnApzZttoEnetR 6i5kE3h4Dmh0I2fg2GwCRe1X4jHUN+P0pgZoY2bDxwhNZMFvuvFEjzoMwhT7cJnKtPvy pz+ZSMKyuZDRqHsF7GumFcp9yPkmzX96uD/5tvvMrR5PPyCYYj5tn+9kbgD2algrNg2C fRDdfbOBzLJO13WzYgR22HPO2Zqv8SbZWdNkyYvHGvxrDopwO/A+QxF/QaYTpKbrNqGB pDo7VGVgASeZf2yqWmt6N/SCHd0aBG6J8nXQxW8yRANmID0Bp7hSJFrFMVHgewTtL1Ty 1ULQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705900163; x=1706504963; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bZ0z7IqXkKgW4KKhbIIw+DZXPurgPTeOP/coSAhpDSo=; b=JFZqEuyWJqsZ/NIdft/zlOwibsFTvNcVEu4950H3xxKhmFWNzFVOVXiH3T7I1I+Fm9 8xFp7EggbRoIfaWEdxspW6M7X2O0bYCyjn1ZDx1Uj1YwnJut3zl24VfzWwZzNQNXiCuX YKr+5ke3/USjUI8LIycHH4nRr7pjPulSHKdO04AydsifdrWn3YF0IeYLLHZeA9N48gQq m9at1JQnQ8c4BZMY1bmpCN7KtAIDUPH2d7u+C3pX5nmzf5tRYRSNQbh/sJk9w7yEOQ5P AFHYxM1gydDU/+zfC9lrkn3UDa+X90SRJxhtuo/3iY5rN1uLSx4ZlKhIBbKZxZjT8WN1 /36A== X-Gm-Message-State: AOJu0YxNCSz/FWSg+LqmsS6OeHZGjIhHXomzXkJoGjNbgjygvkwqt2mA g/+er+4kDt/+DwAv9/s8J0SUoEHGzXUJQ2OU+ILWm2rurEzo1sdk2X8sWw+cxRw= X-Google-Smtp-Source: AGHT+IHevsSBulQpjHdgGTMvWe5gsLarq6R4v3WUerAJWe+/6LMFRXucKMReeZdOy3JXhNYHXIVsJQ== X-Received: by 2002:ad4:5c81:0:b0:686:9454:88dc with SMTP id o1-20020ad45c81000000b00686945488dcmr638818qvh.13.1705900163508; Sun, 21 Jan 2024 21:09:23 -0800 (PST) Received: from hurd (dsl-10-128-232.b2b2c.ca. [72.10.128.232]) by smtp.gmail.com with ESMTPSA id dw7-20020a0562140a0700b0068384d86347sm2102612qvb.96.2024.01.21.21.09.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 21:09:23 -0800 (PST) Date: Mon, 22 Jan 2024 00:09:22 -0500 Message-Id: <87cytu3qf1.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #48849 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control 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 (-) tags 48849 - moreinfo quit From unknown Tue Jun 17 01:44:00 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: Maxime Devos Subject: bug#48849: closed (Re: bug#48849: [PATCH core-updates]: Add #:sh argument to wrap-qt-program) Message-ID: References: <878r4i3q9n.fsf@gmail.com> <678f5b29c1b5e2100bfde5b5121c57a9d2d2f3d8.camel@telenet.be> X-Gnu-PR-Message: they-closed 48849 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 48849@debbugs.gnu.org Date: Mon, 22 Jan 2024 05:13:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1705900382-21600-1" This is a multi-part message in MIME format... ------------=_1705900382-21600-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #48849: [PATCH core-updates]: Add #:sh argument to wrap-qt-program 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 48849@debbugs.gnu.org. --=20 48849: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D48849 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1705900382-21600-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 48849-done) by debbugs.gnu.org; 22 Jan 2024 05:12:52 +0000 Received: from localhost ([127.0.0.1]:39685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRmc7-0005c1-Mp for submit@debbugs.gnu.org; Mon, 22 Jan 2024 00:12:52 -0500 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:51262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRmc4-0005bi-9v for 48849-done@debbugs.gnu.org; Mon, 22 Jan 2024 00:12:50 -0500 Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-783137d8049so260817285a.2 for <48849-done@debbugs.gnu.org>; Sun, 21 Jan 2024 21:12:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705900358; x=1706505158; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=yfevB+Qome3k+aLDk8/1ryfq3ZUA+1uLaoJqkf8PLew=; b=ezjUOumz6uUWHFG3EVJz4n9rHGnuvZfUHEi7CsksNzwV+DWbcGLDR5UYDEC9bqdLcf 58FQNxVwG9T9iqmv/mmWviWrx+AjKS4ExMKrBTiafhEjLaX8WpmAcVLGTeGhdkIdfdiX IACJAzydgldxZJiD0zIeCnx3ePo9GOQ9GnE5qXuBxIS9CSAh1JDcmgU2eb2AMwNJkGxV PO80rBwzD/fk3fJDRNPffmm13k6v+7I2L//VTckTGql2eVo1q472hg+7AMleEbKKM20I V5TABodJwa5v7yt65pP6KADHP6GNpkxS/6cT0gFVrQfAj7Aj+vG+LJJARWc2ZwkH1/Nd f/gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705900358; x=1706505158; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yfevB+Qome3k+aLDk8/1ryfq3ZUA+1uLaoJqkf8PLew=; b=Ag99xCkZuI0ltLpfbbFSAO9tjkjjGhoiMzb1apGiTkeB71e5YGfN5mcgSmN+yBnsBb hPUC/Qkzrxm0xhc+4ABxBCIi6xoYOqfXc2NnBTNAToUPeW6XlcjJqUtEy80grrXcyQNl 8VB7E2BoXX6oGrVhj3belNno90D6BXYLMTo0NKldOIW+Elu3aqI50fcGru9/A0Jpnspu /ys3pRw1tvRRIb9mTsDkY2KvrG6eJX0Vqdaj2IsZvfhlfSGkxCy963YrwsSNHYK72MFG NB9quRPNSrseTWGumE6MT9fMnXXdSh3ccuXr3fzYfiM6dgrD2FDA1Up5y32++Zu8E6Sx 3RNw== X-Gm-Message-State: AOJu0Yw9e+T+OyM+lOc2kXXS37QvEuXQE3FJ81fqHpnFwHQID8fOnZas 15G6r0pbTv5NuIqeuFR/VyaSZv9k7KzDpdcuwVFBKDcuwdcWN5O9k5IKv7bwzyY= X-Google-Smtp-Source: AGHT+IG79cY0oTlo7U3u4qhCsUobRQM0u8M1fip0LdypvFNnx13VwbLkW7LzA5cEfsGHteHb9qrKpg== X-Received: by 2002:a05:620a:42:b0:783:7a57:265d with SMTP id t2-20020a05620a004200b007837a57265dmr4793366qkt.133.1705900358379; Sun, 21 Jan 2024 21:12:38 -0800 (PST) Received: from hurd (dsl-10-128-232.b2b2c.ca. [72.10.128.232]) by smtp.gmail.com with ESMTPSA id c10-20020ae9e20a000000b007839ce3f4ebsm764585qkc.91.2024.01.21.21.12.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 21:12:37 -0800 (PST) From: Maxim Cournoyer To: Maxime Devos Subject: Re: bug#48849: [PATCH core-updates]: Add #:sh argument to wrap-qt-program In-Reply-To: <678f5b29c1b5e2100bfde5b5121c57a9d2d2f3d8.camel@telenet.be> (Maxime Devos's message of "Sat, 05 Jun 2021 13:49:23 +0200") References: <678f5b29c1b5e2100bfde5b5121c57a9d2d2f3d8.camel@telenet.be> Date: Mon, 22 Jan 2024 00:12:36 -0500 Message-ID: <878r4i3q9n.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 48849-done Cc: 48849-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.0 (-) Hi again, Maxime Devos writes: > Hi guix, > > This patch series adds a #:sh keyword argument to wrap-qt-program > and adjusts callers to set this keyword argument appropriately. > > Setting this argument appropriately is required for cross-compilation. > Otherwise, a bash for SYSTEM (as in --system=..) is used instead > of a bash for TARGET (as in --target=...). > > I didn't test building some qt programs with this patch series yet, > as I'm currently waiting on the substitute servers to catch up > with recent changed to core-updates (to avoid building a tower > of rusts). I'll do that later. > > Greetings, > Maxime > > From 27d42f25f54b16f382e18b9ef0fb202fb00da90d Mon Sep 17 00:00:00 2001 > From: Maxime Devos > Date: Sat, 5 Jun 2021 11:02:16 +0200 > Subject: [PATCH 1/8] qt-utils: Allow overriding the shell interpreter in > 'wrap-qt-program'. > > * guix/build/qt-utils.scm (wrap-qt-program): Introduce a #:sh keyword > argument and pass it to 'wrap-program'. I see this patch was already merged by Mathieu in 77b98bf1874aac8ed447e9f0b0ee0865a1d652ba; thus, I'm closing this ticket. Thank you! -- Maxim ------------=_1705900382-21600-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 5 Jun 2021 14:03:10 +0000 Received: from localhost ([127.0.0.1]:49850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpWtJ-00056i-LL for submit@debbugs.gnu.org; Sat, 05 Jun 2021 10:03:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:39590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpWtF-00056X-3M for submit@debbugs.gnu.org; Sat, 05 Jun 2021 10:03:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpWtE-00052I-JR for guix-patches@gnu.org; Sat, 05 Jun 2021 10:03:04 -0400 Received: from albert.telenet-ops.be ([2a02:1800:110:4::f00:1a]:45554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lpWtB-0004n3-9T for guix-patches@gnu.org; Sat, 05 Jun 2021 10:03:04 -0400 Received: from butterfly ([188.188.221.10]) by albert.telenet-ops.be with bizsmtp id DS2r2500A0E3zys06S2w6U; Sat, 05 Jun 2021 16:02:56 +0200 Message-ID: <678f5b29c1b5e2100bfde5b5121c57a9d2d2f3d8.camel@telenet.be> Subject: [PATCH core-updates]: Add #:sh argument to wrap-qt-program From: Maxime Devos To: guix-patches@gnu.org Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-/0tSPMalm8aJtckGHw5A" Date: Sat, 05 Jun 2021 13:49:23 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.34.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1622901776; bh=L5RylUGQEcdIrtOFrl+yuvTjDtJuEISbKdVONo3BNwM=; h=Subject:From:To:Date; b=UMcECXEs9W07a25T4VWVC4jvp4G9ne2d1LQGhuB7HO2dO7iPXJ8rD9phw5JJ/5+AR XU/hwptur9VT+NYH2he+C5U5obyyUvyAg9c0O19MTRBJUR2o4WLOPLLY4aor1DAMSb ph4zuEm0cOb0xu8aGDqsC5NTtlzkjSh3x6h3P32Hatbk+yipx1H3OKpbPlmahwnbIn UJ1utt8nCgxJKFjABL5NenLmQWHMF0bHLMmPAENbi9mkuASJPhTa4NBEoeFeMeDgni dAB7Yche6Wa7LlHG4isXvdAAtUqe6e1i9VuMIF4QLqAgtbtpdOhYNBwUsw1q9AFH7C PMHyiE60ZagqA== Received-SPF: pass client-ip=2a02:1800:110:4::f00:1a; envelope-from=maximedevos@telenet.be; helo=albert.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.7 (/) 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: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-/0tSPMalm8aJtckGHw5A Content-Type: multipart/mixed; boundary="=-zDA+yx9zSj1vUw915buX" --=-zDA+yx9zSj1vUw915buX Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi guix, This patch series adds a #:sh keyword argument to wrap-qt-program and adjusts callers to set this keyword argument appropriately. Setting this argument appropriately is required for cross-compilation. Otherwise, a bash for SYSTEM (as in --system=3D..) is used instead of a bash for TARGET (as in --target=3D...). I didn't test building some qt programs with this patch series yet, as I'm currently waiting on the substitute servers to catch up with recent changed to core-updates (to avoid building a tower of rusts). I'll do that later. Greetings, Maxime --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename*0=0001-qt-utils-Allow-overriding-the-shell-interpreter-in-w.pat; filename*1=ch Content-Type: text/x-patch; name="0001-qt-utils-Allow-overriding-the-shell-interpreter-in-w.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAyN2Q0MmYyNWY1NGIxNmYzODJlMThiOWVmMGZiMjAyZmIwMGRhOTBkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowMjoxNiArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMS84 XSBxdC11dGlsczogQWxsb3cgb3ZlcnJpZGluZyB0aGUgc2hlbGwgaW50ZXJwcmV0ZXIgaW4KICd3 cmFwLXF0LXByb2dyYW0nLgoKKiBndWl4L2J1aWxkL3F0LXV0aWxzLnNjbSAod3JhcC1xdC1wcm9n cmFtKTogSW50cm9kdWNlIGEgIzpzaCBrZXl3b3JkCiAgYXJndW1lbnQgYW5kIHBhc3MgaXQgdG8g J3dyYXAtcHJvZ3JhbScuCi0tLQogZ3VpeC9idWlsZC9xdC11dGlscy5zY20gfCA0ICsrKy0KIDEg ZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQg YS9ndWl4L2J1aWxkL3F0LXV0aWxzLnNjbSBiL2d1aXgvYnVpbGQvcXQtdXRpbHMuc2NtCmluZGV4 IGQyNDg2ZWU4NmMuLjYwZTY5OWZlMzkgMTAwNjQ0Ci0tLSBhL2d1aXgvYnVpbGQvcXQtdXRpbHMu c2NtCisrKyBiL2d1aXgvYnVpbGQvcXQtdXRpbHMuc2NtCkBAIC0xLDUgKzEsNiBAQAogOzs7IEdO VSBHdWl4IC0tLSBGdW5jdGlvbmFsIHBhY2thZ2UgbWFuYWdlbWVudCBmb3IgR05VCiA7OzsgQ29w eXJpZ2h0IMKpIDIwMTYgRGF2aWQgQ3JhdmVuIDxkYXZpZEBjcmF2ZW4uY2g+Cis7OzsgQ29weXJp Z2h0IMKpIDIwMjEgTWF4aW1lIERldm9zIDxtYXhpbWVkZXZvc0B0ZWxlbmV0LmJlPgogOzs7CiA7 OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7OzsKQEAgLTIwLDcgKzIxLDcgQEAK ICAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkIHV0aWxzKQogICAjOmV4cG9ydCAod3JhcC1xdC1w cm9ncmFtKSkKIAotKGRlZmluZSAod3JhcC1xdC1wcm9ncmFtIG91dCBwcm9ncmFtKQorKGRlZmlu ZSogKHdyYXAtcXQtcHJvZ3JhbSBvdXQgcHJvZ3JhbSAjOmtleSAoc2ggKHdoaWNoICJiYXNoIikp KQogICAoZGVmaW5lIChzdWZmaXggZW52LXZhciBwYXRoKQogICAgIChsZXQgKChlbnYtdmFsIChn ZXRlbnYgZW52LXZhcikpKQogICAgICAgKGlmIGVudi12YWwgKHN0cmluZy1hcHBlbmQgZW52LXZh bCAiOiIgcGF0aCkgcGF0aCkpKQpAQCAtMzQsNiArMzUsNyBAQAogICAgICAgICAoeGRnLWNvbmZp Zy1wYXRoIChzdWZmaXggIlhER19DT05GSUdfRElSUyIKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChzdHJpbmctYXBwZW5kIG91dCAiL2V0Yy94ZGciKSkpKQogICAgICh3cmFwLXBy b2dyYW0gKHN0cmluZy1hcHBlbmQgb3V0ICIvYmluLyIgcHJvZ3JhbSkKKyAgICAgICM6c2ggc2gK ICAgICAgIGAoIlFNTDJfSU1QT1JUX1BBVEgiID0gKCxxbWwtcGF0aCkpCiAgICAgICBgKCJRVF9Q TFVHSU5fUEFUSCIgPSAoLHBsdWdpbi1wYXRoKSkKICAgICAgIGAoIlhER19EQVRBX0RJUlMiID0g KCx4ZGctZGF0YS1wYXRoKSkKLS0gCjIuMzEuMQoK --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0002-gnu-qbittorrent-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0002-gnu-qbittorrent-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA4ZWQ1M2E2ODQwYjEwOTljOGNjYzUwYTE3NzkxODdlMTg2ZGZiN2FmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMCArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMi84 XSBnbnU6IHFiaXR0b3JyZW50OiBTZXQgIzpzaCBhcmd1bWVudCBvZiAnd3JhcC1xdC1wcm9ncmFt Jy4KTUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVU Ri04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKCiogZ251L3BhY2thZ2VzL2JpdHRv cnJlbnQuc2NtCiAgKHFiaXR0b3JyZW50KVthcmd1bWVudHNdPCM6cGhhc2VzPnt3cmFwLXF0fToK ICBTZXQgIzpzaCBhcmd1bWVudCBvZiDigJh3cmFwLXF0LXByb2dyYW3igJkuCi0tLQogZ251L3Bh Y2thZ2VzL2JpdHRvcnJlbnQuc2NtIHwgNSArKystLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0 aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvYml0dG9y cmVudC5zY20gYi9nbnUvcGFja2FnZXMvYml0dG9ycmVudC5zY20KaW5kZXggMjliMGQ2MmFkMi4u MzM5MjQ4ZGE5NCAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2JpdHRvcnJlbnQuc2NtCisrKyBi L2dudS9wYWNrYWdlcy9iaXR0b3JyZW50LnNjbQpAQCAtNDQ4LDggKzQ0OCw5IEBAIGRlc2t0b3Bz LiIpCiAgICAgICAgIzpwaGFzZXMKICAgICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhh c2VzCiAgICAgICAgICAoYWRkLWFmdGVyICdpbnN0YWxsICd3cmFwLXF0Ci0gICAgICAgICAgIChs YW1iZGEqICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKLSAgICAgICAgICAgICAo d3JhcC1xdC1wcm9ncmFtIChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikgInFiaXR0b3JyZW50IikK KyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIt a2V5cykKKyAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFtIChhc3NvYy1yZWYgb3V0cHV0cyAi b3V0IikgInFiaXR0b3JyZW50IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIzpzaCAo c2VhcmNoLWlucHV0LWZpbGUgaW5wdXRzICJiaW4vYmFzaCIpKQogICAgICAgICAgICAgICN0KSkp KSkKICAgICAobmF0aXZlLWlucHV0cwogICAgICBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcp Ci0tIAoyLjMxLjEKCg== --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename*0=0003-gnu-electron-cash-Set-sh-argument-of-wrap-qt-program.pat; filename*1=ch Content-Type: text/x-patch; name="0003-gnu-electron-cash-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBiMDJiMGVhMjAyZDVlMzk3MGU1ZGYyYTQ2MWI4Mzk5MGM5ZWRmYzgxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMCArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMy84 XSBnbnU6IGVsZWN0cm9uLWNhc2g6IFNldCAjOnNoIGFyZ3VtZW50IG9mCiAnd3JhcC1xdC1wcm9n cmFtJy4KTUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0 PVVURi04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKCiogZ251L3BhY2thZ2VzL2Zp bmFuY2Uuc2NtCiAgKGVsZWN0cm9uLWNhc2gpW2FyZ3VtZW50c108IzpwaGFzZXM+e3dyYXAtcXR9 OgogIFNldCAjOnNoIGFyZ3VtZW50IG9mIOKAmHdyYXAtcXQtcHJvZ3JhbeKAmS4KLS0tCiBnbnUv cGFja2FnZXMvZmluYW5jZS5zY20gfCA1ICsrKy0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRp b25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9maW5hbmNl LnNjbSBiL2dudS9wYWNrYWdlcy9maW5hbmNlLnNjbQppbmRleCBmYmQ3ZGY3ODNjLi4wMjlkZjRm OTM0IDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvZmluYW5jZS5zY20KKysrIGIvZ251L3BhY2th Z2VzL2ZpbmFuY2Uuc2NtCkBAIC02MTgsOCArNjE4LDkgQEAgb3RoZXIgbWFjaGluZXMvc2VydmVy cy4gIEVsZWN0cnVtIGRvZXMgbm90IGRvd25sb2FkIHRoZSBCaXRjb2luIGJsb2NrY2hhaW4uIikK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoYXNzb2MtcmVmIGlucHV0cyAibGlic2Vj cDI1NmsxIikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL2xpYi9saWJzZWNwMjU2 azEuc28uMCciKSkpKSkKICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ3dyYXAtcXQKLSAg ICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAg ICAgICAgICAgICh3cmFwLXF0LXByb2dyYW0gKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSAiZWxl Y3Ryb24tY2FzaCIpKSkpKSkKKyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRw dXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFtIChh c3NvYy1yZWYgb3V0cHV0cyAib3V0IikgImVsZWN0cm9uLWNhc2giCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAjOnNoIChzZWFyY2gtaW5wdXQtZmlsZSBpbnB1dHMgImJpbi9iYXNoIikp KSkpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL2VsZWN0cm9uY2FzaC5vcmcvIikKICAgICAo c3lub3BzaXMgIkJpdGNvaW4gQ2FzaCB3YWxsZXQiKQogICAgIChkZXNjcmlwdGlvbgotLSAKMi4z MS4xCgo= --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0004-gnu-qgis-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0004-gnu-qgis-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBlYWM0YTlmYmQwOWJkZThkNTJiZDM4ZjAwYTIzYWExMWNkMjRmZmEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMCArMDIwMApTdWJqZWN0OiBbUEFUQ0ggNC84 XSBnbnU6IHFnaXM6IFNldCAjOnNoIGFyZ3VtZW50IG9mICd3cmFwLXF0LXByb2dyYW0nLgpNSU1F LVZlcnNpb246IDEuMApDb250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgKQ29u dGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJpdAoKKiBnbnUvcGFja2FnZXMvZ2VvLnNjbQogIChx Z2lzKVthcmd1bWVudHNdPCM6cGhhc2VzPnt3cmFwLXF0fToKICBTZXQgIzpzaCBhcmd1bWVudCBv ZiDigJh3cmFwLXF0LXByb2dyYW3igJkuCi0tLQogZ251L3BhY2thZ2VzL2dlby5zY20gfCA1ICsr Ky0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9nZW8uc2NtIGIvZ251L3BhY2thZ2VzL2dlby5zY20KaW5k ZXggYzRiZGI2YWNhMC4uNjViNzYzZWNiZSAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2dlby5z Y20KKysrIGIvZ251L3BhY2thZ2VzL2dlby5zY20KQEAgLTIyMjQsOCArMjIyNCw5IEBAIGdyb3dp bmcgc2V0IG9mIGdlb3NjaWVudGlmaWMgbWV0aG9kcy4iKQogICAgICAgICAgKGFkZC1hZnRlciAn aW5zdGFsbCAnd3JhcC1weXRob24KICAgICAgICAgICAgKGFzc29jLXJlZiBweXRob246JXN0YW5k YXJkLXBoYXNlcyAnd3JhcCkpCiAgICAgICAgICAoYWRkLWFmdGVyICd3cmFwLXB5dGhvbiAnd3Jh cC1xdAotICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtl eXMpCi0gICAgICAgICAgICAgKHdyYXAtcXQtcHJvZ3JhbSAoYXNzb2MtcmVmIG91dHB1dHMgIm91 dCIpICJxZ2lzIikKKyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6 YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFtIChhc3NvYy1y ZWYgb3V0cHV0cyAib3V0IikgInFnaXMiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAj OnNoIChzZWFyY2gtaW5wdXQtZmlsZSAiYmluL2Jhc2giKSkKICAgICAgICAgICAgICAjdCkpCiAg ICAgICAgICAoYWRkLWFmdGVyICd3cmFwLXF0ICd3cmFwLWdpcwogICAgICAgICAgICAobGFtYmRh KiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotLSAKMi4zMS4xCgo= --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0005-gnu-keepassxc-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0005-gnu-keepassxc-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBkMzRkN2IwY2Q0NjRiNmFiYmU3ZmZhMzBmOGM2NzRhNjFhMTRmODg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMCArMDIwMApTdWJqZWN0OiBbUEFUQ0ggNS84 XSBnbnU6IGtlZXBhc3N4YzogU2V0ICM6c2ggYXJndW1lbnQgb2YgJ3dyYXAtcXQtcHJvZ3JhbScu Ck1JTUUtVmVyc2lvbjogMS4wCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYt OApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA4Yml0CgoqIGdudS9wYWNrYWdlcy9wYXNzd29y ZC11dGlscy5zY20KICAoa2VlcGFzc3hjKVthcmd1bWVudHNdPCM6cGhhc2VzPnt3cmFwLXF0fToK ICBTZXQgIzpzaCBhcmd1bWVudCBvZiDigJh3cmFwLXF0LXByb2dyYW3igJkuCi0tLQogZ251L3Bh Y2thZ2VzL3Bhc3N3b3JkLXV0aWxzLnNjbSB8IDUgKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3Bh c3N3b3JkLXV0aWxzLnNjbSBiL2dudS9wYWNrYWdlcy9wYXNzd29yZC11dGlscy5zY20KaW5kZXgg MzEwMjUzYzJhNC4uMmE1YTFlNWM5ZiAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3Bhc3N3b3Jk LXV0aWxzLnNjbQorKysgYi9nbnUvcGFja2FnZXMvcGFzc3dvcmQtdXRpbHMuc2NtCkBAIC0xNDYs OCArMTQ2LDkgQEAgaHVtYW4uIikKICAgICAgICAjOnBoYXNlcwogICAgICAgIChtb2RpZnktcGhh c2VzICVzdGFuZGFyZC1waGFzZXMKICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ3dyYXAt cXQKLSAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlz KQotICAgICAgICAgICAgICh3cmFwLXF0LXByb2dyYW0gKGFzc29jLXJlZiBvdXRwdXRzICJvdXQi KSAia2VlcGFzc3hjIikKKyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRz ICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFtIChhc3Nv Yy1yZWYgb3V0cHV0cyAib3V0IikgImtlZXBhc3N4YyIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICM6c2ggKHNlYXJjaC1pbnB1dC1maWxlIGlucHV0cyAiYmluL2Jhc2giKSkKICAgICAg ICAgICAgICAjdCkpKSkpCiAgICAgKG5hdGl2ZS1pbnB1dHMKICAgICAgYCgoImFzY2lpZG9jdG9y IiAscnVieS1hc2NpaWRvY3RvcikKLS0gCjIuMzEuMQoK --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0006-gnu-qtpass-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0006-gnu-qtpass-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAyNTY5MTAwMTJiOTZlMGM3NDg5YWM2NWU3NzQ4ZjQ4MDY5MDZjMzYwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggNi84 XSBnbnU6IHF0cGFzczogU2V0ICM6c2ggYXJndW1lbnQgb2YgJ3dyYXAtcXQtcHJvZ3JhbScuCk1J TUUtVmVyc2lvbjogMS4wCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOApD b250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA4Yml0CgoqIGdudS9wYWNrYWdlcy9wYXNzd29yZC11 dGlscy5zY20KICAocXRwYXNzKVthcmd1bWVudHNdPCM6cGhhc2VzPnt3cmFwLXF0fToKICBTZXQg IzpzaCBhcmd1bWVudCBvZiDigJh3cmFwLXF0LXByb2dyYW3igJkuCi0tLQogZ251L3BhY2thZ2Vz L3Bhc3N3b3JkLXV0aWxzLnNjbSB8IDUgKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlv bnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3Bhc3N3b3Jk LXV0aWxzLnNjbSBiL2dudS9wYWNrYWdlcy9wYXNzd29yZC11dGlscy5zY20KaW5kZXggMmE1YTFl NWM5Zi4uMTliMWI1NjIzYyAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3Bhc3N3b3JkLXV0aWxz LnNjbQorKysgYi9nbnUvcGFja2FnZXMvcGFzc3dvcmQtdXRpbHMuc2NtCkBAIC02ODMsOCArNjgz LDkgQEAga2V5IFVSSXMgdXNpbmcgdGhlIHN0YW5kYXJkIG90cGF1dGg6Ly8gc2NoZW1lLiIpCiAg ICAgICAgICAgICAgICAoaW5zdGFsbC1maWxlICJxdHBhc3MuMSIgbWFuKQogICAgICAgICAgICAg ICAgI3QpKSkKICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ3dyYXAtcXQKLSAgICAgICAg ICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAg ICAgICh3cmFwLXF0LXByb2dyYW0gKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSAicXRwYXNzIikK KyAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIt a2V5cykKKyAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFtIChhc3NvYy1yZWYgb3V0cHV0cyAi b3V0IikgInF0cGFzcyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICM6c2ggKHNlYXJj aC1pbnB1dC1maWxlIGlucHV0cyAiYmluL2Jhc2giKSkKICAgICAgICAgICAgICAjdCkpCiAgICAg ICAgICAoYWRkLWJlZm9yZSAnY2hlY2sgJ2NoZWNrLXNldHVwCiAgICAgICAgICAgIDs7IE1ha2Ug UXQgcmVuZGVyICJvZmZzY3JlZW4iLCByZXF1aXJlZCBmb3IgdGVzdHMuCi0tIAoyLjMxLjEKCg== --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0007-gnu-openshot-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0007-gnu-openshot-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAyMzQ4NmQxMjM0NDJkNjNhYWM3YjU0ZWMwYzRkMGI0Nzg2MjM3NzYyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggNy84 XSBnbnU6IG9wZW5zaG90OiBTZXQgIzpzaCBhcmd1bWVudCBvZiAnd3JhcC1xdC1wcm9ncmFtJy4K TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04 CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKCiogZ251L3BhY2thZ2VzL3ZpZGVvLnNj bQogIChvcGVuc2hvdClbYXJndW1lbnRzXTwjOnBoYXNlcz57d3JhcC1wcm9ncmFtfToKICBTZXQg IzpzaCBhcmd1bWVudCBvZiDigJh3cmFwLXF0LXByb2dyYW3igJkuCi0tLQogZ251L3BhY2thZ2Vz L3ZpZGVvLnNjbSB8IDUgKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3ZpZGVvLnNjbSBiL2dudS9w YWNrYWdlcy92aWRlby5zY20KaW5kZXggNGIxZDI1NDBlNC4uMjUwY2E5NDRhYSAxMDA2NDQKLS0t IGEvZ251L3BhY2thZ2VzL3ZpZGVvLnNjbQorKysgYi9nbnUvcGFja2FnZXMvdmlkZW8uc2NtCkBA IC00NTYwLDkgKzQ1NjAsMTAgQEAgQVBJLiAgSXQgaW5jbHVkZXMgYmluZGluZ3MgZm9yIFB5dGhv biwgUnVieSwgYW5kIG90aGVyIGxhbmd1YWdlcy4iKQogICAgICAgICAgICAgICAgICAgICAgIChz ZXRlbnYgIkhPTUUiICIvdG1wIikKICAgICAgICAgICAgICAgICAgICAgICAjdCkpCiAgICAgICAg ICAgICAgICAgICAoYWRkLWFmdGVyICdpbnN0YWxsICd3cmFwLXByb2dyYW0KLSAgICAgICAgICAg ICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAg ICAgICAgICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzIG91dHB1dHMgIzphbGxvdy1v dGhlci1rZXlzKQogICAgICAgICAgICAgICAgICAgICAgIChsZXQgKChvdXQgKGFzc29jLXJlZiBv dXRwdXRzICJvdXQiKSkpCi0gICAgICAgICAgICAgICAgICAgICAgICAod3JhcC1xdC1wcm9ncmFt IG91dCAib3BlbnNob3QtcXQiKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICh3cmFwLXF0LXBy b2dyYW0gb3V0ICJvcGVuc2hvdC1xdCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIzpzaCAoc2VhcmNoLWlucHV0LWZpbGUgImJpbi9iYXNoIikpKQogICAgICAgICAg ICAgICAgICAgICAgICN0KSkpKSkKICAgICAoaG9tZS1wYWdlICJodHRwczovL3d3dy5vcGVuc2hv dC5vcmcvIikKICAgICAoc3lub3BzaXMgIlZpZGVvIGVkaXRvciIpCi0tIAoyLjMxLjEKCg== --=-zDA+yx9zSj1vUw915buX Content-Disposition: attachment; filename="0008-gnu-kristall-Set-sh-argument-of-wrap-qt-program.patch" Content-Type: text/x-patch; name="0008-gnu-kristall-Set-sh-argument-of-wrap-qt-program.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA5MjgwM2NiZWY1YWZmYTNkYmJmMDQ5MjYyZTFmY2YyOTBkOGQ4NjIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFNhdCwgNSBKdW4gMjAyMSAxMTowNDoyMSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggOC84 XSBnbnU6IGtyaXN0YWxsOiBTZXQgIzpzaCBhcmd1bWVudCBvZiAnd3JhcC1xdC1wcm9ncmFtJy4K TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04 CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKCiogZ251L3BhY2thZ2VzL3dlYi1icm93 c2Vycy5zY20KICAoa3Jpc3RhbGwpW2FyZ3VtZW50c108IzpwaGFzZXM+e3dyYXAtcHJvZ3JhbX06 CiAgU2V0ICM6c2ggYXJndW1lbnQgb2Yg4oCYd3JhcC1xdC1wcm9ncmFt4oCZLgotLS0KIGdudS9w YWNrYWdlcy93ZWItYnJvd3NlcnMuc2NtIHwgNyArKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgNCBp bnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy93 ZWItYnJvd3NlcnMuc2NtIGIvZ251L3BhY2thZ2VzL3dlYi1icm93c2Vycy5zY20KaW5kZXggYWYx NzhmOTA5Mi4uMzYzM2ZmMzRhOCAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3dlYi1icm93c2Vy cy5zY20KKysrIGIvZ251L3BhY2thZ2VzL3dlYi1icm93c2Vycy5zY20KQEAgLTQ0Myw5ICs0NDMs MTAgQEAgYWNjZXNzLiIpCiAgICAgICAgICAgICAgICAgICAgIi9zaGFyZS9mb250cy90cnVldHlw ZS9Ob3RvQ29sb3JFbW9qaSIpKSkKICAgICAgICAgICAgICAgICN0KSkKICAgICAgICAgICAgKGFk ZC1hZnRlciAnaW5zdGFsbCAnd3JhcC1wcm9ncmFtCi0gICAgICAgICAgICAgKGxhbWJkYSogKCM6 a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAgICAgICAgKGxldCAoKG91 dCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpKSkKLSAgICAgICAgICAgICAgICAgKHdyYXAtcXQt cHJvZ3JhbSBvdXQgImtyaXN0YWxsIikpCisgICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlu cHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAgIChsZXQgKChv dXQgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSkKKyAgICAgICAgICAgICAgICAgICAgIChiYXNo IChzZWFyY2gtaW5wdXQtZmlsZSBpbnB1dHMgImJpbi9iYXNoIikpKQorICAgICAgICAgICAgICAg ICAod3JhcC1xdC1wcm9ncmFtIG91dCAia3Jpc3RhbGwiICM6c2ggYmFzaCkpCiAgICAgICAgICAg ICAgICAjdCkpKSkpCiAgICAgICAobmF0aXZlLWlucHV0cwogICAgICAgIGAoKCJicmVlemUtc3R5 bGVzaGVldCIKLS0gCjIuMzEuMQoK --=-zDA+yx9zSj1vUw915buX-- --=-/0tSPMalm8aJtckGHw5A Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYLtkuhccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7h9UAPwL/gNHHZiy/jvK9Jpa1FoORrkh Gsu8NdPnSRO963lwagEAxKk9Hoi1CIdR2B6M1oCWPTGjtUYSFseNzC0RrNnklwc= =nXH1 -----END PGP SIGNATURE----- --=-/0tSPMalm8aJtckGHw5A-- ------------=_1705900382-21600-1--