From patchwork Sun Oct 31 05:43:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark H Weaver X-Patchwork-Id: 34186 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 05A2427BBE3; Sun, 31 Oct 2021 05:47:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BCD1227BBE1 for ; Sun, 31 Oct 2021 05:47:18 +0000 (GMT) Received: from localhost ([::1]:43658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mh3gZ-0007nc-3e for patchwork@mira.cbaines.net; Sun, 31 Oct 2021 01:47:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mh3fO-0007mF-39 for guix-patches@gnu.org; Sun, 31 Oct 2021 01:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mh3fN-0008Bg-Pv for guix-patches@gnu.org; Sun, 31 Oct 2021 01:46:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mh3fN-0000wk-Lq for guix-patches@gnu.org; Sun, 31 Oct 2021 01:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51508] [PATCH 0/2] Update icedove to 91 branch Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Oct 2021 05:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jonathan Brielmaier Cc: 51508@debbugs.gnu.org Received: via spool by 51508-submit@debbugs.gnu.org id=B51508.16356591323602 (code B ref 51508); Sun, 31 Oct 2021 05:46:01 +0000 Received: (at 51508) by debbugs.gnu.org; 31 Oct 2021 05:45:32 +0000 Received: from localhost ([127.0.0.1]:58865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mh3et-0000w1-U7 for submit@debbugs.gnu.org; Sun, 31 Oct 2021 01:45:32 -0400 Received: from world.peace.net ([64.112.178.59]:50970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mh3es-0000vp-1g for 51508@debbugs.gnu.org; Sun, 31 Oct 2021 01:45:30 -0400 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mh3el-0006KW-9b; Sun, 31 Oct 2021 01:45:23 -0400 From: Mark H Weaver In-Reply-To: <87k0huuq5a.fsf@netris.org> References: <20211030104659.12458-1-jonathan.brielmaier@web.de> <87k0huuq5a.fsf@netris.org> Date: Sun, 31 Oct 2021 01:43:23 -0400 Message-ID: <87h7cxvje1.fsf@netris.org> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches Hi Jonathan, Jonathan Brielmaier writes: > One big outstanding issue, is that thunderbird uses now the > ~/.thunderbird folder for the profiles. I did not get it using > ~/.icedove like before. So you need to migrate (copy) your profile. I > can live with that, who can't: have fun finding out how to get back the > old behaviour :) Here's a proposed patch that might be what's needed: --8<---------------cut here---------------start------------->8--- --8<---------------cut here---------------end--------------->8--- Would you like to test it? Mark diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 30b5d6544e..39d67641ff 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1687,6 +1687,9 @@ standards of the IceCat project.") "comm/suite/components/customizeToolbar.js") (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) + (substitute* "comm/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp" + (("\"Thunderbird\"") "\"Icedove\"") + (("\"\\.thunderbird\"") "\".icedove\"")) ;; Override addon URLs and settings (substitute* "comm/mail/app/profile/all-thunderbird.js"