Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 58C7A84E53 for ; Thu, 9 Nov 2023 15:21:18 +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 Hijz0nJms0ha for ; Thu, 9 Nov 2023 15:21:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C223684D66 for ; Thu, 9 Nov 2023 15:21:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BB45CFA2F; Thu, 9 Nov 2023 15:21:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1699543277123680" MIME-Version: 1.0 Date: Thu, 9 Nov 2023 15:21:17 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/graphics/opencolorio To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20231109152117.BB45CFA2F@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1699543277123680 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Thu Nov 9 15:21:17 UTC 2023 Modified Files: pkgsrc/graphics/opencolorio: distinfo pkgsrc/graphics/opencolorio/patches: patch-src_utils_NumberUtils.h Log Message: opencolorio: NetBSD has strtol_l To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/opencolorio/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/graphics/opencolorio/patches/patch-src_utils_NumberUtils.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1699543277123680 Content-Disposition: inline Content-Length: 2462 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/opencolorio/distinfo diff -u pkgsrc/graphics/opencolorio/distinfo:1.11 pkgsrc/graphics/opencolorio/distinfo:1.12 --- pkgsrc/graphics/opencolorio/distinfo:1.11 Thu Nov 9 14:54:03 2023 +++ pkgsrc/graphics/opencolorio/distinfo Thu Nov 9 15:21:17 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2023/11/09 14:54:03 nros Exp $ +$NetBSD: distinfo,v 1.12 2023/11/09 15:21:17 nros Exp $ BLAKE2s (OpenColorIO-2.2.1.tar.gz) = 5fd74fcfa9cc588b7252dcc32df273c69a62a49ccd22b3258f6b2a4d3022624a SHA512 (OpenColorIO-2.2.1.tar.gz) = d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9 @@ -9,4 +9,4 @@ SHA1 (patch-src_OpenColorIO_CMakeLists.t SHA1 (patch-src_OpenColorIO_OCIOZArchive.cpp) = 07f6832350a400d98f273bacf16a82df1c1031f9 SHA1 (patch-src_apps_ocioarchive_main.cpp) = 227dc6f8bee4415db6eb54deef8551aee8b2bb36 SHA1 (patch-src_apputils_argparse.cpp) = 2c0948e891ad340a36f728070ac57b55691cece0 -SHA1 (patch-src_utils_NumberUtils.h) = 25bc5722b133402127560727b8f718e211eadc97 +SHA1 (patch-src_utils_NumberUtils.h) = 35cd321b9759144a16e8a376f83a119a6f7e4719 Index: pkgsrc/graphics/opencolorio/patches/patch-src_utils_NumberUtils.h diff -u pkgsrc/graphics/opencolorio/patches/patch-src_utils_NumberUtils.h:1.1 pkgsrc/graphics/opencolorio/patches/patch-src_utils_NumberUtils.h:1.2 --- pkgsrc/graphics/opencolorio/patches/patch-src_utils_NumberUtils.h:1.1 Thu Nov 9 14:54:03 2023 +++ pkgsrc/graphics/opencolorio/patches/patch-src_utils_NumberUtils.h Thu Nov 9 15:21:17 2023 @@ -1,7 +1,8 @@ -$NetBSD: patch-src_utils_NumberUtils.h,v 1.1 2023/11/09 14:54:03 nros Exp $ +$NetBSD: patch-src_utils_NumberUtils.h,v 1.2 2023/11/09 15:21:17 nros Exp $ Solaris does not have strtod_l and strtof_l Portability fix, use "defined" to check for preprocessor defines +NetBSD has strtol_l --- src/utils/NumberUtils.h.orig 2023-01-06 02:05:59.000000000 +0000 +++ src/utils/NumberUtils.h @@ -27,3 +28,12 @@ Portability fix, use "defined" to check #else tempval = ::strtof_l(first, &endptr, loc.local); #endif +@@ -144,7 +148,7 @@ really_inline from_chars_result from_cha + long int + #ifdef _WIN32 + tempval = _strtol_l(first, &endptr, 0, loc.local); +-#elif defined(__GLIBC__) ++#elif defined(__GLIBC__) || defined(__NetBSD__) + tempval = ::strtol_l(first, &endptr, 0, loc.local); + #else + tempval = ::strtol(first, &endptr, 0); --_----------=_1699543277123680--