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: 67089 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); + }