From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id wOnJJ6gi32IrCAAAbAwnHQ (envelope-from ) for ; Tue, 26 Jul 2022 01:09:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id YCLeJqgi32Jn4gAAG6o9tA (envelope-from ) for ; Tue, 26 Jul 2022 01:09:28 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6538B2F552 for ; Tue, 26 Jul 2022 01:09:27 +0200 (CEST) Received: from localhost ([::1]:33142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oG7CY-0005XF-JP for larch@yhetil.org; Mon, 25 Jul 2022 19:09:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oG7CA-0005WW-CW for guix-patches@gnu.org; Mon, 25 Jul 2022 19:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33679) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oG7CA-0005Hp-3B for guix-patches@gnu.org; Mon, 25 Jul 2022 19:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oG7C9-00009v-Qf for guix-patches@gnu.org; Mon, 25 Jul 2022 19:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56771] [PATCH 01/33] gnu: qtbase: Patch /bin/pwd in executable scripts. References: <20220725211704.4977-1-maxim.cournoyer@gmail.com> In-Reply-To: <20220725211704.4977-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 23:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56771 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56771@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 56771-submit@debbugs.gnu.org id=B56771.1658790505402 (code B ref 56771); Mon, 25 Jul 2022 23:09:01 +0000 Received: (at 56771) by debbugs.gnu.org; 25 Jul 2022 23:08:25 +0000 Received: from localhost ([127.0.0.1]:51614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7BY-00006F-1t for submit@debbugs.gnu.org; Mon, 25 Jul 2022 19:08:24 -0400 Received: from mail-qk1-f170.google.com ([209.85.222.170]:43577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7BS-00005F-MC for 56771@debbugs.gnu.org; Mon, 25 Jul 2022 19:08:22 -0400 Received: by mail-qk1-f170.google.com with SMTP id o21so9833930qkm.10 for <56771@debbugs.gnu.org>; Mon, 25 Jul 2022 16:08:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4/KKhZyqdXkGqR/r8W/4K9Xf18+/JKaKt9t/HEAH2fY=; b=JhK680Ah7V3Sod1GqsFF1JcJmqLfRZiVaCqSoSOWtevLlSa67DAH9NzpsM83gZPcRm HcSc/jzHLA6TsHB3pT+zdBubU55BvdvtByftrUFhzaMV2s1P0nv5Nxy6UzMDiMrAwlOw qgcKFeHmZYYnYdduvMEsifrUzsZulyK9TWvbeG0DWg/cD2yWUBAhaL2YRYiJZVkiICun JRkyZ45Y5eQ6gqdrmjTZjaAogmmDjA6RomyBOs54IjSAf53UyKiJHluy+9PRbpKk15T7 AivC0TjYt5CjKfE9mc/GZ8vU1Ux83OhJU3MjnyvjAKXFJlNu40PHEUkXbis8b0XF31YX m2ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4/KKhZyqdXkGqR/r8W/4K9Xf18+/JKaKt9t/HEAH2fY=; b=XDaPXEbcD8tC+osZw3T5NQ6dPX02w9hbFUp6++jPzNocOgXOCk7c6Xp8zhNQBUt0oB 1U7gruvAOPw6vLwuTvYudltIGcD6bhz29d5DtQy/UzF7VhqYyWJ6H4e1MZbOX1eAZ0JI dWVQEvBP2XJzqY2DyA/YSi37AMf/2jWEfx7nU/eZqmRFUDOkBXZ7XFXklU/j5sfY/RBR 5+JlpU3Zf+44dIlkgNsbIFQ5g4HChG3ZYdhV8l3AR8/ZnAPOv6XLQCL77DF/lNNqZ8lZ Ao+LOomCYaLWf26T0DlD8Jb6y3KcCH24jzON94QKy48NDUNa0PxcE5rF32idzgnzI/Zr 1BfQ== X-Gm-Message-State: AJIora+HBdDns+YeYFN3FuMY/ITnlrXDSOKS7nWcrGHvzSRSnnckFYCG Es4QXk2sNVA3zNQhX8ur0BxQCUn6974= X-Google-Smtp-Source: AGRyM1sAe2tomH/Z/S0oix+g6X/g3g5f7yz1j1C92g43D9jvvQJZ4Z/en/BcS4tA8lG5aqjAJEQHTQ== X-Received: by 2002:a05:620a:15e6:b0:6b5:e45f:f802 with SMTP id p6-20020a05620a15e600b006b5e45ff802mr10881521qkm.284.1658790492840; Mon, 25 Jul 2022 16:08:12 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-125-69.b2b2c.ca. [205.233.125.69]) by smtp.gmail.com with ESMTPSA id c15-20020ac8008f000000b0031ee9afafccsm8110580qtg.14.2022.07.25.16.08.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 16:08:12 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 25 Jul 2022 19:07:31 -0400 Message-Id: <20220725230803.10002-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1658790567; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=4/KKhZyqdXkGqR/r8W/4K9Xf18+/JKaKt9t/HEAH2fY=; b=QVrRIvsXLRvGa+mZ8SMJ1K2JTc0rSrPg9OMwVMMxpuqiQNRY/Oem4xhsiPiJpKS2BCMQip 3+DRFgezvNckpyDi8ijyx6FIwsK00KNYjYIGCJYa/YMwsv8ySQPHqta1kW/9tHzcpDA4Qs meQp+AXIN8qdosJO8xc1I6FoGGd3T7lawyJnvHtfF9aCUA8bdK83pVS2juGmcs+xBXgNZ7 FuRytUcO6IKGra1RHjgwwV317s4VFrpbSsHiJdORU9WHYaNInD4sKXf9ckMf75aKSlIjNN QZZi3JjjkB+kYaf9FWyi0V/t9TQY7nLTUIl9RQ2c3SI4c1n9U8Yfofu9jHmo/w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658790567; a=rsa-sha256; cv=none; b=aGRzew0h3n7J55u4po8C2uA5WXe7ic193CZbMYW7mZke4HMBQSQ3oAT2Xu5ceguEbEAEff dhf3+FxNPylyU1DIDvnhN9TXclxl6gh7UWPkxMAjrZZvobfHqGlSGKiV2Kz9ipR/uO7v2A 6SZIHcxZsbbcn8eZn3NaKnhQKDlc8vI49aYsiYm7wqI6mI/nKmoWFWN6jF2XE11uFa19Ej DtNR9tjD5OdjT8n3tDYBydH/AQKyP0zPBW569iv48T6WQcZ+k/WVFfwBnVl3XbCY5kr+6D RzKNNX9bhIUKNOJ1hVrwoww8ZV0JljJsaSX6j+rG9Bg66s/xHPDK5yXCAKZv8Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=JhK680Ah; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=JhK680Ah; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 6538B2F552 X-Spam-Score: 5.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: cJWJGhjOZqn0 * gnu/packages/qt.scm (qtbase)[phases]{patch-paths}: Patch /bin/pwd. [inputs]: Add coreutils-minimal. --- gnu/packages/qt.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ae68317492..fd26264892 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -622,6 +622,9 @@ (define-public qtbase (delete 'patch-xdg-open) (add-after 'patch-paths 'patch-more-paths (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "bin" "\\.in$") + (("/bin/pwd") + (search-input-file inputs "bin/pwd"))) (substitute* "src/gui/platform/unix/qgenericunixservices.cpp" (("\"xdg-open\"") (format #f "~s" (search-input-file inputs "bin/xdg-open")))) @@ -687,7 +690,7 @@ (define-public qtbase ninja wayland-protocols))) (inputs (modify-inputs (package-inputs qtbase-5) - (prepend bash-minimal libxcb md4c) + (prepend bash-minimal coreutils-minimal libxcb md4c) (replace "gtk+" gtk) ;use latest gtk (replace "postgresql" postgresql))) ;use latest postgresql (native-search-paths -- 2.36.1