From b2023c35eff98bc637bf1dcc67670e551dc30ae4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 4 Jan 2021 15:26:25 +0100 Subject: [PATCH] icu66: update tzdata 2020f --- dev-libs/icu/icu66-66.1.recipe | 9 +- dev-libs/icu/patches/icu66-66.1.patchset | 262 ++++++++++++++++++++++- 2 files changed, 263 insertions(+), 8 deletions(-) diff --git a/dev-libs/icu/icu66-66.1.recipe b/dev-libs/icu/icu66-66.1.recipe index 8b5f32bd1..8437c1331 100644 --- a/dev-libs/icu/icu66-66.1.recipe +++ b/dev-libs/icu/icu66-66.1.recipe @@ -41,12 +41,13 @@ wrapping when displaying the text." HOMEPAGE="http://www.icu-project.org" COPYRIGHT="1995-2020 IBM Corporation and others." LICENSE="ICU" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz" SOURCE_URI_2="https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-data.zip#noarchive" -#SOURCE_URI_3="http://www.iana.org/time-zones/repository/releases/tzdata2019c.tar.gz#noarchive" +SOURCE_URI_3="http://www.iana.org/time-zones/repository/releases/tzdata2020f.tar.gz#noarchive" CHECKSUM_SHA256="52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e" CHECKSUM_SHA256_2="8be647f738891d2beb79d48f99077b3499948430eae6f1be112553b15ab0243e" +CHECKSUM_SHA256_3="121131918c3ae6dc5d40f0eb87563a2be920b71a76e2392c09519a5e4a666881" SOURCE_DIR="icu" PATCHES="icu66-$portVersion.patchset" @@ -129,8 +130,8 @@ BUILD() cd source # Created during build and prevent rebuilds. - #rm -rf tools/tzcode/vanguard - #cp ../../../sources-3/tzdata*.tar.gz tools/tzcode/ + rm -rf tools/tzcode/vanguard + cp ../../../sources-3/tzdata*.tar.gz tools/tzcode/ unzip -oq ../../../sources-2/icu4c-*-data.zip rm -f data/in/icudt??l.dat diff --git a/dev-libs/icu/patches/icu66-66.1.patchset b/dev-libs/icu/patches/icu66-66.1.patchset index d2727fc04..135f498c2 100644 --- a/dev-libs/icu/patches/icu66-66.1.patchset +++ b/dev-libs/icu/patches/icu66-66.1.patchset @@ -1,4 +1,4 @@ -From fe890ee1d18946889c6efe516f8aca4ac326c449 Mon Sep 17 00:00:00 2001 +From 423a10417bf27bccf25d0da05f65f100353dc9dd Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 20 Sep 2019 14:50:08 +0200 Subject: Import changes from icu 60.1 patchset. @@ -113,10 +113,10 @@ index 80139f7..51328f1 100644 tdatamarker: $(TZDATA) mkdir $(VANGUARD_DIR) -- -2.24.1 +2.28.0 -From 753e3410f1e309310afb4bfd9999ec2e671490bb Mon Sep 17 00:00:00 2001 +From 3aaeee6be5f2d7cb52de70120d2d36872532969f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 20 Sep 2019 16:03:07 +0200 Subject: Fix duplicate definition of constant @@ -137,5 +137,259 @@ index bb814cd..965c949 100644 ## Compiler switch to embed a runtime search path LD_RPATH= -- -2.24.1 +2.28.0 + + +From 205d912c76585b5b6862e4e940fd1140b741e401 Mon Sep 17 00:00:00 2001 +From: yumaoka +Date: Thu, 8 Oct 2020 20:52:39 -0400 +Subject: ICU-21325 tz database 2020b updates + + +diff --git a/source/tools/tzcode/Makefile.in b/source/tools/tzcode/Makefile.in +index 51328f1..ea249f0 100644 +--- a/source/tools/tzcode/Makefile.in ++++ b/source/tools/tzcode/Makefile.in +@@ -19,14 +19,11 @@ TZCODE = $(firstword $(wildcard ./tzcode*.tar.gz) $(wildcard $(srcdir)/tzcode*.t + endif + + +-PRIMARY_YDATA= africa antarctica asia australasia \ +- europe northamerica southamerica +-YDATA= $(PRIMARY_YDATA) pacificnew etcetera factory backward +-NDATA= systemv +-SDATA= solar87 solar88 solar89 +-#TDATA= $(YDATA) $(NDATA) $(SDATA) +-TDATA= $(YDATA) $(NDATA) +-YEARISTYPE= ./yearistype ++PRIMARY_DATA = africa antarctica asia australasia europe northamerica southamerica ++SUPPLEMENTAL_DATA = etcetera factory backward ++#DEPRECATED_DATA = pacificnew systemv solar87 solar88 solar89 ++#TDATA = $(PRIMARY_DATA) $(SUPPLEMENTAL_DATA) $(DEPRECATED_DATA) ++TDATA = $(PRIMARY_DATA) $(SUPPLEMENTAL_DATA) + + TZDIR=zoneinfo + +@@ -34,7 +31,7 @@ CFLAGS+=-D_POSIX_C_SOURCE + CPPFLAGS+= -DTZDIR=\"$(TZDIR)\" + + # more data +-XDATA=zone.tab yearistype.sh leapseconds iso3166.tab ++XDATA=zone.tab leapseconds iso3166.tab + ICUDATA=ZoneMetaData.java icu_zone.txt tz2icu zoneinfo64.txt zoneinfo.txt + + VANGUARD_DIR= ./vanguard +@@ -102,8 +99,8 @@ tzorig: $(TZCODE) $(TZDATA) + cat $(TZORIG)/factory.orig $(srcdir)/icuzones > $(TZORIG)/factory + -mv $(TZORIG)/zishrink.awk $(TZORIG)/zishrink.awk.orig + sed -e '/if (line ~ \/^R SystemV \/) return/s/^/#/' $(TZORIG)/zishrink.awk.orig > $(TZORIG)/zishrink.awk +- -mv $(TZORIG)/Makefile $(TZORIG)/Makefile.orig +- sed -e "s/^BACKWARD=.*/BACKWARD= backward pacificnew/" $(TZORIG)/Makefile.orig > $(TZORIG)/Makefile ++# -mv $(TZORIG)/Makefile $(TZORIG)/Makefile.orig ++# sed -e "s/^BACKWARD=.*/BACKWARD= backward pacificnew/" $(TZORIG)/Makefile.orig > $(TZORIG)/Makefile + $(MAKE) -C $@ $(TZORIG_OPTS) zdump zones + + $(ZDUMPOUT): tzorig +@@ -129,7 +126,7 @@ $(ICUZDUMPOUT): $(ICUZDUMPEXEC) + # + + +-$(ZICTARG): $(OBJECTS) $(TDATA) yearistype $(srcdir)/tz2icu.h ++$(ZICTARG): $(OBJECTS) $(TDATA) $(srcdir)/tz2icu.h + $(CC) $(CFLAGS) $(TZORIG_EXTRA_CFLAGS) $(LFLAGS) -I$(srcdir) $(OBJECTS) $(LDLIBS) -o $@ + + $(TZ2ICUTARG): $(srcdir)/tz2icu.cpp $(srcdir)/tz2icu.h +@@ -150,12 +147,8 @@ tdatamarker: $(TZDATA) + done + touch $@ + +-yearistype: yearistype.sh +- cp yearistype.sh yearistype +- chmod +x yearistype +- + posix_only: $(ZICEXEC) $(TDATA) $(srcdir)/icuzones +- $(ZICEXEC) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA) $(srcdir)/icuzones ++ $(ZICEXEC) -d $(TZDIR) -L /dev/null $(TDATA) $(srcdir)/icuzones + + + icu_data: $(TZ2ICUEXEC) posix_only +@@ -163,7 +156,7 @@ icu_data: $(TZ2ICUEXEC) posix_only + $(TZ2ICUEXEC) $(TZDIR) zone.tab `echo $(TZDATA) | sed -e "s/.*\/tzdata//;s/\.tar\.gz$$//"` --old + + clean: +- -rm -f core *.o *.out zdump${EXEEXT} $(ZICTARG) yearistype date $(TZ2ICUTARG) ++ -rm -f core *.o *.out zdump${EXEEXT} $(ZICTARG) date $(TZ2ICUTARG) + @echo ICU specific cleanup: + -rm -f $(ICUDATA) + -rm -rf $(TZDIR) +diff --git a/source/tools/tzcode/icuzdump.cpp b/source/tools/tzcode/icuzdump.cpp +index 71551ed..783f63d 100644 +--- a/source/tools/tzcode/icuzdump.cpp ++++ b/source/tools/tzcode/icuzdump.cpp +@@ -137,12 +137,12 @@ public: + + getCutOverTimes(cutlo, cuthi); + t = cutlo; +- timezone->getOffset(t, FALSE, rawOffset, dstOffset, status); ++ timezone->getOffset(t, false, rawOffset, dstOffset, status); + while (t < cuthi) { + int32_t newRawOffset, newDstOffset; + UDate newt = t + SEARCH_INCREMENT; + +- timezone->getOffset(newt, FALSE, newRawOffset, newDstOffset, status); ++ timezone->getOffset(newt, false, newRawOffset, newDstOffset, status); + + UBool bSameOffset = (rawOffset + dstOffset) == (newRawOffset + newDstOffset); + UBool bSameDst = ((dstOffset != 0) && (newDstOffset != 0)) || ((dstOffset == 0) && (newDstOffset == 0)); +@@ -158,7 +158,7 @@ public: + } + UDate medt = lot + ((diff / 2) / tick) * tick; + int32_t medRawOffset, medDstOffset; +- timezone->getOffset(medt, FALSE, medRawOffset, medDstOffset, status); ++ timezone->getOffset(medt, false, medRawOffset, medDstOffset, status); + + bSameOffset = (rawOffset + dstOffset) == (medRawOffset + medDstOffset); + bSameDst = ((dstOffset != 0) && (medDstOffset != 0)) || ((dstOffset == 0) && (medDstOffset == 0)); +@@ -171,10 +171,10 @@ public: + } + // write out the boundary + str.remove(); +- formatter->format(lot, rawOffset + dstOffset, (dstOffset == 0 ? FALSE : TRUE), str); ++ formatter->format(lot, rawOffset + dstOffset, (dstOffset == 0 ? false : true), str); + out << str << " > "; + str.remove(); +- formatter->format(hit, newRawOffset + newDstOffset, (newDstOffset == 0 ? FALSE : TRUE), str); ++ formatter->format(hit, newRawOffset + newDstOffset, (newDstOffset == 0 ? false : true), str); + out << str; + if (linesep != NULL) { + out << linesep; +@@ -211,7 +211,7 @@ private: + + class ZoneIterator { + public: +- ZoneIterator(UBool bAll = FALSE) { ++ ZoneIterator(UBool bAll = false) { + if (bAll) { + zenum = TimeZone::createEnumeration(); + } +@@ -288,7 +288,7 @@ extern int + main(int argc, char *argv[]) { + int32_t low = 1902; + int32_t high = 2038; +- UBool bAll = FALSE; ++ UBool bAll = false; + const char *dir = NULL; + const char *linesep = NULL; + +@@ -355,7 +355,7 @@ main(int argc, char *argv[]) { + + ZoneIterator* zit; + if (bAll) { +- zit = new ZoneIterator(TRUE); ++ zit = new ZoneIterator(true); + } else { + if (argc <= 1) { + zit = new ZoneIterator(); +@@ -402,7 +402,7 @@ main(int argc, char *argv[]) { + + } else { + // stdout +- UBool bFirst = TRUE; ++ UBool bFirst = true; + for (;;) { + TimeZone* tz = zit->next(); + if (tz == NULL) { +@@ -411,7 +411,7 @@ main(int argc, char *argv[]) { + dumper.setTimeZone(tz); + tz->getID(id); + if (bFirst) { +- bFirst = FALSE; ++ bFirst = false; + } else { + cout << endl; + } +diff --git a/source/tools/tzcode/icuzones b/source/tools/tzcode/icuzones +index 77cf719..52f5698 100644 +--- a/source/tools/tzcode/icuzones ++++ b/source/tools/tzcode/icuzones +@@ -17,7 +17,19 @@ + Zone Etc/Unknown 0 - Unknown + + # SystemV time zones. +-# The Olson systemv file has these commented out. ++# IANA tzdb file 'systemv' file has these SystemV/* zones commented out up to 2020a. ++# 'systemv' file was removed in 2020b. We keep them in this supplemental zone data ++# file for compatibility purpose. ++ ++# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S ++Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D ++Rule SystemV min 1973 - Oct lastSun 2:00 0 S ++Rule SystemV 1974 only - Jan 6 2:00 1:00 D ++Rule SystemV 1974 only - Nov lastSun 2:00 0 S ++Rule SystemV 1975 only - Feb 23 2:00 1:00 D ++Rule SystemV 1975 only - Oct lastSun 2:00 0 S ++Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D ++Rule SystemV 1976 max - Oct lastSun 2:00 0 S + + # Zone NAME GMTOFF RULES/SAVE FORMAT [UNTIL] + Zone SystemV/AST4ADT -4:00 SystemV A%sT +@@ -34,6 +46,11 @@ Zone SystemV/PST8 -8:00 - PST + Zone SystemV/YST9 -9:00 - YST + Zone SystemV/HST10 -10:00 - HST + ++# pacificnew ++# IANA tzdb file 'pacificnew' used to contain a Link for US/Pacific-New. ++# 'pacificnew' file was removed in 2020b. We keep the Link here for compatibility. ++Link America/Los_Angeles US/Pacific-New ++ + + # The list below is for supporting legacy ICU zone aliases. + # These definitions were originally defined in tz.alias. +diff --git a/source/tools/tzcode/tz2icu.cpp b/source/tools/tzcode/tz2icu.cpp +index b946ffb..cf53c83 100644 +--- a/source/tools/tzcode/tz2icu.cpp ++++ b/source/tools/tzcode/tz2icu.cpp +@@ -51,7 +51,7 @@ + + using namespace std; + +-bool ICU44PLUS = TRUE; ++bool ICU44PLUS = true; + string TZ_RESOURCE_NAME = ICU_TZ_RESOURCE; + + //-------------------------------------------------------------------- +@@ -1431,19 +1431,19 @@ void FinalRule::print(ostream& os) const { + + int main(int argc, char *argv[]) { + string rootpath, zonetab, version; +- bool validArgs = FALSE; ++ bool validArgs = false; + + if (argc == 4 || argc == 5) { +- validArgs = TRUE; ++ validArgs = true; + rootpath = argv[1]; + zonetab = argv[2]; + version = argv[3]; + if (argc == 5) { + if (strcmp(argv[4], "--old") == 0) { +- ICU44PLUS = FALSE; ++ ICU44PLUS = false; + TZ_RESOURCE_NAME = ICU_TZ_RESOURCE_OLD; + } else { +- validArgs = FALSE; ++ validArgs = false; + } + } + } +@@ -1781,7 +1781,6 @@ int main(int argc, char *argv[]) { + time_t sec; + time(&sec); + struct tm* now = localtime(&sec); +- int32_t thisYear = now->tm_year + 1900; + + string filename = TZ_RESOURCE_NAME + ".txt"; + // Write out a resource-bundle source file containing data for +-- +2.28.0