microsoft · BillyONeal · Aug 28, 2020 · Aug 1, 2020
diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL
@@ -1,5 +1,5 @@
 Source: icu
-Version: 67.1-2
+Version: 67.1-3
 Homepage: http://icu-project.org/apiref/icu4c/
 Description: Mature and widely used Unicode and localization library.
 Supports: !(arm|uwp)
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
@@ -169,8 +169,6 @@ file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
     ${CURRENT_PACKAGES_DIR}/share
     ${CURRENT_PACKAGES_DIR}/debug/share
-    ${CURRENT_PACKAGES_DIR}/lib/pkgconfig
-    ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig
     ${CURRENT_PACKAGES_DIR}/lib/icu
     ${CURRENT_PACKAGES_DIR}/debug/lib/icud)
 
@@ -203,6 +201,15 @@ else()
                 file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sicu${MODULE}d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/icu${MODULE}d.lib)
             endif()
         endforeach()
+
+        file(GLOB_RECURSE pkg_files LIST_DIRECTORIES false ${CURRENT_PACKAGES_DIR}/*.pc)
+        message(STATUS "${pkg_files}")
+        foreach(pkg_file IN LISTS pkg_files)
+            message(STATUS "${pkg_file}")
+            file(READ ${pkg_file} PKG_FILE)
+            string(REGEX REPLACE "-ls([^ \\t\\n]+)" "-l\\1" PKG_FILE "${PKG_FILE}" )
+            file(WRITE ${pkg_file} "${PKG_FILE}")
+        endforeach()        
     endif()
 
     # force U_STATIC_IMPLEMENTATION macro
@@ -226,6 +233,7 @@ endif()
 # Generates warnings about missing pdbs for icudt.dll
 # This is expected because ICU database contains no executable code
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread m)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/v8/3f8dc4b.patch b/ports/v8/3f8dc4b.patch
@@ -0,0 +1,155 @@
+diff --git a/src/objects/js-number-format.cc b/src/objects/js-number-format.cc
+index ad831c5..bcd4403 100644
+--- a/src/objects/js-number-format.cc
++++ b/src/objects/js-number-format.cc
+@@ -1241,44 +1241,33 @@
+ }
+
+ namespace {
+-Maybe<icu::UnicodeString> IcuFormatNumber(
++Maybe<bool> IcuFormatNumber(
+     Isolate* isolate,
+     const icu::number::LocalizedNumberFormatter& number_format,
+-    Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
++    Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
+   // If it is BigInt, handle it differently.
+   UErrorCode status = U_ZERO_ERROR;
+-  icu::number::FormattedNumber formatted;
+   if (numeric_obj->IsBigInt()) {
+     Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
+     Handle<String> big_int_string;
+     ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
+                                      BigInt::ToString(isolate, big_int),
+-                                     Nothing<icu::UnicodeString>());
+-    formatted = number_format.formatDecimal(
++                                     Nothing<bool>());
++    *formatted = number_format.formatDecimal(
+         {big_int_string->ToCString().get(), big_int_string->length()}, status);
+   } else {
+     double number = numeric_obj->IsNaN()
+                         ? std::numeric_limits<double>::quiet_NaN()
+                         : numeric_obj->Number();
+-    formatted = number_format.formatDouble(number, status);
++    *formatted = number_format.formatDouble(number, status);
+   }
+   if (U_FAILURE(status)) {
+     // This happen because of icu data trimming trim out "unit".
+     // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
+-    THROW_NEW_ERROR_RETURN_VALUE(isolate,
+-                                 NewTypeError(MessageTemplate::kIcuError),
+-                                 Nothing<icu::UnicodeString>());
++    THROW_NEW_ERROR_RETURN_VALUE(
++        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
+   }
+-  if (fp_iter) {
+-    formatted.getAllFieldPositions(*fp_iter, status);
+-  }
+-  icu::UnicodeString result = formatted.toString(status);
+-  if (U_FAILURE(status)) {
+-    THROW_NEW_ERROR_RETURN_VALUE(isolate,
+-                                 NewTypeError(MessageTemplate::kIcuError),
+-                                 Nothing<icu::UnicodeString>());
+-  }
+-  return Just(result);
++  return Just(true);
+ }
+
+ }  // namespace
+@@ -1289,10 +1278,16 @@
+     Handle<Object> numeric_obj) {
+   DCHECK(numeric_obj->IsNumeric());
+
+-  Maybe<icu::UnicodeString> maybe_format =
+-      IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
++  icu::number::FormattedNumber formatted;
++  Maybe<bool> maybe_format =
++      IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
+   MAYBE_RETURN(maybe_format, Handle<String>());
+-  return Intl::ToString(isolate, maybe_format.FromJust());
++  UErrorCode status = U_ZERO_ERROR;
++  icu::UnicodeString result = formatted.toString(status);
++  if (U_FAILURE(status)) {
++    THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
++  }
++  return Intl::ToString(isolate, result);
+ }
+
+ namespace {
+@@ -1405,12 +1400,18 @@
+ }
+
+ namespace {
+-Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
+-                          icu::FieldPositionIterator* fp_iter,
++Maybe<int> ConstructParts(Isolate* isolate,
++                          icu::number::FormattedNumber* formatted,
+                           Handle<JSArray> result, int start_index,
+                           Handle<Object> numeric_obj, bool style_is_unit) {
++  UErrorCode status = U_ZERO_ERROR;
++  icu::UnicodeString formatted_text = formatted->toString(status);
++  if (U_FAILURE(status)) {
++    THROW_NEW_ERROR_RETURN_VALUE(
++        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
++  }
+   DCHECK(numeric_obj->IsNumeric());
+-  int32_t length = formatted.length();
++  int32_t length = formatted_text.length();
+   int index = start_index;
+   if (length == 0) return Just(index);
+
+@@ -1419,13 +1420,14 @@
+   // other region covers some part of the formatted string. It's possible
+   // there's another field with exactly the same begin and end as this backdrop,
+   // in which case the backdrop's field_id of -1 will give it lower priority.
+-  regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
++  regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
+
+   {
+-    icu::FieldPosition fp;
+-    while (fp_iter->next(fp)) {
+-      regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
+-                                         fp.getEndIndex()));
++    icu::ConstrainedFieldPosition cfp;
++    cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
++    while (formatted->nextPosition(cfp, status)) {
++      regions.push_back(
++          NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
+     }
+   }
+
+@@ -1447,7 +1449,7 @@
+     Handle<String> substring;
+     ASSIGN_RETURN_ON_EXCEPTION_VALUE(
+         isolate, substring,
+-        Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
++        Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
+         Nothing<int>());
+     Intl::AddElement(isolate, result, index, field_type_string, substring);
+     ++index;
+@@ -1467,20 +1469,19 @@
+       number_format->icu_number_formatter().raw();
+   CHECK_NOT_NULL(fmt);
+
+-  icu::FieldPositionIterator fp_iter;
+-  Maybe<icu::UnicodeString> maybe_format =
+-      IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
++  icu::number::FormattedNumber formatted;
++  Maybe<bool> maybe_format =
++      IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
+   MAYBE_RETURN(maybe_format, Handle<JSArray>());
+-
+   UErrorCode status = U_ZERO_ERROR;
++
+   bool style_is_unit =
+       Style::UNIT == StyleFromSkeleton(fmt->toSkeleton(status));
+   CHECK(U_SUCCESS(status));
+
+   Handle<JSArray> result = factory->NewJSArray(0);
+-  Maybe<int> maybe_format_to_parts =
+-      ConstructParts(isolate, maybe_format.FromJust(), &fp_iter, result, 0,
+-                     numeric_obj, style_is_unit);
++  Maybe<int> maybe_format_to_parts = ConstructParts(
++      isolate, &formatted, result, 0, numeric_obj, style_is_unit);
+   MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
+
+   return result;
diff --git a/ports/v8/CONTROL b/ports/v8/CONTROL
@@ -0,0 +1,6 @@
+Source: v8
+Version: 8.3.110.13
+Homepage: https://v8.dev
+Description: Google Chrome's JavaScript engine
+Build-Depends: icu, zlib, glib (linux), pthread (linux)
+Supports: !(arm|arm64|uwp|osx)
diff --git a/ports/v8/build.patch b/ports/v8/build.patch
@@ -0,0 +1,179 @@
+diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
+index 5a0984f54..4f301517b 100644
+--- a/config/compiler/BUILD.gn
++++ b/config/compiler/BUILD.gn
+@@ -1473,6 +1473,8 @@ config("default_warnings") {
+       # Disables.
+       "-Wno-missing-field-initializers",  # "struct foo f = {0};"
+       "-Wno-unused-parameter",  # Unused function parameters.
++      "-Wno-invalid-offsetof", # Use of "conditionally-supported" offsetof in c++17
++      "-Wno-range-loop-construct",
+     ]
+   }
+
+@@ -1887,11 +1889,21 @@ config("no_incompatible_pointer_warnings") {
+ # Shared settings for both "optimize" and "optimize_max" configs.
+ # IMPORTANT: On Windows "/O1" and "/O2" must go before the common flags.
+ if (is_win) {
+-  common_optimize_on_cflags = [
++  common_optimize_on_cflags = []
++  if(is_clang) {
++    common_optimize_on_cflags += [
+     "/Ob2",  # Both explicit and auto inlining.
++    ]
++  } else {
++  common_optimize_on_cflags += [
++    "/Ob3",  # Both explicit and auto inlining.
++    ]
++  }
++  common_optimize_on_cflags += [
+     "/Oy-",  # Disable omitting frame pointers, must be after /O2.
+     "/Zc:inline",  # Remove unreferenced COMDAT (faster links).
+   ]
++
+   if (!is_asan) {
+     common_optimize_on_cflags += [
+       # Put data in separate COMDATs. This allows the linker
+diff --git a/config/linux/pkg-config.py b/config/linux/pkg-config.py
+index 5adf70cc3..1438c365b 100644
+--- a/config/linux/pkg-config.py
++++ b/config/linux/pkg-config.py
+@@ -41,7 +41,11 @@ from optparse import OptionParser
+ # Additionally, you can specify the option --atleast-version. This will skip
+ # the normal outputting of a dictionary and instead print true or false,
+ # depending on the return value of pkg-config for the given package.
+-
++#
++# --pkg_config_libdir=<path> allows direct override
++# of the PKG_CONFIG_LIBDIR environment library.
++#
++# --full-path-libs causes lib names to include their full path.
+
+ def SetConfigPath(options):
+   """Set the PKG_CONFIG_LIBDIR environment variable.
+@@ -105,11 +109,29 @@ def RewritePath(path, strip_prefix, sysroot):
+     return path
+
+
++flag_regex = re.compile("(-.)(.+)")
++
++def FlagReplace(matchobj):
++  if matchobj.group(1) == '-I':
++     return matchobj.group(1) + subprocess.check_output([u'cygpath',u'-w',matchobj.group(2)]).strip().decode("utf-8")
++  if matchobj.group(1) == '-L':
++     return matchobj.group(1) + subprocess.check_output([u'cygpath',u'-w',matchobj.group(2)]).strip().decode("utf-8")
++  if matchobj.group(1) == '-l':
++     return matchobj.group(1) + matchobj.group(2) + '.lib'
++  return matchobj.group(0)
++
++def ConvertGCCToMSVC(flags):
++  """Rewrites GCC flags into MSVC flags."""
++  if 'win32' not in sys.platform:
++    return flags
++  return [ flag_regex.sub(FlagReplace,flag) for flag in flags]
++
++
+ def main():
+   # If this is run on non-Linux platforms, just return nothing and indicate
+   # success. This allows us to "kind of emulate" a Linux build from other
+   # platforms.
+-  if "linux" not in sys.platform:
++  if "linux" not in sys.platform and 'win32' not in sys.platform:
+     print("[[],[],[],[],[]]")
+     return 0
+
+@@ -122,12 +144,15 @@ def main():
+   parser.add_option('-a', action='store', dest='arch', type='string')
+   parser.add_option('--system_libdir', action='store', dest='system_libdir',
+                     type='string', default='lib')
++  parser.add_option('--pkg_config_libdir', action='store', dest='pkg_config_libdir',
++                    type='string')
+   parser.add_option('--atleast-version', action='store',
+                     dest='atleast_version', type='string')
+   parser.add_option('--libdir', action='store_true', dest='libdir')
+   parser.add_option('--dridriverdir', action='store_true', dest='dridriverdir')
+   parser.add_option('--version-as-components', action='store_true',
+                     dest='version_as_components')
++  parser.add_option('--full-path-libs', action='store_true', dest='full_path_libs')
+   (options, args) = parser.parse_args()
+
+   # Make a list of regular expressions to strip out.
+@@ -144,6 +169,10 @@ def main():
+   else:
+     prefix = ''
+
++  # Override PKG_CONFIG_LIBDIR
++  if options.pkg_config_libdir:
++    os.environ['PKG_CONFIG_LIBDIR'] = options.pkg_config_libdir
++
+   if options.atleast_version:
+     # When asking for the return value, just run pkg-config and print the return
+     # value, no need to do other work.
+@@ -203,7 +232,7 @@ def main():
+   # For now just split on spaces to get the args out. This will break if
+   # pkgconfig returns quoted things with spaces in them, but that doesn't seem
+   # to happen in practice.
+-  all_flags = flag_string.strip().split(' ')
++  all_flags = ConvertGCCToMSVC(flag_string.strip().split(' '))
+
+
+   sysroot = options.sysroot
+@@ -220,7 +249,10 @@ def main():
+       continue;
+
+     if flag[:2] == '-l':
+-      libs.append(RewritePath(flag[2:], prefix, sysroot))
++      library = RewritePath(flag[2:], prefix, sysroot)
++      # Skip math library on MSVC
++      if library != 'm.lib':
++        libs.append(library)
+     elif flag[:2] == '-L':
+       lib_dirs.append(RewritePath(flag[2:], prefix, sysroot))
+     elif flag[:2] == '-I':
+@@ -237,6 +269,14 @@ def main():
+     else:
+       cflags.append(flag)
+
++  if options.full_path_libs:
++    full_path_libs = []
++    for lib_dir in lib_dirs:
++      for lib in libs:
++        if os.path.isfile(lib_dir+"/"+lib):
++          full_path_libs.append(lib_dir+"/"+lib)
++    libs = full_path_libs
++
+   # Output a GN array, the first one is the cflags, the second are the libs. The
+   # JSON formatter prints GN compatible lists when everything is a list of
+   # strings.
+diff --git a/config/linux/pkg_config.gni b/config/linux/pkg_config.gni
+index 428e44ac0..a0d2175ee 100644
+--- a/config/linux/pkg_config.gni
++++ b/config/linux/pkg_config.gni
+@@ -45,6 +45,9 @@ declare_args() {
+   # in similar fashion by setting the `system_libdir` variable in the build's
+   # args.gn file to 'lib' or 'lib64' as appropriate for the target architecture.
+   system_libdir = "lib"
++
++  # Allow directly overriding the PKG_CONFIG_LIBDIR enviroment variable
++  pkg_config_libdir = ""
+ }
+
+ pkg_config_script = "//build/config/linux/pkg-config.py"
+@@ -87,6 +90,17 @@ if (host_pkg_config != "") {
+   host_pkg_config_args = pkg_config_args
+ }
+
++if (pkg_config_libdir != "") {
++  pkg_config_args += [
++    "--pkg_config_libdir",
++    pkg_config_libdir,
++  ]
++  host_pkg_config_args += [
++    "--pkg_config_libdir",
++    pkg_config_libdir,
++  ]
++}
++
+ template("pkg_config") {
+   assert(defined(invoker.packages),
+          "Variable |packages| must be defined to be a list in pkg_config.")