From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id cHrUDgWqLmbL3gAAe85BDQ:P1 (envelope-from ) for ; Sun, 28 Apr 2024 21:56:53 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id cHrUDgWqLmbL3gAAe85BDQ (envelope-from ) for ; Sun, 28 Apr 2024 21:56:53 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=web.de header.s=s29768273 header.b=SnqX6MI5; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714334212; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=MUlRMtvyqNjzq8wM7EFcp3O728xEROS01CzytGTjOgs=; b=JfmllS07e2XW/KExq046ZKbASCE1N0AymkhFsSJ7603LZxsrc50twgUvCPyDQTJCd/MnG+ yITcU7jyHSzaoflfvL2LV/krAxrkkglERGvQiFNkO+sMrz7ySChwbiG7VB8o3SJ+A6zyn2 G8KjXYZ2ygs2wNlnDI7DYMxnfaq/mfxzNmdWioLI7OthshykrBYvbLuGTTGiY0iyCsKXJa X0STUuYON3ogzcJsT0HTku0TKU7zg3xLZI4VKVf6gOupN5glHmxdvNwGDP5daKpqday1KP BuDK1ueEno5Q2EXB8CuZdro6rz2Dh3rz610d4D5yFUAgWADYJ1OGo+4PwuGGGQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714334212; a=rsa-sha256; cv=none; b=qJM7uwgnCGky+s5f2vCynjLp/I4osmRCjBvYJzMzadj+qgas5Cf126g6/YfPDxIBUT73rX gwpPzjJO3X6p3mIyTO40+B7TII0vC0+3HdUOIPhUREfL/oII4Pj9IoruUAi2w2d9HgXZBn Y/yZTL9Y3eQoNtr8C3kjVu+lrJmKcnPOmUKrKfvBo57TdBrM9Cv96bO+a/ob1Sl9vqtFW4 EVGqv6zEsWybS5kvUNLCbV284moJbITciUthPfQyi20IbXHScuKSsYT3BKFRws9s4hxpbr 0FF2dLuFnQ5ACxPaJ/3ZqfK2xTx3fzxluYWvO/gArEGaYku54ZDRgAX3HveUFg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=web.de header.s=s29768273 header.b=SnqX6MI5; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BCE203C3B9 for ; Sun, 28 Apr 2024 21:56:52 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1Adg-00021z-Uz; Sun, 28 Apr 2024 15:56:44 -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 1s1Adf-00021Z-FE for guix-patches@gnu.org; Sun, 28 Apr 2024 15:56:43 -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 1s1Adf-0008ML-7C for guix-patches@gnu.org; Sun, 28 Apr 2024 15:56:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1Ady-0001Ef-AQ for guix-patches@gnu.org; Sun, 28 Apr 2024 15:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#67849] [PATCH 1/3] 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, 28 Apr 2024 19:57: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 Received: via spool by 67849-submit@debbugs.gnu.org id=B67849.17143341684724 (code B ref 67849); Sun, 28 Apr 2024 19:57:02 +0000 Received: (at 67849) by debbugs.gnu.org; 28 Apr 2024 19:56:08 +0000 Received: from localhost ([127.0.0.1]:52587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1Ad5-0001Dx-Hv for submit@debbugs.gnu.org; Sun, 28 Apr 2024 15:56:08 -0400 Received: from mout.web.de ([212.227.17.11]:52339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1Ad2-0001DW-Rk for 67849@debbugs.gnu.org; Sun, 28 Apr 2024 15:56:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1714334139; x=1714938939; i=jonathan.brielmaier@web.de; bh=MUlRMtvyqNjzq8wM7EFcp3O728xEROS01CzytGTjOgs=; 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=SnqX6MI5rtbBBXFxBbrHy6fJCvDvHA5PlSrd9Gcbw3+uTRZsRJzQB05n37KV7Yts 3QVw9yBNRk8UmzdmRuFb6oBcap2i1krsKtdDi+HBqsXa3JNUfltb6pA7pBMgTD68A b4ait7o7z5lloAvA7fNkncDgcFQOeYG08a8eYsNPRSZBck9Dlfg0M6tUbtOF8aw9+ suMpTIGuF/fQ9JrIhxK7ur4/Jk+BND3jBG4Xus5oxR61BhW4l09IuaM668NyN1fDY Bz30/iPMc6VO6FQRfg7/QRXWx2kQjlVSrKUXlS+hEqZsCUFbemlsHMziVqwJn6ZZk 2YeYp4K4L66TsrL2XQ== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from 3700X.fritz.box ([77.187.136.144]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MUU6E-1sA0KI3UKe-00S7Va; Sun, 28 Apr 2024 21:55:38 +0200 Date: Sun, 28 Apr 2024 21:55:15 +0200 Message-ID: <75512c64bcd6cfe20a0dd38b2334e1f06a6f7e58.1714333675.git.jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:u657/suKbkeggod/rZatxN6+E3Pk5BIbzoH1HpZQetDSflE9S6T fgc5g99MHVqM/eiPzcg3csI9KKkEIi7bjhpeHo+0xmuOCRmJZM4BQI9a1ST/BM0VM7WJdSa EnbbL3Pw6N9MvfsD4WVA5u8QRvZZctU5v17+am9nVNVikC09HTC+ypePwtEa+ji0oRTm3iq UvWQIt13La9+AERmF628g== UI-OutboundReport: notjunk:1;M01:P0:jNPBgku+JLA=;b5Dz24pfJ82kxO2xlxTpz+bIT/w wHJjoV9LzXPs4RNm4dDqaVj/Jwd7U+2qwYZbCStO6Wx+eQC1/56NMn8mmTZ2Bv2GJHChsEF2f 2RLyBv5BJUPUye+1oPn++F/u9wCfKIfcv0ZexD+SHGc1sGSqOYYVD1eKOPA4ft2zq4NVzEnhu S9Ov7cvCqQfQ+UirL8q2Gyx4Vniz3HzpJV5k5+4nGELdssUXKyYFffuPSd8PMHA9N99ExOq8z Gqwa7GPdkxZ0YXTNSr9FsssJI3WGH+UWMwdKh60/d3r3zIjwuPsCnn/whw9wa7Q2SciJuE4SX jnKfKCh5+FGXjIKcc6lvKrsA/n0MJTpMnCw0rDpVBg1kQRL5CVbd47e91cPo46oKdpE0SmeFN b6Z/5HClcU7OKT6Xd0s3RBKUTn/S6/uyVjjNul6arhy1UQe9Fqybq1gKVBuy5rn7MxujZAzTm WgZhFc1r665vUVXSduRk/qDOWhE6GgEopF8NlwRJq3FDsQ5P56H+VVuusynobh2MupySk+f2n 8rcCDBmqdrgO/TMd+wxdSmTA9x9iddugiFd70LQHujGsOHJB3efmDvnLeSe3kkuFs13nFCq/r sQhRGeC2OYW7J2MaCA7UQSLne11NmhxgmasKxvga2Ly0QGpKvML7P4ft4tw7SYc2XfZ+lDGQL uckoLRe2RsOW2Bd1u0QbMaybD/Ap0gRr2iDZwQm/oD7igJAbTlFWeAH4DMF5sz3DS6hNb8F9Y NdsS50VKzS+lPlRpqX3VYOntd7pIDgxhZ5bdW+eMYQiUSm5EYQ0VSx2lYqkMXEBjVOo53V5qr GPrGhbeeI6unMQO51oeZl0uyJa4An6q2n0adw2zjnleUM= 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 From: Jonathan Brielmaier via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.39 X-Spam-Score: -3.39 X-Migadu-Queue-Id: BCE203C3B9 X-Migadu-Scanner: mx11.migadu.com X-TUID: W2RSDhQp0abC Icedove@115 does not properly work without this patch. See: https://bugzilla.mozilla.org/show_bug.cgi?id=3D1843007 * 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 =2D-- 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.pat= ch diff --git a/gnu/local.mk b/gnu/local.mk index 42961e60b2..f368eae54f 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1478,6 +1478,7 @@ dist_patch_DATA =3D \ %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.pat= ch \ %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 0dfe63b20a..19dfc8c4eb 100644 =2D-- 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/gn= u/packages/patches/icu4c-icu-22132-fix-vtimezone.patch new file mode 100644 index 0000000000..4fe520318a =2D-- /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?focusedComment= Id=3D166752 +Author: Sean Burke +License: +Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=3D1843007 + +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& s= tatus) const { + } + } + } else { +- UnicodeString icutzprop; +- UVector customProps(nullptr, uhash_compareUnicodeString, status)= ; ++ UVector customProps(uprv_deleteUObject, uhash_compareUnicodeStri= ng, 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); + } base-commit: 9f183c3627a006e8fd3bb9708448bc05a6204e6d =2D- 2.41.0