Received: by mail.netbsd.org (Postfix, from userid 605) id A6E0684EFC; Thu, 20 Apr 2023 14:42:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D685F84EF3 for ; Thu, 20 Apr 2023 14:42:33 +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 vZpB_iOCCRiK for ; Thu, 20 Apr 2023 14:42:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0241A84D08 for ; Thu, 20 Apr 2023 14:42:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EFEE6FA85; Thu, 20 Apr 2023 14:42:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1682001752166020" MIME-Version: 1.0 Date: Thu, 20 Apr 2023 14:42:32 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/textproc/icu To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230420144232.EFEE6FA85@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1682001752166020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Thu Apr 20 14:42:32 UTC 2023 Modified Files: pkgsrc/textproc/icu: Makefile distinfo Added Files: pkgsrc/textproc/icu/patches: patch-common_unicode_ures.h Log Message: icu: fix build breakage Commit 2de88f9d9c07f7e693449f94858d96053222acea / issue 21833 changes UChar_t* to char16_t* in ures.h (lines 815, 840, 862, 885 at least, functions ures_getUnicodeString() and friends). This breaks compilation of code using -DUCHAR_TYPE=uint16_t. https://unicode-org.atlassian.net/browse/ICU-22356 Workaround: revert to previous version, like Gentoo does https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5db7fc59b5ff77e2cf44f51784ed4e87aeab5b Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 pkgsrc/textproc/icu/Makefile cvs rdiff -u -r1.100 -r1.101 pkgsrc/textproc/icu/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/textproc/icu/patches/patch-common_unicode_ures.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1682001752166020 Content-Disposition: inline Content-Length: 4359 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.146 pkgsrc/textproc/icu/Makefile:1.147 --- pkgsrc/textproc/icu/Makefile:1.146 Wed Apr 19 08:06:31 2023 +++ pkgsrc/textproc/icu/Makefile Thu Apr 20 14:42:32 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.146 2023/04/19 08:06:31 adam Exp $ +# $NetBSD: Makefile,v 1.147 2023/04/20 14:42:32 wiz Exp $ DISTNAME= icu4c-73_1-src PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GITHUB:=unicode-org/} EXTRACT_SUFX= .tgz Index: pkgsrc/textproc/icu/distinfo diff -u pkgsrc/textproc/icu/distinfo:1.100 pkgsrc/textproc/icu/distinfo:1.101 --- pkgsrc/textproc/icu/distinfo:1.100 Wed Apr 19 08:06:31 2023 +++ pkgsrc/textproc/icu/distinfo Thu Apr 20 14:42:32 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.100 2023/04/19 08:06:31 adam Exp $ +$NetBSD: distinfo,v 1.101 2023/04/20 14:42:32 wiz Exp $ BLAKE2s (icu4c-73_1-src.tgz) = f4b7b4298932436e17ffce3aa4a5c8dca744161483150b8cc716d356166440f8 SHA512 (icu4c-73_1-src.tgz) = e788e372716eecebc39b56bbc88f3a458e21c3ef20631c2a3d7ef05794a678fe8dad482a03a40fdb9717109a613978c7146682e98ee16fade5668d641d5c48f8 @@ -10,6 +10,7 @@ SHA1 (patch-common_putilimp.h) = 0924d38 SHA1 (patch-common_ubidiimp.h) = 180eb1fe1069c393ddf1deb46da00f466d8438e8 SHA1 (patch-common_umutex.h) = b22b7c02b4645a87f71d54885d858d0cf9005988 SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8 +SHA1 (patch-common_unicode_ures.h) = 10007e7f0c219596a8e3b92abac9f83dbb28c36c SHA1 (patch-common_uposixdefs.h) = 2900a3747b49bcf1a81dbb5a20692c120f28cb04 SHA1 (patch-config_Makefile.inc.in) = e7cee161315321d2580074054d87714b55319886 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 Added files: Index: pkgsrc/textproc/icu/patches/patch-common_unicode_ures.h diff -u /dev/null pkgsrc/textproc/icu/patches/patch-common_unicode_ures.h:1.1 --- /dev/null Thu Apr 20 14:42:32 2023 +++ pkgsrc/textproc/icu/patches/patch-common_unicode_ures.h Thu Apr 20 14:42:32 2023 @@ -0,0 +1,50 @@ +$NetBSD: patch-common_unicode_ures.h,v 1.1 2023/04/20 14:42:32 wiz Exp $ + +Commit 2de88f9d9c07f7e693449f94858d96053222acea / issue 21833 +changes UChar_t* to char16_t* in ures.h (lines 815, 840, 862, 885 +at least, functions ures_getUnicodeString() and friends). + +This breaks compilation of code using -DUCHAR_TYPE=uint16_t. +https://unicode-org.atlassian.net/browse/ICU-22356 + +Workaround: revert to previous version, like Gentoo does +https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5db7fc59b5ff77e2cf44f51784ed4e87aeab5b + +--- common/unicode/ures.h.orig 2023-04-13 21:41:15.000000000 +0000 ++++ common/unicode/ures.h +@@ -812,7 +812,7 @@ inline UnicodeString + ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +- const char16_t *r = ures_getString(resB, &len, status); ++ const UChar *r = ures_getString(resB, &len, status); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { +@@ -837,7 +837,7 @@ inline UnicodeString + ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +- const char16_t* r = ures_getNextString(resB, &len, key, status); ++ const UChar* r = ures_getNextString(resB, &len, key, status); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { +@@ -859,7 +859,7 @@ inline UnicodeString + ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +- const char16_t* r = ures_getStringByIndex(resB, indexS, &len, status); ++ const UChar* r = ures_getStringByIndex(resB, indexS, &len, status); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { +@@ -882,7 +882,7 @@ inline UnicodeString + ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +- const char16_t* r = ures_getStringByKey(resB, key, &len, status); ++ const UChar* r = ures_getStringByKey(resB, key, &len, status); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { --_----------=_1682001752166020--