From patchwork Thu Oct 19 20:13:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 55060 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6E9D827BBE2; Thu, 19 Oct 2023 21:15:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 90CB727BBE9 for ; Thu, 19 Oct 2023 21:14:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtZPo-0007bG-Vl; Thu, 19 Oct 2023 16:14:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtZPf-0007Ui-UH for guix-patches@gnu.org; Thu, 19 Oct 2023 16:14:36 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtZPf-00066T-MN for guix-patches@gnu.org; Thu, 19 Oct 2023 16:14:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtZQ6-000697-6N for guix-patches@gnu.org; Thu, 19 Oct 2023 16:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66643] [PATCH] gnu: icedove/wayland: Use wrap-program. Resent-From: Aleksandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Oct 2023 20:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66643 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66643@debbugs.gnu.org Cc: ivan-p-sokolov@ya.ru X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169774645923527 (code B ref -1); Thu, 19 Oct 2023 20:15:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Oct 2023 20:14:19 +0000 Received: from localhost ([127.0.0.1]:37906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtZPO-00067O-Gz for submit@debbugs.gnu.org; Thu, 19 Oct 2023 16:14:19 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtZPK-000674-GO for submit@debbugs.gnu.org; Thu, 19 Oct 2023 16:14:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtZOn-0006jm-Rr for guix-patches@gnu.org; Thu, 19 Oct 2023 16:13:41 -0400 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtZOl-0005xY-TE for guix-patches@gnu.org; Thu, 19 Oct 2023 16:13:41 -0400 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-507c91582fdso56983e87.2 for ; Thu, 19 Oct 2023 13:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697746417; x=1698351217; darn=gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=9xJPD8YfM96d5X2gKD+IXWVfs7Buv4vF4Ad8bGkkbdw=; b=BAa796FO5cVM5K0rxBv1LfwmxSXE4WAvpiNCSomIMBuRk9Fnlw0fqrVP+neFWmScmC 01VEh8AbvPQsrF5zwth3vR5+5rflh2U3aNmJ5iA4B0Af/t2V2zDNSK+ff7QDVX5ROrVu JmPepgbu9cXTV8GmONgfc4ihIOf9tss6sETGVJOAnXuS2yUI5idFdvibmJh1u/E9hkbH TBqxOJJGvdJTf31dw2FaCH6f7RCBS9bQiwagqRJ0QplTxwqzKR8tS1MFdrS7/lyjlBcV KzYVspq1FpZCNpAJqOZz3MQnfwdq+cP1W0b0Ugv+ZKLhUk5qaQPRIjRdVbtWA5B1ERc3 DRCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697746417; x=1698351217; h=content-transfer-encoding:mime-version:user-agent:message-id:date :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9xJPD8YfM96d5X2gKD+IXWVfs7Buv4vF4Ad8bGkkbdw=; b=GoVGsol3E5IulNervn6WrQ2KsqpuK05qBZWag033Y93Zb3nIWL/6JTWy3bb8PMoXQm VfCJm7fryZEuAZ1sfI0Y02EG6LbQqUSnRDhJ7SckCHyHeg6Zb4OQc0I71+lKWHq1oWzp r2wPcMhDZ9zGhszQevpRtpAQxMEm5J1e7RuuVULE5j+uqawUgCtpHv8s4GNx4x3JOMyy Hoo/1JBVsQOrDe/g3nDD8CHiftv+q/iFnP+EkRe1PJIAeut8S39NjYJevVTNqyDHy/zC Gd37Zekpls25wkNvGAl7AFGuvToI8h4egCvbMXsa4jH7dasr5Gp+4Vx/tJebPPZOmmnQ GhzQ== X-Gm-Message-State: AOJu0YyZRjp/a3lDgypYxMbQ8x21prel2YX838IWEqPee8+dPVjetatc zcqBGCDesn7tWvL+3G8BAMxSDnBKstk= X-Google-Smtp-Source: AGHT+IEbgtdXTlmazuT6AUUzLZd19GNCmPcjYkG9ewzGjy6ct2g9j1PGwOB3ULrt8w1F8wEGAYb/Eg== X-Received: by 2002:ac2:4c0e:0:b0:507:aa44:28fa with SMTP id t14-20020ac24c0e000000b00507aa4428famr2392765lfq.26.1697746416886; Thu, 19 Oct 2023 13:13:36 -0700 (PDT) Received: from magi ([176.59.3.85]) by smtp.gmail.com with ESMTPSA id g2-20020ac25382000000b00503189d8b8csm24286lfh.198.2023.10.19.13.13.35 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Oct 2023 13:13:36 -0700 (PDT) From: Aleksandr Vityazev Date: Thu, 19 Oct 2023 23:13:33 +0300 Message-ID: <87bkcugyky.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::129; envelope-from=avityazew@gmail.com; helo=mail-lf1-x129.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, FREEMAIL_REPLY=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, When $@ is used in a bash script without escaping, it causes files with spaces in the name to fail to open. This patch fixes this for icedove-wayland. You can also see this kind of thing in qemu. https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/virtualization.scm?h=master#n417 I don't think you should use wrap-program there. WDYT? * gnu/packages/gnuzilla (icedove/wayland): Use wrap-program, since "$@" must be escaped. Thanks to ivan-p-sokolov@ya.ru for noticing the issue! --- gnu/packages/gnuzilla.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) base-commit: c065da01ff956d3c2bdfc45a33d910e509a211d9 prerequisite-patch-id: ec4a09723b91089c8eb5b5269ae81272bb4d81b4 prerequisite-patch-id: 9680399593e3dcdb5b10ee646023efd1215942d9 prerequisite-patch-id: 66497a0079d0077e7b5001707d8211c525ea7193 prerequisite-patch-id: 4f512542ae5806d47054e063e3dd1df66258c530 prerequisite-patch-id: 48abb1e84ca8d85b23794222f8fa5b4d2dfa4699 prerequisite-patch-id: a7fdd2f87131ad73865389152d4a826df24fcae7 prerequisite-patch-id: 1600413a45a50114906f4390653c3fbb7f536a4c prerequisite-patch-id: 51e95882782a53eda933e884fb5e80487ba52b9f prerequisite-patch-id: 177b2873f4e77585c464ac3d24bec78d58f128bd prerequisite-patch-id: 631a6785018f999fcbf7e22fb8e2aae9329ced55 prerequisite-patch-id: 1bd1b328f9e3c7119fed731ffd7e7d87ac33f0c2 prerequisite-patch-id: 79105270952c22f07255cb315da1db44f505b07b prerequisite-patch-id: 9c5af3baa3dac6233837fb6eb0b7467b969caff4 prerequisite-patch-id: 1156b461c8622b5071656309b05c026abab0f277 prerequisite-patch-id: 8a5e3746b5092496884d50ef4359148ac9349a83 prerequisite-patch-id: 579e44cb67db2d0d3c6232c7c306457a0b5a1a27 prerequisite-patch-id: f5dc3c2782749512e23becb166db7aafacd0be1f prerequisite-patch-id: 41717fac7367d7e596c093548408ab4bb7d11575 prerequisite-patch-id: 82761b9bede107314f9e75282e1851da281e1d53 prerequisite-patch-id: 4eaffd8b1788833c76590916476337e55ae234b0 prerequisite-patch-id: b501999eff4662ed2917dba3b934abd1a5e2252a prerequisite-patch-id: d2b947c72b82c6366d8164f1d732a4d25c6cb4fa prerequisite-patch-id: e1df80a774d3de676f01f262c68f506b0bc1ed92 prerequisite-patch-id: 1e2e9dfb8051b74814d7711e0247674a20329b1e prerequisite-patch-id: 3dc346b9df988744c17f4c810753d8afcb00a642 prerequisite-patch-id: e2c517c1181b6b34eda2f660985dd6db280d886f prerequisite-patch-id: cf256fc20be65ced1f1486423f4bbea768d686ae prerequisite-patch-id: 4c8c9425dae8a721016c4e0e7ed9c2fbe3556d9e prerequisite-patch-id: fb5c2f33b0ee041a46c6025d04271c3dbdb53d15 prerequisite-patch-id: c9d2a6a24a622955395ad090a0eb22598c16b23d prerequisite-patch-id: eeeefc7040171849bdaa2c9cd9f47731c80287ea prerequisite-patch-id: 56c4e80a78ecd8514c5d96c4492925ad57d4dd14 prerequisite-patch-id: ebee5547a41485f7ca26f93609f53ade60601f3f prerequisite-patch-id: 9c816f74d4166f1be0964ea0ef27d602495cd9bb prerequisite-patch-id: faae90b478e36eb4f2f17bde8782032b30e2e4db prerequisite-patch-id: bf26fe3d5e2082445217490ec635e6e85b65247f prerequisite-patch-id: 1722a64febdad4cfaff4a22c44d9661fcf0b6a5a prerequisite-patch-id: a50461c3f84736992a9fdcc23c36920a6555d567 prerequisite-patch-id: 6dec4cc56ec808267f99ac5f1be941fabb28e126 prerequisite-patch-id: 741be4e6b815c817ceedff55ea6da159e5050524 diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a367d7a00f..7a71fc8cb9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Baptiste Strazzul ;;; Copyright © 2022 SeerLite +;;; Copyright © 2023 Aleksandr Vityazev ;;; ;;; This file is part of GNU Guix. ;;; @@ -2076,14 +2077,11 @@ (define-public icedove/wayland #~(begin (use-modules (guix build utils)) (let* ((exe (string-append #$output "/bin/icedove"))) - (mkdir-p (dirname exe)) - (call-with-output-file exe - (lambda (port) - (format port "#!~a - MOZ_ENABLE_WAYLAND=1 exec ~a $@" - #$(file-append bash-minimal "/bin/bash") - #$(file-append icedove "/bin/icedove")))) - (chmod exe #o555) + (install-file #$(file-append icedove "/bin/icedove") + (string-append #$output "/bin")) + (wrap-program exe + #:sh #$(file-append bash-minimal "/bin/bash") + '("MOZ_ENABLE_WAYLAND" "" = ("1"))) ;; Provide the manual and .desktop file. (copy-recursively (string-append #$icedove "/share") (string-append #$output "/share"))