From patchwork Sun Aug 18 11:57:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 30134 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 979F527BBEA; Sun, 18 Aug 2024 12:58:51 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 807F327BBE2 for ; Sun, 18 Aug 2024 12:58:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sfeYF-0006jF-OS; Sun, 18 Aug 2024 07:58:27 -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 1sfeYC-0006i8-H5 for guix-patches@gnu.org; Sun, 18 Aug 2024 07:58:24 -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 1sfeYC-0003Ip-7R for guix-patches@gnu.org; Sun, 18 Aug 2024 07:58:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=EDrqdusoLaLk6rLRDMEKJz9AlJGWTN2V6Cfzy/PlG+s=; b=XpxdRWzD2y51vG4LeGx6BFeFYY2aM4bb7pt4ZZqKgxl8MoUok6XKBSEnDeN0ywXXMQE7YRV2rlztYVMDTLQvsUwpIi0/B0ZXBgkgFOR1VtkPaVSIr0YSiUYA4OSk+BU9WqECpSM72DCuLW+gbljvTMqBIYnSu4yDKcvDjjU9pZphooOGjojVcgPe6d3EkXE8JpPaafxkqANU8GDRyIdqvoti4exD4P2yHkDjOFw5OjX6hDBLSm5ysftu1pV7K+/Qf9gpIaRKgIbndLiqj5moTtS2VXgZ8+WXpJpv6Yf2/vR+4Ew67EMhLGE/KRqUqU+Rew0h/pVKX6iYyewfdVppDw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sfeYq-0003xs-DB for guix-patches@gnu.org; Sun, 18 Aug 2024 07:59:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#67849] [PATCH v3 1/5] gnu: icu4c: Add patch for VTIMEZONE bug. References: In-Reply-To: Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Aug 2024 11:59:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67849@debbugs.gnu.org Cc: Jonathan Brielmaier Received: via spool by 67849-submit@debbugs.gnu.org id=B67849.172398231515168 (code B ref 67849); Sun, 18 Aug 2024 11:59:04 +0000 Received: (at 67849) by debbugs.gnu.org; 18 Aug 2024 11:58:35 +0000 Received: from localhost ([127.0.0.1]:55539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfeYN-0003wV-4L for submit@debbugs.gnu.org; Sun, 18 Aug 2024 07:58:35 -0400 Received: from mout.web.de ([212.227.15.4]:55141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfeYE-0003vU-Vv for 67849@debbugs.gnu.org; Sun, 18 Aug 2024 07:58:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1723982258; x=1724587058; i=jonathan.brielmaier@web.de; bh=EDrqdusoLaLk6rLRDMEKJz9AlJGWTN2V6Cfzy/PlG+s=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID: MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=sI/f/7NGQoM7EUh4WLnRefJeXfOqrgk307g6wKRFLk14CyHrJybVmX6SPI8O7E1v Hb1uY8sPwq5DkchkxHkOhiRXxcFYyk1xGnBOPPCOOaRWRNdqcsOm7AbgtQ6h0vxMs 3KsAzUGK04CFFeKDW5T6kd8Uj87cTSdlPGMkRZ5WBjNHYXEzAYdLKOfN6z14Qc49T KAWWXQILFJj/Mk+APMfvaTghOagt0ZKl84wUWRUk0a5FMJSBhW4S/+qaOQ9/vDG8U 6M7r9LDCj2a29eHnnlkoonPNzqIdnvmGDKN/7HsW8MMIb4PvumpX/0HZ+KnwQbeoq 6E1K6/TftjkL+4ph/A== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from 3700X.fritz.box ([78.51.25.171]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MQPZd-1sS7tL1dFR-00MkMW; Sun, 18 Aug 2024 13:57:38 +0200 Date: Sun, 18 Aug 2024 13:57:24 +0200 Message-ID: <0a6c0efc757e38f653e8dbe0d82cc9d20fd61d51.1723982094.git.jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:K7ifaqbqRlbduQF6pI4KVOen8OIe+pQWurDvl6QSj9mtuee3Hii 7QnQqKffBuKNjrv9Whgv7Aeybd23tDfoXjGqzCtTVOxrxI/0HHd9CcmaqRqTLMs/13/cOGX hQp4tiBuLHfpPq8dlRC7uYAuJ06dJzClX7RxGQq8VhC/jCELkPPZpVw4v56+B9oIzi7qVdU /wV+TEri2fKRqpUmQ7+gQ== UI-OutboundReport: notjunk:1;M01:P0:E+Mkd3Jz7co=;s0Q1wA5c+QUHcgrZ8RhCh5RmySf +9ngbOQzRXORw6thVT0hLa6+lIE7xN4USm1FVKyUxShczug8kS0tG9i8xhAffIvW1iTkUMItd LCImHJj5LySNhjg04eUsSy2xiyzDyHZ44ZdpQpm396IXN0wrmefZW66gPZtSSyQnEkYplDdmw qIiYyk2fuEVzgtw5nqw5cfQvFrMHtGKHZelmgC8ilvsLBX5c3x7EKaIayuI3XrPINTeLezg0Y 6IjiT0k5umIW7wzQRJKWnexDCxgXQQEH+07y6fn1jsNJei8/Gdu7iyBYfMtmixSBf6AwOrmXg Ga+PtnsDCg4ekjw77Sz5t5wXReVQf6Pgx1sw0hgXAIO/1h71aEj9lfxmlEqh0quQPEcPhm64e osKywEhy/pX/XwUqn4aAVc8nKpiP/ckpyja9MtmhkUx3SYXiNSokLIDzpH/Kxc8twQYaGJUoQ 1Z+yodVJGGe/2w/xeeDY0ZJgju6NLd8H1z+jUIijjUDrx0Z3s5OyGgI59X7i8YTa51su7Wj3L c9WZZb8+ASzi2A27DBK+mS9+lge6NFjF/dfIPCz7dYbsimosf2HgTtx877fvJNpB8qI7f8+lt n9Uz0TfLKq3Kx1u1YVUNX7cQCw6vC6naNlL+ttySd9Icn1OMDol2bSg8MYuS4J7EoS9Na/jsF FuUSR/eJS4IRzV9zhgNY3jHq89bM2cjUrbIUzMfYsJqUcALvH0uTqpX1ZLtHEtoFFQ05Zl49q QlK2FvhoCPHnWOuNap4kBT7HxQZKD8BVTb6iy+u87EyTG37vGImF9jhlgC2qkwLm7hTe8nYYo cY2U+6B7Ax6K/tm2tmnDfiwQ== 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: , Reply-to: Jonathan Brielmaier X-ACL-Warn: , Jonathan Brielmaier via Guix-patches X-Patchwork-Original-From: Jonathan Brielmaier via Guix-patches via From: Jonathan Brielmaier 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 Icedove@115 does not properly work without this patch. See: https://bugzilla.mozilla.org/show_bug.cgi?id=1843007 * gnu/packages/icu4c.scm (icu4c-73)[source]: Use patch. * gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. Change-Id: Ie64d1e33afedbaedbaafaeb607a201eb671ac7bd Change-Id: I6d753eacc7daac5663128b20a550044d0fd0ddb7 --- gnu/local.mk | 1 + gnu/packages/icu4c.scm | 5 +-- .../icu4c-icu-22132-fix-vtimezone.patch | 31 +++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch base-commit: 6c045f2c9eb7b8efe7c8a1002cda990abaa9be1a -- 2.45.2 diff --git a/gnu/local.mk b/gnu/local.mk index 91cc679b7d..df30097316 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1510,6 +1510,7 @@ dist_patch_DATA = \ %D%/packages/patches/icecat-use-system-wide-dir.patch \ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch \ %D%/packages/patches/icedtea-7-hotspot-pointer-comparison.patch \ + %D%/packages/patches/icu4c-icu-22132-fix-vtimezone.patch \ %D%/packages/patches/icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 2031d72768..6f09fae65c 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -126,8 +126,9 @@ (define-public icu4c-73 (base32 "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4")) (patches - (cons - (search-patch + (append + (search-patches + "icu4c-icu-22132-fix-vtimezone.patch" "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch") (origin-patches (package-source icu4c)))))))) diff --git a/gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch b/gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch new file mode 100644 index 0000000000..4fe520318a --- /dev/null +++ b/gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch @@ -0,0 +1,31 @@ +Source: https://unicode-org.atlassian.net/browse/ICU-22132?focusedCommentId=166752 +Author: Sean Burke +License: +Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1843007 + +diff --git a/icu4c/source/i18n/vtzone.cpp b/icu4c/source/i18n/vtzone.cpp +index 3035106701..5e738e11fa 100644 +--- a/source/i18n/vtzone.cpp ++++ b/source/i18n/vtzone.cpp +@@ -1735,14 +1735,14 @@ VTimeZone::write(VTZWriter& writer, UErrorCode& status) const { + } + } + } else { +- UnicodeString icutzprop; +- UVector customProps(nullptr, uhash_compareUnicodeString, status); ++ UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status); + if (olsonzid.length() > 0 && icutzver.length() > 0) { +- icutzprop.append(olsonzid); +- icutzprop.append(u'['); +- icutzprop.append(icutzver); +- icutzprop.append(u']'); +- customProps.addElement(&icutzprop, status); ++ LocalPointer icutzprop(new UnicodeString(ICU_TZINFO_PROP), status); ++ icutzprop->append(olsonzid); ++ icutzprop->append(u'['); ++ icutzprop->append(icutzver); ++ icutzprop->append(u']'); ++ customProps.adoptElement(icutzprop.orphan(), status); + } + writeZone(writer, *tz, &customProps, status); + } From patchwork Sun Aug 18 11:57:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 30137 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 2A5FF27BBE2; Sun, 18 Aug 2024 12:59:05 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 1CD4F27BBEA for ; Sun, 18 Aug 2024 12:59:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sfeYD-0006iL-Dl; Sun, 18 Aug 2024 07:58:25 -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 1sfeYB-0006hr-SF for guix-patches@gnu.org; Sun, 18 Aug 2024 07:58:23 -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 1sfeYB-0003Ib-IJ for guix-patches@gnu.org; Sun, 18 Aug 2024 07:58:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=pkXA2GC3U7JZRuc64txkoTl07oAI6JwHcGeSyVl9noQ=; b=i8u/2o9rOPItFEhSdZN2rZnP5D/BeB5pYLHwYgzWH/Y1a5E/Mkmj9jAQyg3je3yifWjinIKlk6/vNJ3kncSaAfpznt0aebo042y8YALaxFhQLkSmnH0hoYyX05AIMvjAQBu3Xn87SZQVEnmm72yNM9L+Vt3GnZ5rnqQtfkXWbEWoM11+4Cyqvp8XhCkaZt98BRm92hVmxFpmDtUE5sv2g7eWybBYDMQKnUKnq441qajzZodZlA3PMTRysLKYRYJ0JBn71Q/5hKLIDXif/NtaKHY2APRRXujrdlno28YYOKFE5Dtv/nCHlLzNh4OtdZMw1/Z+4X7TYS3aQjRLnBncwg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sfeYp-0003xV-EK; Sun, 18 Aug 2024 07:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#67849] [PATCH v3 2/5] gnu: icedove: Update to 115.10.1. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: clement@lassieur.org, jonathan.brielmaier@web.de, mhw@netris.org, guix-patches@gnu.org Resent-Date: Sun, 18 Aug 2024 11:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67849@debbugs.gnu.org Cc: Jonathan Brielmaier , =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier , Mark H Weaver X-Debbugs-Original-Xcc: =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier , Mark H Weaver Received: via spool by 67849-submit@debbugs.gnu.org id=B67849.172398231415154 (code B ref 67849); Sun, 18 Aug 2024 11:59:03 +0000 Received: (at 67849) by debbugs.gnu.org; 18 Aug 2024 11:58:34 +0000 Received: from localhost ([127.0.0.1]:55535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfeYL-0003wK-GJ for submit@debbugs.gnu.org; Sun, 18 Aug 2024 07:58:34 -0400 Received: from mout.web.de ([212.227.15.3]:44083) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfeYD-0003vL-BA for 67849@debbugs.gnu.org; Sun, 18 Aug 2024 07:58:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1723982258; x=1724587058; i=jonathan.brielmaier@web.de; bh=pkXA2GC3U7JZRuc64txkoTl07oAI6JwHcGeSyVl9noQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=Q3eAh0i5qrdbUWSZv+nhiUXBVx4KfKonhWThrldcvnxray3mBCfvhd6sbf1Zaix2 cvI3Tn5nXRKQTbGBKCT1/cmFWxVk/YDVI9gi5yNG/K7zns3ssu/+XTYLkKfQ04NRB A1ZDZUScP/KDUJ8e1mjNiotJyYd4MIzWiM7lAnFxxq4s/Hc3/CKcJfWSFEA4dLLQf m5aa4As1bA0DZ6khEBiIEw0An66pEeRmP1cECWqRQ3vaJNWU1vmTdEf9mejzBReZ/ pFlshoxottgHrE3oyVPPWr+z9Py3tBYmzCcXr4dRC9IRinaVFJLxZNeOYVUU90jNF atbybgtTZxpQfFemnQ== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from 3700X.fritz.box ([78.51.25.171]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1Mcpuw-1s6rx22fOU-00ZaPf; Sun, 18 Aug 2024 13:57:38 +0200 Date: Sun, 18 Aug 2024 13:57:25 +0200 Message-ID: <9aaa72bea4888b38de10b488d22bbff3d0fa19f7.1723982094.git.jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <0a6c0efc757e38f653e8dbe0d82cc9d20fd61d51.1723982094.git.jonathan.brielmaier@web.de> References: <0a6c0efc757e38f653e8dbe0d82cc9d20fd61d51.1723982094.git.jonathan.brielmaier@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:HXaHc+DcU/N46znrNvv1k12u3RlVYw+oH5vD1VgaYXzrXALa8+E 1273HA4BUruKfIZBBb1yZqdCQMf3GUM/ZJIkorVZ7aKAq/N+F5AQuZsRzN0cG/ndP3k6ufB pQ2dSI6xLTn67moe6sG1HAuv91/2rxHhdkhd+xBWRsaHH/ZJX7a+ngOv/i8AkNRSivAp7OG 7DLJ1VFzR+1iDUYtgsn+A== UI-OutboundReport: notjunk:1;M01:P0:WiBFd8yKimI=;X4OI7LnEdHGCFtCTXv8Y8SVbiOZ ++/l3zcNDSHIs7ls0UbVgq+hJZKfZE/63QET9XMBO8yz8X2PA6qabAxrJ+mbH176DobNg46Ph t/iP5rdXVYDZ4AfAdChRJhIhr5FDLCevaOPyH6wCAwPUmRL+TiAQeYztFcgB7UCi2d8jOrDv9 yOlrNOGeh/HmBlOLCv9Y29xeRP7TMyJmciDMzVEPGkzbpRXvbnnYKvZtYQgAkWYTRgg57kssR cm4Rx8trjeN7rxrxG1aOWD8Y9/FZ2x4PgdB38HqmxhJ0lxcwqZfuMRMoZsKMN268OpZN8HSm6 wlosfM5hLeiYBv67hiUuR1UHAAdzlZM9P1lq8qaOIENEeKDW1Imr8+PTQThKF+V5QstCs5jAw cECSCDLzgckXmARbLlAEw8QAVFZQR02vT1bbDdVcq10uu66M/vfsVFQamPUf+rUKrF9Il3K8g Qj75Se1uX1u4uljpA0a2Tz+42Z2NVWnP2I46x5iZ1oOP+L4kf+XIvJnM6XjdILNi6UePm0QZb RDKWd/keMl7NmtukgjJpkr3bdjhfZTqWsFZRiMdoEn161+U0x2YzLfhJZBnn2JjKDlHZlx20Y VQv/LPRjU4yfHvr3JgT5bIkyR+TwbdmTxUzd/taxWUDoKDkV8k4962JyTqbSWk9QnLM9L9fZN 05ijAcUfYNWd4ytbEZ82ls6/9w967nXQe6aRAKgcWogCZVW0tGPbEjlj0KCAhbg+pnWFOLidG BiHVeUFj0qe9xVY2e0ayktN3cCVHujjeC2HcO7u3OIV8BBiJ4uZs2iTS7NPi/i5S3tio8knlK R70lKaTfwIozXsvFR0lJdNBmEp5dLv3W8nppZ16dIGNn0g7ooXMDwAzPrKYOwgMI7SK+nttYW U8oVuOdOq8JIXxLd4fkJIXxlCQXg2kkrjPy4= 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: , Reply-to: Jonathan Brielmaier X-ACL-Warn: , Jonathan Brielmaier via Guix-patches X-Patchwork-Original-From: Jonathan Brielmaier via Guix-patches via From: Jonathan Brielmaier 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/gnuzilla.scm (all-mozilla-102-locales, %icecat-102-base-version, %icecat-102-version, icecat-102-source): Remove variables. (%icedove-build-id, %icedove-version, thunderbird-comm-source): Update for 115.10.1. (thunderbird-comm-l10n): Switch to provided tarball. (icedove-source)[origin]: Add `zstd` package. Use `icecat-source`. Provide l10n folder from tarball. (icedove-minimal)[arguments]: Use MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE instead of deprecated MACH_USE_SYSTEM_PYTHON. Use GUIX_PYTHONPATH and bundled NSS library. [inputs]: Use `icu4c-73`. Add `nspr`. Remove `nss` for now. [native-inputs]: Update clang and llvm to version 15. Use newer `node-lts`. (make-l10n-package)[arguments]: Set GUIX_PYTHONPATH. Change-Id: Ie6d9eb00f609c9872ac985adec72da92ee4be336 --- gnu/packages/gnuzilla.scm | 344 ++++---------------------------------- 1 file changed, 36 insertions(+), 308 deletions(-) -- 2.45.2 diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 039b6de71c..c109729b49 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1159,282 +1159,8 @@ (define %icecat-locales "ru" "sc" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "tg" "th" "tl" "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW")) -(define all-mozilla-102-locales - (mozilla-locales - ;; sha256 changeset locale - ;;--------------------------------------------------------------------------- - ("1s59ihmj8x6z0ssq4xav689jb5azrpdnay8csgjm1b9pw7wmvcli" "a6940ae1a02f" "ach") - ("1cqixlk9f8p63jz20wzsvnfb7xa82ba725gzdydlwz2axgp09c26" "4e2c7d1ddbed" "af") - ("19r1yhmfxqasyslc8gr9as5w1scscz1xr8iqy9zi4b90fdjzs0ac" "06897e40a7ea" "an") - ("0nfknb1p03j9fgmkwlm1mzdyh10g0l33x34ab39kc072apziyv0n" "9272819b09e2" "ar") - ("11qqblqfffbmkdr5b6mxzq02i8rj1hjq3iy6xv5i5xxy311b3vpb" "f706d22e6910" "ast") - ("0q2p1a437qr2nshdd4934qkv2sblmykiwzir149c8p9m5sjk0dyw" "f5c2a9800add" "az") - ("0gxxm3lv18kj0922bw0g897azc4nkrszm5irgwdkgmkbyr97li83" "98ba7d51484f" "be") - ("10vrbbaabjns824ndya6c09znm815pak2xpvqgjydl3r5qvacx65" "5c79c77311cd" "bg") - ("1il7yyifx5xzj0v2lna315mppl5pk1vi4m9r66hdz1lzc485m1wp" "c80c87ef7193" "bn") - ("1p1ig4v9pczzrnnxzr20r61g7xk85k5lgnxhzgn1rx518p85xrkm" "6a1bcb9851b2" "br") - ("08q33bk9kdvbyc4ib58bsn2b67ki3d2yzskkf5r2n5zlglblksa2" "939779cb58d6" "bs") - ("1bdkywrqah85fh8kfnz163qnc02ffx0a4vlnx5pq1wg9j4f1gznf" "9a45ccf144f1" "ca") - ("0hhmp5dzc0rssykl0b2n9h0vfy4svwhxmhpsr3rcfpbg2s0r5h6l" "4f60e18fc248" "ca-valencia") - ("18phbl9raqsbys9wa8z0gq0h0pw3b55v6ngn67r4373lfc0s9cxv" "b4ef404c7de8" "cak") - ("0147qyw1y97mgqhkb46wblxv61lq2mvvm5n5ihwf49l5cyizi0jg" "f56ef18f05df" "cs") - ("08sbhnsxndlsaijnxndc367qcbrzb29m7bpkcawinz9fg6mz3573" "4f9d92f04f5e" "cy") - ("09cm5kk1sh2a6ws1fj185jrknhfa6n4bhj7nfnr4lsk339n0kvv9" "902503567e30" "da") - ("0r630bki5d4ylicq6lzh6s2mvsq225933szswmm0sap507rj75cm" "6000baf7a412" "de") - ("0749qjsfv3rn94rnci3ydgndw27qlr3w3w97kfwma2gmsf3m3r0p" "4a948952d1f4" "dsb") - ("0yc64i7mpxhs4qlyyh59i2aiz0vpap0bn8slcsk8b71wd1d7cy5m" "153a16a13733" "el") - ("0d4m5ji6ii10yap8y24cxx3fr60ba1jqi10hy3j1cq6ni7hzavga" "7ce17ae529ac" "en-CA") - ("12jzqcfbgdhfm8f2gqp15bdnin62li07jwicjc8ynn4cl9a19xiz" "a25d9eea7c23" "en-GB") - ("0gbb8hfc5yvjah63mapjxm53wxrf98srbrbg43b9g734zfi4n8y5" "4ed3471dad5d" "eo") - ("19lw7zmqx2irjmv5y6r7nncp6nysn06abf10n3dzj5nzgays6sln" "853fe7acb415" "es-AR") - ("0rq4pa380b77rkv6dq7sqx8a8i33jk3vs5rgcl8fv7slqvsw23kd" "921b67bf27a5" "es-CL") - ("1dyxzab9hln5spch66wmfagfzmfdiaxgpq7qlzvdfg98wkqdj25n" "c9a210ea496c" "es-ES") - ("1gwpmfl37wxl7rynqswgj41liljflgxydvljd4zdhk3jzqn605fb" "ddd35183d81c" "es-MX") - ("0c3blniddklapifnjbz03f2frw24jjgwgwn6swl5mwm2z0y6wa9f" "82d23ffaa7d3" "et") - ("05mq2df6n6fr8m5m2xwl0f6n1q3zgjrnk465ldx1nfr9agrhd36c" "13975626d549" "eu") - ("1l1jyqqiy551903j6yzh9ayg1pf26q2hr9h3jj4l51xzp7x4ms2q" "039e1fdb7c71" "fa") - ("091l05y9sggxznv0y11b9zy5qf146p0hb5faw4ix7yn5p5kca2f5" "7bd3722d82de" "ff") - ("1lllwjvmbl5dx44fcvsqg08fbflkc8dx5as9n6nf4xlkzydx6izm" "39808e88c9d1" "fi") - ("10ha955vvyf5vbciricm72kplj9j0s00g2333lmg46jiwi7aviiv" "426d373db6a7" "fr") - ("11zdfk8jvdy1k9z1q162cwapplcbz35l3dq4mv45brdin3v0x8kr" "96cd93d18389" "fy-NL") - ("1l5xr25gmssyachwmfprlnp2v2xj4b0hp8gxrf7fi5bvv9c2fynb" "de3daf7d3f9d" "ga-IE") - ("06h9ijfsn1cgz5fvxxbisk7fvqhgsw99id92575hgyg1p8xb1n69" "f04aea656d9e" "gd") - ("19913i5n8yyfhz9j21krlk7wqsyy89vggxc1m1swv94y2ix8rpaj" "1b8cdb87bf69" "gl") - ("0k5x31bfl2l0r9b5dkn03frm1gd8n6igai7ch2f1kj0skflynwww" "82df570c4241" "gn") - ("03rygnj9xhfvykark7dls117kwhid13ghvrsqiial0vp8m7ymx79" "e2e41d7beaa5" "gu-IN") - ("0vyraplj1x7b5im15anhzdaq03k2gqfyybgklrd4f9ry6msh5jhx" "de724e943805" "he") - ("1zqps586jrgxpf7xx2l3qw3ch3fr31r9a25y861fpxrpvh7ygw7g" "898598e1a5c6" "hi-IN") - ("0czq68l3qdhdc0mgazlrh8x83a6d5qrjwgjv8xvsmmzi7h68ww0l" "2711d1515af0" "hr") - ("1wwvrnm38gk2rnw4vmcranh8hk61gjcj9292pck3ckiv6mq7kd4s" "03e02f3d0676" "hsb") - ("0yvgdxlbyhhg3lk43hxx9gx66rcm7gaj02zzzx5zni8dhvlk2v6m" "d423ada9dc00" "hu") - ("1kjm7bg4990jhfbxwc38r4lqm2fbcxc82nc2d4qkqwikr4aah4b9" "06836af0bd6e" "hy-AM") - ("1dla7r3snvagb7m985xxqyi7gl498cr5xsz8msw0zpg6xmi05rlx" "299bd950d538" "ia") - ("0w8w9xn93akir7nqcp5iwr3kqvba5gbirg7gmzlzg7mgrhw8pcsa" "dee087477b99" "id") - ("10iakv1c1d20ihxg1s7c3zc1zfw18vr2kspcw7bk5k02rmrffgcn" "320095d063ed" "is") - ("1xn5pa3rc7l6k2migm3c0dx71q1hk7mjls045xpv9cy8gvirnj94" "4722680fb5bf" "it") - ("0va9zfj3wqh1yvbgh3x808yvdyxkg780vazjg887wbxpfk1n6hxa" "cb3cfe294621" "ja") - ("0qvjc3fhk6jg2c3g6mymmnslg1rkkxmv9gi3whf2bc5mzfgyc5zw" "7efe92bd7780" "ja-JP-mac") - ("0zfiwwz0axbd219ar32c7a6b8h816sf04ajx6jl74s5kyij79y82" "4c1fe3a18da9" "ka") - ("1aiik4758r5df76q2a132y5fjdjrsxshjylk7irwsr7yy0c7f63g" "acdf76048aa0" "kab") - ("0icxh4sgv6m1yykycb9d9c43k3r6w02f9c6jr04wm8hvqq5icfl5" "9b418ff7936b" "kk") - ("1cqlhggf46lr7w399k7qb7a1hc56f32w1dy26i2racpppzza5plc" "9771ada0b5f8" "km") - ("0p04irnb7x7y37m6lz388x9dynn8rnk000avpp296barajnhs5i8" "645aa37a2112" "kn") - ("1lbc1fxr5i0ccymlsd8axz3633cqggg5k8ak5yqwi704g7kvv9g2" "1cd68952d119" "ko") - ("11b55bxg73zqfdn5gy9nn5imab2mv0hxr603whggp7vymllgb7kb" "26bb83959bfe" "lij") - ("15jsijm6d26i0105gz0f7sh2yh2v4pmw4j95cwkdrb1d8m935jlz" "b9829891f153" "lt") - ("0liwwv13fgyw97nizhsyy53xrbf8jks5ics7qkkxfccawjrg5rlb" "e5f09d03d959" "lv") - ("0w420yf3hdnl7dp9mn9ghc20cq79k24fn9adn3syk723ppl6mkb0" "7884845e94f3" "mk") - ("13wkr7rgqsv9w3d9w7k8lnxdzgfixsq4bmc27zsyc770l6062ml6" "030db7412202" "mr") - ("06nsadcnxx0ssdp67x47dj9crihn1ycgd5mwvn5m7lkb97r4ch9f" "40a7703e875c" "ms") - ("0mlnjdzck6dp9p59ajj3sr63r36fn0qi8r9scrqrqcisgfclw9sg" "daca40056531" "my") - ("0z1hgx9d5i9w20f9k9azzng1y3lmm5d6hdjkj7rf6r5710bhhzh5" "664bd049e105" "nb-NO") - ("1466qvrs13g2iix1k35cknb2pia9b66li2ncvdyqf0jsd92z9k8x" "eaa6ae781ba0" "ne-NP") - ("0jgmz2lkzj0aspd9mabygzic6li5s2b25y0r6vjg8mv3jm5pi86j" "5ef8f1c9739e" "nl") - ("1m46x0h20vdfbzjxlz0ac43dbaq40xnyldr2yzbf7pk5di9pzxa6" "f08e15466d5d" "nn-NO") - ("0r3zvihqh6iya3z1qm7if0m3zfgf81s9qp7x7qc701h2q357wkgf" "6712c0e12ec2" "oc") - ("102j89jm28c223yhhkrj76xxj4kmy58hcs2r0jn15xa1qkqv1fdk" "8f36cc819e00" "pa-IN") - ("1j9za6s0i46abn8dsrlkpck3qxxw35rhfcg1xs1vp8sc4ckg8qwi" "c3b0c1c02b94" "pl") - ("1k9lbsvckpwl4xax8kxp5yxsfkspq2mhqm77jh5nl9aw88dsn55b" "cc32bf9630fe" "pt-BR") - ("0f0jyvbn2sa5m66wqdzh4607g4gd0270xq37ipd9ls52b4764bd8" "5478d7242086" "pt-PT") - ("19znkkialh1d4np7qcp80xkagrf1j2xah2s1xxzsh854p3d30zs7" "dd934a76fb01" "rm") - ("1xn26r8g8zzkb5myfgmnjbk8k4i0brkvbrvnhp7k5nkrnsin25di" "d57ab3dee73d" "ro") - ("04rhkxlmpp5pyzw85ldbfkmiigqr2p9y5cbns5dqs6sz1633ccxp" "7aea98f33a20" "ru") - ("1zzkkxl7ayxh5gx9snyvp5czflsvi77hp48li613h3c2fii4n9qk" "7c986f4b5044" "sco") - ("1219i0ghhqj3s1i0rm68jjkvivh6y40938wav7z4ifck527sq6r1" "bc9e55d4e3ea" "si") - ("05i5p3n3a6hgl6rf10yjs4vag7y3rn2jwgxsddcdcqiv6405zn81" "8814afd7f67e" "sk") - ("1wcqdbm1py1ldq6cj2g201m715nql79r6szr71jvrxacb711c62a" "20013dc06e96" "sl") - ("0g2izkaa4ipwgwyhy77ciyrxxpf4pxzj9mjqvxriy5prmkhm3zjs" "d86d5d2b6eef" "son") - ("1cc99m6srjg8698dkc3il70crby0mdv43v3ijwy069k4w50hyjjg" "49bb5fae5d9b" "sq") - ("13kfssq4fhq9mb36as6sxiaffl17qyg1wdw8kpz3ilqm86bsjrgl" "d6a0ab79b06f" "sr") - ("1wx9snbm0431q97i0q0nv4wbsqcv9nhllwfr88crlp7bfj5w8czw" "4bab04993da3" "sv-SE") - ("0laglkfl8ml0ip5vmm3z2q790hgwax9gfqwq3wm68a2nnsyck8fw" "4b3316c4aa48" "szl") - ("15pnlic4q7m48y0mc5yh8w5yscjwzx0mmfrbj3f2b9jxxa44nx4h" "48c7aab86db8" "ta") - ("16qar5y0wns75ryi8bfv7yln3mjsyn7qi4345zcniz3ydgkczh46" "7bbb3dac8f47" "te") - ("112g7x8h0qz16r5faam386x4a0rgwd4zy02d5agmg9m0kbficdfx" "009fd0852454" "th") - ("1l80kh9byqxnz5vkz357rb39g4y9sgn9pr0v29ywp6d009img1qg" "dad9caecd7a9" "tl") - ("1nalvjlxxsa9wldhhdb93bgfc7dl084xayh7i7mgg93yjgrym93x" "0c48082d37cd" "tr") - ("0wkxqcfgsra2ljws28kiwajv73w9aa8drsc4fqlg9krbicnjl2n8" "f6d105faedcc" "trs") - ("18jf4ysrfv3635fyxc1vwr970dr2r05bl3h8v599pwp2g7jzyjpm" "e1011388a55e" "uk") - ("1ihmksjsz54yii23qda5iv8cxrj9144afy75hzhvfi6m182kj4h8" "c4e927eab511" "ur") - ("0d42dhfa2vcw24wsvwf95pw20np0pz8c0is6p4307n981n8s207y" "7063df917cb3" "uz") - ("04khnkrg8css55hyna01jqay9c2ppxk5znbx2zj9i25knhvvx1lq" "1753054e6ab8" "vi") - ("0fi5kxn78xp7s15svkqlf4748j4pzxh941nm52n6kbbrhyi3qcqn" "93bc595dc32e" "xh") - ("0jg676vd37wqgzjnm0yynj7xrvm6fsgdwg296h78wnyc33zc4ads" "edd4e468bc31" "zh-CN") - ("1y4wldm3z95mfjlficp994jyqg0lj07wi35b79dy1s8ljy3jilil" "0bad1f7d2b2d" "zh-TW"))) - -(define %icecat-102-base-version "102.15.1") -(define %icecat-102-version (string-append %icecat-102-base-version "-guix0-preview1")) - -;; 'icecat-source' is a "computed" origin that generates an IceCat tarball -;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' -;; script from the upstream IceCat project. -(define icecat-102-source - (let* ((major-version (first (string-split %icecat-102-base-version #\.))) - (minor-version (second (string-split %icecat-102-base-version #\.))) - (sub-version (third (string-split %icecat-102-base-version #\.))) - - (upstream-firefox-version (string-append %icecat-102-base-version "esr")) - (upstream-firefox-source - (origin - (method url-fetch) - (uri (string-append - "https://ftp.mozilla.org/pub/firefox/releases/" - upstream-firefox-version "/source/" - "firefox-" upstream-firefox-version ".source.tar.xz")) - (sha256 - (base32 - "04q1fjninm9lw721xgv0c2fknicc24s8iaimkabwcfwmcnvly689")))) - - ;; The upstream-icecat-base-version may be older than the - ;; %icecat-base-version. - (upstream-icecat-base-version "102.15.0") - (gnuzilla-commit "400fbfdbc0c1ac9c68c9f52fd2ab6899bc8e8bd0") - (gnuzilla-source - (origin - (method git-fetch) - (uri (git-reference - (url "git://git.savannah.gnu.org/gnuzilla.git") - (commit gnuzilla-commit))) - (file-name (git-file-name "gnuzilla" - ;;upstream-icecat-base-version - (string-take gnuzilla-commit 8))) - (sha256 - (base32 - "1fqrf94a5vnjq56zyyxlc1zsvbblgmzcks760nj1szpws4y91m8r")))) - - ;; 'search-patch' returns either a valid file name or #f, so wrap it - ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. - (makeicecat-patch - (local-file (assume-valid-file-name - (search-patch "icecat-102-makeicecat.patch"))))) - - (origin - (method computed-origin-method) - (file-name (string-append "icecat-" %icecat-102-version ".tar.xz")) - (sha256 #f) - (uri - (delay - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - (let ((firefox-dir - (string-append "firefox-" #$%icecat-102-base-version)) - (icecat-dir - (string-append "icecat-" #$%icecat-102-version))) - - (set-path-environment-variable - "PATH" '("bin") - (list #+python - #+(canonical-package bash) - #+(canonical-package coreutils) - #+(canonical-package findutils) - #+(canonical-package patch) - #+(canonical-package xz) - #+(canonical-package sed) - #+(canonical-package grep) - #+(canonical-package bzip2) - #+(canonical-package gzip) - #+(canonical-package tar))) - - (set-path-environment-variable - "PYTHONPATH" - (list #+(format #f "lib/python~a/site-packages" - (version-major+minor - (package-version python)))) - '#+(cons python-jsonschema - (map second - (package-transitive-propagated-inputs - python-jsonschema)))) - - ;; We copy the gnuzilla source directory because it is - ;; read-only in 'gnuzilla-source', and the makeicecat script - ;; uses "cp -a" to copy parts of it and assumes that the - ;; copies will be writable. - (copy-recursively #+gnuzilla-source "/tmp/gnuzilla" - #:log (%make-void-port "w")) - - (with-directory-excursion "/tmp/gnuzilla" - (make-file-writable "makeicecat") - (invoke "patch" "--force" "--no-backup-if-mismatch" - "-p1" "--input" #+makeicecat-patch) - (patch-shebang "makeicecat") - (substitute* "makeicecat" - (("^readonly FFMAJOR=(.*)" all ffmajor) - (unless (string=? #$major-version - (string-trim-both ffmajor)) - ;; The makeicecat script cannot be expected to work - ;; properly on a different version of Firefox, even if - ;; no errors occur during execution. - (error "makeicecat major version mismatch")) - (string-append "readonly FFMAJOR=" #$major-version "\n")) - (("^readonly FFMINOR=.*") - (string-append "readonly FFMINOR=" #$minor-version "\n")) - (("^readonly FFSUB=.*") - (string-append "readonly FFSUB=" #$sub-version "\n")) - (("^readonly DATADIR=.*") - "readonly DATADIR=/tmp/gnuzilla/data\n") - (("^readonly SOURCEDIR=.*") - (string-append "readonly SOURCEDIR=" icecat-dir "\n")) - (("/bin/sed") - #+(file-append (canonical-package sed) "/bin/sed")))) - - (format #t "Unpacking upstream firefox tarball...~%") - (force-output) - (invoke "tar" "xf" #+upstream-firefox-source) - (rename-file firefox-dir icecat-dir) - - (with-directory-excursion icecat-dir - (format #t "Populating l10n directory...~%") - (force-output) - (mkdir "l10n") - (with-directory-excursion "l10n" - (for-each - (lambda (locale-dir) - (let ((locale - (string-drop (basename locale-dir) - (+ 32 ; length of hash - (string-length "-mozilla-locale-"))))) - (format #t " ~a~%" locale) - (force-output) - (copy-recursively locale-dir locale - #:log (%make-void-port "w")) - (for-each make-file-writable (find-files locale)) - (with-directory-excursion locale - (when (file-exists? ".hgtags") - (delete-file ".hgtags")) - (mkdir-p "browser/chrome/browser/preferences") - (call-with-output-file - "browser/chrome/browser/preferences/advanced-scripts.dtd" - (lambda (port) #f))))) - '#+all-mozilla-102-locales) - (copy-recursively #+mozilla-compare-locales - "compare-locales" - #:log (%make-void-port "w")) - (delete-file "compare-locales/.gitignore") - (delete-file "compare-locales/.hgignore") - (delete-file "compare-locales/.hgtags"))) - - (format #t "Running makeicecat script...~%") - (force-output) - (invoke "bash" "/tmp/gnuzilla/makeicecat") - - (format #t "Packing IceCat source tarball...~%") - (force-output) - (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args))) - (invoke "tar" "cfa" #$output - ;; Avoid non-determinism in the archive. We set the - ;; mtime of files in the archive to early 1980 because - ;; the build process fails if the mtime of source - ;; files is pre-1980, due to the creation of zip - ;; archives. - "--mtime=@315619200" ; 1980-01-02 UTC - "--owner=root:0" - "--group=root:0" - "--sort=name" - icecat-dir))))))))) - -(define %icedove-build-id "20230830000000") ;must be of the form YYYYMMDDhhmmss -(define %icedove-version "102.15.0") +(define %icedove-build-id "20240418000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "115.10.1") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. @@ -1442,12 +1168,12 @@ (define thunderbird-comm-source (origin (method hg-fetch) (uri (hg-reference - (url "https://hg.mozilla.org/releases/comm-esr102") - (changeset "ac0b189e3bc07ee798d5ed84e99f874bc72204a6"))) + (url "https://hg.mozilla.org/releases/comm-esr115") + (changeset "24e9961527d4cbb7f3f92687c40ee2fa96fb44cb"))) (file-name (string-append "thunderbird-" %icedove-version "-checkout")) (sha256 (base32 - "0705grqr906rw3ps32yiw4d5iaiwlql8a1ikhr43k546szypn3wg")))) + "06z4x0nnl277wnj6rk7y8dfhc4gd3d8y1x34nw321ysy8sah8i9f")))) (define (comm-source->locales+changeset source) "Given SOURCE, a checkout of the Thunderbird 'comm' component, return the @@ -1466,26 +1192,18 @@ (define %icedove-locales "pt-PT" "rm" "ro" "ru" "sk" "sl" "sq" "sr" "sv-SE" "th" "tr" "uk" "uz" "vi" "zh-CN" "zh-TW")) -;;; To find out which changeset to use for the comm-l10n repo, use the -;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source -;;; checkout directory. The complete localization data should be released as -;;; a tarball in the next release (see: -;;; https://bugzilla.mozilla.org/show_bug.cgi?id=1817086). When this tarball -;;; is available, it should replace the complete 'l10n' directory at the root -;;; of the IceCat source, instead of only the 'calendar', chat and mail -;;; directories that it provides. (define thunderbird-comm-l10n - (let* ((changeset "95b46b8428d5") - (version (git-version %icedove-version "0" changeset))) - (origin - (method hg-fetch) - (uri (hg-reference - (url "https://hg.mozilla.org/projects/comm-l10n") - (changeset changeset))) - (file-name (git-file-name "comm-l10n" version)) - (sha256 - (base32 - "0hfsiv9p7s2ik6648gm1774d187vlm1i1c9xwyd8g8ihk2dzyn5i"))))) + (origin + (method url-fetch) + (uri (string-append + "https://ftp.mozilla.org/pub/thunderbird/releases/" + %icedove-version + "/source/thunderbird-" + %icedove-version + ".strings_all.tar.zst")) + (sha256 + (base32 + "1d7r1kmw0j0b07rg7lq2m3lp2ixfcavqp19g06glxdgf7kjymr84")))) (define icedove-source (let ((name (string-append "icedove-" %icedove-version))) @@ -1503,16 +1221,18 @@ (define icedove-source (set-path-environment-variable "PATH" '("bin") (list #+(canonical-package tar) - #+(canonical-package xz))) + #+(canonical-package xz) + #+(canonical-package zstd))) ;; Extract the base Icecat tarball, renaming its top-level ;; directory. (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",") - "-xf" #$icecat-102-source) + "-xf" #$icecat-source) (chdir #$name) ;; Merge the Thunderdbird localization data. - (copy-recursively #$thunderbird-comm-l10n "l10n") + (invoke "tar" "--extract" "--file" #$thunderbird-comm-l10n + "--directory" "l10n/") ;; Add the Thunderbird-specific "comm" directory.. (mkdir "comm") @@ -1695,9 +1415,13 @@ (define-public icedove-minimal (setenv "CXX" "clang++") (setenv "MOZ_NOSPAM" "1") - (setenv "MACH_USE_SYSTEM_PYTHON" "1") + (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") (setenv "PYTHON" (search-input-file inputs "/bin/python")) + (setenv "GUIX_PYTHONPATH" + (string-append (getcwd) + "/obj-x86_64-pc-linux-gnu/_virtualenvs/build")) + (setenv "MOZ_BUILD_DATE" #$%icedove-build-id) ; avoid timestamp (setenv "MOZ_APP_NAME" "icedove") (setenv "LDFLAGS" (string-append "-Wl,-rpath=" #$output @@ -1739,7 +1463,7 @@ (define-public icedove-minimal "ac_add_options --with-system-jpeg\n" "ac_add_options --with-system-libevent\n" "ac_add_options --with-system-nspr\n" - "ac_add_options --with-system-nss\n" + ; UNBUNDLE-ME! "ac_add_options --with-system-nss\n" "ac_add_options --with-system-zlib\n" "ac_add_options --without-wasm-sandboxed-libraries\n" "mk_add_options MOZ_MAKE_FLAGS=-j" @@ -1819,7 +1543,7 @@ (define-public icedove-minimal gtk+ gtk+-2 hunspell - icu4c + icu4c-73 libcanberra libevent libffi @@ -1835,7 +1559,8 @@ (define-public icedove-minimal libxt mesa mit-krb5 - nss + nspr + ;; UNBUNDLE-ME! nss (pending upgrade of 'nss' to 3.90 or later) pango pixman pulseaudio @@ -1847,11 +1572,11 @@ (define-public icedove-minimal zlib)) (native-inputs (list `(,rust "cargo") - clang - llvm + clang-15 + llvm-15 m4 nasm - node + node-lts perl pkg-config python-wrapper @@ -1917,6 +1642,9 @@ (define (make-l10n-package project version source locales) (string-append (getcwd) "/mach_state")) (setenv "MOZCONFIG" (string-append (getcwd) "/.mozconfig")) (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") + (setenv "GUIX_PYTHONPATH" + (string-append (getcwd) + "/obj/_virtualenvs/build/lib/python3.10/site-packages")) (setenv "BUILD_BACKENDS" "FasterMake,RecursiveMake"))) (replace 'build ;build and install data files (lambda* (#:key outputs #:allow-other-keys) From patchwork Sun Aug 18 11:57:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 30135 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 F41FF27BBE9; Sun, 18 Aug 2024 12:59:00 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 D169427BBEA for ; Sun, 18 Aug 2024 12:58:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sfeYO-000736-CD; Sun, 18 Aug 2024 07:58:36 -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 1sfeYM-0006zy-FW for guix-patches@gnu.org; Sun, 18 Aug 2024 07:58:34 -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 1sfeYM-0003J4-6R for guix-patches@gnu.org; Sun, 18 Aug 2024 07:58:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=96hsicTEUKMXRgfVOGPnCLo4MQeQoJgrwzy2/m1QYfM=; b=VI/tghf583scgAV2/BKyqDfA3qG9hBwaW/NIU2JWxISZDGFAWk0HZRDwDc/7gccX8I9PT/c55EILVOdxL4hcw482Ce2b+I+TDKhgl5TdFeW+Hg2syTzDghIUMMAf6V/3jkZXKKXjchjUH8vKI1DS5JKtxdp8WTRx12FWFLFeX4k0AYnrI/ad4mGqzb9OpC0pzA1nQVLrD8Ji8AJuSiPjFrSmRjVJ+do7SzOSfP8SJfGzqZ970QEO5vjfMEoSF2x7k8vyACGIp7kq08sJv4aH6G1JgC/EbUEOrOI2pqHvF9Jfm50mOYZHDA97+h892X5RKTHmN9OnVz9NA9XCtsixlQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sfeYo-0003xI-Fm; Sun, 18 Aug 2024 07:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#67849] [PATCH v3 3/5] gnu: icedove-wayland: Use icedove-minimal instead of icedove. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: clement@lassieur.org, jonathan.brielmaier@web.de, mhw@netris.org, guix-patches@gnu.org Resent-Date: Sun, 18 Aug 2024 11:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67849@debbugs.gnu.org Cc: Jonathan Brielmaier , =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier , Mark H Weaver X-Debbugs-Original-Xcc: =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier , Mark H Weaver Received: via spool by 67849-submit@debbugs.gnu.org id=B67849.172398230915134 (code B ref 67849); Sun, 18 Aug 2024 11:59:02 +0000 Received: (at 67849) by debbugs.gnu.org; 18 Aug 2024 11:58:29 +0000 Received: from localhost ([127.0.0.1]:55531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfeYG-0003w1-KY for submit@debbugs.gnu.org; Sun, 18 Aug 2024 07:58:28 -0400 Received: from mout.web.de ([212.227.15.14]:37199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfeYD-0003vM-BD for 67849@debbugs.gnu.org; Sun, 18 Aug 2024 07:58:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1723982259; x=1724587059; i=jonathan.brielmaier@web.de; bh=96hsicTEUKMXRgfVOGPnCLo4MQeQoJgrwzy2/m1QYfM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=LjoL6+DS4lNmRalkkDhsCdUZnzAUHNUZ+C/NSImu0dNzn6bO+sH/bVagKWAVcn/J T5wbugGf7NrxhW/2ZdP0VGajp3tJM7lVI7AhtwGiIj/6sF/seWlSlKeJVeZrR8HiL /ZX/i6XAnI7beWyGzSOu1Of73cYroxkCwzTtIcPpr25QbSer4T7AUtajpkxfezLwB S89+jNzAWjOqbjyW+1lDA2pgiZpX/4430Bro1uqRoadwZFCJy5rTHHe2A4JzWYhTT 98a0/biKr0tWV19oYbAXLlfw/Lz4M2zsvgMiKR4ar7tm/8wmCU0poGWW+2erYR1iS GnwGgx+eLLuqXdW1FA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from 3700X.fritz.box ([78.51.25.171]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MDdy7-1spnXh3wxD-00A7Y2; Sun, 18 Aug 2024 13:57:38 +0200 Date: Sun, 18 Aug 2024 13:57:26 +0200 Message-ID: <0ea2193df631d120d940fbd81983750ee3c4267b.1723982094.git.jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <0a6c0efc757e38f653e8dbe0d82cc9d20fd61d51.1723982094.git.jonathan.brielmaier@web.de> References: <0a6c0efc757e38f653e8dbe0d82cc9d20fd61d51.1723982094.git.jonathan.brielmaier@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:c9CgyoqXf7z3lJSZHUxJYIfrCwoY4dcZnrzrMH5SGItiA7ciupR 0itPlM/IW8flxF1iOt/YbBt/u02aB7GbLovozvdm00mjZzpep1Y8d6fXekiG0jXcgKeAxue clPEfKJECFNKD5How4hLUl2V/37Aesmyq3ER7Opp8RRWC9JZC8PgmeBROZdRf+Hbyibdd3n wtk/SALnHmv/vfKF9OweQ== UI-OutboundReport: notjunk:1;M01:P0:H20cK4/vyS4=;WmHnVEyRo8Gq/ARuH6SOy4RTyIh 9v8dlLEez/XRuzNK13/3ODZ9CQstPsopxtu0oXGy114F2tdORoJ3GaHW/CNAXdJaUXZ469jEm TVtRJtkVC/QGN0hVDOe+qXe9Jy53XkwomDx6PxNGNkCqlyvKUR+qeJqDeUKMkkmXEdmWj4+/q x9/TIPIdaUAZlEc8T21mh2oFJugqWUy3qllb4j3D5fC30iDZwEXDT7fqAmX0DkwTiAOkrj/A8 bQnhragBg12XYXI7arQhrx3WFkb0BO9U8dlbPPVx1FFV17FdZh3KMuUzB5MA7pkkxmMu0/x8H NkPDUDmMZ0nsYZ7v4r+pqOJcj1HPb1KEl0A6FM598NoZ4jgZWHHyzdP/XQBIbck6TkN+yzIGK WoLp5I/lBm1f+h2YPwXjkytgbUI7mvxC2mCPHqt4lG63k0IhP7Se2KnkuZEE2ULg0c6sJK5B2 2qRJCS0UUdBL/bs98RxeYE3dy82t9uSnqCnRjxeIlJRsI225UMBNtY5AmI0LImI1DsayG74Ov ZoAHUp3pugeV5oTB9Fa5Hd9ODkBOFBoY1gIw85Lx+1DBu8x8/yZS53JEDJ0kfLA4Zh86vDUqB U8g65ExSCZGbL9SBWOzb1FTQ1d2369W46AuoHhAhbLoLdr7H2Ir4yrOEUEuDNxpmAWso7LnJN P+BQmcso7SqdLkO6OwWA3EG26gwPnyp09D9oExxMRiwiOOUbpSYIF2Q+9EhGL2fqy31V7RFcm oMJVXaSHHtZ0jBpJ7qPbGlRRz71P63N5wQoYKMD2xz/r+42NFB6j6FXu8PEYyjCfSZDuMFwjr kygH17rXf0KF72ZbthU/Ecr43F+fTfUNNp4//4tr8nv6Hu9/IlmtqpQX4cnmm1a1iNPlKkn8b YEoFn2h3SX7OgYCHH/pP5KidCC8FAZeLe+tY= 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: , Reply-to: Jonathan Brielmaier X-ACL-Warn: , Jonathan Brielmaier via Guix-patches X-Patchwork-Original-From: Jonathan Brielmaier via Guix-patches via From: Jonathan Brielmaier 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 `icedove` does currently not built. * gnu/packages/gnuzilla.scm (icedove-wayland): Use `icedove-minimal` instead of `icedove`. Change-Id: Idc01d6a93071cff11ef139e6738aff1c7687d975 --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.45.2 diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index c109729b49..823ab2758b 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1787,7 +1787,7 @@ (define-public icedove (define-public icedove/wayland (package - (inherit icedove) + (inherit icedove-minimal) (name "icedove-wayland") (build-system trivial-build-system) (arguments @@ -1803,14 +1803,14 @@ (define-public icedove/wayland (format port "#!~a MOZ_ENABLE_WAYLAND=1 exec ~a \"$@\"" #$(file-append bash-minimal "/bin/bash") - #$(file-append icedove "/bin/icedove")))) + #$(file-append icedove-minimal "/bin/icedove")))) (chmod exe #o555) ;; Provide the manual and .desktop file. - (copy-recursively (string-append #$icedove "/share") + (copy-recursively (string-append #$icedove-minimal "/share") (string-append #$output "/share")) (substitute* (string-append #$output "/share/applications/icedove.desktop") - ((#$icedove) #$output)))))) + ((#$icedove-minimal) #$output)))))) (native-inputs '()) (inputs '()))) From patchwork Sun Aug 18 11:57:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 30136 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 1FCDA27BBEC; Sun, 18 Aug 2024 12:59:01 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 1034927BBE2 for ; Sun, 18 Aug 2024 12:58:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sfeYE-0006in-Ns; Sun, 18 Aug 2024 07:58:26 -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 1sfeYD-0006iH-8j for guix-patches@gnu.org; Sun, 18 Aug 2024 07:58:25 -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 1sfeYC-0003Iu-Uh for guix-patches@gnu.org; Sun, 18 Aug 2024 07:58:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3Ak1zrDFmLOAzCFUFmisFalTQ6UEPv6iHHqqwkm8QKw=; b=ntJowkYD8PgKuwR/pr8WDtkpKCppDHNGIorurbqvoGoSKCgKHC1c1Hh1PsDLX85rI7lkFhOcp75zTERGLf9pGTcKrdvOWu5Lia9FPcd1ygol/Nzmc3SadXKcWbJcEYKZRthi2NKvhc8JMFMlIkuC4Sldqd3XSUGWy+XwL3vChYvE1NoPCIvNVnj27C+qL1yppkf5rocD5dleCBYz3aAzjOj6tRr4IjeKl9gcPwDganV6+fDHKpDq6NyPDoiuDl6H45P0YvKmZUEDHmuKDLPuq3Z3UlC2dZQj0Qvq+hQcCvrWY2Y8ur66NrmiIvAwKUrCYuNBPwmYXpyQZc4D0pMmyw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sfeYo-0003xP-UL; Sun, 18 Aug 2024 07:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#67849] [PATCH v3 4/5] gnu: icedove. Update to 115.14.0. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: clement@lassieur.org, jonathan.brielmaier@web.de, mhw@netris.org, guix-patches@gnu.org Resent-Date: Sun, 18 Aug 2024 11:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67849@debbugs.gnu.org Cc: Jonathan Brielmaier , =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier , Mark H Weaver X-Debbugs-Original-Xcc: =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier , Mark H Weaver Received: via spool by 67849-submit@debbugs.gnu.org id=B67849.172398230915141 (code B ref 67849); Sun, 18 Aug 2024 11:59:02 +0000 Received: (at 67849) by debbugs.gnu.org; 18 Aug 2024 11:58:29 +0000 Received: from localhost ([127.0.0.1]:55533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfeYG-0003w4-WF for submit@debbugs.gnu.org; Sun, 18 Aug 2024 07:58:29 -0400 Received: from mout.web.de ([212.227.15.14]:54545) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfeYD-0003vN-Ct for 67849@debbugs.gnu.org; Sun, 18 Aug 2024 07:58:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1723982259; x=1724587059; i=jonathan.brielmaier@web.de; bh=3Ak1zrDFmLOAzCFUFmisFalTQ6UEPv6iHHqqwkm8QKw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=Xw/uTJdxd4kyXBt8XZnxApiX8uGg8sgqV5aK+uiUUy4u62e2ga9D1n0cBAMvOiUP FBjhfZ2Q3M3mQgIa73WBV1F6Aabdk7HgDYIELt6at1OZbtCKNtnMnQWyTgF7+CToC FvdkJ8mT3dhzsX3JnZRRd2f/ET1dQnnnpCBqPdL8D0cOkLJM1q1fFkZIl9wTP/Y6L P9VLY62ATaShpdLbZb7z1EL6uADsvIBaxDzfeZe45zCfzojfT/ALCe7oWeJ4XhRhQ FU+0Gyl4p8v+yvpB9H0XHMv2ezm8a8r1SoXfuiXbcoDam+Hq1482M1I7P82aJAQfv JtvjSP3nUCASQkCT2A== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from 3700X.fritz.box ([78.51.25.171]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MF2ke-1sv2jb0lxo-00GRk5; Sun, 18 Aug 2024 13:57:39 +0200 Date: Sun, 18 Aug 2024 13:57:27 +0200 Message-ID: <6da36083172944a7e7334fd3a3b68cddcddf5d8b.1723982094.git.jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <0a6c0efc757e38f653e8dbe0d82cc9d20fd61d51.1723982094.git.jonathan.brielmaier@web.de> References: <0a6c0efc757e38f653e8dbe0d82cc9d20fd61d51.1723982094.git.jonathan.brielmaier@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:98sAQc+WdR5zIWCzwuR5kk/L9E0ktEaP0/v5Jd3yIMtQsKyckVW 8HSYExUZReNEBvqzgGRBJ2AsWqTVSVu1G2vO09f7BmCf1qEcuH5QnzOPSX9WPxf4XHk8MM5 MoLyTTuHInO5h3EfAz8GhE0SRlJq8EdhMuPR2ptqvmL7LESa/e/V+JYBk/fUyceeLhpp3DB UrSHRNCUL+lpjPmqGjd8g== UI-OutboundReport: notjunk:1;M01:P0:8Hes9sj+VaU=;G50xJHcPh2zBKBKIshI7xRjw9Oa tfKI801rH3ZEKuSz4jeXX2WWGan1hnwRMFZuIdq4dN6G1TAuIrstqxJxWBK6meBnbek6t98S5 logiCun5piXwAHTZOQ581lk8edopi5Wn2b+SjjXGkLsxTWncfM3WqIj6wcL52euSXLUwISbR+ j/Wg748Ucka/NxULCdB3dwpd29sKa1Ul34pcDkQ/PAD8fSaePdhTlgpxDK9BTjKGEqmr2K3v3 qvDuSQMlvOpUoGslgwHALHDUi22tFhTRE8wdSxTb3xt3KkE1/nYtmcMalBxYw3F3wki6TiUQk 92fBAqppendCjc9Ree9Z3vLOSpGnYGNx5nLIPNSIBaXADeOBFNeFRAafttWSIsYc26D0klyF1 jwVCzhjhPX0y7b6+f+QR2/Lr4BqfhlxUgDXvls4TgOLWTC7USj1OaHJoSw4f2MYBXp7LvM5CR gUjj19VFFNG/MOWphrYCu5EyWX162/M0OJeRM039lDe2d1ZMUnYTSSCEkADA/dZ5TGBtqk9eG 9CB9X0Cq5RP5zzICBgjpyhtpD7vVVipvKc0aflIsSbycE/yOvTKH4LRi9Cynjdr3GqpitMxr7 duZetrzOEd7APxmd1tHpkGTRRgSaUIwdviMheCaFNI5qNfeUoJ6U8mw26wPP9Ak5QrirDdrXW zLKXaDiDIT1U1bVf21E2wMcpH802fFKR/1dyDLcVeP+EJ+d02rHU8S+YVrsomRTLc8XCGbOU2 oy+C2d8giA8pr3UW253utwiGcpxVkhJSP2yNJCj4Dmpe4e0OdYNx8vCbAMF1uM271YPJUgWb0 +qxkuQy1IVxemMCifgo5Ed3tkiRJ0dFsMgPzyFKvudHqovPLIrH+EypE4jI+szmZEHO+HmC+G y5t3t8Q6jafHLUaDKZpMkhMue/lcjpAexkuM= 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: , Reply-to: Jonathan Brielmaier X-ACL-Warn: , Jonathan Brielmaier via Guix-patches X-Patchwork-Original-From: Jonathan Brielmaier via Guix-patches via From: Jonathan Brielmaier 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/gnuzilla.scm (%icedove-version): Update to 115.14.0. Change-Id: I7564b525059f6c26beeee4bf9514fa38cc2aaa58 --- gnu/packages/gnuzilla.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.45.2 diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 823ab2758b..7228667be7 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1159,8 +1159,8 @@ (define %icecat-locales "ru" "sc" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "tg" "th" "tl" "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW")) -(define %icedove-build-id "20240418000000") ;must be of the form YYYYMMDDhhmmss -(define %icedove-version "115.10.1") +(define %icedove-build-id "20240807000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "115.14.0") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. @@ -1169,11 +1169,11 @@ (define thunderbird-comm-source (method hg-fetch) (uri (hg-reference (url "https://hg.mozilla.org/releases/comm-esr115") - (changeset "24e9961527d4cbb7f3f92687c40ee2fa96fb44cb"))) + (changeset "99f915f469c83ab9f535e41cce590e44f6ccfa46"))) (file-name (string-append "thunderbird-" %icedove-version "-checkout")) (sha256 (base32 - "06z4x0nnl277wnj6rk7y8dfhc4gd3d8y1x34nw321ysy8sah8i9f")))) + "0w6ckv6d95f4ildfbwv343zpgl3j4gnramc0vnjc1l3k72pcbjn2")))) (define (comm-source->locales+changeset source) "Given SOURCE, a checkout of the Thunderbird 'comm' component, return the @@ -1203,7 +1203,7 @@ (define thunderbird-comm-l10n ".strings_all.tar.zst")) (sha256 (base32 - "1d7r1kmw0j0b07rg7lq2m3lp2ixfcavqp19g06glxdgf7kjymr84")))) + "0ymnxsdlnh56bjishs1i35yq96qng1apsp5yjgn9cvvmr7mr926b")))) (define icedove-source (let ((name (string-append "icedove-" %icedove-version))) From patchwork Sun Aug 18 11:57:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 30133 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 8908A27BBEA; Sun, 18 Aug 2024 12:58:38 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 545BC27BBE9 for ; Sun, 18 Aug 2024 12:58:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sfeYF-0006j0-1X; Sun, 18 Aug 2024 07:58:27 -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 1sfeYC-0006hs-0G for guix-patches@gnu.org; Sun, 18 Aug 2024 07:58:24 -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 1sfeYB-0003Ih-Nx for guix-patches@gnu.org; Sun, 18 Aug 2024 07:58:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ki9f0qb5CEfjiEttGo7gW33uXKOA0LwtE5M8sAuNTE4=; b=l5CFLIRcbQSs/ABXIHErzBWppnUkj3Ql6442WkSEMJTG8puZARIF/+JX8jcB583rKv0Yxzks0nhPOQ9MiQ/1j/oRUs+4QqIRZNtchm2Q+g9vTPKtc09qSdd1XBm5eynF82OGIf+mrvj8NclA4X0P8DkbbntEELRCTfbQZWFp/J+jza4Ttduz19n+v1nN90bWRg6cFzU8XM6ao7a7/wj6VsFjxcXGrfZ77ikhxLkNaPnffSAplf30CGRKEQ7lq1Nk6Rx5oFQVKc44LyFzA3BEeMsy4b0f3dlTbCSB+MymFOBJMpXmU8t+d5OWbWkBz/G/eUL4atF+GEthmRusWqo3cw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sfeYp-0003xi-TH; Sun, 18 Aug 2024 07:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#67849] [PATCH v3 5/5] gnu: icedove-minimal: Add StartupWMClass. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: clement@lassieur.org, jonathan.brielmaier@web.de, mhw@netris.org, guix-patches@gnu.org Resent-Date: Sun, 18 Aug 2024 11:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67849@debbugs.gnu.org Cc: Jonathan Brielmaier , =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier , Mark H Weaver X-Debbugs-Original-Xcc: =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier , Mark H Weaver Received: via spool by 67849-submit@debbugs.gnu.org id=B67849.172398231515162 (code B ref 67849); Sun, 18 Aug 2024 11:59:03 +0000 Received: (at 67849) by debbugs.gnu.org; 18 Aug 2024 11:58:35 +0000 Received: from localhost ([127.0.0.1]:55537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfeYM-0003wN-NA for submit@debbugs.gnu.org; Sun, 18 Aug 2024 07:58:35 -0400 Received: from mout.web.de ([212.227.15.4]:58765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfeYE-0003vT-Vx for 67849@debbugs.gnu.org; Sun, 18 Aug 2024 07:58:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1723982259; x=1724587059; i=jonathan.brielmaier@web.de; bh=ki9f0qb5CEfjiEttGo7gW33uXKOA0LwtE5M8sAuNTE4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=uBCdGBTH5jJxTO+YV0LdzAxpomYGrzNGbWma8PL6h+3H6SguDqRLDz3u3oea20W7 xe9YXiAYmz6lpIOsbiSy0IxhWaZPuiLnk+Y5EYS16TPNup++NUZDKZUENPbXkcOnO h+aPuMFN4frnROZ+U3nV1sRw8fmdHVACUk/HhatYMU8Cm9FqISDSd+d2LV5mTcFA2 YfaxZdOs/aYtbtRsjaQPxr2fNY8YSLHifLC+SLG7twWeFdfCWy+jVEkZwaWSKTtrv qiixvV70FCkp9T5fVfZTuSQedosLWwVEEVlZQr5Af0VgLTGPKvAGpmBt8y7xjq9AB gw0Tbrrk2YAYg5e4EA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from 3700X.fritz.box ([78.51.25.171]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1M4KJR-1sfNQI1mcL-000ncq; Sun, 18 Aug 2024 13:57:39 +0200 Date: Sun, 18 Aug 2024 13:57:28 +0200 Message-ID: <3e055c28c90ce29fc4dbccbcd0b916df68426d2d.1723982094.git.jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <0a6c0efc757e38f653e8dbe0d82cc9d20fd61d51.1723982094.git.jonathan.brielmaier@web.de> References: <0a6c0efc757e38f653e8dbe0d82cc9d20fd61d51.1723982094.git.jonathan.brielmaier@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:XjTZNKS+u+5McTPUKzgfXU8heP3D4hiaz9l2+LbxJXjC7SkjQGv uxeKuqzp6MBYv57k8NFgsbhRwkn1P3XXMcpEzomOD9IAydziyZ4pLwQpb9mevcapuC8xmZO ISRz/xJli0p0V3xYcIVDrwKspiTE84XweVyUzzhSJOndvbsU4EvMxzHFYUQYMQI3RKfu3vd xoQdHKA8kAUR/+ZYdxlZA== UI-OutboundReport: notjunk:1;M01:P0:mCrxqPH2SUU=;3qwtBmDVNUQvOLvNTsJ+YkZ1M58 9u0k6FG536sVSuA0GmzGlyUxzHtMFKgGnsOSsyhGWP0nAV2UbHlUkKlOyr5bfr5j0DjB03bXU Ap/65Wr/rtCnoBtDCIwF257n3iX4q6Cd9WmSbPG3Q4mm8vvX2X+weYE03Uh4JdDC9WbmO5N8p 3VI8iYcu18er0ckllNMIVvk0sN8LhBfmxNx+0EqXdVLyDkwdPtvVww6NaMn2eKxtH53dtEkRt 7/rVO2vkkiAH9vBHA4hxm6A/vo39hrifqDV4w8BGDEzITu0ZlHTEOap0/7vovQkgoftDRroQN saWVPqdl9TyZpOCqhcW0mcBpZJMEQZ5xCD8wrgNsUfzQHkon0f2IhedzQLhE+CMItfWLYgiqP ft48+6S1x2/Sp3gf7MpG2GmyFhmB81RJ6fUvnJBrWmbyydbO4BbXoM3DwsHgoT5ryDXW78wHL HO37amGKafAWEwV9EzFsyqhTmsTlnJ1PVxtOsInTjJfzNPAzanQGfFpZXRqLdB9kDXsB9saUk HXV+yAYksVJZqSEAljM9GXguHMgZEMk10MrqvuWbccBglsVuvGhHMI9GoIEQp8vLrJV5scQaT SPMJvdE2kHYbMgTWuH7W/Cn0hzL7cIZav6U7kbEdnizl20aezjPN/nd/IDqbRszwq5XURl395 +nhtCgSBFqOdhToTHR+CRzikzpb6KOb6ji+KIso8Z2pPxrlX6yzxSXn9CrQzvAkv3lH5/C9KA RslNKqZrJ3X3bGqMBzZH9e11tudIcFiE11Es8D6KkLeDSOmIUUVxG1ojGAuEK81A5QLnXjKE6 uo4u4sFmhK4M8g8Yg48C4psa0w7jYYstNvPKEnc9AGKDKYg7rFcKoSyqT9W5lkidGFXK+q2Xk qvNGrZy2laBilof39sQX9bgg0NVOJIeaGn1E= 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: , Reply-to: Jonathan Brielmaier X-ACL-Warn: , Jonathan Brielmaier via Guix-patches X-Patchwork-Original-From: Jonathan Brielmaier via Guix-patches via From: Jonathan Brielmaier 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 Fixes https://issues.guix.gnu.org/69267 * gnu/packages/gnuzilla.scm (icedove-minimal)[arguments]: Set MOZ_APP_REMOTINGNAME and StartupWMClass. Change-Id: Ibf334c2d840a49aa7ec84da44eceecd85cb3bcd2 --- gnu/packages/gnuzilla.scm | 4 ++++ 1 file changed, 4 insertions(+) -- 2.45.2 diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7228667be7..67390d9699 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1424,6 +1424,9 @@ (define-public icedove-minimal (setenv "MOZ_BUILD_DATE" #$%icedove-build-id) ; avoid timestamp (setenv "MOZ_APP_NAME" "icedove") + ;; WM_CLASS (default is "$MOZ_APP_NAME-$MOZ_UPDATE_CHANNEL"). + (setenv "MOZ_APP_REMOTINGNAME" "Icedove") + (setenv "LDFLAGS" (string-append "-Wl,-rpath=" #$output "/lib/icedove")) (mkdir-p (string-append (getcwd) "/builddir")) @@ -1496,6 +1499,7 @@ (define-public icedove-minimal MimeType=x-scheme-handler/mailto;~@ Type=Application~@ Actions=ComposeMessage;~@ + StartupWMClass=Icedove;~@ [Desktop Action ComposeMessage]~@ Name=Write new message~@ Exec=~@*~a/bin/icedove -compose~%"