Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9A89F84ECB for ; Thu, 14 Dec 2023 10:44:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Kqxa57ilHPtl for ; Thu, 14 Dec 2023 10:44:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A28F484D26 for ; Thu, 14 Dec 2023 10:44:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 906D2FA42; Thu, 14 Dec 2023 10:44:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_17025506634530" MIME-Version: 1.0 Date: Thu, 14 Dec 2023 10:44:23 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/textproc/icu To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20231214104423.906D2FA42@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_17025506634530 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: adam Date: Thu Dec 14 10:44:23 UTC 2023 Modified Files: pkgsrc/textproc/icu: Makefile PLIST distinfo pkgsrc/textproc/icu/patches: patch-Makefile.in Log Message: icu: updated to 74.2 ICU 74.2 updates to CLDR 44.1 locale data. These are maintenance releases for ICU 74 and CLDR 44, with limited sets of bug fixes and no API or structural changes. The CLDR bug fix relevant for ICU is for some formatting patterns that erroneously had two adjacent space characters. These are coalesced into one. (CLDR-17233) Important: DateFormat.getInstanceForSkeleton() and the DateTimePatternGenerator sometimes used the wrong patterns because they failed to use/inherit certain data (ICU-22575 — CLDR 44 had removed some redundant data that ICU relied on) To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 pkgsrc/textproc/icu/Makefile cvs rdiff -u -r1.55 -r1.56 pkgsrc/textproc/icu/PLIST cvs rdiff -u -r1.103 -r1.104 pkgsrc/textproc/icu/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_17025506634530 Content-Disposition: inline Content-Length: 4892 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/icu/Makefile diff -u pkgsrc/textproc/icu/Makefile:1.152 pkgsrc/textproc/icu/Makefile:1.153 --- pkgsrc/textproc/icu/Makefile:1.152 Wed Nov 8 12:56:49 2023 +++ pkgsrc/textproc/icu/Makefile Thu Dec 14 10:44:23 2023 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.152 2023/11/08 12:56:49 wiz Exp $ +# $NetBSD: Makefile,v 1.153 2023/12/14 10:44:23 adam Exp $ -DISTNAME= icu4c-74_1-src +DISTNAME= icu4c-74_2-src PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GITHUB:=unicode-org/} GITHUB_PROJECT= icu -GITHUB_RELEASE= release-74-1 +GITHUB_RELEASE= release-74-2 EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/textproc/icu/PLIST diff -u pkgsrc/textproc/icu/PLIST:1.55 pkgsrc/textproc/icu/PLIST:1.56 --- pkgsrc/textproc/icu/PLIST:1.55 Wed Nov 8 12:56:49 2023 +++ pkgsrc/textproc/icu/PLIST Thu Dec 14 10:44:23 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.55 2023/11/08 12:56:49 wiz Exp $ +@comment $NetBSD: PLIST,v 1.56 2023/12/14 10:44:23 adam Exp $ bin/derb bin/genbrk bin/gencfu @@ -261,7 +261,6 @@ sbin/gencmn sbin/gennorm2 sbin/gensprep sbin/icupkg -share/icu/${PKGVERSION}/LICENSE share/icu/${PKGVERSION}/config/${MH_NAME} share/icu/${PKGVERSION}/install-sh share/icu/${PKGVERSION}/mkinstalldirs Index: pkgsrc/textproc/icu/distinfo diff -u pkgsrc/textproc/icu/distinfo:1.103 pkgsrc/textproc/icu/distinfo:1.104 --- pkgsrc/textproc/icu/distinfo:1.103 Wed Nov 8 12:56:49 2023 +++ pkgsrc/textproc/icu/distinfo Thu Dec 14 10:44:23 2023 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.103 2023/11/08 12:56:49 wiz Exp $ +$NetBSD: distinfo,v 1.104 2023/12/14 10:44:23 adam Exp $ -BLAKE2s (icu4c-74_1-src.tgz) = e76fb76e3a57d7ab2d90697b056ea45d6db443200b95b56c26e4bedebebb0a5b -SHA512 (icu4c-74_1-src.tgz) = 32c28270aa5d94c58d2b1ef46d4ab73149b5eaa2e0621d4a4c11597b71d146812f5e66db95f044e8aaa11b94e99edd4a48ab1aa8efbe3d72a73870cd56b564c2 -Size (icu4c-74_1-src.tgz) = 26625850 bytes -SHA1 (patch-Makefile.in) = 67440d3af9b62b8c0be258c490255ba17f778ab4 +BLAKE2s (icu4c-74_2-src.tgz) = a0ffb4d6fdbbecd749eb2c8a552707ba18836dc51e69750d49d39181035b96ee +SHA512 (icu4c-74_2-src.tgz) = 0cbe29122370ba03a8fb5b0f1494f598748044ad2aa4d66ba65fe98ebeb88da2d73d324ad6bfc44e004846e0ab5c9a34d1fdf3d6bdb3095c0d47e929b943e6db +Size (icu4c-74_2-src.tgz) = 26618071 bytes +SHA1 (patch-Makefile.in) = be52aa478e96e5f32ff95924d6a58860806585a8 SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09 SHA1 (patch-common_putil.cpp) = cc867aaef753c23ff12db019e41836c0dd5ac6d1 SHA1 (patch-common_putilimp.h) = 0924d38a780b626fea78754aa2da6cf3ca19b9b7 Index: pkgsrc/textproc/icu/patches/patch-Makefile.in diff -u pkgsrc/textproc/icu/patches/patch-Makefile.in:1.1 pkgsrc/textproc/icu/patches/patch-Makefile.in:1.2 --- pkgsrc/textproc/icu/patches/patch-Makefile.in:1.1 Sat Apr 22 20:11:45 2017 +++ pkgsrc/textproc/icu/patches/patch-Makefile.in Thu Dec 14 10:44:23 2023 @@ -1,11 +1,20 @@ -$NetBSD: patch-Makefile.in,v 1.1 2017/04/22 20:11:45 adam Exp $ +$NetBSD: patch-Makefile.in,v 1.2 2023/12/14 10:44:23 adam Exp $ +In 74.2, LICENSE is a symlink to non-existing file, so it can't be installed. Add linker flags for finding the libraries to pkg-config files. Avoid using programs which need elevated privileges during the build. ---- Makefile.in.orig 2016-09-09 21:28:18.000000000 +0000 +--- Makefile.in.orig 2023-12-11 22:27:41.000000000 +0000 +++ Makefile.in -@@ -272,7 +272,7 @@ config/icu-i18n.pc: config/icu.pc Makefi +@@ -190,7 +190,6 @@ install-icu: $(INSTALLED_BUILT_FILES) + $(INSTALL_SCRIPT) $(top_srcdir)/install-sh $(DESTDIR)$(pkgdatadir)/install-sh + @$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig + $(INSTALL_DATA) $(ALL_PKGCONFIG_FILES) $(DESTDIR)$(libdir)/pkgconfig/ +- $(INSTALL_DATA) $(top_srcdir)/../LICENSE $(DESTDIR)$(pkgdatadir)/LICENSE + ifeq ($(INSTALL_ICU_CONFIG),true) + $(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config + endif +@@ -284,7 +283,7 @@ config/icu-i18n.pc: config/icu.pc Makefi @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Internationalization library" >> $@ @echo "Name: $(PACKAGE)-i18n" >> $@ @echo "Requires: icu-uc" >> $@ @@ -14,7 +23,7 @@ Avoid using programs which need elevated @echo $@ updated. config/icu-io.pc: config/icu.pc Makefile icudefs.mk -@@ -280,7 +280,7 @@ config/icu-io.pc: config/icu.pc Makefile +@@ -292,7 +291,7 @@ config/icu-io.pc: config/icu.pc Makefile @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Stream and I/O Library" >> $@ @echo "Name: $(PACKAGE)-io" >> $@ @echo "Requires: icu-i18n" >> $@ @@ -23,7 +32,7 @@ Avoid using programs which need elevated @echo $@ updated. ICULEHB_LIBS=@ICULEHB_LIBS@ -@@ -299,7 +299,7 @@ ifneq ($(ICULEHB_LIBS),) +@@ -311,7 +310,7 @@ ifneq ($(ICULEHB_LIBS),) else @echo "Requires: icu-le" >> $@ endif --_----------=_17025506634530--