From patchwork Fri May 24 23:39:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 64868 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 A415527BBE9; Sat, 25 May 2024 00:40:16 +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_INVALID, DKIM_SIGNED,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 D20E927BBE2 for ; Sat, 25 May 2024 00:40:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAeW0-00048E-6m; Fri, 24 May 2024 19:40:01 -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 1sAeVz-000485-2z for guix-patches@gnu.org; Fri, 24 May 2024 19:39:59 -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 1sAeVv-0001Mg-AK for guix-patches@gnu.org; Fri, 24 May 2024 19:39:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sAeW2-0007wu-6c for guix-patches@gnu.org; Fri, 24 May 2024 19:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71181] [PATCH] gnu: make-torbrowser: Fix fontconfig regex substitution. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 May 2024 23:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71181 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71181@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista , clement@lassieur.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171659397530540 (code B ref -1); Fri, 24 May 2024 23:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 May 2024 23:39:35 +0000 Received: from localhost ([127.0.0.1]:39789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAeVb-0007wW-Ce for submit@debbugs.gnu.org; Fri, 24 May 2024 19:39:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:39506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAeVX-0007wQ-S6 for submit@debbugs.gnu.org; Fri, 24 May 2024 19:39:33 -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 1sAeVN-00041W-W9 for guix-patches@gnu.org; Fri, 24 May 2024 19:39:22 -0400 Received: from mx1.riseup.net ([198.252.153.129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sAeVL-0001G4-Nn for guix-patches@gnu.org; Fri, 24 May 2024 19:39:21 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4VmM2D6m5pzDqGX; Fri, 24 May 2024 23:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1716593957; bh=7BCenEui3pYMM4yxk/KfGKCOaHguAhL2G8IbKuxHxeY=; h=From:To:Cc:Subject:Date:From; b=iKIInLD7fCFOIweWqDHnZ26J+v8wwuBdWMGfdbE2vlPCclpXhNX6gJDqRgVk9Sk4u ilpop6pr59y4/pYmTG7Kfw6JBUw33jbag2VhoPk3qZNr23O8WoJEEYrPhHtzZYGq4N LA3vV99pv9qBuSXyFTschXckC+5CsSlPm1FU7iJk= X-Riseup-User-ID: 8944A5F8FCAFBC84196127E2026AC81AA4DEBAC7CDA36F698CE7895BA1B0DE21 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4VmM2C5BKGzFx3Q; Fri, 24 May 2024 23:39:15 +0000 (UTC) From: =?utf-8?b?QW5kcsOp?= Batista Date: Fri, 24 May 2024 20:39:03 -0300 Message-ID: <20240524233903.5274-1-nandre@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=nandre@riseup.net; helo=mx1.riseup.net 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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 * gnu/packages/tor-browsers.scm (make-torbrowser): Update the regex string to match upstream changes which incidentaly fixes browser crashes when trying to save a local file. Revert commit 6489f97f4a999b9b5e9b1a16d51c905e0cde4cdf, since it is not needed anymore. User may need to remove their current '~/.torbrowser' directory. See: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f834378bd2e23a556c9a0ea289b45fdcff76b0cc https://github.com/NixOS/nixpkgs/issues/307095#issuecomment-2083208021 https://github.com/NixOS/nixpkgs/pull/307832/commits/c69a216eec2f8f3ae1ddbaf051666d7eff424440 --- gnu/packages/tor-browsers.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) base-commit: 6e86089d563ccb67ae04cd941ca7b66c1777831f prerequisite-patch-id: 68e53aac2a35dbfbea7ed662cfeebaf49522fe15 prerequisite-patch-id: dd5bc77d91dae65eee89595ab69d75d9e350e243 prerequisite-patch-id: c27180cf8f7652911e41b82119b57c6afb6c3704 prerequisite-patch-id: 874c268a3e4df7ec392640f5007a944999faa1bb prerequisite-patch-id: b60499d5dc9b901bafea2201811796f2d98f3b02 prerequisite-patch-id: aa983b960ee243f147dbb7f82e840770b2ef2d42 prerequisite-patch-id: 81def0b727ea901fd0475db0822cabd4d2e9ead2 prerequisite-patch-id: ac136cd17d28ddf391530182f217d64a32e2fc5a prerequisite-patch-id: 377f4e0bf2b9f1fefab70ba82f52da478dd2a065 prerequisite-patch-id: 94a6a290f68fc2557a5a2261f70515bfa1947e91 prerequisite-patch-id: 61e44e045ef136bc6198f2657181539e5b5f7c9c prerequisite-patch-id: e5df9f9413531d74df7f256d898ad71ae3f82f8b prerequisite-patch-id: 6b1d3ada5d13a2f9a6c924f172f8dbcdd28f78da prerequisite-patch-id: 888a2f00734e42f295670eabaebe54b6e7e9c8ca prerequisite-patch-id: b1fa283906b438a88e8eb9700de80641f0a669ac prerequisite-patch-id: 86d30cea5187d3741999fc0f58d1108d0b88d575 prerequisite-patch-id: 665cdd9808ede8af5a0c0278f4020bf6d3b99b9e prerequisite-patch-id: b59a25bcd466b2521185129c5d7309688cc0246d prerequisite-patch-id: 47e83d477113db515e09259fea8c18f5843a4304 prerequisite-patch-id: d52ad82aafcaeee901c8af0206237570d85fd69e prerequisite-patch-id: 7c3927e11321df826a0aa31f7ddb51e49f243206 prerequisite-patch-id: e0f7e7695ec066155f5d7b51883cbc8d761e6cc4 prerequisite-patch-id: 6b37e64551a6bcc14d0e9ddc75fc4e1837018fbd prerequisite-patch-id: a4df8f46dcf25d55f564809c43e8d904fac1fe3d prerequisite-patch-id: c28613a031ff3a794c504189a8e10745f1ad4526 prerequisite-patch-id: 4c7de1c2affd62c7339f9b3eadf3957e49889381 prerequisite-patch-id: fc7edb1c8e5a365f3e7ff489ffda252207dcd383 prerequisite-patch-id: ce6e3c8217fd856fb3913f8091de87a4c079c942 prerequisite-patch-id: 1d0b32626fb3bb668cac465c6cec683f027bcdb6 prerequisite-patch-id: da717042dec2c6787070189745ae0b847a354bc8 prerequisite-patch-id: 3a0534c5eda5d7b9e7a0fa2d81d3798de4e8eb19 prerequisite-patch-id: 66bd24b989de5cb7d468f31f798894f573520291 prerequisite-patch-id: 6b8a791a7218c8ae8aa6fa850ca0e1d11b222bf8 prerequisite-patch-id: 3454548553c5d47d67f3be4bbf7023d4ccd8e3e7 diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 7a2f8841b5..40711eea6a 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -739,7 +739,7 @@ (define (runpaths-of-input label) (copy-recursively (in-vicinity #$assets "fontconfig") (in-vicinity lib "fontconfig")) (substitute* (in-vicinity lib "fontconfig/fonts.conf") - (("fonts") + (("fonts") (format #f "~a" (in-vicinity lib "fonts")))) (delete-file-recursively (in-vicinity lib "fonts")) (copy-recursively (in-vicinity #$assets "fonts") @@ -805,11 +805,7 @@ (define (runpaths-of-input label) "https://gnuzilla.gnu.org/mozzarella") (format #t "pref(~s, ~s);~%" "lightweightThemes.getMoreURL" - "https://gnuzilla.gnu.org/mozzarella") - ;; FIXME: https://github.com/NixOS/nixpkgs/issues/307095 - (format #t "pref(~s, ~a);~%" - "widget.use-xdg-desktop-portal.file-picker" - "1")))))) + "https://gnuzilla.gnu.org/mozzarella")))))) (add-after 'autoconfig 'autoconfig-tor (lambda* (#:key inputs #:allow-other-keys) (let ((lib (in-vicinity #$output "lib/torbrowser"))