diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /intl | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'intl')
-rw-r--r-- | intl/gtest/moz.build | 6 | ||||
-rw-r--r-- | intl/l10n/docs/crosschannel/repositories.rst | 2 | ||||
-rw-r--r-- | intl/unicharutil/util/moz.build | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/intl/gtest/moz.build b/intl/gtest/moz.build index c8e31a34b7..1387983066 100644 --- a/intl/gtest/moz.build +++ b/intl/gtest/moz.build @@ -4,10 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -UNIFIED_SOURCES += [] - -# skip the test on windows10-aarch64 due to perma-crash - bug 1544961 -if not (CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "aarch64"): - UNIFIED_SOURCES += ["TestEncoding.cpp"] +UNIFIED_SOURCES += ["TestEncoding.cpp"] FINAL_LIBRARY = "xul-gtest" diff --git a/intl/l10n/docs/crosschannel/repositories.rst b/intl/l10n/docs/crosschannel/repositories.rst index 8461b32fbd..8959c9377e 100644 --- a/intl/l10n/docs/crosschannel/repositories.rst +++ b/intl/l10n/docs/crosschannel/repositories.rst @@ -11,4 +11,4 @@ https://hg.mozilla.org/l10n/gecko-strings-quarantine/. The code is in https://hg.mozilla.org/mozilla-central/file/tip/python/l10n/mozxchannel/, supported as a mach subcommand in https://hg.mozilla.org/mozilla-central/file/tip/tools/compare-locales/mach_commands.py, -as a taskcluster kind in https://hg.mozilla.org/mozilla-central/file/tip/taskcluster/ci/l10n-cross-channel, and scheduled in cron in https://hg.mozilla.org/mozilla-central/file/tip/.cron.yml. +as a taskcluster kind in https://hg.mozilla.org/mozilla-central/file/tip/taskcluster/kinds/l10n-cross-channel, and scheduled in cron in https://hg.mozilla.org/mozilla-central/file/tip/.cron.yml. diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build index 2bbd00415c..2396210428 100644 --- a/intl/unicharutil/util/moz.build +++ b/intl/unicharutil/util/moz.build @@ -32,6 +32,6 @@ GeneratedFile( inputs=["../../icu/source/data/translit/Latin_ASCII.txt"], ) -GeneratedFile("IsCombiningDiacritic.h", script="is_combining_diacritic.py", force=True) +GeneratedFile("IsCombiningDiacritic.h", script="is_combining_diacritic.py") FINAL_LIBRARY = "xul" |