firefox: update to 115.0

iigs

2023-07-04 8d8ddbad8a03cd738225b37f4f8f82829295fa0e

firefox: update to 115.0

Update 03-browser-extension-css.patch

Update 09-glean.patch

Delete malloc_usable_size.patch

Update patch-build_autoconf_compiler-opts.m4.patch

 components/web/firefox/Makefile

@@ -18,6 +18,7 @@
# Copyright 2021 Carsten Grzemba
#

USE_PARALLEL_BUILD = yes
include ../../../make-rules/shared-macros.mk

# ESR should be set to esr for esr build, or an empty string for other builds
@@ -26,11 +27,11 @@
# CANDIDATE_BUILD is the build number found in the candidates directory.
# CANDIDATE_BETA is the beta version found in the candidates directory.
# Do not define either for final release build.
# CANDIDATE_BUILD=1
# CANDIDATE_BUILD=2
# CANDIDATE_BETA=9

COMPONENT_NAME =    firefox
COMPONENT_VERSION =    114.0.2
COMPONENT_VERSION =    115.0
COMPONENT_SUMMARY=      Mozilla Firefox Web browser
COMPONENT_PROJECT_URL =    https://www.mozilla.com/firefox
COMPONENT_SRC_NAME =    $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -40,7 +41,7 @@
else
COMPONENT_ARCHIVE =    $(COMPONENT_SRC_NAME)$(ESR).source.tar.xz
endif
COMPONENT_ARCHIVE_HASH= sha256:aa602032f0b7065b743ba7fabf96714398aba538bcc017a4b0fff556dc69f8fe
COMPONENT_ARCHIVE_HASH= sha256:7cdb23fe5ccb54334c8fe14c1e5dd89d5788f8e7b79a2bd9cc4eabdc7e54e898
ifndef CANDIDATE_BUILD
MOZILLA_FTP =        https://ftp.mozilla.org/pub/$(COMPONENT_NAME)/releases/$(COMPONENT_VERSION)$(ESR)
else

 components/web/firefox/patches/03-browser-extension-css.patch

@@ -9,9 +9,9 @@
     content/browser/extension-linux-panel.css
 #endif
 #ifdef XP_MACOSX
