You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
icu-devel: sync with main port
This commit is contained in:
@@ -25,7 +25,7 @@ set my_name icu
|
||||
# port file all | sort -u | xargs grep -El ':icu( |$)' | rev | cut -d / -f 2 | rev | xargs port info --name --subport | cut -d : -f 2 | tr ',' ' ' | grep -v '\-\-' | tr ' ' '\n' | sort -u
|
||||
|
||||
github.setup unicode-org ${my_name} 78.3 release-
|
||||
revision 0
|
||||
revision 1
|
||||
epoch 1
|
||||
subport ${name}-docs { revision 0 }
|
||||
subport ${name}-lx { revision 0 }
|
||||
@@ -62,7 +62,7 @@ if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
|
||||
merger_must_run_binaries yes
|
||||
}
|
||||
|
||||
distname icu4c-[string map {.rc rc} ${version}]-sources
|
||||
distname icu4c-${version}-sources
|
||||
extract.suffix .tgz
|
||||
worksrcdir icu/source
|
||||
|
||||
@@ -73,6 +73,8 @@ if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
|
||||
|
||||
# fix rpath mess
|
||||
patchfiles-append patch-config-mh-darwin.diff
|
||||
patchfiles-append platform.h.patch \
|
||||
abs.patch
|
||||
|
||||
compiler.cxx_standard 2017
|
||||
|
||||
@@ -193,7 +195,7 @@ if {${subport} eq "${name}-docs"} {
|
||||
long_description-append Documentation.
|
||||
|
||||
use_zip yes
|
||||
distname icu4c-[string map {.rc rc} ${version}]-docs
|
||||
distname icu4c-${version}-docs
|
||||
checksums rmd160 a2e3cbf0b532e7bb3c5e21a66eb70bf5124ceae4 \
|
||||
sha256 7d7a502c881bb744531c3526dc02ffb18a1960caadb129c67818cc72d97c6bb1 \
|
||||
size 10664785
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
Fix abs() ambiguity.
|
||||
https://trac.macports.org/ticket/73705
|
||||
|
||||
--- i18n/measunit_extra.cpp.orig 2026-03-18 04:44:50
|
||||
+++ i18n/measunit_extra.cpp 2026-03-23 07:51:52
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "util.h"
|
||||
#include <limits.h>
|
||||
#include <cstdlib>
|
||||
+#include <cmath>
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
|
||||
@@ -686,7 +687,7 @@ class Token { (public)
|
||||
// Check if the value is integer.
|
||||
uint64_t int_result = static_cast<uint64_t>(double_result);
|
||||
const double kTolerance = 1e-9;
|
||||
- if (abs(double_result - int_result) > kTolerance) {
|
||||
+ if (std::abs(double_result - int_result) > kTolerance) {
|
||||
status = kUnitIdentifierSyntaxError;
|
||||
return 0;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
Work around bug in old clang versions that had __has_cpp_attribute defined even
|
||||
in C mode.
|
||||
|
||||
https://discourse.llvm.org/t/possible-bug-with-has-cpp-attribute/36508/4
|
||||
https://bugs.llvm.org/show_bug.cgi?id=23435
|
||||
--- common/unicode/platform.h.orig 2026-03-17 12:44:50.000000000 -0500
|
||||
+++ common/unicode/platform.h 2026-03-22 14:39:11.000000000 -0500
|
||||
@@ -388,7 +388,7 @@
|
||||
#else
|
||||
# define UPRV_HAS_ATTRIBUTE(x) 0
|
||||
#endif
|
||||
-#ifdef __has_cpp_attribute
|
||||
+#if defined(__cplusplus) && defined(__has_cpp_attribute)
|
||||
# define UPRV_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
|
||||
#else
|
||||
# define UPRV_HAS_CPP_ATTRIBUTE(x) 0
|
||||
Reference in New Issue
Block a user