Manual merge of version 115.7.0esr-1+rpi1 and 115.12.0esr-1 to produce 115.12.0esr...

diff --cc debian/changelog
index 595ac5032f0f512777000640116fb190478eb6d2,3317762f51010272be5106e30b9336c5df864085..3ee62a9bf755fae31c1833db7d50108191915acb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,62 +1,97 @@@
- firefox-esr (115.7.0esr-1+rpi1) trixie-staging; urgency=medium
++firefox-esr (115.12.0esr-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Dec 2018 06:56:52 +0000]
 +  * Hack broken rust target selection so it produces the right target
 +    on raspbian.
 +  * Fix clean target.
 +
 +  [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green]
 +  * Use a fake homedir for build (Closes: 933757).
 +
 +  [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable webrtc, it seems to fail to build on raspbian.
 +  * Try to disable Neon
 +
 +  [changes introduced in 78.3.0esr-2+rpi1 by Peter Michael Green]
 +  * Clean up pycache directories.
 +  * Disable neon in qcms.
 +
 +  [changes brought over from thunderbird 1:91.3.2-1+rpi1 by Peter Michael Green]
 +  * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting
 +    definitions error.
 +
 +  [changes brought over from thunderbird 1:102.1.1-1+rpi1 by Peter Michael Green]
 +  * Disable more armv7/neon stuff.
 +
 +  [changes introduced in 102.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable jit (or at least try to)
 +    + Pass disable-jit from debian/rules
 +    + Nerf jit detection in s/moz.configure
 +
 +  [changes introduced in 115.3.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable conflicting include in js/src/jit/shared/AtomicOperations-shared-jit.cpp
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Feb 2024 06:28:50 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 25 Jul 2024 12:08:54 +0000
++
+ firefox-esr (115.12.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-26, also known as:
+     CVE-2024-5702, CVE-2024-5688, CVE-2024-5690, CVE-2024-5691,
+     CVE-2024-5693, CVE-2024-5696, CVE-2024-5700.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 12 Jun 2024 05:41:00 +0900
+ 
+ firefox-esr (115.11.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-22, also known as:
+     CVE-2024-4367, CVE-2024-4767, CVE-2024-4768, CVE-2024-4769,
+     CVE-2024-4770, CVE-2024-4777.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 15 May 2024 05:05:03 +0900
+ 
+ firefox-esr (115.10.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-19, also known as:
+     CVE-2024-3852, CVE-2024-3854, CVE-2024-3857, CVE-2024-2609,
+     CVE-2024-3859, CVE-2024-3861, CVE-2024-3302, CVE-2024-3864.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 17 Apr 2024 05:35:49 +0900
+ 
+ firefox-esr (115.9.1esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-16, also known as CVE-2024-29944.
+ 
+  -- Mike Hommey <glandium@debian.org>  Sat, 23 Mar 2024 05:09:32 +0900
+ 
+ firefox-esr (115.9.0esr-2) unstable; urgency=medium
+ 
+   * debian/control*, debian/rules: Undo workaround for bug 1052002.
+ 
+  -- Mike Hommey <glandium@debian.org>  Thu, 21 Mar 2024 14:01:10 +0900
+ 
+ firefox-esr (115.9.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-13, also known as:
+     CVE-2024-0743, CVE-2024-2607, CVE-2024-2608, CVE-2024-2616,
+     CVE-2023-5388, CVE-2024-2610, CVE-2024-2611, CVE-2024-2612,
+     CVE-2024-2614.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 20 Mar 2024 05:59:40 +0900
+ 
+ firefox-esr (115.8.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - Fixed FTBFS with python 3.12. Closes: #1061437.
+   * Fixes for mfsa2024-06, also known as:
+     CVE-2024-1546, CVE-2024-1547, CVE-2024-1548, CVE-2024-1549,
+     CVE-2024-1550, CVE-2024-1551, CVE-2024-1552, CVE-2024-1553.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 21 Feb 2024 06:08:41 +0900
  
  firefox-esr (115.7.0esr-1) unstable; urgency=medium
  

diff --cc debian/rules
index a41d0b447839b885e7484a1990147dd2cbb6678d,0b48b60b65e0c169c61e738636ede09acf0a4202..e72d4234adeb839e0a528c4407976e2270d2c03b
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -142,13 -140,9 +142,9 @@@ ifeq (default,$(origin CXX)
  CXX := g++
  endif
  
- ifeq (,$(filter buster bullseye,$(DIST)))
- PATH := /usr/lib/llvm-14/bin:$(PATH)
- endif
- 
 -ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
 +#ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
  CONFIGURE_FLAGS += --disable-jit
 -endif
 +#endif
  
  CXXFLAGS := $(CFLAGS)
  # Work around https://sourceware.org/bugzilla/show_bug.cgi?id=30578

diff --cc gfx/qcms/src/lib.rs
Simple merge