Attachment 241077 Details for Bug 270422 – v0 (RC1)

[patch] v0 (RC1)

bug270422.diff (text/plain), 5.07 KB, created by Jan Beich on 2023-03-23 19:18:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2023-03-23 19:18:00 UTC

Size: 5.07 KB

patch

obsolete

>From 01e51e2d93796ffd0dc5d8b6fa59f0afb55fb0d7 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Thu, 23 Mar 2023 17:56:40 +0000
>Subject: [PATCH] devel/icu: update to 73.r
>
>- Temporarily switch to GitHub automatic archive
>
>Changes:	https://github.com/unicode-org/icu/releases/tag/release-73-rc
>Reported by:	GitHub (watch releases)
>PR:		270422
>Exp-run by:	antoine
>---
> devel/icu/Makefile                     | 10 +++++-----
> devel/icu/distinfo                     |  6 +++---
> devel/icu/files/patch-common_putil.cpp | 12 ++++++------
> devel/icu/pkg-plist                    |  5 +++++
> 4 files changed, 19 insertions(+), 14 deletions(-)
>
>diff --git a/devel/icu/Makefile b/devel/icu/Makefile
>index 1e6fa4e38d32..49c60e13fdd7 100644
>--- a/devel/icu/Makefile
>+++ b/devel/icu/Makefile
>@@ -1,11 +1,9 @@
> PORTNAME=	icu
>-DISTVERSION=	72_1
>+DISTVERSIONPREFIX=	release-
>+DISTVERSION=	73-rc
> PORTREVISION?=	0 # keep for icu-lx
> PORTEPOCH?=	1
> CATEGORIES?=	devel
>-MASTER_SITES=	https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/rc/-&/:S/_/-/g}/ \
>-		SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION}
>-DISTNAME=	icu4c-${DISTVERSION}-src
> 
> MAINTAINER=	office@FreeBSD.org
> COMMENT?=	International Components for Unicode (from IBM)
>@@ -30,7 +28,9 @@ TEST_TARGET=	check
> CPE_VENDOR=	${PORTNAME}-project
> CPE_PRODUCT=	international_components_for_unicode
> USE_LDCONFIG=	yes
>-WRKSRC=		${WRKDIR}/icu/source
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	unicode-org
>+WRKSRC_SUBDIR=	icu4c/source
> 
> ICUMAJOR=	${PORTVERSION:C/\..*//}
> PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/}
>diff --git a/devel/icu/distinfo b/devel/icu/distinfo
>index 481018ce3f20..345ff40d5188 100644
>--- a/devel/icu/distinfo
>+++ b/devel/icu/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1666140801
>-SHA256 (icu4c-72_1-src.tgz) = a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68
>-SIZE (icu4c-72_1-src.tgz) = 26303933
>+TIMESTAMP = 1679594200
>+SHA256 (unicode-org-icu-release-73-rc_GH0.tar.gz) = e9932ab1ab13a79c5d4769e00dee3d7c031ead70662d908ac03570fe16e7ec44
>+SIZE (unicode-org-icu-release-73-rc_GH0.tar.gz) = 81490090
>diff --git a/devel/icu/files/patch-common_putil.cpp b/devel/icu/files/patch-common_putil.cpp
>index ac071ed2f2a7..f17f0ef319a0 100644
>--- a/devel/icu/files/patch-common_putil.cpp
>+++ b/devel/icu/files/patch-common_putil.cpp
>@@ -1,15 +1,15 @@
>---- common/putil.cpp.orig	2016-10-19 17:20:56 UTC
>+--- common/putil.cpp.orig	2023-03-23 17:56:40 UTC
> +++ common/putil.cpp
>-@@ -1789,7 +1789,7 @@ remapPlatformDependentCodepage(const cha
>+@@ -2004,7 +2004,7 @@ remapPlatformDependentCodepage(const char *locale, con
>           */
>          name = "ISO-8859-1";
>      }
> -#elif U_PLATFORM_IS_DARWIN_BASED
> +#elif U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM == U_PF_BSD
>-     if (locale == NULL && *name == 0) {
>+     if (locale == nullptr && *name == 0) {
>          /*
>          No locale was specified, and an empty name was passed in.
>-@@ -1808,11 +1808,6 @@ remapPlatformDependentCodepage(const cha
>+@@ -2023,11 +2023,6 @@ remapPlatformDependentCodepage(const char *locale, con
>           */
>          name = "UTF-8";
>      }
>@@ -19,9 +19,9 @@
> -        name = "EUC-KR";
> -    }
>  #elif U_PLATFORM == U_PF_HPUX
>-     if (locale != NULL && uprv_strcmp(locale, "zh_HK") == 0 && uprv_strcmp(name, "big5") == 0) {
>+     if (locale != nullptr && uprv_strcmp(locale, "zh_HK") == 0 && uprv_strcmp(name, "big5") == 0) {
>          /* HP decided to extend big5 as hkbig5 even though it's not compatible :-( */
>-@@ -1942,7 +1937,7 @@ int_getDefaultCodepage()
>+@@ -2183,7 +2178,7 @@ int_getDefaultCodepage()
>         nl_langinfo may use the same buffer as setlocale. */
>      {
>          const char *codeset = nl_langinfo(U_NL_LANGINFO_CODESET);
>diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist
>index d14fdca286c1..0a59aef5899e 100644
>--- a/devel/icu/pkg-plist
>+++ b/devel/icu/pkg-plist
>@@ -48,6 +48,7 @@ include/unicode/fieldpos.h
> include/unicode/filteredbrk.h
> include/unicode/fmtable.h
> include/unicode/format.h
>+include/unicode/formattednumber.h
> include/unicode/formattedvalue.h
> include/unicode/fpositer.h
> include/unicode/gender.h
>@@ -93,6 +94,7 @@ include/unicode/scientificnumberformatter.h
> include/unicode/search.h
> include/unicode/selfmt.h
> include/unicode/simpleformatter.h
>+include/unicode/simplenumberformatter.h
> include/unicode/simpletz.h
> include/unicode/smpdtfmt.h
> include/unicode/sortkey.h
>@@ -144,6 +146,7 @@ include/unicode/udisplayoptions.h
> include/unicode/uenum.h
> include/unicode/ufieldpositer.h
> include/unicode/uformattable.h
>+include/unicode/uformattednumber.h
> include/unicode/uformattedvalue.h
> include/unicode/ugender.h
> include/unicode/uidna.h
>@@ -166,6 +169,7 @@ include/unicode/unorm.h
> include/unicode/unorm2.h
> include/unicode/unum.h
> include/unicode/unumberformatter.h
>+include/unicode/unumberoptions.h
> include/unicode/unumberrangeformatter.h
> include/unicode/unumsys.h
> include/unicode/uobject.h
>@@ -181,6 +185,7 @@ include/unicode/usearch.h
> include/unicode/uset.h
> include/unicode/usetiter.h
> include/unicode/ushape.h
>+include/unicode/usimplenumberformatter.h
> include/unicode/uspoof.h
> include/unicode/usprep.h
> include/unicode/ustdio.h

Actions: View | Diff

Attachments on bug 270422: 241077