--- a/MozillaFirefox/MozillaFirefox.changes Mon Feb 13 22:24:53 2023 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes Tue Mar 07 11:48:25 2023 +0100
@@ -1,4 +1,81 @@
-------------------------------------------------------------------
+Tue Mar 7 09:40:11 UTC 2023 - Martin Liška <mliska@suse.cz>
+
+- Cherry-pick upstream changes for GCC 13 in gcc13-fix.patch.
+
+-------------------------------------------------------------------
+Mon Mar 6 20:09:41 UTC 2023 - Andreas Schwab <schwab@suse.de>
+
+- Limit memory use on riscv64
+
+-------------------------------------------------------------------
+Sat Mar 4 16:03:22 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Fix 32 bit build bmo#1810584 (add mozilla-bmo1810584.patch)
+
+-------------------------------------------------------------------
+Fri Mar 3 17:29:27 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Mozilla Firefox 110.0.1 (boo#1208886)
+ * Fixed clearing recent cookies clears all cookies
+ (bmo#1816279)
+ * Fixed WebGL crashes on Linux when ran inside a VMWare virtual
+ machine (bmo#1807942)
+ * Fixed a bug with CSP serialization causing bugs with the MitID
+ Digital ID in Denmark (bmo#1819096)
+
+-------------------------------------------------------------------
+Wed Feb 15 09:56:46 UTC 2023 - Wolfgang Rosenauer <wr@rosenauer.org>
+
+- Mozilla Firefox 110.0
+ * https://www.mozilla.org/en-US/firefox/110.0/releasenotes
+ MFSA 2023-05 (bsc#1208144)
+ * CVE-2023-25728 (bmo#1790345)
+ Content security policy leak in violation reports using iframes
+ * CVE-2023-25730 (bmo#1794622)
+ Screen hijack via browser fullscreen mode
+ * CVE-2023-25743 (bmo#1800203)
+ Fullscreen notification not shown in Firefox Focus
+ * CVE-2023-0767 (bmo#1804640)
+ Arbitrary memory write via PKCS 12 in NSS
+ * CVE-2023-25735 (bmo#1810711)
+ Potential use-after-free from compartment mismatch in SpiderMonkey
+ * CVE-2023-25737 (bmo#1811464)
+ Invalid downcast in SVGUtils::SetupStrokeGeometry
+ * CVE-2023-25738 (bmo#1811852)
+ Printing on Windows could potentially crash Firefox with some
+ device drivers
+ * CVE-2023-25739 (bmo#1811939)
+ Use-after-free in mozilla::dom::ScriptLoadContext::~ScriptLoadContext
+ * CVE-2023-25729 (bmo#1792138)
+ Extensions could have opened external schemes without user knowledge
+ * CVE-2023-25732 (bmo#1804564)
+ Out of bounds memory write from EncodeInputStream
+ * CVE-2023-25734 (bmo#1784451, bmo#1809923, bmo#1810143, bmo#1812338)
+ Opening local .url files could cause unexpected network loads
+ * CVE-2023-25740 (bmo#1812354)
+ Opening local .scf files could cause unexpected network loads
+ * CVE-2023-25731 (bmo#1801542)
+ Prototype pollution when rendering URLPreview
+ * CVE-2023-25733 (bmo#1808632)
+ Possible null pointer dereference in TaskbarPreviewCallback
+ * CVE-2023-25736 (bmo#1811331)
+ Invalid downcast in GetTableSelectionMode
+ * CVE-2023-25741 (bmo#1437126, bmo#1812611, bmo#1813376)
+ Same-origin policy leak via image drag and drop
+ * CVE-2023-25742 (bmo#1813424)
+ Web Crypto ImportKey crashes tab
+ * CVE-2023-25744 (bmo#1789449, bmo#1803628, bmo#1810536)
+ Memory safety bugs fixed in Firefox 110 and Firefox ESR 102.8
+ * CVE-2023-25745 (bmo#1688592, bmo#1797186, bmo#1804998,
+ bmo#1806521, bmo#1813284)
+ Memory safety bugs fixed in Firefox 110
+- requires
+ NSS = 3.87
+ rust/cargo = 1.66
+- update create-tar.sh
+
+-------------------------------------------------------------------
Wed Feb 1 19:48:47 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
- Mozilla Firefox 109.0.1
--- a/MozillaFirefox/MozillaFirefox.spec Mon Feb 13 22:24:53 2023 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Tue Mar 07 11:48:25 2023 +0100
@@ -28,9 +28,9 @@
# orig_suffix b3
# major 69
# mainver %major.99
-%define major 109
+%define major 110
%define mainver %major.0.1
-%define orig_version 109.0.1
+%define orig_version 110.0.1
%define orig_suffix %{nil}
%define update_channel release
%define branding 1
@@ -99,17 +99,17 @@
BuildRequires: gcc-c++
%endif
%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300
-BuildRequires: cargo >= 1.63
-BuildRequires: rust >= 1.63
+BuildRequires: cargo >= 1.65
+BuildRequires: rust >= 1.65
%else
# Newer sle/leap/tw use parallel versioned rust releases which have
# a different method for provides that we can use to request a
# specific version
# minimal requirement:
-BuildRequires: rust+cargo >= 1.63
+BuildRequires: rust+cargo >= 1.65
# actually used upstream:
-BuildRequires: cargo1.65
-BuildRequires: rust1.65
+BuildRequires: cargo1.66
+BuildRequires: rust1.66
%endif
%if 0%{useccache} != 0
BuildRequires: ccache
@@ -120,7 +120,7 @@
BuildRequires: libproxy-devel
BuildRequires: makeinfo
BuildRequires: mozilla-nspr-devel >= 4.35
-BuildRequires: mozilla-nss-devel >= 3.86
+BuildRequires: mozilla-nss-devel >= 3.87
BuildRequires: nasm >= 2.14
BuildRequires: nodejs >= 10.22.1
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
@@ -193,7 +193,7 @@
Source11: firefox.1
Source12: mozilla-get-app-id
Source13: spellcheck.js
-Source14: https://github.com/openSUSE/firefox-scripts/raw/4503820/create-tar.sh
+Source14: https://github.com/openSUSE/firefox-scripts/raw/7335408da3073ec6b582fc364010cf09665765b3/create-tar.sh
Source15: firefox-appdata.xml
Source16: %{name}.changes
Source17: firefox-search-provider.ini
@@ -228,6 +228,8 @@
Patch25: one_swizzle_to_rule_them_all.patch
Patch26: svg-rendering.patch
Patch27: mozilla-buildfixes.patch
+Patch28: mozilla-bmo1810584.patch
+Patch29: gcc13-fix.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-branded-icons.patch
@@ -404,7 +406,7 @@
# Done with env-variables.
source ./.obsenv.sh
-%ifarch aarch64 %arm ppc64 ppc64le
+%ifarch aarch64 %arm ppc64 ppc64le riscv64
%limit_build -m 2500
%endif
--- a/MozillaFirefox/create-tar.sh Mon Feb 13 22:24:53 2023 +0100
+++ b/MozillaFirefox/create-tar.sh Tue Mar 07 11:48:25 2023 +0100
@@ -1,5 +1,34 @@
#!/bin/bash
+function main() {
+ # Exit script on CTRL+C
+ trap "exit" INT
+
+ if [ $# -ne 1 ]; then
+ print_usage_and_exit
+ fi
+
+ check_required_tools
+
+ # Sourcing the given tar_stamps-file to have the variables available
+ TAR_STAMP="$1"
+ source "$TAR_STAMP" || print_usage_and_exit
+
+ set_internal_variables
+
+ check_what_to_do_with_source_tarballs
+ download_upstream_source_tarballs
+
+ if [ -z ${SKIP_LOCALES+x} ]; then
+ check_what_to_do_with_locales_tarballs
+ create_locales_tarballs
+ else
+ printf "%-40s: User forced skip (SKIP_LOCALES set)\n" "locales"
+ fi
+
+ clean_up_old_tarballs
+}
+
function print_usage_and_exit() {
echo "Usage: create-tar.sh tar_stamps"
echo ""
@@ -17,55 +46,70 @@
#SKIP_LOCALES="" # Uncomment to skip l10n-generation
EOF
-exit 1
+ exit 1
+}
+
+function check_required_tools() {
+ # check required tools
+ check_for_binary /usr/bin/hg "mercurial"
+ check_for_binary /usr/bin/jq "jq"
+ which python3 > /dev/null || exit 1
+
+ # use parallel compression, if available
+ compression='-J'
+ pixz -h > /dev/null 2>&1
+ if (($? != 127)); then
+ compression='-Ipixz'
+ fi
}
-if [ $# -ne 1 ]; then
- print_usage_and_exit
-fi
-
-# Sourcing the given tar_stamps-file to have the variables available
-TAR_STAMP="$1"
-source "$TAR_STAMP" || print_usage_and_exit
+function set_internal_variables() {
+ # Internal variables
+ BRANCH="releases/mozilla-$CHANNEL"
+ if [ "$PRODUCT" = "firefox" ]; then
+ FF_LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json"
+ else
+ FF_LOCALE_FILE="thunderbird-$VERSION/browser/locales/l10n-changesets.json"
+ TB_LOCALE_FILE="thunderbird-$VERSION/comm/mail/locales/l10n-changesets.json"
+ L10N_STRING_PATTERNS="thunderbird-$VERSION/python/l10n/tbxchannel/l10n_merge.py"
+ fi
-# Internal variables
-BRANCH="releases/mozilla-$CHANNEL"
-if [ "$PRODUCT" = "firefox" ]; then
- LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json"
-else
- LOCALE_FILE="thunderbird-$VERSION/comm/mail/locales/l10n-changesets.json"
-fi
-
-SOURCE_TARBALL="$PRODUCT-$VERSION$VERSION_SUFFIX.source.tar.xz"
-FTP_URL="https://ftp.mozilla.org/pub/$PRODUCT/releases/$VERSION$VERSION_SUFFIX/source"
-FTP_CANDIDATES_BASE_URL="https://ftp.mozilla.org/pub/$PRODUCT/candidates"
-# Make first letter of PRODCUT upper case
-PRODUCT_CAP="${PRODUCT^}"
-LOCALES_URL="https://product-details.mozilla.org/1.0/l10n/$PRODUCT_CAP"
-PRODUCT_URL="https://product-details.mozilla.org/1.0/$PRODUCT.json"
-# Exit script on CTRL+C
-trap "exit" INT
+ SOURCE_TARBALL="$PRODUCT-$VERSION$VERSION_SUFFIX.source.tar.xz"
+ PREV_SOURCE_TARBALL="$PRODUCT-$PREV_VERSION$PREV_VERSION_SUFFIX.source.tar.xz"
+ FTP_URL="https://ftp.mozilla.org/pub/$PRODUCT/releases/$VERSION$VERSION_SUFFIX/source"
+ FTP_CANDIDATES_BASE_URL="https://ftp.mozilla.org/pub/%s/candidates"
+ LOCALES_URL="https://product-details.mozilla.org/1.0/l10n"
+ PRODUCT_URL="https://product-details.mozilla.org/1.0"
+ ALREADY_EXTRACTED_LOCALES_FILE=0
+}
function get_ftp_candidates_url() {
- VERSION_WITH_SUFFIX="$1"
- echo "$FTP_CANDIDATES_BASE_URL/$VERSION_WITH_SUFFIX-candidates"
+ local CURR_PRODUCT="$1"
+ local VERSION_WITH_SUFFIX="$2"
+ printf "$FTP_CANDIDATES_BASE_URL/$VERSION_WITH_SUFFIX-candidates" "$CURR_PRODUCT"
}
function check_tarball_source () {
TARBALL=$1
# Print out what is going to be done:
- if [ -e $TARBALL ]; then
+ if [ -e "$TARBALL" ]; then
echo "Reuse existing file"
- elif wget --spider $FTP_URL/$TARBALL 2> /dev/null; then
+ elif wget --spider "$FTP_URL/$TARBALL" 2> /dev/null; then
echo "Download file"
- else
- echo "Mercurial checkout"
+ else
+ local CANDIDATE_TARBALL_LOCATION=""
+ CANDIDATE_TARBALL_LOCATION="$(printf "%s/%s/source/%s" "$(get_ftp_candidates_url "$PRODUCT" "$VERSION$VERSION_SUFFIX")" "$BUILD_ID" "$TARBALL" )"
+ if wget --spider "$CANDIDATE_TARBALL_LOCATION" 2> /dev/null; then
+ echo "Download UNRELEASED candidate"
+ else
+ echo "Mercurial checkout"
+ fi
fi
}
function ask_cont_abort_question() {
while true; do
- read -p "$1 [(c)ontinue/(a)bort] " ca
+ read -r -p "$1 [(c)ontinue/(a)bort] " ca
case $ca in
[Cc]* ) return 0 ;;
[Aa]* ) return 1 ;;
@@ -75,20 +119,20 @@
}
function check_for_binary() {
- if ! test -x $1; then
+ if ! test -x "$1"; then
echo "$1 is missing: execute zypper in $2"
exit 5
fi
}
function get_source_stamp() {
- BUILD_ID="$1"
- FTP_CANDIDATES_BASE_URL=$(get_ftp_candidates_url $VERSION$VERSION_SUFFIX)
- FTP_CANDIDATES_JSON_SUFFIX="${BUILD_ID}/linux-x86_64/en-US/$PRODUCT-$VERSION$VERSION_SUFFIX.json"
- BUILD_JSON=$(curl --silent --fail "$FTP_CANDIDATES_BASE_URL/$FTP_CANDIDATES_JSON_SUFFIX") || return 1;
- REV=$(echo "$BUILD_JSON" | jq .moz_source_stamp)
- SOURCE_REPO=$(echo "$BUILD_JSON" | jq .moz_source_repo)
- TIMESTAMP=$(echo "$BUILD_JSON" | jq .buildid)
+ local CURR_BUILD_ID="$1"
+ local FTP_CANDIDATES_BASE_URL=$(get_ftp_candidates_url "$PRODUCT" "$VERSION$VERSION_SUFFIX")
+ local FTP_CANDIDATES_JSON_SUFFIX="${CURR_BUILD_ID}/linux-x86_64/en-US/$PRODUCT-$VERSION$VERSION_SUFFIX.json"
+ local BUILD_JSON=$(curl --silent --fail "$FTP_CANDIDATES_BASE_URL/$FTP_CANDIDATES_JSON_SUFFIX") || return 1;
+ local REV=$(echo "$BUILD_JSON" | jq .moz_source_stamp)
+ local SOURCE_REPO=$(echo "$BUILD_JSON" | jq .moz_source_repo)
+ local TIMESTAMP=$(echo "$BUILD_JSON" | jq .buildid)
echo "Extending $TAR_STAMP with:"
echo "RELEASE_REPO=${SOURCE_REPO}"
echo "RELEASE_TAG=${REV}"
@@ -103,39 +147,43 @@
}
function get_build_number() {
- LAST_FOUND=""
- VERSION_WITH_SUFFIX="$1"
-
- BUILD_ID=$(curl --silent "$PRODUCT_URL" | jq -e '.["releases"] | .["'$PRODUCT-$VERSION_WITH_SUFFIX'"] | .["build_number"]')
+ local LAST_FOUND=""
+ local CURR_PRODUCT="$1"
+ local VERSION_WITH_SUFFIX="$2"
+ local CURR_BUILD_ID=""
+ local CURR_FTP_BASE_URL=""
+ CURR_BUILD_ID=$(curl --silent "$PRODUCT_URL/$CURR_PRODUCT.json" | jq -e '.["releases"] | .["'$CURR_PRODUCT-$VERSION_WITH_SUFFIX'"] | .["build_number"]')
# Slow fall-back
if [ $? -ne 0 ]; then
echo "Build number not found in product URL, falling back to slow FTP-parsing." 1>&2
- FTP_CANDIDATES_BASE_URL=$(get_ftp_candidates_url $VERSION_WITH_SUFFIX)
+ CURR_FTP_BASE_URL=$(get_ftp_candidates_url "$CURR_PRODUCT" "$VERSION_WITH_SUFFIX")
# Unfortunately, locales-files are not associated to releases, but to builds.
# And since we don't know which build was the final build, we grep them all from
# the candidates-page, sort them and take the last one which should be the oldest
# Error only if not even the first one exists
- LAST_FOUND=$(curl --silent --fail "$FTP_CANDIDATES_BASE_URL/" | grep -o "build[0-9]*/" | sort | uniq | tail -n 1 | cut -d "/" -f 1)
+ LAST_FOUND=$(curl --silent --fail "$CURR_FTP_BASE_URL/" | grep -o "build[0-9]*/" | sort | uniq | tail -n 1 | cut -d "/" -f 1)
else
- LAST_FOUND="build$BUILD_ID"
+ LAST_FOUND="build$CURR_BUILD_ID"
fi
if [ "$LAST_FOUND" != "" ]; then
echo "$LAST_FOUND"
return 0
else
- echo "Error: Could not find build-number for Firefox $VERSION_WITH_SUFFIX !" 1>&2
+ echo "Error: Could not find build-number for $CURR_PRODUCT $VERSION_WITH_SUFFIX !" 1>&2
return 1
fi
}
-
function locales_get() {
- TMP_VERSION="$1"
- BUILD_ID="$2"
- URL_TO_CHECK="${LOCALES_URL}-${TMP_VERSION}"
- FINAL_URL="${URL_TO_CHECK}-${BUILD_ID}.json"
+ local CURR_PRODUCT="$1"
+ local TMP_VERSION="$2"
+ local CURR_BUILD_ID="$3"
+ # Make first letter of CURR_PRODUCT upper case
+ CURR_PRODUCT_CAP="${CURR_PRODUCT^}"
+ URL_TO_CHECK="${LOCALES_URL}/${CURR_PRODUCT_CAP}-${TMP_VERSION}"
+ FINAL_URL="${URL_TO_CHECK}-${CURR_BUILD_ID}.json"
if wget --quiet --spider "$FINAL_URL"; then
echo "$FINAL_URL"
return 0
@@ -145,84 +193,173 @@
fi
}
-function locales_parse() {
+function locales_parse_file() {
+ FILE="$1"
+ python3 -c "import json; import sys; \
+ print('\n'.join(['{} {}'.format(key, value['revision']) \
+ for key, value in sorted(json.load(sys.stdin).items())]));" < "$FILE"
+}
+
+function locales_parse_url() {
URL="$1"
- curl -s "$URL" | python -c "import json; import sys; \
+ curl -s "$URL" | python3 -c "import json; import sys; \
print('\n'.join(['{} {}'.format(key, value['changeset']) \
for key, value in sorted(json.load(sys.stdin)['locales'].items())]));"
}
+function extract_locales_file() {
+ if [ $ALREADY_EXTRACTED_LOCALES_FILE -ne 1 ]; then
+ # still need to extract the locale information from the archive
+ echo "extract locale changesets"
+ if [ "$PRODUCT" = "thunderbird" ]; then
+ tar -xf "$SOURCE_TARBALL" "$FF_LOCALE_FILE" "$TB_LOCALE_FILE" "$L10N_STRING_PATTERNS"
+ else
+ tar -xf "$SOURCE_TARBALL" "$FF_LOCALE_FILE"
+ fi
+ ALREADY_EXTRACTED_LOCALES_FILE=1
+ else
+ echo "Skipping locale changeset extraction, as it was already done."
+ fi
+}
+
function locales_unchanged() {
- BUILD_ID="$1"
- PREV_BUILD_ID=$(get_build_number "$PREV_VERSION$PREV_VERSION_SUFFIX")
+ local CURR_PRODUCT="$1"
+ local CURR_BUILD_ID="$2"
+ local PREV_BUILD_ID=$(get_build_number "$CURR_PRODUCT" "$PREV_VERSION$PREV_VERSION_SUFFIX")
# If no json-file for one of the versions can be found, we say "they changed"
- prev_url=$(locales_get "$PREV_VERSION$PREV_VERSION_SUFFIX" "$PREV_BUILD_ID") || return 1
- curr_url=$(locales_get "$VERSION$VERSION_SUFFIX" "$BUILD_ID") || return 1
+ prev_url=$(locales_get "$CURR_PRODUCT" "$PREV_VERSION$PREV_VERSION_SUFFIX" "$PREV_BUILD_ID") || return 1
+ prev_content=$(locales_parse_url "$prev_url") || exit 1
- prev_content=$(locales_parse "$prev_url") || exit 1
- curr_content=$(locales_parse "$curr_url") || exit 1
+ curr_url=$(locales_get "$CURR_PRODUCT" "$VERSION$VERSION_SUFFIX" "$CURR_BUILD_ID")
+ if [ $? -ne 0 ]; then
+ # We did not find a locales file upstream on the servers
+ if [ -e "$SOURCE_TARBALL" ]; then
+ # We can find out what the locales are, by extracting the json-file from the tar-ball
+ # instead of getting it from the server
+ extract_locales_file || return 1
+ curr_content=$(locales_parse_file "$FF_LOCALE_FILE") || exit 1
+ else
+ # We can't know what the locales are in the current version
+ return 1
+ fi
+ else
+ curr_content=$(locales_parse_url "$curr_url") || exit 1
+ fi
diff -y --suppress-common-lines -d <(echo "$prev_content") <(echo "$curr_content")
}
-# check required tools
-check_for_binary /usr/bin/hg "mercurial"
-check_for_binary /usr/bin/jq "jq"
-which python > /dev/null || exit 1
+function get_locales_directories() {
+ pattern="$1"
-# use parallel compression, if available
-compression='-J'
-pixz -h > /dev/null 2>&1
-if (($? != 127)); then
- compression='-Ipixz'
-fi
+ # This file contains a list of directories, upstream uses to build locales
+ # If it is there, use it. If not, default to all FF + 3 TB-dirs.
+ if [ -e "$L10N_STRING_PATTERNS" ]; then
+ python3 -c "import os; import sys; \
+ sys.path.append(os.path.dirname(\"$L10N_STRING_PATTERNS\")); \
+ from l10n_merge import $pattern; \
+ print(\" \".join([p.strip('*') for p in $pattern]));"
+ else
+ if [ "$pattern" = "GECKO_STRINGS_PATTERNS" ]; then
+ # Default of Firefox: Take all
+ echo "{lang}/"
+ else
+ # Default of Thunderbird: Take those 3 dirs
+ echo "{lang}/calendar/" "{lang}/chat/" "{lang}/mail/"
+ fi
+ fi
+}
+
+function create_and_copy_locales() {
+ locale="$1"
+ source_base="$2"
+ source_template="$3"
+ final_dest="$4"
-# Get ID
-BUILD_ID=$(get_build_number "$VERSION$VERSION_SUFFIX")
+ # Replace {lang} with the actual language-basedir
+ for template in $source_template; do
+ locale_source=$(echo "$template" | sed "s|{lang}|./$source_base/$locale|g")
+ locale_dest=$(echo "$template" | sed "s|{lang}|./$final_dest/$locale|g")
-if [ -z ${SKIP_LOCALES+x} ]; then
- if [ "$PREV_VERSION" != "" ] && locales_unchanged "$BUILD_ID"; then
- printf "%-40s: Did not change. Skipping.\n" "locales"
- LOCALES_CHANGED=0
- else
- printf "%-40s: Need to download.\n" "locales"
- LOCALES_CHANGED=1
- fi
-else
- printf "%-40s: User forced skip (SKIP_LOCALES set)\n" "locales"
-fi
+ # Create intermediary folders
+ for destdir in $locale_dest; do
+ mkdir -p "$destdir"
+ done
+
+ # Copy over FF-files
+ cp -r "$locale_source"/* "$locale_dest"
+ done
+}
+
+function check_what_to_do_with_source_tarballs() {
+ # Get ID
+ BUILD_ID=$(get_build_number "$PRODUCT" "$VERSION$VERSION_SUFFIX")
+
+ # Check what is going to be done and ask for consent
+ for ff in $SOURCE_TARBALL $SOURCE_TARBALL.asc; do
+ printf "%-40s: %s\n" "$ff" "$(check_tarball_source $ff)"
+ done
+
+ ask_cont_abort_question "Is this ok?" || exit 0
+}
-# Check what is going to be done and ask for consent
-for ff in $SOURCE_TARBALL $SOURCE_TARBALL.asc; do
- printf "%-40s: %s\n" $ff "$(check_tarball_source $ff)"
-done
+function check_what_to_do_with_locales_tarballs() {
+ LOCALES_CHANGED=1
-$(ask_cont_abort_question "Is this ok?") || exit 0
+ extract_locales_file
-# Try to download tar-ball from officiall mozilla-mirror
-if [ ! -e $SOURCE_TARBALL ]; then
- wget https://ftp.mozilla.org/pub/$PRODUCT/releases/$VERSION$VERSION_SUFFIX/source/$SOURCE_TARBALL
-fi
-# including signature
-if [ ! -e $SOURCE_TARBALL.asc ]; then
- wget https://ftp.mozilla.org/pub/$PRODUCT/releases/$VERSION$VERSION_SUFFIX/source/$SOURCE_TARBALL.asc
-fi
+ if [ "$PREV_VERSION" != "" ]; then
+ # If we have a previous version, check either FF or (TB and FF)
+ if [ "$PRODUCT" = "firefox" ]; then
+ locales_unchanged "$PRODUCT" "$BUILD_ID"
+ else
+ FF_BUILD_ID=$(get_build_number "firefox" "$VERSION$VERSION_SUFFIX")
+ locales_unchanged "$PRODUCT" "$BUILD_ID" && locales_unchanged "firefox" "$FF_BUILD_ID"
+ fi
+ LOCALES_CHANGED=$?
+ fi
+
+ # New line for better visibility
+ echo ""
+ if [ $LOCALES_CHANGED -eq 1 ]; then
+ printf "%-40s: Need to download.\n" "locales"
+ ask_cont_abort_question "Is this ok?" || exit 0
+ else
+ printf "%-40s: Did not change. Skipping.\n" "locales"
+ fi
+}
-# we might have an upstream archive already and can skip the checkout
-if [ -e $SOURCE_TARBALL ]; then
- if [ -z ${SKIP_LOCALES+x} ] && [ $LOCALES_CHANGED -ne 0 ]; then
- # still need to extract the locale information from the archive
- echo "extract locale changesets"
- tar -xf $SOURCE_TARBALL $LOCALE_FILE
+function download_release_or_candidate_file() {
+ local upstream_file="$1"
+ if [ -e "$upstream_file" ]; then
+ return;
+ fi
+
+ if ! wget --quiet --show-progress --progress=bar "$FTP_URL/$upstream_file"; then
+ local CANDIDATE_TARBALL_LOCATION=""
+ CANDIDATE_TARBALL_LOCATION="$(printf "%s/%s/source/%s" "$(get_ftp_candidates_url "$PRODUCT" "$VERSION$VERSION_SUFFIX")" "$BUILD_ID" "$upstream_file" )"
+ wget --quiet --show-progress --progress=bar "$CANDIDATE_TARBALL_LOCATION"
fi
- get_source_stamp "$BUILD_ID"
-else
- # We are working on a version that is not yet published on the mozilla mirror
- # so we have to actually check out the repo
+}
+
+function download_upstream_source_tarballs() {
+ # Try to download tar-ball from officiall mozilla-mirror
+ download_release_or_candidate_file "$SOURCE_TARBALL"
+ download_release_or_candidate_file "$SOURCE_TARBALL.asc"
- # mozilla
- if [ -d $PRODUCT-$VERSION ]; then
- pushd $PRODUCT-$VERSION || exit 1
+ # we might have an upstream archive already and can skip the checkout
+ if [ -e "$SOURCE_TARBALL" ]; then
+ get_source_stamp "$BUILD_ID"
+ else
+ # We are working on a version that is not yet published on the mozilla mirror
+ # so we have to actually check out the repo
+ clone_and_repackage_sources
+ fi
+}
+
+function clone_and_repackage_sources() {
+ if [ -d "$PRODUCT-$VERSION" ]; then
+ pushd "$PRODUCT-$VERSION" || exit 1
_repourl=$(hg paths)
case "$_repourl" in
*$BRANCH*)
@@ -233,18 +370,18 @@
* )
echo "removing obsolete tree"
popd || exit 1
- rm -rf $PRODUCT-$VERSION
+ rm -rf "$PRODUCT-$VERSION"
;;
esac
fi
- if [ ! -d $PRODUCT-$VERSION ]; then
+ if [ ! -d "$PRODUCT-$VERSION" ]; then
echo "cloning new $BRANCH..."
- hg clone https://hg.mozilla.org/$BRANCH $PRODUCT-$VERSION
+ hg clone "https://hg.mozilla.org/$BRANCH $PRODUCT-$VERSION"
if [ "$PRODUCT" = "thunderbird" ]; then
- hg clone https://hg.mozilla.org/releases/comm-$CHANNEL $PRODUCT-$VERSION/comm
+ hg clone "https://hg.mozilla.org/releases/comm-$CHANNEL" "$PRODUCT-$VERSION/comm"
fi
fi
- pushd $PRODUCT-$VERSION || exit 1
+ pushd "$PRODUCT-$VERSION" || exit 1
# parse out the Firefox-release tag for this Thunderbird-checkout
if [ "$PRODUCT" = "thunderbird" ]; then
@@ -254,18 +391,18 @@
FF_RELEASE_TAG="$RELEASE_TAG"
fi
- hg update --check $FF_RELEASE_TAG
- [ "$FF_RELEASE_TAG" == "default" ] || hg update -r $FF_RELEASE_TAG
+ hg update --check "$FF_RELEASE_TAG"
+ [ "$FF_RELEASE_TAG" == "default" ] || hg update -r "$FF_RELEASE_TAG"
# get repo and source stamp
- REV=$(hg -R . parent --template="{node|short}\n")
- SOURCE_REPO=$(hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/https:/")
- TIMESTAMP=$(date +%Y%m%d%H%M%S)
+ local REV=$(hg -R . parent --template="{node|short}\n")
+ local SOURCE_REPO=$(hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/https:/")
+ local TIMESTAMP=$(date +%Y%m%d%H%M%S)
if [ "$PRODUCT" = "thunderbird" ]; then
pushd comm || exit 1
- hg update --check $RELEASE_TAG
+ hg update --check "$RELEASE_TAG"
popd || exit 1
- rm -rf thunderbird-${VERSION}/{,comm/}other-licenses/7zstub
+ rm -rf thunderbird-"${VERSION}"/{,comm/}other-licenses/7zstub
fi
popd || exit 1
@@ -283,48 +420,108 @@
echo "RELEASE_TIMESTAMP=$TIMESTAMP" >> "$TAR_STAMP"
echo "creating archive..."
- tar $compression -cf $PRODUCT-$VERSION$VERSION_SUFFIX.source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS $PRODUCT-$VERSION
-fi
+ tar "$compression" -cf "$PRODUCT-$VERSION$VERSION_SUFFIX.source.tar.xz" --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS "$PRODUCT-$VERSION"
+ ALREADY_EXTRACTED_LOCALES_FILE=1
+}
+
+function create_locales_tarballs() {
+ if [ ! -z ${SKIP_LOCALES+x} ]; then
+ echo "Skipping locales-creation."
+ exit 0
+ fi
+
+ if [ "$LOCALES_CHANGED" -ne 0 ]; then
+ clone_and_repackage_locales
+ elif [ -f "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" ]; then
+ # Locales did not change, but the old tar-ball is in this directory
+ # Simply rename it:
+ echo "Moving l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz to l10n-$VERSION$VERSION_SUFFIX.tar.xz"
+ mv "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" "l10n-$VERSION$VERSION_SUFFIX.tar.xz"
+ fi
+}
+
+function clone_and_repackage_locales() {
+ # l10n
+ FINAL_L10N_BASE="l10n"
+ FF_L10N_BASE="l10n" # Only change this in TB-builds to a separate dir
+ TB_L10N_BASE="l10n_tb"
-if [ ! -z ${SKIP_LOCALES+x} ]; then
- echo "Skipping locales-creation."
- exit 0
-fi
+ # If we are doing Thunderbird, we'll have to checkout both TB and FF l10n-repos
+ # Thunderbird has one single mono-repo, FF has one for each language
+ if [ "$PRODUCT" = "thunderbird" ]; then
+ echo "Fetching Thunderbird locales..."
+ if [ -d "$TB_L10N_BASE/.hg" ]; then
+ pushd "$TB_L10N_BASE/" || exit 1
+ hg pull || exit 1
+ popd || exit 1
+ else
+ hg clone "https://hg.mozilla.org/projects/comm-l10n/" "$TB_L10N_BASE/" || exit 1
+ fi
+ # Just using the first entry here, as all languages have the same changeset
+ tb_changeset=$(jq -r 'to_entries[0]| "\(.key) \(.value|.revision)"' "$TB_LOCALE_FILE" | cut -d " " -f 2)
+ [ "$RELEASE_TAG" == "default" ] || hg -R "$TB_L10N_BASE/" up -C -r "$tb_changeset" || exit 1
+ FF_L10N_BASE="l10n_ff"
+ fi
-if [ $LOCALES_CHANGED -ne 0 ]; then
- # l10n
- echo "fetching locales..."
- test ! -d l10n && mkdir l10n
- jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' $LOCALE_FILE | \
- while read locale changeset ; do
+ test ! -d $FF_L10N_BASE && mkdir $FF_L10N_BASE
+ # No-op, if we are building FF:
+ test ! -d $FINAL_L10N_BASE && mkdir $FINAL_L10N_BASE
+
+ # This is only relevant for Thunderbird-builds
+ # Here, the relevant directories we need to copy from FF and from TB
+ # are specified in a python-file in the tarball
+ # Is of form '{lang}/Foo/bar/ {lang}/Baz/bar/ ..'
+ ff_locale_template=$(get_locales_directories "GECKO_STRINGS_PATTERNS")
+ tb_locale_template=$(get_locales_directories "COMM_STRINGS_PATTERNS")
+
+ echo "Fetching Browser locales..."
+ jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' "$FF_LOCALE_FILE" | \
+ while read -r locale changeset ; do
case $locale in
ja-JP-mac|en-US)
;;
*)
echo "reading changeset information for $locale"
echo "fetching $locale changeset $changeset ..."
- if [ -d "l10n/$locale/.hg" ]; then
- pushd "l10n/$locale" || exit 1
- hg pull
+ if [ -d "$FF_L10N_BASE/$locale/.hg" ]; then
+ pushd "$FF_L10N_BASE/$locale" || exit 1
+ hg pull || exit 1
popd || exit 1
else
- hg clone "https://hg.mozilla.org/l10n-central/$locale" "l10n/$locale"
+ hg clone "https://hg.mozilla.org/l10n-central/$locale" "$FF_L10N_BASE/$locale" || exit 1
fi
- [ "$RELEASE_TAG" == "default" ] || hg -R "l10n/$locale" up -C -r "$changeset"
+ [ "$RELEASE_TAG" == "default" ] || hg -R "$FF_L10N_BASE/$locale" up -C -r "$changeset" || exit 1
+
+ # If we are doing TB, we have to merge both l10n-repos
+ if [ "$PRODUCT" = "thunderbird" ] && test -d "$TB_L10N_BASE/$locale/" ; then
+ create_and_copy_locales "$locale" "$FF_L10N_BASE" "$ff_locale_template" "$FINAL_L10N_BASE"
+ create_and_copy_locales "$locale" "$TB_L10N_BASE" "$tb_locale_template" "$FINAL_L10N_BASE"
+ fi
;;
esac
done
echo "creating l10n archive..."
if [ "$PRODUCT" = "thunderbird" ]; then
- TB_TAR_FLAGS="--exclude=browser --exclude=suite"
+ TB_TAR_FLAGS="--exclude=suite"
fi
- tar $compression -cf l10n-$VERSION$VERSION_SUFFIX.tar.xz \
+ tar "$compression" -cf "l10n-$VERSION$VERSION_SUFFIX.tar.xz" \
--exclude=.hgtags --exclude=.hgignore --exclude=.hg \
- $TB_TAR_FLAGS \
- l10n
-elif [ -f "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" ]; then
- # Locales did not change, but the old tar-ball is in this directory
- # Simply rename it:
- echo "Moving l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz to l10n-$VERSION$VERSION_SUFFIX.tar.xz"
- mv "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" "l10n-$VERSION$VERSION_SUFFIX.tar.xz"
-fi
+ "$TB_TAR_FLAGS" \
+ "$FINAL_L10N_BASE"
+}
+
+function clean_up_old_tarballs() {
+ if [ -e "$PREV_SOURCE_TARBALL" ]; then
+ echo ""
+ echo "Deleting old sources tarball $PREV_SOURCE_TARBALL"
+ ask_cont_abort_question "Is this ok?" || exit 0
+ rm "$PREV_SOURCE_TARBALL"
+ rm "$PREV_SOURCE_TARBALL.asc"
+ # if old and new lang-tarball are there, delete the old one
+ if [ -f "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz" ] && [ -f "l10n-$VERSION$VERSION_SUFFIX.tar.xz" ]; then
+ rm "l10n-$PREV_VERSION$PREV_VERSION_SUFFIX.tar.xz"
+ fi
+ fi
+}
+
+main "$@"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/gcc13-fix.patch Tue Mar 07 11:48:25 2023 +0100
@@ -0,0 +1,1 @@
+../gcc13-fix.patch
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-bmo1810584.patch Tue Mar 07 11:48:25 2023 +0100
@@ -0,0 +1,1 @@
+../mozilla-bmo1810584.patch
\ No newline at end of file
--- a/MozillaFirefox/tar_stamps Mon Feb 13 22:24:53 2023 +0100
+++ b/MozillaFirefox/tar_stamps Tue Mar 07 11:48:25 2023 +0100
@@ -1,10 +1,10 @@
PRODUCT="firefox"
CHANNEL="release"
-VERSION="109.0.1"
+VERSION="110.0.1"
VERSION_SUFFIX=""
-PREV_VERSION="109.0"
+PREV_VERSION="110.0"
PREV_VERSION_SUFFIX=""
#SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release"
-RELEASE_TAG="30244986d6ff55bc3396db436fe1dba555828106"
-RELEASE_TIMESTAMP="20230127170202"
+RELEASE_TAG="36ae3bdd6923c31262b6452d02323e856a19e5af"
+RELEASE_TIMESTAMP="20230227191043"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gcc13-fix.patch Tue Mar 07 11:48:25 2023 +0100
@@ -0,0 +1,225 @@
+diff --git a/tools/profiler/core/platform.cpp b/tools/profiler/core/platform.cpp
+--- a/tools/profiler/core/platform.cpp
++++ b/tools/profiler/core/platform.cpp
+@@ -1176,11 +1176,11 @@
+ if (!profiledThreadData) {
+ // This thread was not profiled, continue with the next one.
+ continue;
+ }
+ ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock lockedThreadData =
+- offThreadRef.LockedRWFromAnyThread();
++ offThreadRef.GetLockedRWFromAnyThread();
+ MOZ_RELEASE_ASSERT(array.append(ProfiledThreadListElement{
+ profiledThreadData->Info().RegisterTime(),
+ lockedThreadData->GetJSContext(), profiledThreadData}));
+ }
+
+@@ -4208,11 +4208,11 @@
+ ProfileBufferEntry::Kind::RunningTimes, runningTimesDiff);
+ }
+
+ if (threadStackSampling) {
+ ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock
+- lockedThreadData = offThreadRef.LockedRWFromAnyThread();
++ lockedThreadData = offThreadRef.GetLockedRWFromAnyThread();
+ // Suspend the thread and collect its stack data in the local
+ // buffer.
+ mSampler.SuspendAndSampleAndResumeThread(
+ lock, lockedThreadData.DataCRef(), now,
+ [&](const Registers& aRegs, const TimeStamp& aNow) {
+@@ -4922,11 +4922,11 @@
+ ThreadProfilingFeatures threadProfilingFeatures =
+ ActivePS::ProfilingFeaturesForThread(
+ aLock, aOffThreadRef.UnlockedConstReaderCRef().Info());
+ if (threadProfilingFeatures != ThreadProfilingFeatures::NotProfiled) {
+ ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock
+- lockedRWFromAnyThread = aOffThreadRef.LockedRWFromAnyThread();
++ lockedRWFromAnyThread = aOffThreadRef.GetLockedRWFromAnyThread();
+
+ ProfiledThreadData* profiledThreadData = ActivePS::AddLiveProfiledThread(
+ aLock, MakeUnique<ProfiledThreadData>(
+ aOffThreadRef.UnlockedConstReaderCRef().Info()));
+ lockedRWFromAnyThread->SetProfilingFeaturesAndData(
+@@ -5788,11 +5788,11 @@
+
+ ThreadProfilingFeatures threadProfilingFeatures =
+ ActivePS::ProfilingFeaturesForThread(aLock, info);
+ if (threadProfilingFeatures != ThreadProfilingFeatures::NotProfiled) {
+ ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock lockedThreadData =
+- offThreadRef.LockedRWFromAnyThread();
++ offThreadRef.GetLockedRWFromAnyThread();
+ ProfiledThreadData* profiledThreadData = ActivePS::AddLiveProfiledThread(
+ aLock, MakeUnique<ProfiledThreadData>(info));
+ lockedThreadData->SetProfilingFeaturesAndData(threadProfilingFeatures,
+ profiledThreadData, aLock);
+ lockedThreadData->GetNewCpuTimeInNs();
+@@ -6012,11 +6012,11 @@
+ ThreadProfilingFeatures::NotProfiled) {
+ continue;
+ }
+
+ ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock lockedThreadData =
+- offThreadRef.LockedRWFromAnyThread();
++ offThreadRef.GetLockedRWFromAnyThread();
+
+ lockedThreadData->ClearProfilingFeaturesAndData(aLock);
+
+ if (ActivePS::FeatureJS(aLock)) {
+ lockedThreadData->StopJSSampling();
+@@ -6355,11 +6355,11 @@
+
+ // We don't call StopJSSampling() here; there's no point doing that for a JS
+ // thread that is in the process of disappearing.
+
+ ThreadRegistration::OnThreadRef::RWOnThreadWithLock lockedThreadData =
+- aOnThreadRef.LockedRWOnThread();
++ aOnThreadRef.GetLockedRWOnThread();
+
+ ProfiledThreadData* profiledThreadData =
+ lockedThreadData->GetProfiledThreadData(lock);
+ lockedThreadData->ClearProfilingFeaturesAndData(lock);
+
+@@ -6876,11 +6876,11 @@
+ }
+
+ // The profiler mutex must be locked before the ThreadRegistration's.
+ PSAutoLock lock;
+ ThreadRegistration::OnThreadRef::RWOnThreadWithLock lockedThreadData =
+- aOnThreadRef.LockedRWOnThread();
++ aOnThreadRef.GetLockedRWOnThread();
+
+ if (ProfiledThreadData* profiledThreadData =
+ lockedThreadData->GetProfiledThreadData(lock);
+ profiledThreadData && ActivePS::Exists(lock) &&
+ ActivePS::FeatureJS(lock)) {
+diff --git a/tools/profiler/public/ProfilerThreadRegistration.h b/tools/profiler/public/ProfilerThreadRegistration.h
+--- a/tools/profiler/public/ProfilerThreadRegistration.h
++++ b/tools/profiler/public/ProfilerThreadRegistration.h
+@@ -212,18 +212,18 @@
+
+ LockedRWOnThread& mLockedRWOnThread;
+ DataLock mDataLock;
+ };
+
+- [[nodiscard]] RWOnThreadWithLock LockedRWOnThread() {
++ [[nodiscard]] RWOnThreadWithLock GetLockedRWOnThread() {
+ return RWOnThreadWithLock{mThreadRegistration->mData,
+ mThreadRegistration->mDataMutex};
+ }
+
+ template <typename F>
+ auto WithLockedRWOnThread(F&& aF) {
+- RWOnThreadWithLock lockedData = LockedRWOnThread();
++ RWOnThreadWithLock lockedData = GetLockedRWOnThread();
+ return std::forward<F>(aF)(lockedData.DataRef());
+ }
+
+ // This is needed to allow OnThreadPtr::operator-> to return a temporary
+ // OnThreadRef object, for which `->` must work; Here it provides a pointer
+diff --git a/tools/profiler/public/ProfilerThreadRegistry.h b/tools/profiler/public/ProfilerThreadRegistry.h
+--- a/tools/profiler/public/ProfilerThreadRegistry.h
++++ b/tools/profiler/public/ProfilerThreadRegistry.h
+@@ -175,18 +175,18 @@
+
+ LockedRWFromAnyThread& mLockedRWFromAnyThread;
+ ThreadRegistration::DataLock mDataLock;
+ };
+
+- [[nodiscard]] RWFromAnyThreadWithLock LockedRWFromAnyThread() {
++ [[nodiscard]] RWFromAnyThreadWithLock GetLockedRWFromAnyThread() {
+ return RWFromAnyThreadWithLock{mThreadRegistration->mData,
+ mThreadRegistration->mDataMutex};
+ }
+
+ template <typename F>
+ auto WithLockedRWFromAnyThread(F&& aF) {
+- RWFromAnyThreadWithLock lockedData = LockedRWFromAnyThread();
++ RWFromAnyThreadWithLock lockedData = GetLockedRWFromAnyThread();
+ return std::forward<F>(aF)(lockedData.DataRef());
+ }
+
+ private:
+ // Only ThreadRegistry should construct an OnThreadRef.
+diff --git a/tools/profiler/tests/gtest/GeckoProfiler.cpp b/tools/profiler/tests/gtest/GeckoProfiler.cpp
+--- a/tools/profiler/tests/gtest/GeckoProfiler.cpp
++++ b/tools/profiler/tests/gtest/GeckoProfiler.cpp
+@@ -620,11 +620,11 @@
+ // non-const LockedRWOnThread
+
+ EXPECT_FALSE(TR::IsDataMutexLockedOnCurrentThread());
+ {
+ TR::OnThreadRef::RWOnThreadWithLock rwOnThreadWithLock =
+- aOnThreadRef.LockedRWOnThread();
++ aOnThreadRef.GetLockedRWOnThread();
+ EXPECT_TRUE(TR::IsDataMutexLockedOnCurrentThread());
+ TestConstLockedRWOnThread(rwOnThreadWithLock.DataCRef(),
+ beforeRegistration, afterRegistration,
+ &onStackChar);
+ TestLockedRWOnThread(rwOnThreadWithLock.DataRef(), beforeRegistration,
+@@ -1019,11 +1019,11 @@
+ // non-const LockedRWFromAnyThread
+
+ EXPECT_FALSE(TR::IsDataMutexLockedOnCurrentThread());
+ {
+ TRy::OffThreadRef::RWFromAnyThreadWithLock rwFromAnyThreadWithLock =
+- aOffThreadRef.LockedRWFromAnyThread();
++ aOffThreadRef.GetLockedRWFromAnyThread();
+ if (profiler_current_thread_id() == testThreadId) {
+ EXPECT_TRUE(TR::IsDataMutexLockedOnCurrentThread());
+ }
+ TestLockedRWFromAnyThread(rwFromAnyThreadWithLock.DataRef(),
+ beforeRegistration, afterRegistration,
+@@ -1156,11 +1156,11 @@
+ aOffThreadRef) {
+ if (otherThreadLoops % 1000 == 0) {
+ PR_Sleep(PR_MillisecondsToInterval(1));
+ }
+ TRy::OffThreadRef::RWFromAnyThreadWithLock rwFromAnyThreadWithLock =
+- aOffThreadRef.LockedRWFromAnyThread();
++ aOffThreadRef.GetLockedRWFromAnyThread();
+ ++otherThreadReads;
+ if (otherThreadReads % 1000 == 0) {
+ PR_Sleep(PR_MillisecondsToInterval(1));
+ }
+ });
+
+diff --git a/gfx/2d/Rect.h b/gfx/2d/Rect.h
+--- a/gfx/2d/Rect.h
++++ b/gfx/2d/Rect.h
+@@ -10,16 +10,17 @@
+ #include "BaseRect.h"
+ #include "BaseMargin.h"
+ #include "NumericTools.h"
+ #include "Point.h"
+ #include "Tools.h"
+ #include "mozilla/Maybe.h"
+
+ #include <cmath>
++#include <cstdint>
+
+ namespace mozilla {
+
+ template <typename>
+ struct IsPixel;
+
+ namespace gfx {
+
+diff --git a/toolkit/components/telemetry/pingsender/pingsender.cpp b/toolkit/components/telemetry/pingsender/pingsender.cpp
+--- a/toolkit/components/telemetry/pingsender/pingsender.cpp
++++ b/toolkit/components/telemetry/pingsender/pingsender.cpp
+@@ -1,14 +1,15 @@
+ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+ #include <cstdlib>
++#include <cstdint>
+ #include <cstring>
+ #include <ctime>
+ #include <fstream>
+ #include <iomanip>
+ #include <string>
+ #include <vector>
+
+ #include <zlib.h>
--- a/mozilla-bmo1568145.patch Mon Feb 13 22:24:53 2023 +0100
+++ b/mozilla-bmo1568145.patch Tue Mar 07 11:48:25 2023 +0100
@@ -10,7 +10,7 @@
diff --git a/python/mozbuild/mozbuild/action/langpack_manifest.py b/python/mozbuild/mozbuild/action/langpack_manifest.py
--- a/python/mozbuild/mozbuild/action/langpack_manifest.py
+++ b/python/mozbuild/mozbuild/action/langpack_manifest.py
-@@ -15,16 +15,17 @@ from __future__ import absolute_import,
+@@ -13,16 +13,17 @@
import argparse
import datetime
@@ -26,9 +26,9 @@
import mozversioncontrol
import requests
from fluent.syntax.parser import FluentParser
- from mozbuild.configure.util import Version
from mozpack.chrome.manifest import Manifest, ManifestLocale, parse_manifest
-@@ -102,17 +103,17 @@ def get_dt_from_hg(path):
+
+@@ -101,17 +102,17 @@ def get_dt_from_hg(path):
# ts == "20170914215617"
###
def get_timestamp_for_locale(path):
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-bmo1810584.patch Tue Mar 07 11:48:25 2023 +0100
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Iain Ireland <iireland@mozilla.com>
+# Date 1674084161 0
+# Node ID 0a20a4613cc423258696c2e6200dc7d34f934cb6
+# Parent 26cacd18b61e629c8c45ca45c36770d3bf3f15b8
+Bug 1810584: Suppress false positive error for gcc r=mgaudet
+
+Differential Revision: https://phabricator.services.mozilla.com/D167194
+
+diff --git a/js/src/irregexp/moz.build b/js/src/irregexp/moz.build
+--- a/js/src/irregexp/moz.build
++++ b/js/src/irregexp/moz.build
+@@ -9,16 +9,20 @@ FINAL_LIBRARY = "js"
+ # Includes should be relative to parent path
+ LOCAL_INCLUDES += ["!..", ".."]
+
+ include("../js-config.mozbuild")
+ include("../js-cxxflags.mozbuild")
+
+ CXXFLAGS += ["-Wno-error=type-limits", "-Wno-error=return-type"]
+
++# Suppress spurious warnings in third-party code. See bug 1810584.
++if CONFIG["CC_TYPE"] == "gcc":
++ CXXFLAGS += ["-Wno-error=nonnull"]
++
+ UNIFIED_SOURCES += [
+ "imported/regexp-bytecode-generator.cc",
+ "imported/regexp-bytecode-peephole.cc",
+ "imported/regexp-bytecodes.cc",
+ "imported/regexp-compiler-tonode.cc",
+ "imported/regexp-dotprinter.cc",
+ "imported/regexp-interpreter.cc",
+ "imported/regexp-macro-assembler-tracer.cc",
+
--- a/mozilla-kde.patch Mon Feb 13 22:24:53 2023 +0100
+++ b/mozilla-kde.patch Tue Mar 07 11:48:25 2023 +0100
@@ -3,7 +3,7 @@
# Date 1559294891 -7200
# Fri May 31 11:28:11 2019 +0200
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
-# Parent a6ee87356867ce6ed5b0be1ba2c2690a488beb55
+# Parent 191cd9e24a9e0812f74c808ceef611c8b10141e1
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@@ -31,7 +31,7 @@
#ifdef MOZ_MEMORY
# include "mozmemory.h"
#endif
-@@ -4878,16 +4879,27 @@ nsresult Preferences::InitInitialObjects
+@@ -4882,16 +4883,27 @@ nsresult Preferences::InitInitialObjects
"unix.js"
# if defined(_AIX)
,
@@ -59,7 +59,7 @@
#if defined(MOZ_WIDGET_GTK)
// Under Flatpak/Snap package, load /etc/firefox/defaults/pref/*.js.
-@@ -4969,17 +4981,17 @@ nsresult Preferences::InitInitialObjects
+@@ -4973,17 +4985,17 @@ nsresult Preferences::InitInitialObjects
}
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@@ -105,7 +105,7 @@
diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
--- a/python/mozbuild/mozpack/chrome/flags.py
+++ b/python/mozbuild/mozpack/chrome/flags.py
-@@ -229,16 +229,17 @@ class Flags(OrderedDict):
+@@ -228,16 +228,17 @@ class Flags(OrderedDict):
"os": StringFlag,
"osversion": VersionFlag,
"abi": StringFlag,
@@ -126,7 +126,7 @@
diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
--- a/python/mozbuild/mozpack/chrome/manifest.py
+++ b/python/mozbuild/mozpack/chrome/manifest.py
-@@ -39,16 +39,17 @@ class ManifestEntry(object):
+@@ -37,16 +37,17 @@ class ManifestEntry(object):
"os",
"osversion",
"abi",
@@ -165,7 +165,7 @@
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
-@@ -1239,36 +1239,66 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1240,36 +1240,66 @@ nsUnknownContentTypeDialog.prototype = {
params.handlerApp &&
params.handlerApp.executable &&
params.handlerApp.executable.isFile()
@@ -1704,9 +1704,9 @@
+ desktop = nsKDEUtils::kdeSession() ? u"kde"_ns : u"gnome"_ns;
#elif defined(MOZ_WIDGET_ANDROID)
bool isTablet = false;
- if (mozilla::AndroidBridge::Bridge()) {
- mozilla::AndroidBridge::Bridge()->GetStaticStringField(
- "android/os/Build$VERSION", "RELEASE", osVersion);
+ if (jni::IsAvailable()) {
+ jni::String::LocalRef release = java::sdk::Build::VERSION::RELEASE();
+ osVersion.Assign(release->ToString());
isTablet = java::GeckoAppShell::IsTablet();
}
+ desktop = u"android"_ns;
--- a/mozilla-pgo.patch Mon Feb 13 22:24:53 2023 +0100
+++ b/mozilla-pgo.patch Tue Mar 07 11:48:25 2023 +0100
@@ -1,6 +1,6 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 855b1f176633af8ae11c0d791c8b33e9a2ae88e0
+# Parent d6f551c7b3dc20bb47526e06c44646fd159f3dd1
diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure
--- a/build/moz.configure/lto-pgo.configure
@@ -133,17 +133,17 @@
CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
+ if [ -n "$MOZ_PGO" ]; then
-+ if [ -z "$USE_ARTIFACT" ]; then
-+ ac_add_options --enable-lto
-+ fi
-+ export AR="$topsrcdir/gcc/bin/gcc-ar"
-+ export NM="$topsrcdir/gcc/bin/gcc-nm"
-+ export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib"
++ if [ -z "$USE_ARTIFACT" ]; then
++ ac_add_options --enable-lto
++ fi
++ export AR="$topsrcdir/gcc/bin/gcc-ar"
++ export NM="$topsrcdir/gcc/bin/gcc-nm"
++ export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib"
+ fi
+
# We want to make sure we use binutils and other binaries in the tooltool
# package.
- mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
+ mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$MOZ_FETCHES_DIR/binutils/bin:$PATH"
else
# For some builds we don't want to have Clang based static-analysis activated
if [ -z "$DISABLE_CLANG_PLUGIN" ]; then
--- a/mozilla-silence-no-return-type.patch Mon Feb 13 22:24:53 2023 +0100
+++ b/mozilla-silence-no-return-type.patch Tue Mar 07 11:48:25 2023 +0100
@@ -1,10 +1,10 @@
# HG changeset patch
-# Parent 9d5642506b3a46c3bb28c659173d7055c9674c77
+# Parent 2ac470c477a4897e48ca399b50614af79fececc4
diff --git a/Cargo.lock b/Cargo.lock
--- a/Cargo.lock
+++ b/Cargo.lock
-@@ -2348,18 +2348,16 @@ name = "glsl-to-cxx"
+@@ -2367,18 +2367,16 @@ name = "glsl-to-cxx"
version = "0.1.0"
dependencies = [
"glsl",
@@ -26,24 +26,24 @@
diff --git a/Cargo.toml b/Cargo.toml
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -154,16 +154,17 @@ async-task = { git = "https://github.com
- chardetng = { git = "https://github.com/hsivonen/chardetng", rev="3484d3e3ebdc8931493aa5df4d7ee9360a90e76b" }
- chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" }
+@@ -155,16 +155,17 @@ chardetng_c = { git = "https://github.co
coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev="fc68464b5445caf111e41f643a2e69ccce0b4f83" }
fog = { path = "toolkit/components/glean/api" }
libudev-sys = { path = "dom/webauthn/libudev-sys" }
packed_simd = { package = "packed_simd_2", git = "https://github.com/hsivonen/packed_simd", rev="412f9a0aa556611de021bde89dee8fefe6e0fbbd" }
- midir = { git = "https://github.com/mozilla/midir.git", rev = "e1b4dcb767f9e69afe95a860374aaa9635d81e3d" }
- minidump_writer_linux = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "75ada456c92a429704691a85e1cb42fef8cafc0d" }
+ midir = { git = "https://github.com/mozilla/midir.git", rev = "519e651241e867af3391db08f9ae6400bc023e18" }
+ minidump-writer = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "7d76616d27b9dc87fe3a94639b8b4f947d52a6aa" }
+ # warp 0.3.3 + https://github.com/seanmonstar/warp/pull/1007
+ warp = { git = "https://github.com/glandium/warp", rev = "4af45fae95bc98b0eba1ef0db17e1dac471bb23d" }
+glslopt = { path = "third_party/rust/glslopt/" }
# application-services overrides to make updating them all simpler.
- interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "d7dbd32fa379ad46820476222f4d2aeaed2d7175" }
- sql-support = { git = "https://github.com/mozilla/application-services", rev = "d7dbd32fa379ad46820476222f4d2aeaed2d7175" }
- sync15 = { git = "https://github.com/mozilla/application-services", rev = "d7dbd32fa379ad46820476222f4d2aeaed2d7175" }
- tabs = { git = "https://github.com/mozilla/application-services", rev = "d7dbd32fa379ad46820476222f4d2aeaed2d7175" }
- viaduct = { git = "https://github.com/mozilla/application-services", rev = "d7dbd32fa379ad46820476222f4d2aeaed2d7175" }
- webext-storage = { git = "https://github.com/mozilla/application-services", rev = "d7dbd32fa379ad46820476222f4d2aeaed2d7175" }
+ interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }
+ sql-support = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }
+ sync15 = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }
+ tabs = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }
+ viaduct = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }
+ webext-storage = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }
diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h
--- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h
+++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h
@@ -2223,7 +2223,7 @@
diff --git a/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc b/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc
--- a/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc
-@@ -114,16 +114,17 @@ GainControl::Mode Agc1ConfigModeToInterf
+@@ -115,16 +115,17 @@ GainControl::Mode Agc1ConfigModeToInterf
case Agc1Config::kAdaptiveAnalog:
return GainControl::kAdaptiveAnalog;
case Agc1Config::kAdaptiveDigital:
@@ -2241,7 +2241,7 @@
// Maximum lengths that frame of samples being passed from the render side to
// the capture side can have (does not apply to AEC3).
-@@ -1955,16 +1956,17 @@ void AudioProcessingImpl::InitializeNois
+@@ -1956,16 +1957,17 @@ void AudioProcessingImpl::InitializeNois
case NoiseSuppresionConfig::kModerate:
return NsConfig::SuppressionLevel::k12dB;
case NoiseSuppresionConfig::kHigh:
--- a/series Mon Feb 13 22:24:53 2023 +0100
+++ b/series Tue Mar 07 11:48:25 2023 +0100
@@ -22,6 +22,8 @@
one_swizzle_to_rule_them_all.patch
svg-rendering.patch
mozilla-buildfixes.patch
+mozilla-bmo1810584.patch
+gcc13-fix.patch
# Firefox patches
firefox-kde.patch