Merge version 102.11.0esr-1+rpi1 and 102.13.0esr-1~deb12u1 to produce 102.13.0esr...

diff --cc debian/changelog
index 8fa0609c63e862b1859ce6df1777669c990d7469,8e861af7a2ac43485dfdf0d7a388ba8a5e9e17cb..353f74ffe4ede22716d4e5eca263f9d73c50dc19
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,23 +1,55 @@@
- firefox-esr (102.11.0esr-1+rpi1) bookworm-staging; urgency=medium
++firefox-esr (102.13.0esr-1~deb12u1+rpi1) bookworm-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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 03 Jun 2023 06:24:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Jul 2023 23:04:55 +0000
++
+ firefox-esr (102.13.0esr-1~deb12u1) bookworm-security; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2023-23, also known as:
+     CVE-2023-37201, CVE-2023-37202, CVE-2023-37207, CVE-2023-37208,
+     CVE-2023-37211.
+ 
+   * debian/rules, media/ffvpx/config_unix64.h: Work around
+     https://sourceware.org/bugzilla/show_bug.cgi?id=30578.
+   * debian/upstream.mk: Unstable is trixie.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 05 Jul 2023 05:33:32 +0900
+ 
+ firefox-esr (102.12.0esr-1~deb12u1) bookworm-security; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2023-19, also known as:
+     CVE-2023-34414, CVE-2023-34416.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 07 Jun 2023 05:34:19 +0900
  
  firefox-esr (102.11.0esr-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 3977bede4b27f7f4be78812c597c02eb8a66169b,18b82268cdae01dc769fc813d2e5a52737981b3f..b9a9c4ee6a46db3d37eeb3d4f97c669a0becb8af
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -23,10 -23,4 +23,11 @@@ debian-hacks/Work-around-bz-1775202-to-
  debian-hacks/Allow-to-override-rust-LTO-flag.patch
  debian-hacks/Remove-workaround-for-old-libstdc-problem-which-now-.patch
  debian-hacks/Add-missing-webrtc-directory-for-ppc64el-bz-1775202.patch
+ debian-hacks/Work-around-https-sourceware.org-bugzilla-show_bug.c.patch
 +raspbian-rust-triplet-hack.patch
 +try-to-disable-neon.patch
 +try-harder-to-disable-neon.patch
 +disable-neon-in-qcms.patch
 +use-a-define-instead-of-a-typedef-for-do.patch
 +disable-more-armv7neon-stuff.patch
 +disable-jit.patch

diff --cc debian/rules
index 926d141518aa426c48dcb402cf1f2aab27ad4561,0425122664e4f16b720243648c443cbe7cba5d5a..6e8b0ea55c39a1cd6c438233b9d9e14765fb9d45
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -148,11 -146,17 +148,17 @@@ ifeq (default,$(origin CXX)
  CXX := g++
  endif
  
 -ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
 +#ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
  CONFIGURE_FLAGS += --disable-jit
 -endif
 +#endif
  
- CXXFLAGS = $(CFLAGS)
+ CXXFLAGS := $(CFLAGS)
+ # Work around https://sourceware.org/bugzilla/show_bug.cgi?id=30578
+ ifneq (,$(filter trixie,$(DIST)))
+ ifneq (,$(filter amd64,$(DEB_HOST_ARCH)))
+ CFLAGS += -DFFMPEG_DISABLE_INLINE_ASM
+ endif
+ endif
  RUSTFLAGS = --remap-path-prefix=$(CURDIR)=.
  
  EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS MOZILLA_OFFICIAL RUSTFLAGS