<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1eb839a11cd85aaa95bf1a72d3369ea1e3e829c9">https://github.com/macports/macports-ports/commit/1eb839a11cd85aaa95bf1a72d3369ea1e3e829c9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1eb839a11cd icu: update to 67.1.
</span>1eb839a11cd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1eb839a11cd85aaa95bf1a72d3369ea1e3e829c9
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Wed Jul 22 17:00:29 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> icu: update to 67.1.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Two patches have been merged into upstream, authored by jmr@macports.org,
</span><span style='display:block; white-space:pre;color:#404040;'> so delete them. For the deleted max_align_t.patch see [1] and for the
</span><span style='display:block; white-space:pre;color:#404040;'> deleted umachine.h.patch see [2].
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also:
</span><span style='display:block; white-space:pre;color:#404040;'> - revbump icu-le-hb since it is needed to build icu-lx.
</span><span style='display:block; white-space:pre;color:#404040;'> - revbump libxml2 to use the new icu as py*-xml2 is needed for itstool
</span><span style='display:block; white-space:pre;color:#404040;'> which is pulled into the build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1] https://github.com/unicode-org/icu/commit/a3078fb8c89b61c35ccebb04cf6b189bc81093b3
</span><span style='display:block; white-space:pre;color:#404040;'> [2] https://github.com/unicode-org/icu/commit/c6fd07cdecce8fc3a517258d5145e89cd2781a9b
</span>---
devel/icu-le-hb/Portfile | 2 +-
devel/icu/Portfile | 20 +++--
devel/icu/files/max_align_t.patch | 89 ----------------------
.../patch-i18n-formatted_string_builder.h.diff | 11 +++
devel/icu/files/umachine.h.patch | 11 ---
textproc/libxml2/Portfile | 2 +-
6 files changed, 22 insertions(+), 113 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu-le-hb/Portfile b/devel/icu-le-hb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 820846e981d..d50e4fef155 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu-le-hb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu-le-hb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup behdad icu-le-hb 1.0.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories devel textproc
platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/Portfile b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 686df5eadb2..de7cc878284 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ set my_name icu4c
</span> # whenever the library version number changes. Thanks.
# To find dependencies, use:
# port file all | sort -u | xargs grep -El ':icu( |$)' | rev | cut -d / -f 2 | rev | sort -u
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 65.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 67.1
</span> if {${subport} eq "${name}58"} {
version 58.3
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,9 @@ distname ${my_name}-[string map {. _} ${version}]-src
</span> extract.suffix .tgz
worksrcdir ${name}/source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4537a0ce1879b24cdee150862615a7a899d6fa05 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24267934
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c4a84ef7d2e18d6d1374b5ed6449227b94550e14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24518055
</span>
if {${os.major} >= 11 || ${subport} eq "${name}58"} {
configure.python /usr/bin/python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,9 +76,9 @@ subport ${name}-docs {
</span>
use_zip yes
distname ${my_name}-[string map {. _} ${version}]-docs
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 cbcd2e6ccaace975381924fec597d8ae0d2b8336 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8fcc9b3d8a1092933b38541047c46743c14c4967310f830eeba2d92056e72163 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7868905
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5132c05255a982017540088fa5a133237f22510e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d5a2b188a3bd55252d5fbcce75d563ec1ab574e31de626b40dc7b797f03d89b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7913999
</span>
extract.dir ${worksrcpath}/doc/html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,13 +132,11 @@ if { ${subport} ne "${name}-docs" } {
</span>
if { [vercmp ${version} 59] >= 0 } {
patchfiles-append patch-config-mh-darwin.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/59391
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append max_align_t.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/59723
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append umachine.h.patch
</span>
patchfiles-append patch-declspec-conflict.patch
# https://trac.macports.org/ticket/60325
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-i18n-formatted_string_builder.h.diff
</span> }
# ICU has three mechanisms to aid other projects in building properly
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/files/max_align_t.patch b/devel/icu/files/max_align_t.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d761b6a2495..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/files/max_align_t.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,89 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/toolutil/toolutil.cpp.orig 2019-10-03 07:30:54.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/toolutil/toolutil.cpp 2019-10-22 03:07:00.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,6 +60,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstddef>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "unicode/errorcode.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "unicode/putil.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "cmemory.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -243,7 +245,7 @@ struct UToolMemory {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char name[64];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int32_t capacity, maxCapacity, size, idx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *array;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- alignas(max_align_t) char staticArray[1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ alignas(std::max_align_t) char staticArray[1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- U_CAPI UToolMemory * U_EXPORT2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- common/uarrsort.cpp.orig 2019-10-03 07:30:54.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ common/uarrsort.cpp 2019-10-22 03:10:45.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,6 +18,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Internal function for sorting arrays.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstddef>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "unicode/utypes.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "cmemory.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "uarrsort.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +37,7 @@ enum {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static constexpr int32_t sizeInMaxAlignTs(int32_t sizeInBytes) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (sizeInBytes + sizeof(max_align_t) - 1) / sizeof(max_align_t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (sizeInBytes + sizeof(std::max_align_t) - 1) / sizeof(std::max_align_t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* UComparator convenience implementations ---------------------------------- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,7 +141,7 @@ static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- insertionSort(char *array, int32_t length, int32_t itemSize,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UComparator *cmp, const void *context, UErrorCode *pErrorCode) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- icu::MaybeStackArray<max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE)> v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ icu::MaybeStackArray<std::max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE)> v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sizeInMaxAlignTs(itemSize) > v.getCapacity() &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v.resize(sizeInMaxAlignTs(itemSize)) == nullptr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *pErrorCode = U_MEMORY_ALLOCATION_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -233,7 +235,7 @@ static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- quickSort(char *array, int32_t length, int32_t itemSize,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UComparator *cmp, const void *context, UErrorCode *pErrorCode) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* allocate two intermediate item variables (x and w) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- icu::MaybeStackArray<max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE) * 2> xw;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ icu::MaybeStackArray<std::max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE) * 2> xw;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(sizeInMaxAlignTs(itemSize)*2 > xw.getCapacity() &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xw.resize(sizeInMaxAlignTs(itemSize) * 2) == nullptr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *pErrorCode=U_MEMORY_ALLOCATION_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- common/utext.cpp.orig 2019-10-03 07:30:54.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ common/utext.cpp 2019-10-22 03:13:50.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,6 +16,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * created by: Markus W. Scherer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstddef>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "unicode/utypes.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "unicode/ustring.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "unicode/unistr.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -566,8 +568,8 @@ enum {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // when a provider asks for a UText to be allocated with extra storage.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct ExtendedUText {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UText ut;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- max_align_t extension;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ UText ut;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::max_align_t extension;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const UText emptyText = UTEXT_INITIALIZER;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -582,7 +584,7 @@ utext_setup(UText *ut, int32_t extraSpac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // We need to heap-allocate storage for the new UText
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int32_t spaceRequired = sizeof(UText);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (extraSpace > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- spaceRequired = sizeof(ExtendedUText) + extraSpace - sizeof(max_align_t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ spaceRequired = sizeof(ExtendedUText) + extraSpace - sizeof(std::max_align_t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ut = (UText *)uprv_malloc(spaceRequired);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ut == NULL) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/files/patch-i18n-formatted_string_builder.h.diff b/devel/icu/files/patch-i18n-formatted_string_builder.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3c7ef5a6530
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/files/patch-i18n-formatted_string_builder.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- i18n/formatted_string_builder.h.orig 2020-04-22 13:04:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ i18n/formatted_string_builder.h 2020-08-02 15:55:24.296030000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -224,8 +224,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr FormattedStringBuilder::Field::Field(uint8_t category, uint8_t field)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : bits((
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U_ASSERT(category <= 0xf),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U_ASSERT(field <= 0xf),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static_cast<uint8_t>((category << 4) | field)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )) {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/files/umachine.h.patch b/devel/icu/files/umachine.h.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ef9280dfb74..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/files/umachine.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- common/unicode/umachine.h.orig 2019-10-03 21:16:41.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ common/unicode/umachine.h 2019-11-21 21:24:38.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,7 +372,7 @@ typedef int8_t UBool;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef char16_t UChar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(UCHAR_TYPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef UCHAR_TYPE UChar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__cplusplus)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__cplusplus) && (!defined(U_SHOW_CPLUSPLUS_API) || U_SHOW_CPLUSPLUS_API != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef char16_t UChar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef uint16_t UChar;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libxml2/Portfile b/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cac18ad158b..503b6fd0a12 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup clang_dependency 1.0
</span>
name libxml2
version 2.9.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories textproc
platforms darwin
license MIT
</pre><pre style='margin:0'>
</pre>