--- gecko-dev-master/browser/components/extensions/ExtensionPopups.jsm.~1~    2022-07-16 15:05:03.000000000 +0000
+++ gecko-dev-master/browser/components/extensions/ExtensionPopups.jsm    2022-07-17 03:45:53.080806609 +0000
@@ -67,12 +67,16 @@
--- gecko-dev-master/browser/components/extensions/ExtensionPopups.sys.mjs.old    2023-06-05 21:19:27.919203523 -0400
+++ gecko-dev-master/browser/components/extensions/ExtensionPopups.sys.mjs    2023-06-05 21:21:53.084756280 -0400
@@ -43,12 +43,16 @@
 XPCOMUtils.defineLazyGetter(lazy, "standaloneStylesheets", () => {
   let stylesheets = [];
 

 components/web/firefox/patches/09-glean.patch

@@ -1,8 +1,8 @@
Split glean out of the rest of the rust patches since this gets updated every
few weeks and breaks all the time.  The right solution is to have the os
integrated into Mozilla's glean source repo.
--- firefox-114.0/third_party/rust/glean-core/.cargo-checksum.json.~1~  2023-05-23 18:21:31.277578920 -0400
+++ firefox-114.0/third_party/rust/glean-core/.cargo-checksum.json      2023-05-23 18:27:01.256307964 -0400
--- gecko-dev-master/third_party/rust/glean-core/.cargo-checksum.json.~1~    2023-05-14 21:16:44.095357410 -0400
+++ gecko-dev-master/third_party/rust/glean-core/.cargo-checksum.json    2023-05-14 21:17:42.692364968 -0400
@@ -1 +1 @@
-{"files":{"Cargo.toml":"5055da6c8d5ffdd06289d0620283762c972140496e8a9c0c15f0b2c505db8cfa","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"026495898699b54608eb4ec16074ffafc57920d80ccb59961c501a1ea28c9985","build.rs":"4857bea99c6b8c08db8818efa9d3738716f52d3acb68159323957ae52892a3eb","src/common_metric_data.rs":"72051c4349885d4a94fc41bb4edda88d31551f2f9ebcdb4e868a98161bc76233","src/core/mod.rs":"e8883dfd146c19254fb26ae4304a0e2b58c6e38adfff886adde17bb27312872b","src/core_metrics.rs":"a877e42e0f8b932adb52a5681ad76fd977808cb48c7eeb29b1e4bbe804f1ea96","src/coverage.rs":"49613fd310bd24d779472720975fbe6c97ec370a95eb55f10afa43f67539c942","src/database/mod.rs":"cf642a2134e2e6fe27d43101eb6025178d299d17bf791ff10964eafc78258813","src/debug.rs":"90158cc5d488ba67b60d06647e54e59a1d7bdeb906087e4fe4cfab4373c1cc6c","src/dispatcher/global.rs":"f69cd81a90a37c306d4e0ce8177ea5a3ae2ffda5b431ae46b9a22c9e38891271","src/dispatcher/mod.rs":"c53165ed76defa7f7844af8ff0eefb82e0be25bf4b44d16fa8752d8e2bfef778","src/error.rs":"b93c7d3e243b21bb9eafc95f17860aba1a942b2f2b0a7f43307690f05fece516","src/error_recording.rs":"d7858647808d81173558e12de88f3fbe4e589969e3bd246bfb388f90f8ff3814","src/event_database/mod.rs":"bc7204b5a873f761c5b89198d7e93eb3d351ae6a63d4f7adb4119c0d09cf0c77","src/fd_logger.rs":"0c9def6fa53db1a2ab93c85795f8a7df57797bcfd3978146923e151752e291a6","src/glean.udl":"32e3a78cc0829a6de2cb72007f43fae05c6e4cf2ecd76229c5dba24d1a1094e1","src/glean_metrics.rs":"9414fb1453d19f6832df33e4c6ef7383d62203e47026bf5bc9552b083101ddd1","src/histogram/exponential.rs":"58bb1770bae45770d92995515d328eb50a7e78726224f779446ae7d1632a6a3e","src/histogram/functional.rs":"1a63a305b48bcef7bc38136b40d916df4bb8f098dc602514ada54a9b091f6951","src/histogram/linear.rs":"4342a1733175d7f97b2b41adb18100537c206100c9fccb5bd13bd782c9cb3c9a","src/histogram/mod.rs":"eeb7aff80806ab76cdce101dc08887b5552f8b4bdf64683f64f767e0f06a889d","src/internal_metrics.rs":"dac2a1818d15599bf5328a88036fb3675884b230e2a57e9458cbf3e2f51bb2ab","src/internal_pings.rs":"f67e3166623cf354f79ea5aa76289276468cdac6e0fe6e6b6f427dcf3fc5367b","src/lib.rs":"198315af01596cca427d770e31fa57f6c73c834abbd20f560fc167b5a309b0db","src/lib_unit_tests.rs":"7c4dbbcf1c06ad64f39e901dda597d428fe02b25d1830a72e87d572173deb4f0","src/metrics/boolean.rs":"0591043a88e81c77b694cc8124b9e4996e81a46df1402e1bdf364d2885d8215e","src/metrics/counter.rs":"0f46083c1c8f1abfab582391478731cdc9f33bc80fffef4a2e0e64592a2253c0","src/metrics/custom_distribution.rs":"9ca60176837e216da3655b2a3ba08a296444aaa7d966ddd498478fdfb2b21049","src/metrics/datetime.rs":"ca12a426fbc564847d64e6ddcaa3f298065ba4bca0372c638058c20909f626d5","src/metrics/denominator.rs":"7bacb81ea2b81da8775f61544022d35d91f159e1aa494944eaf9536cacc18b4d","src/metrics/event.rs":"7d5a2511966fe647355fe78be6c26f43f1c5ec9c0eedb7395c5ee586b3a8195f","src/metrics/experiment.rs":"48aaf06b32a691500dbc51be95955071947d7760e3b81d30ac8d8d0161c1df3f","src/metrics/labeled.rs":"c6e2200694e3cd623e8369420d3b35759b117ef9e8188fd33afaa81685fdce28","src/metrics/memory_distribution.rs":"e9456afc7759980d06d1e2e3620a3117995d27d16bc3c5a05ea8c023475ae47a","src/metrics/memory_unit.rs":"d7a678e5242febd021283b30c0099a9e62729944816a3f17d2d91e2808bc0570","src/metrics/metrics_enabled_config.rs":"87fed12219c756ecf1e5c8cd6a21f26999b6bbcf3ffc1b5467b0a58ca5ad35d8","src/metrics/mod.rs":"759ba845d4598e3fea4877d2687da958b15480ec453562c48dac7872ab300ee8","src/metrics/numerator.rs":"442236e1d63b31299f3f073bead683101de995845a638834201c6f30fc03ea90","src/metrics/ping.rs":"02bac8664a0d38a3519fa387513e3ecbb4b54e9367d842f6e52594ecaa514b07","src/metrics/quantity.rs":"915ab10cf1e1666fc2c707bc51232843e914d93eea2a249eb15df28b6a74cd2b","src/metrics/rate.rs":"38a6986387ec3927dbd81d8a881e257674e91bb97ccd43eb6285f691d5e06531","src/metrics/recorded_experiment.rs":"33958abee79d8b55dec4cb5d20742640423713010f76314075cefde18b5c118a","src/metrics/string.rs":"f7ffc07c23bedc1b8579121d931468b0713834fc037f7945267257fdbdf9a5d0","src/metrics/string_list.rs":"db886476bf2a8318f17c6bdcdb4f699b413181497d1271dbec2bcbecf2df96ce","src/metrics/text.rs":"d727bcc14d2c4f946a517ac0110f585bfbe4898f813bdbad68756505529300f6","src/metrics/time_unit.rs":"b7578010c6270a45b30342b59189a862b2ede9dd24e9afae3e90fa6b970b3d24","src/metrics/timespan.rs":"ae1a2966f0a5446327ad2b9ca0738992976350ad334a5e11fd4ee611a690394e","src/metrics/timing_distribution.rs":"57d4b3f19e7382f80cc596406d3d1c191f61bc3c81f92bf137a13c2fa174c822","src/metrics/url.rs":"9bec842b7a811f01c1f0a0deb54b2dac2f8488882e7e9251cd91d18e6b500939","src/metrics/uuid.rs":"f824019fe3e8d8945490b7eb0ac1c6b7b2ffc991543f4b6332d12827955cf420","src/ping/mod.rs":"9b44f1d20b249988f51dc31bd9f2dfab50e5dba8b88744ef89dbe1d50903bfdb","src/scheduler.rs":"129863e31205404a3d1708627a62583324c347d143f976216f769893ec541ea0","src/storage/mod.rs":"3fd0fb9b743a1ec12b8b1fd07f1a99594db030ec47ab4afe255923e6d11a636a","src/system.rs":"e3d1b54e1d39cafe6f4dc7ff5021b08c879733f909951b0e1332b3efa9ed97bd","src/traits/boolean.rs":"be0e130f8043215705becc956d45b126c340568f1b24a396c0af9b4334a41ced","src/traits/counter.rs":"c686d26e131d854cd7a7df83c900ca7c17a03c663a30cf58ab48c7259476ce85","src/traits/custom_distribution.rs":"159a5e26fb2326f5bcdc46979aa9c6481c5f0e93ecf957f668bb3f6988d8b00f","src/traits/datetime.rs":"636ac1456b1b042e38cf5ae6193c5b232ea0b80df62f583a2097891baef9641b","src/traits/event.rs":"3f48aa336854141784d121f7fa9e283f6ff708a9214f9c0aade3a68cc38dda99","src/traits/labeled.rs":"c633c68e70a44e73f8aff88aaab1029c0faded3cad08d822590ed8838f24b4fd","src/traits/memory_distribution.rs":"55bb8f45e948319fbba9d28a50d8742da134b066a42e480887db7c7e435f4096","src/traits/mod.rs":"d0aa19a7cd97326fd2e026635406a5a9403953ced4954443a2bcbca32d868554","src/traits/numerator.rs":"6e4f236bdc448f1bde7a8c249dcd086204c2c69990d3f444e746290929226ed3","src/traits/ping.rs":"8831c106c03afeb458b0b028fa1ce61f056ebf8e82bc0a171a1bff255d920748","src/traits/quantity.rs":"6ffe25c913bef4315573d747308c182de740b2a4e02ba22cd21d0c33ba521f31","src/traits/rate.rs":"f000790440e0f389f0b160526a9a9a266e58d1405915ae56ac550f482858222c","src/traits/string.rs":"0c3c88382ff2e8eba89c7cfe129c4b84e31140af717819533c14919541ad790c","src/traits/string_list.rs":"14e56b62c2c2be1dd8013f12001f235b084abd2a0d5aa2f7932843877af49ac0","src/traits/text.rs":"8af7d3a0c87cfd8c6d33d6ad47532b431055bbdd395f9110da5630222c23cf93","src/traits/timespan.rs":"52be325a9c061916f34c5b638a07a93b4a14aa89fe365783103d2e06b998f547","src/traits/timing_distribution.rs":"7cb59eb55e92516e6b076e2bb2d7fa120f491f01ba873918f93421079cc442ad","src/traits/url.rs":"c27f7add23214ff051078b65b88120b620560d2841a1056c7214d5237e86b9e4","src/traits/uuid.rs":"81322e71c7e847bacaf827a2cd58f6193bdc208355524207f7f38db039da6aa8","src/upload/directory.rs":"f671abed05d57061b59e12b0c6faccdf6765eb632aed9d28599dfdc3bf0c4546","src/upload/mod.rs":"0ae4150e72f577cc09e4bf804a368e8ed8ff5b50251515fd5038c331245bc89b","src/upload/policy.rs":"c250957a37783e74af8002cd80ba06ef9780a389fb0f61b8b665b79688f0a360","src/upload/request.rs":"a16fbe823228e73a2acc6f4324d6c635be22dfefb19ae71146245d9236baa87a","src/upload/result.rs":"7efbbe50e8d36beb3f23e7bfd172d22e1c003472d2dd8055b06f6050c36437c5","src/util.rs":"ee7500434d9758a320dd410f18d7e18da956591e19d2555db87eef9623e4b916","tests/boolean.rs":"76d6014ff108cb6514d9bceb1b2b14749a55b09921f4595a5e30f1bd3546e9f0","tests/common/mod.rs":"ade7a65d4c52a389e1036d41af124ecca73a1cdbc117c9d9b932e44148b55235","tests/counter.rs":"46c82058cb1d7c60b340b6dbce998b4ea57333767ff52635d48a65235180e276","tests/custom_distribution.rs":"53530972243670ef58c85a906b70931d14e81ae2e1f69092c71a27e561edff6c","tests/datetime.rs":"ec3c9760e70bb2cbc61ab23281c891bc1ec493c5c545466c29fd13e4f05c2c96","tests/event.rs":"a12a32846666f232f700d5234e78fd9d5c85b45ed84cca1061ee9eedf333e66f","tests/labeled.rs":"e9ea6dba17059d68114efce0c23373be9ceed922bf5e638a2158a6422c75a1c1","tests/memory_distribution.rs":"a5a7aa955e60823ea29a6f4bc96c61e41f1e41f08958aa4854668cf8fe04cde6","tests/ping.rs":"8d480950acc33cbd8da9ed9575266d561f1b4601ed02de15d155227b9e27e6c3","tests/ping_maker.rs":"2a807cb93a7302a3f7f274b3cb266db1961ae4733aacd4279c9f0e94679b55ff","tests/quantity.rs":"55e7dca346fd1d27f0974b78ca3fb12427cb5da2ee637afc08a54f360f947361","tests/rate.rs":"1de571b9f0ee9a9006cbc8a31f91352d3ff1190b50840f0f668b470a7cd2a3a5","tests/storage.rs":"f0c8312bd789d7bda502cd45f35fef6b8591652bd194d07da4d81935ebe69b48","tests/string.rs":"7ece988a4b8efe6932ccb90bfe2f3c8aaea983777e99d7de6028bf6a29459ee6","tests/string_list.rs":"d80d7ed42802e22aa3f255f66c1dcea5ce0548a10f38b311748fd754c5ff9d0e","tests/text.rs":"1d43f6b90a43124311cacf0a6ee16f9e1e9263bcd11fee8b996d6efd81633638","tests/timespan.rs":"d50d75c7d75da3a878d67331cb0df8ae5e6a099ffab474361f71a408e02528d7","tests/timing_distribution.rs":"dbe2c8efa5dfb8037765b50433568c04ba111953822584da1c4931837fdfc060","tests/uuid.rs":"052ad26a6927c56272219340211cf4a059d200f14287b482fe8621d7bce3cc54","uniffi.toml":"6ddc98b686b0925a81abd9d1c769e5c98ac29771b210a1c535931a46dec9a8e3"},"package":"3493e4f4df45199762f43a6d2298fa9d885fa5ddc9efdc118a41b38c69c7ad59"}
\ No newline at end of file
@@ -25,3 +25,4 @@
+    target_os = "illumos",
 )))]
 pub const OS: &str = "unknown";


 components/web/firefox/patches/malloc_usable_size.patch

File was deleted

 components/web/firefox/patches/patch-build_autoconf_compiler-opts.m4.patch

@@ -1,19 +1,17 @@
g++: error: -pie is not supported in this configuration
make[4]: *** [/ws/grzemba/oi-userland/components/web/firefox/firefox-68.12.0/config/rules.mk:540: ../../../dist/bin/js] Error 1
make[4]: Leaving directory '/ws/grzemba/oi-userland/components/web/firefox/build/amd64/js/src/shell'

diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
index 6e73e20..cff81b0 100644
--- a/build/autoconf/compiler-opts.m4
+++ b/build/autoconf/compiler-opts.m4
@@ -175,10 +175,6 @@ if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$DEVELOPER_OPTIONS"; then
     fi
 fi
--- gecko-dev-master/build/autoconf/compiler-opts.m4.old    2023-06-10 13:54:09.501319246 -0400
+++ gecko-dev-master/build/autoconf/compiler-opts.m4    2023-06-10 13:57:28.109237589 -0400
@@ -147,9 +147,10 @@
 
-if test "$GNU_CC$CLANG_CC"; then
-    MOZ_PROGRAM_LDFLAGS="$MOZ_PROGRAM_LDFLAGS -pie"
-fi
-
 AC_SUBST(MOZ_PROGRAM_LDFLAGS)
 
 dnl ASan assumes no symbols are being interposed, and when that happens,
 if test "$GNU_CC$CLANG_CC"; then
     case "${OS_TARGET}" in
-    Darwin|WASI)
+    Darwin|WASI|SunOS)
         # It's the default on those targets, and clang complains about -pie
         # being unused if passed.
+        # On Illumos, there was an error using -pie with g++ for Firefox 68
         ;;
     *)
         MOZ_PROGRAM_LDFLAGS="$MOZ_PROGRAM_LDFLAGS -pie"